From b81a826bd7dc947f0705afb2b4a5a5aa4640098e Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 28 Aug 2020 06:57:05 -0400 Subject: [PATCH 001/399] Nuspec cleanup --- DistributedLock.Azure/DistributedLock.Azure.csproj | 4 ++-- DistributedLock.Core/DistributedLock.Core.csproj | 6 +++--- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 4 ++-- .../DistributedLock.SqlServer.csproj | 4 ++-- .../DistributedLock.WaitHandles.csproj | 4 ++-- DistributedLock/DistributedLock.csproj | 8 ++++++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index b69da01f..99642960 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -13,10 +13,10 @@ 1.0.0-alpha01 1.0.0.0 Michael Adelson - TODO + Provides a distributed locking implementation based on Azure blob leases Copyright © 2020 Michael Adelson MIT - distributed lock async waithandle mutex sql postgres + distributed lock async azure blob lease https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index f92f93bc..c7045d08 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,13 +10,13 @@ - 1.0.0 + 1.0.0-alpha01 1.0.0.0 Michael Adelson - TODO description + Core interfaces and utilities that support the DistributedLock.* family of packages Copyright © 2020 Michael Adelson MIT - TODO tags + distributed lock async mutex reader writer semaphore https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index e7ce454e..e18e101a 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -13,10 +13,10 @@ 1.0.0-alpha01 1.0.0.0 Michael Adelson - TODO + Provides a distributed lock implementation based on Postgresql Copyright © 2020 Michael Adelson MIT - distributed lock async waithandle mutex sql postgres + distributed lock async mutex sql postgres https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index c15ab771..1ec8264b 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -13,10 +13,10 @@ 1.0.0-alpha01 1.0.0.0 Michael Adelson - TODO + Provides a distributed lock implementation based on SQL Server Copyright © 2020 Michael Adelson MIT - TODO + distributed lock async mutex sql sqlserver https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 6de629b7..9017e95c 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -13,10 +13,10 @@ 1.0.0-alpha01 1.0.0.0 Michael Adelson - TODO + Provides a distributed lock implementation based on global WaitHandle objects in Windows Copyright © 2020 Michael Adelson MIT - TODO + distributed lock async mutex waithandle https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 28b8da47..51c1452f 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -13,10 +13,14 @@ 2.0.0-alpha01 2.0.0.0 Michael Adelson - Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines + + Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella + package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also + be installed individually. + Copyright © 2017 Michael Adelson MIT - distributed lock async waithandle mutex sql sqlserver reader writer azure semaphore + distributed lock async waithandle mutex sql sqlserver postgres reader writer azure semaphore https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 From 96665eb61b4ce6d720310c315084d2a3623c9793 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 29 Aug 2020 07:24:50 -0400 Subject: [PATCH 002/399] Fix failing tests --- DistributedLock.SqlServer/SqlSemaphore.cs | 8 +++++--- ...leReaderWriterLockConnectionStringStrategyTestCases.cs | 1 + .../Tests/Azure/AzureBlobLeaseDistributedLockTest.cs | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index a28042f7..5e98449e 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -457,9 +457,11 @@ IF APPLOCK_MODE('public', @{TicketLockNameParameter}, @{LockScopeVariable}) = 'N AND (@{LockScopeVariable} = 'Session' OR APPLOCK_MODE('public', @{TicketLockNameParameter}, 'Session') = 'NoLock') BEGIN {C/* "allowOneWait" will be specified when we are in a busy wait loop. To avoid burning CPU we pick the first unheld ticket we come - across and allow that wait to be 1ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket - becomes available. */} - {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 1 ELSE 0 END" : null)} + across and allow that wait to be 32ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket + becomes available. Note that we used to wait just 1ms here. However, in testing that proved flaky in detecting + deadlocks; empirically, 32ms seems to be sufficient to work reliably. The longer wait should also reduce the + CPU load without meaningfully adding delay overhead. */} + {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 32 ELSE 0 END" : null)} SET @anyNotHeld = 1 {( diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index 5fb76577..5457a2e6 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -21,6 +21,7 @@ public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCas /// Tests the logic where upgrading a connection stops and restarts the keepalive /// [Test] + [NonParallelizable, Retry(tryCount: 3)] // this test is somewhat timing sensitive public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() { var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 7712bf26..9c5b7391 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -188,6 +188,7 @@ public async Task TestSuccessfulRenewal() } [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public void TestTriggersHandleLostIfLeaseExpiresNaturally() { using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); From 5705656e1662436e9ea3e5ad97fdda0b589628e0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 29 Aug 2020 23:27:51 -0400 Subject: [PATCH 003/399] Add test for public namespaces --- DistributedLock.Tests/Tests/ApiTest.cs | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 DistributedLock.Tests/Tests/ApiTest.cs diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs new file mode 100644 index 00000000..da8676eb --- /dev/null +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Linq; +using System.Reflection; +using NUnit.Framework; + +namespace Medallion.Threading.Tests.Tests +{ + public class ApiTest + { + private static object[] DistributedLockAssemblies => typeof(ApiTest).Assembly + .GetReferencedAssemblies() + .Where(a => a.Name.StartsWith("DistributedLock.")) + .ToArray(); + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicNamespaces(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + var publicTypes = assembly.GetTypes() +#if DEBUG + .Where(t => assemblyName.Name != "DistributedLock.Core" || !t.Namespace.Contains(".Internal")) +#endif + .Where(t => t.IsPublic); + + var expectedNamespace = assemblyName.Name.Replace("DistributedLock", "Medallion.Threading") + .Replace(".Core", string.Empty); + foreach (var type in publicTypes) + { + type.Namespace.ShouldEqual(expectedNamespace, $"{type} in {assemblyName}"); + } + } + } +} From f5b6a4391df2c4b00209313f947b532ab7692325 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 31 Aug 2020 06:38:07 -0400 Subject: [PATCH 004/399] Upgrade to latest postgres --- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index e18e101a..c2453f50 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -39,7 +39,7 @@ - + From 17c1ea3afecd8b85edb473ae938bb896d852f9d3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 31 Aug 2020 07:11:18 -0400 Subject: [PATCH 005/399] Test stabilization --- .../Data/ExternalConnectionOrTransactionStrategyTestCases.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index f94edca1..b927780a 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -20,9 +20,10 @@ public abstract class ExternalConnectionOrTransactionStrategyTestCases this._lockProvider.Dispose(); [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing sensitive for SqlSemaphore (see comment in that file regarding the 32ms wait) public void TestDeadlockDetection() { - var timeout = TimeSpan.FromSeconds(30); + var timeout = TimeSpan.FromSeconds(15); using var barrier = new Barrier(participantCount: 2); const string LockName1 = nameof(TestDeadlockDetection) + "_1", From 288fa46af61b19426231d02d303f26f34f3a35b5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 31 Aug 2020 07:12:19 -0400 Subject: [PATCH 006/399] Improve EventWaitHandle construction logic to better recover from UnauthorizedAccessException --- .../EventWaitHandleDistributedLock.cs | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index 58ab2a65..ec495161 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -170,7 +170,6 @@ void RefreshEvent() private EventWaitHandle CreateEvent() { - // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle var security = new EventWaitHandleSecurity(); // allow anyone to wait on and signal this lock security.AddAccessRule( @@ -181,17 +180,38 @@ private EventWaitHandle CreateEvent() ) ); - var @event = new EventWaitHandle( - // if we create, start as unlocked - initialState: true, - // allow only one thread to hold the lock - mode: EventResetMode.AutoReset, - name: this.Name, - createdNew: out _ - ); - @event.SetAccessControl(security); + const int MaxTries = 3; + var tries = 0; + + while (true) + { + ++tries; + try + { + // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle + var @event = new EventWaitHandle( + // if we create, start as unlocked + initialState: true, + // allow only one thread to hold the lock + mode: EventResetMode.AutoReset, + name: this.Name, + createdNew: out _ + ); + @event.SetAccessControl(security); + return @event; + } + // fallback handling based on https://stackoverflow.com/questions/1784392/my-eventwaithandle-says-access-to-the-path-is-denied-but-its-not + catch (UnauthorizedAccessException) when (tries <= MaxTries) + { + if (EventWaitHandle.TryOpenExisting(this.Name, out var existing)) + { + return existing; + } + } - return @event; + // if we fail both, we might be in a race. Add in a small random sleep to attempt desynchronization + Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); + } } bool IInternalDistributedLock.WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken) => false; From 19a226f312d231b8905737b75315bc9c2a10760c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 31 Aug 2020 07:48:01 -0400 Subject: [PATCH 007/399] Simplify SyncOverAsync construct --- .../AzureBlobLeaseDistributedLock.cs | 5 +--- .../AzureBlobLeaseDistributedLockHandle.cs | 2 +- ...onnectionOrTransactionDbDistributedLock.cs | 2 +- .../Data/MultiplexedConnectionLock.cs | 2 +- .../Internal/DistributedLockHelpers.cs | 24 +++++++---------- .../Internal/IInternalDistributedLock.cs | 5 ---- .../Internal/SyncOverAsync.cs | 26 +++++++++---------- .../PostgresDistributedLock.cs | 3 --- .../SqlDistributedLock.cs | 2 -- .../SqlDistributedReaderWriterLockHandle.cs | 2 +- .../SqlDistributedSemaphore.cs | 4 +-- DistributedLock.Tests/Tests/ApiTest.cs | 6 ++--- .../AzureBlobLeaseDistributedLockTest.cs | 2 +- .../Tests/Core/SyncOverAsyncTest.cs | 10 +++---- .../Tests/Data/SqlDatabaseConnectionTest.cs | 4 +-- .../EventWaitHandleDistributedLock.cs | 2 -- 16 files changed, 39 insertions(+), 62 deletions(-) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 6d72e692..1185ef61 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -161,9 +161,6 @@ static string ConvertToValidName(string name) return new AzureBlobLeaseDistributedLockHandle(internalHandle); } - // todo remove - bool IInternalDistributedLock.WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken) => false; - internal sealed class InternalHandle : IDistributedLockHandle { private readonly CancellationTokenSource _renewalCancellationSource = new CancellationTokenSource(); @@ -192,7 +189,7 @@ static Task StartRenewalOrHandleCheckTask(WeakReference weakThis public string LeaseId => this._leaseClient.LeaseId; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, false); + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); public async ValueTask DisposeAsync() { diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index a9d69789..c7796454 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -34,7 +34,7 @@ internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.Inter /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, false); + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); /// /// Releases the lock asynchronously diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index cbc2ec05..8ebb046d 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -139,7 +139,7 @@ public Handle( public DatabaseConnection? Connection => Volatile.Read(ref this._innerHandle)?.Connection; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, willGoAsync: false); + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); public ValueTask DisposeAsync() { diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 9f12abd9..6ab32ec2 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -243,7 +243,7 @@ public ValueTask DisposeAsync() return default; } - void IDisposable.Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, willGoAsync: false); + void IDisposable.Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); } } diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 4483f667..1814cfde 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -65,7 +65,7 @@ public ManagedFinalizationDistributedLockHandle(IDistributedLockHandle innerHand public CancellationToken HandleLostToken => this._innerHandle.HandleLostToken; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, false); + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); public ValueTask DisposeAsync() { @@ -83,16 +83,14 @@ public static THandle Acquire(IInternalDistributedLock @lock, where THandle : class, IDistributedLockHandle => SyncOverAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken), - willGoAsync: @lock.WillGoAsync(timeout, cancellationToken) + (@lock, timeout, cancellationToken) ); public static THandle? TryAcquire(IInternalDistributedLock @lock, TimeSpan timeout, CancellationToken cancellationToken) where THandle : class, IDistributedLockHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken), - willGoAsync: @lock.WillGoAsync(timeout, cancellationToken) + (@lock, timeout, cancellationToken) ); #endregion @@ -105,16 +103,14 @@ public static THandle Acquire(IInternalDistributedReaderWriterLock SyncOverAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken, state.isWrite), - (@lock, timeout, cancellationToken, isWrite), - willGoAsync: false + (@lock, timeout, cancellationToken, isWrite) ); public static THandle? TryAcquire(IInternalDistributedReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken, bool isWrite) where THandle : class, IDistributedLockHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken, state.isWrite), - (@lock, timeout, cancellationToken, isWrite), - willGoAsync: false + (@lock, timeout, cancellationToken, isWrite) ); #endregion @@ -129,8 +125,7 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock SyncOverAsync.Run( state => AcquireUpgradeableReadLockAsync(state.@lock, state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken), - willGoAsync: false + (@lock, timeout, cancellationToken) ); public static TUpgradeableHandle? TryAcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken) @@ -138,8 +133,7 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock SyncOverAsync.Run( state => state.@lock.InternalTryAcquireUpgradeableReadLockAsync(state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken), - willGoAsync: false + (@lock, timeout, cancellationToken) ); #endregion @@ -148,10 +142,10 @@ public static ValueTask UpgradeToWriteLockAsync(IInternalDistributedLockUpgradea handle.InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken).ThrowTimeoutIfFalse(); public static void UpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => - SyncOverAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken), false); + SyncOverAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan timeout, CancellationToken cancellationToken) => - SyncOverAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken), false); + SyncOverAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); #endregion private static Exception LockTimeout() => new TimeoutException("Timeout exceeded when trying to acquire the lock"); diff --git a/DistributedLock.Core/Internal/IInternalDistributedLock.cs b/DistributedLock.Core/Internal/IInternalDistributedLock.cs index 0c231564..ecaf765e 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLock.cs @@ -19,10 +19,5 @@ interface IInternalDistributedLock : IDistributedLock // internals ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); - // todo remove - /// - /// In a sync-over-async scenario, determines whether the code will need to go async anyway - /// - bool WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken); } } diff --git a/DistributedLock.Core/Internal/SyncOverAsync.cs b/DistributedLock.Core/Internal/SyncOverAsync.cs index 698e5703..97bdbddd 100644 --- a/DistributedLock.Core/Internal/SyncOverAsync.cs +++ b/DistributedLock.Core/Internal/SyncOverAsync.cs @@ -24,7 +24,7 @@ static class SyncOverAsync // todo get rid of WillGoAsync, replace with a debug-only API for turning on these assertions that a test can use // e. g. using (SyncOverAsync.SyncMode()) { Assert.DoesNotThrow(() => handle.Dispose()); } - public static void Run(Func action, TState state, bool willGoAsync) + public static void Run(Func action, TState state) { Run( async s => @@ -32,30 +32,30 @@ public static void Run(Func action, TState state, boo await s.action(s.state).ConfigureAwait(false); return true; }, - (action, state), - willGoAsync + (action, state) ); } - public static TResult Run(Func> action, TState state, bool willGoAsync) + public static TResult Run(Func> action, TState state) { Invariant.Require(!_isSynchronous); - if (willGoAsync) - { - var task = action(state); - Invariant.Require(!task.IsCompleted); - // call AsTask(), since https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=netcore-3.1 - // says that we should not call GetAwaiter().GetResult() except on a completed ValueTask - return task.AsTask().GetAwaiter().GetResult(); - } - try { _isSynchronous = true; var task = action(state); Invariant.Require(task.IsCompleted); + + // this should never happen (and can't in the debug build). However, to make absolutely sure we have this as + // fallback logic for the release build + if (!task.IsCompleted) + { + // call AsTask(), since https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=netcore-3.1 + // says that we should not call GetAwaiter().GetResult() except on a completed ValueTask + return task.AsTask().GetAwaiter().GetResult(); + } + return task.GetAwaiter().GetResult(); } finally diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index fd454cd4..beba3ee1 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -61,9 +61,6 @@ private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => this._internalLock.TryAcquireAsync(timeout, PostgresAdvisoryLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new PostgresDistributedLockHandle(h)); - // todo remove - bool IInternalDistributedLock.WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken) => false; - internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, string connectionString, Action? options) { if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index 434a4be5..72ba1f29 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -90,8 +90,6 @@ private SqlDistributedLock(string name, bool exactName, Func DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); - bool IInternalDistributedLock.WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken) => false; - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => this._internalLock.TryAcquireAsync(timeout, SqlApplicationLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new SqlDistributedLockHandle(h)); diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index 4bcfd136..58b7c1ed 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -23,7 +23,7 @@ internal SqlDistributedReaderWriterLockHandle() { } /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this, willGoAsync: false); + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); /// /// Releases the lock asynchronously diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs index 4bcb3a46..13c756ac 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs @@ -76,7 +76,7 @@ private SqlDistributedSemaphore(string name, int maxCount, FuncSpecifies a token by which the wait can be canceled /// A which can be used to release the ticket or null on failure public SqlDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncOverAsync.Run(t => t.@this.TryAcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken), false); + SyncOverAsync.Run(t => t.@this.TryAcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken)); /// /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: @@ -92,7 +92,7 @@ private SqlDistributedSemaphore(string name, int maxCount, FuncSpecifies a token by which the wait can be canceled /// A which can be used to release the ticket public SqlDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncOverAsync.Run(t => t.@this.AcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken), false); + SyncOverAsync.Run(t => t.@this.AcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken)); /// /// Attempts to acquire a semaphore ticket asynchronously. Usage: diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index da8676eb..29ea228b 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -11,7 +11,7 @@ public class ApiTest { private static object[] DistributedLockAssemblies => typeof(ApiTest).Assembly .GetReferencedAssemblies() - .Where(a => a.Name.StartsWith("DistributedLock.")) + .Where(a => a.Name!.StartsWith("DistributedLock.")) .ToArray(); [TestCaseSource(nameof(DistributedLockAssemblies))] @@ -20,11 +20,11 @@ public void TestPublicNamespaces(AssemblyName assemblyName) var assembly = Assembly.Load(assemblyName); var publicTypes = assembly.GetTypes() #if DEBUG - .Where(t => assemblyName.Name != "DistributedLock.Core" || !t.Namespace.Contains(".Internal")) + .Where(t => assemblyName.Name != "DistributedLock.Core" || !t.Namespace!.Contains(".Internal")) #endif .Where(t => t.IsPublic); - var expectedNamespace = assemblyName.Name.Replace("DistributedLock", "Medallion.Threading") + var expectedNamespace = assemblyName.Name!.Replace("DistributedLock", "Medallion.Threading") .Replace(".Core", string.Empty); foreach (var type in publicTypes) { diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 9c5b7391..4d8578eb 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -51,7 +51,7 @@ public async Task TestLockOnDifferentBlobClientTypes( } else { - SyncOverAsync.Run(_ => TestAsync(), default(object), willGoAsync: false); + SyncOverAsync.Run(_ => TestAsync(), default(object)); } async ValueTask TestAsync() diff --git a/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs b/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs index 15d4d7d3..f7e2844e 100644 --- a/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs +++ b/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs @@ -9,24 +9,22 @@ namespace Medallion.Threading.Tests.Core public class SyncOverAsyncTest { [Test] - public void TestSyncOverAsyncVoid([Values] bool willGoAsync) + public void TestSyncOverAsyncVoid() { var currentThread = Thread.CurrentThread; SyncOverAsync.Run<(int a, int b, Thread startingThread, bool expectAsync)>( async state => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), - (1, 2, currentThread, willGoAsync), - willGoAsync: willGoAsync + (1, 2, currentThread, false) ); } [Test] - public void TestSyncOverAsyncWithResult([Values] bool willGoAsync) + public void TestSyncOverAsyncWithResult() { var currentThread = Thread.CurrentThread; var result = SyncOverAsync.Run( async ((int a, int b, Thread startingThread, bool expectAsync) state) => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), - (1, 2, currentThread, willGoAsync), - willGoAsync: willGoAsync + (1, 2, currentThread, false) ); Assert.AreEqual(3, result); } diff --git a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs index 921def0d..f0e66eb6 100644 --- a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs @@ -39,7 +39,7 @@ public async Task TestExecuteNonQueryAlreadyCanceled( } else { - Assert.Catch(() => SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0, false)); + Assert.Catch(() => SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0)); } } @@ -61,7 +61,7 @@ public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] b var task = Task.Run(async () => { if (isAsync) { await command.ExecuteNonQueryAsync(cancellationTokenSource.Token, disallowAsyncCancellation: true); } - else { SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0, false); } + else { SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } }); Assert.IsFalse(task.Wait(TimeSpan.FromSeconds(.1))); diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index ec495161..8ab3dcd6 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -213,7 +213,5 @@ private EventWaitHandle CreateEvent() Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); } } - - bool IInternalDistributedLock.WillGoAsync(TimeoutValue timeout, CancellationToken cancellationToken) => false; } } From 0424b2d68d6633db8ade081116a0a32d8afd7089 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 3 Sep 2020 07:03:31 -0400 Subject: [PATCH 008/399] Implement wait handle semaphore --- DistributedLock.Core/IDistributedSemaphore.cs | 80 +++++++ .../Internal/DistributedLockHelpers.cs | 24 ++- .../Internal/IInternalDistributedSemaphore.cs | 25 +++ ...tributedSemaphore.IDistributedSemaphore.cs | 85 ++++++++ .../SqlDistributedSemaphore.cs | 68 +----- ...ckTestCases.cs => DbSemaphoreTestCases.cs} | 42 +++- .../DistributedLockCoreTestCases.cs | 11 +- .../DistributedSemaphoreCoreTestCases.cs | 28 --- .../SqlServer/TestingSqlServerProviders.cs | 2 +- .../Infrastructure/TestingLockProvider.cs | 2 + .../TestingSemaphoreAsMutexProvider.cs | 6 +- .../TestingSemaphoreProvider.cs | 6 +- .../TestingSynchronizationStrategy.cs | 6 + ...vider.cs => TestingWaitHandleProviders.cs} | 8 + ...stingWaitHandlesSynchronizationStrategy.cs | 3 + .../Tests/CombinatorialTests.cs | 11 +- .../EventWaitHandleDistributedLockTest.cs | 10 +- .../WaitHandleDistributedSemaphoreTest.cs | 95 +++++++++ .../DistributedWaitHandleHelpers.cs | 184 ++++++++++++++++ .../EventWaitHandleDistributedLock.cs | 197 +++--------------- .../EventWaitHandleDistributedLockHandle.cs | 2 +- ...tributedSemaphore.IDistributedSemaphore.cs | 85 ++++++++ .../WaitHandleDistributedSemaphore.cs | 74 +++++++ .../WaitHandleDistributedSemaphoreHandle.cs | 67 ++++++ ...GenerateIDistributedLockImplementations.cs | 16 +- DistributedLockTaker/Program.cs | 6 + 26 files changed, 852 insertions(+), 291 deletions(-) create mode 100644 DistributedLock.Core/IDistributedSemaphore.cs create mode 100644 DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs create mode 100644 DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs rename DistributedLock.Tests/AbstractTestCases/Data/{SemaphoreSelfDeadlockTestCases.cs => DbSemaphoreTestCases.cs} (61%) rename DistributedLock.Tests/Infrastructure/WaitHandles/{TestingEventWaitHandleDistributedLockProvider.cs => TestingWaitHandleProviders.cs} (55%) create mode 100644 DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs create mode 100644 DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs create mode 100644 DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs create mode 100644 DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs create mode 100644 DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs new file mode 100644 index 00000000..e9a284ee --- /dev/null +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading +{ + /// + /// A synchronization primitive which restricts access to a resource or critical section of code to a fixed number of concurrent threads/processes. + /// Compare to . + /// + public interface IDistributedSemaphore + { + /// + /// A name that uniquely identifies the semaphore + /// + string Name { get; } + + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket or null on failure + IDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket + IDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket or null on failure + ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket + ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + } +} diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 1814cfde..c5d4b8ce 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -137,6 +137,26 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock AcquireAsync(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedLockHandle => + @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(@object: "semaphore"); + + public static THandle Acquire(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedLockHandle => + SyncOverAsync.Run( + state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + + public static THandle? TryAcquire(IInternalDistributedSemaphore @lock, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedLockHandle => + SyncOverAsync.Run( + state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + #endregion + #region ---- IDistributedLockUpgradeableHandle implementations ---- public static ValueTask UpgradeToWriteLockAsync(IInternalDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => handle.InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken).ThrowTimeoutIfFalse(); @@ -148,9 +168,9 @@ public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handl SyncOverAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); #endregion - private static Exception LockTimeout() => new TimeoutException("Timeout exceeded when trying to acquire the lock"); + private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); - public static async ValueTask ThrowTimeoutIfNull(this ValueTask task) where T : class => + public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => await task.ConfigureAwait(false) ?? throw LockTimeout(); private static async ValueTask ThrowTimeoutIfFalse(this ValueTask task) diff --git a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs new file mode 100644 index 00000000..617de1b8 --- /dev/null +++ b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Internal +{ +#if DEBUG + public +#else + internal +#endif + interface IInternalDistributedSemaphore : IDistributedSemaphore + where THandle : class, IDistributedLockHandle + { + new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + + // internals + ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); + } +} diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs new file mode 100644 index 00000000..3034ebdd --- /dev/null +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.SqlServer +{ + public partial class SqlDistributedSemaphore + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public SqlDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public SqlDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs index 13c756ac..4e3d247b 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.SqlServer /// /// Implements a distributed semaphore using SQL Server constructs. /// - public class SqlDistributedSemaphore + public sealed partial class SqlDistributedSemaphore : IInternalDistributedSemaphore { private readonly IDbDistributedLock _internalLock; private readonly SqlSemaphore _strategy; @@ -62,71 +62,7 @@ private SqlDistributedSemaphore(string name, int maxCount, Func public string Name { get; } - /// - /// Attempts to acquire a semaphore ticket synchronously. Usage: - /// - /// using (var handle = mySemaphore.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public SqlDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncOverAsync.Run(t => t.@this.TryAcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken)); - - /// - /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: - /// - /// using (mySemaphore.Acquire(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public SqlDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncOverAsync.Run(t => t.@this.AcquireAsync(t.timeout, t.cancellationToken), (@this: this, timeout, cancellationToken)); - - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.TryAcquireInternalAsync(timeout, cancellationToken); - - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - this.TryAcquireInternalAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); - - private async ValueTask TryAcquireInternalAsync(TimeoutValue timeout, CancellationToken cancellationToken) + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { var handle = await this._internalLock.TryAcquireAsync(timeout, this._strategy, cancellationToken, contextHandle: null).ConfigureAwait(false); return handle != null ? new SqlDistributedSemaphoreHandle(handle) : null; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/SemaphoreSelfDeadlockTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs similarity index 61% rename from DistributedLock.Tests/AbstractTestCases/Data/SemaphoreSelfDeadlockTestCases.cs rename to DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs index e5935ae5..01b1a034 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/SemaphoreSelfDeadlockTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs @@ -5,12 +5,7 @@ namespace Medallion.Threading.Tests.Data { - /// - /// These cases test "self-deadlock", where a semaphore acquire cannot possibly succeed because the current connection owns - /// all tickets. Since this can only happen when a connection/transaction is re-used, we require - /// on our providers. - /// - public abstract class SemaphoreSelfDeadlockTestCases + public abstract class DbSemaphoreTestCases where TSemaphoreProvider : TestingSemaphoreProvider, new() where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() where TDb : ITestingDb, new() @@ -20,6 +15,11 @@ public abstract class SemaphoreSelfDeadlockTestCases this._semaphoreProvider = new TSemaphoreProvider(); [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); + /// + /// This case and several that follow test "self-deadlock", where a semaphore acquire cannot possibly succeed because + /// the current connection owns all tickets. Since this can only happen when a connection/transaction is re-used, we require + /// on our providers. + /// [Test] public void TestSelfDeadlockThrowsOnInfiniteWait() { @@ -71,5 +71,35 @@ public void TestSelfDeadlockWaitRespectsCancellation() acquireTask.ContinueWith(t => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); acquireTask.Status.ShouldEqual(TaskStatus.Canceled); } + + [Test] + public void TestSameNameDifferentCounts() + { + var longTimeout = TimeSpan.FromSeconds(5); + + // if 2 semaphores have different views of what the max count is, things still kind of + // work. The semaphore with the higher count behaves normally. The semaphore with the lower + // count behaves normally when the number of contenders is below it's count. After that, it + // behaves unpredictably. For example, if we have counts 2 and 3 and the 3-semaphore holds 2 tickets, + // then the 2-semaphore might or might not be able to acquire a ticket depending on whether the + // 3-semaphore holds tickets 1&2 (no), 1&3 (yes), or 2&3 (yes). This test serves to document + // the behavior that is more well-defined + + var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 2); + var semaphore3 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 3); + + var handle1 = semaphore2.Acquire(longTimeout); + var handle2 = semaphore3.Acquire(longTimeout); + var handle3 = semaphore3.Acquire(longTimeout); + semaphore2.TryAcquire().ShouldEqual(null); + semaphore3.TryAcquire().ShouldEqual(null); + + handle1.Dispose(); + handle1 = semaphore3.Acquire(longTimeout); + + handle1.Dispose(); + handle2.Dispose(); + handle3.Dispose(); + } } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 13fa1c7d..d8bd2507 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -413,8 +413,15 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) command.StandardInput.Flush(); } - using var handle = acquireTask.Result; - Assert.IsNotNull(handle, this.GetType().Name); + if (this._lockProvider.SupportsCrossProcessAbandonment) + { + using var handle = acquireTask.Result; + Assert.IsNotNull(handle, this.GetType().Name); + } + else + { + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromSeconds(1))); + } } private Command RunLockTaker(TLockProvider engine, params string[] args) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index eb42c7e3..6de596cb 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -81,34 +81,6 @@ public void TestHighTicketCount() handles.ForEach(h => h.Dispose()); } - [Test] - public void TestSameNameDifferentCounts() - { - // if 2 semaphores have different views of what the max count is, things still kind of - // work. The semaphore with the higher count behaves normally. The semaphore with the lower - // count behaves normally when the number of contenders is below it's count. After that, it - // behaves unpredictably. For example, if we have counts 2 and 3 and the 3-semaphore holds 2 tickets, - // then the 2-semaphore might or might not be able to acquire a ticket depending on whether the - // 3-semaphore holds tickets 1&2 (no), 1&3 (yes), or 2&3 (yes). This test serves to document - // the behavior that is more well-defined - - var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 2); - var semaphore3 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 3); - - var handle1 = semaphore2.Acquire(LongTimeout); - var handle2 = semaphore3.Acquire(LongTimeout); - var handle3 = semaphore3.Acquire(LongTimeout); - semaphore2.TryAcquire().ShouldEqual(null); - semaphore3.TryAcquire().ShouldEqual(null); - - handle1.Dispose(); - handle1 = semaphore3.Acquire(LongTimeout); - - handle1.Dispose(); - handle2.Dispose(); - handle3.Dispose(); - } - [Test] [NonParallelizable] // somewhat perf-sensitive public void TestSemaphoreParallelism() diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs index 717014f8..f0848237 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs @@ -42,7 +42,7 @@ public sealed class TestingSqlDistributedSemaphoreProvider : Tes where TStrategy : TestingDbSynchronizationStrategy, new() where TDb : ITestingSqlServerDb, new() { - public override SqlDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => this.Strategy.GetConnectionOptions() .Create( (connectionString, options) => diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index 44dbdcab..6d21c7bf 100644 --- a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -11,6 +11,8 @@ public abstract class TestingLockProvider : ITestingNameProvider, IDi public virtual TStrategy Strategy => this._lazyStrategy.Value; + public virtual bool SupportsCrossProcessAbandonment => true; + public abstract IDistributedLock CreateLockWithExactName(string name); public abstract string GetSafeName(string name); diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index 58a36f67..448c0600 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -61,9 +61,9 @@ public override void Dispose() private class SemaphoreAsMutex : IDistributedLock { - private readonly Threading.SqlServer.SqlDistributedSemaphore _semaphore; + private readonly IDistributedSemaphore _semaphore; - public SemaphoreAsMutex(Threading.SqlServer.SqlDistributedSemaphore semaphore) + public SemaphoreAsMutex(IDistributedSemaphore semaphore) { this._semaphore = semaphore; } @@ -98,5 +98,7 @@ public sealed class TestingSemaphore5AsMutexProvider this.Strategy.SupportsCrossProcessSingleSemaphoreTicketAbandonment; } } diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs index c3b981bf..2e7e63e4 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs @@ -9,16 +9,16 @@ public abstract class TestingSemaphoreProvider : ITestingNameProvider { public TStrategy Strategy { get; } = new TStrategy(); - public abstract Threading.SqlServer.SqlDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount); + public abstract IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount); public abstract string GetSafeName(string name); public virtual string GetCrossProcessLockType() => - this.CreateSemaphoreWithExactName(string.Empty, maxCount: 1).GetType().Name; + this.CreateSemaphore(string.Empty, maxCount: 1).GetType().Name; /// /// Returns a semaphore whose name is based on /// - public Threading.SqlServer.SqlDistributedSemaphore CreateSemaphore(string baseName, int maxCount) => + public IDistributedSemaphore CreateSemaphore(string baseName, int maxCount) => this.CreateSemaphoreWithExactName(this.GetUniqueSafeName(baseName), maxCount); public void Dispose() => this.Strategy.Dispose(); diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 0e85eded..8ac80695 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -10,6 +10,12 @@ namespace Medallion.Threading.Tests /// public abstract class TestingSynchronizationStrategy : IDisposable { + /// + /// Whether or not abandoning a ticket held in another process will cause that ticket + /// to be released if tickets are still held elsewhere + /// + public virtual bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => true; + public virtual void PrepareForHandleAbandonment() { } public virtual void PerformAdditionalCleanupForHandleAbandonment() { } public virtual IDisposable? PrepareForHandleLost() => null; diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingEventWaitHandleDistributedLockProvider.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs similarity index 55% rename from DistributedLock.Tests/Infrastructure/WaitHandles/TestingEventWaitHandleDistributedLockProvider.cs rename to DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index feb54e75..90718f07 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingEventWaitHandleDistributedLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -12,4 +12,12 @@ public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockP public override string GetSafeName(string name) => EventWaitHandleDistributedLock.GetSafeName(name); } + + [SupportsContinuousIntegration] + public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider + { + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); + + public override string GetSafeName(string name) => WaitHandleDistributedSemaphore.GetSafeName(name); + } } diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs index 7906a10a..36875cbd 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs @@ -7,5 +7,8 @@ namespace Medallion.Threading.Tests.WaitHandles [SupportsContinuousIntegration] public sealed class TestingWaitHandlesSynchronizationStrategy : TestingSynchronizationStrategy { + // since the wait handle won't be collected by the system until all instances of it are closed, + // we won't see abandoned handles release their tickets until the semaphore is fully abandoned + public override bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => false; } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index e7ad960e..f8371842 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -92,6 +92,10 @@ public class Core_Sql_ExternalTransactionSynchronizationStrategy_SqlServerDb_Sql public class Core_Sql_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDbTest : DistributedLockCoreTestCases, TestingSystemDataSqlServerDb>, TestingExternalTransactionSynchronizationStrategy> { } public class Core_Sql_OwnedConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedConnectionSynchronizationStrategy_SqlServerDbTest : DistributedLockCoreTestCases, TestingSqlServerDb>, TestingOwnedConnectionSynchronizationStrategy> { } public class Core_Sql_OwnedTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedTransactionSynchronizationStrategy_SqlServerDbTest : DistributedLockCoreTestCases, TestingSqlServerDb>, TestingOwnedTransactionSynchronizationStrategy> { } + public class DbSemaphore_SqlSemaphore_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : DbSemaphoreTestCases, TestingSqlServerDb>, TestingExternalConnectionSynchronizationStrategy, TestingSqlServerDb> { } + public class DbSemaphore_SqlSemaphore_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDbTest : DbSemaphoreTestCases, TestingSystemDataSqlServerDb>, TestingExternalConnectionSynchronizationStrategy, TestingSystemDataSqlServerDb> { } + public class DbSemaphore_SqlSemaphore_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : DbSemaphoreTestCases, TestingSqlServerDb>, TestingExternalTransactionSynchronizationStrategy, TestingSqlServerDb> { } + public class DbSemaphore_SqlSemaphore_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDbTest : DbSemaphoreTestCases, TestingSystemDataSqlServerDb>, TestingExternalTransactionSynchronizationStrategy, TestingSystemDataSqlServerDb> { } public class ExternalConnectionOrTransactionStrategy_ReaderWriterAsMutex_SqlReaderWriter_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalConnectionSynchronizationStrategy_SqlServerDb_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingSqlServerDb>, TestingExternalConnectionSynchronizationStrategy>, TestingExternalConnectionSynchronizationStrategy, TestingSqlServerDb> { } public class ExternalConnectionOrTransactionStrategy_ReaderWriterAsMutex_SqlReaderWriter_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingSystemDataSqlServerDb>, TestingExternalConnectionSynchronizationStrategy>, TestingExternalConnectionSynchronizationStrategy, TestingSystemDataSqlServerDb> { } public class ExternalConnectionOrTransactionStrategy_ReaderWriterAsMutex_SqlReaderWriter_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalTransactionSynchronizationStrategy_SqlServerDb_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingSqlServerDb>, TestingExternalTransactionSynchronizationStrategy>, TestingExternalTransactionSynchronizationStrategy, TestingSqlServerDb> { } @@ -150,10 +154,6 @@ public class SemaphoreCore_SqlSemaphore_ExternalTransactionSynchronizationStrate public class SemaphoreCore_SqlSemaphore_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDbTest : DistributedSemaphoreCoreTestCases, TestingSystemDataSqlServerDb>, TestingExternalTransactionSynchronizationStrategy> { } public class SemaphoreCore_SqlSemaphore_OwnedConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedConnectionSynchronizationStrategy_SqlServerDbTest : DistributedSemaphoreCoreTestCases, TestingSqlServerDb>, TestingOwnedConnectionSynchronizationStrategy> { } public class SemaphoreCore_SqlSemaphore_OwnedTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedTransactionSynchronizationStrategy_SqlServerDbTest : DistributedSemaphoreCoreTestCases, TestingSqlServerDb>, TestingOwnedTransactionSynchronizationStrategy> { } - public class SemaphoreSelfDeadlock_SqlSemaphore_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalConnectionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : SemaphoreSelfDeadlockTestCases, TestingSqlServerDb>, TestingExternalConnectionSynchronizationStrategy, TestingSqlServerDb> { } - public class SemaphoreSelfDeadlock_SqlSemaphore_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalConnectionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDbTest : SemaphoreSelfDeadlockTestCases, TestingSystemDataSqlServerDb>, TestingExternalConnectionSynchronizationStrategy, TestingSystemDataSqlServerDb> { } - public class SemaphoreSelfDeadlock_SqlSemaphore_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_ExternalTransactionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : SemaphoreSelfDeadlockTestCases, TestingSqlServerDb>, TestingExternalTransactionSynchronizationStrategy, TestingSqlServerDb> { } - public class SemaphoreSelfDeadlock_SqlSemaphore_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDb_ExternalTransactionSynchronizationStrategy_SystemDataSqlServerDb_SystemDataSqlServerDbTest : SemaphoreSelfDeadlockTestCases, TestingSystemDataSqlServerDb>, TestingExternalTransactionSynchronizationStrategy, TestingSystemDataSqlServerDb> { } public class UpgradeableReaderWriterConnectionStringStrategy_SqlReaderWriter_ConnectionMultiplexingSynchronizationStrategy_SqlServerDb_SqlServerDb_ConnectionMultiplexingSynchronizationStrategy_SqlServerDb_SqlServerDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases, TestingSqlServerDb>, TestingConnectionMultiplexingSynchronizationStrategy, TestingSqlServerDb> { } public class UpgradeableReaderWriterConnectionStringStrategy_SqlReaderWriter_OwnedConnectionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedConnectionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases, TestingSqlServerDb>, TestingOwnedConnectionSynchronizationStrategy, TestingSqlServerDb> { } public class UpgradeableReaderWriterConnectionStringStrategy_SqlReaderWriter_OwnedTransactionSynchronizationStrategy_SqlServerDb_SqlServerDb_OwnedTransactionSynchronizationStrategy_SqlServerDb_SqlServerDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases, TestingSqlServerDb>, TestingOwnedTransactionSynchronizationStrategy, TestingSqlServerDb> { } @@ -169,4 +169,7 @@ public class UpgradeableReaderWriterCore_SqlReaderWriter_OwnedTransactionSynchro namespace Medallion.Threading.Tests.WaitHandles { [Category("CI")] public class Core_EventWaitHandle_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases { } + [Category("CI")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandlesSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } + public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index 33a8cc35..2dc15033 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -33,8 +33,10 @@ public void TestWorkingName(string name, NameStyle nameStyle) => [Test] public void TestMaxLengthNames() { - var maxLengthName = EventWaitHandleDistributedLock.GlobalPrefix - + new string('a', EventWaitHandleDistributedLock.MaxNameLength - EventWaitHandleDistributedLock.GlobalPrefix.Length); + EventWaitHandleDistributedLock.MaxNameLength.ShouldEqual(DistributedWaitHandleHelpers.MaxNameLength); + + var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix + + new string('a', EventWaitHandleDistributedLock.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); this.TestWorkingName(maxLengthName, NameStyle.Exact); this.TestBadName(maxLengthName + "a", NameStyle.Exact); } @@ -59,7 +61,7 @@ public void TestGetSafeLockNameCompat() { // stored separately for testing compat const int MaxNameLengthWithoutGlobalPrefix = 253; - (EventWaitHandleDistributedLock.MaxNameLength - EventWaitHandleDistributedLock.GlobalPrefix.Length) + (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); EventWaitHandleDistributedLock.GetSafeName("").ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); @@ -75,7 +77,7 @@ public void TestGetSafeLockNameCompat() private static EventWaitHandleDistributedLock CreateLock(string name, NameStyle nameStyle) => new EventWaitHandleDistributedLock( - (nameStyle == NameStyle.AddPrefix ? EventWaitHandleDistributedLock.GlobalPrefix + name : name), + (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), abandonmentCheckCadence: TimeSpan.FromSeconds(.3), exactName: nameStyle != NameStyle.Safe ); diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs new file mode 100644 index 00000000..f4c37912 --- /dev/null +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -0,0 +1,95 @@ +using Medallion.Threading.WaitHandles; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.Tests.WaitHandles +{ + [Category("CI")] + public class WaitHandleDistributedSemaphoreTest + { + [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] + [TestCase(null, NameStyle.Safe, ExpectedResult = typeof(ArgumentNullException))] + [TestCase("abc", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"gLoBaL\weirdPrefixCasing", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"global\weirdPrefixCasing2", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase("", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + [TestCase(@"a\b", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + public Type TestBadName(string? name, NameStyle nameStyle) + { + if (name != null) + { + this.TestWorkingName(name, NameStyle.Safe); // should always work + } + + return Assert.Catch(() => CreateAsLock(name!, nameStyle)).GetType(); + } + + [TestCase(" \t", NameStyle.AddPrefix)] + [TestCase("/a/b/c", NameStyle.AddPrefix)] + [TestCase("\r\n", NameStyle.AddPrefix)] + public void TestWorkingName(string name, NameStyle nameStyle) => + Assert.DoesNotThrow(() => CreateAsLock(name, nameStyle).Acquire().Dispose()); + + [Test] + public void TestMaxLengthNames() + { + WaitHandleDistributedSemaphore.MaxNameLength.ShouldEqual(DistributedWaitHandleHelpers.MaxNameLength); + + var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix + + new string('a', WaitHandleDistributedSemaphore.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); + this.TestWorkingName(maxLengthName, NameStyle.Exact); + this.TestBadName(maxLengthName + "a", NameStyle.Exact); + } + + [Test] + public void TestGarbageCollection() + { + var @lock = CreateAsLock("gc_test", NameStyle.AddPrefix); + WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); + + var weakHandle = AbandonLock(); + GC.Collect(); + GC.WaitForPendingFinalizers(); + + weakHandle.IsAlive.ShouldEqual(false); + using var handle = @lock.TryAcquire(); + Assert.IsNotNull(handle); + } + + [Test] + public void TestGetSafeLockNameCompat() + { + // stored separately for testing compat + const int MaxNameLengthWithoutGlobalPrefix = 253; + (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) + .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); + + WaitHandleDistributedSemaphore.GetSafeName("").ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + WaitHandleDistributedSemaphore.GetSafeName("abc").ShouldEqual(@"Global\abc"); + WaitHandleDistributedSemaphore.GetSafeName("\\").ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); + WaitHandleDistributedSemaphore.GetSafeName(new string('a', MaxNameLengthWithoutGlobalPrefix)) + .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); + WaitHandleDistributedSemaphore.GetSafeName(new string('\\', MaxNameLengthWithoutGlobalPrefix)) + .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); + WaitHandleDistributedSemaphore.GetSafeName(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)) + .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); + } + + private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => + new WaitHandleDistributedSemaphore( + (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), + maxCount: 1, + abandonmentCheckCadence: TimeSpan.FromSeconds(.3), + exactName: nameStyle != NameStyle.Safe + ); + + public enum NameStyle + { + Exact, + AddPrefix, + Safe, + } + } +} diff --git a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs new file mode 100644 index 00000000..e7026708 --- /dev/null +++ b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs @@ -0,0 +1,184 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.WaitHandles +{ + internal static class DistributedWaitHandleHelpers + { + internal const string GlobalPrefix = @"Global\"; + private static readonly TimeoutValue DefaultAbandonmentCheckCadence = TimeSpan.FromSeconds(2); + + // 260 based on LINQPad experimentation + public static int MaxNameLength => 260; + + public static string GetSafeName(string name) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + // Note: the reason we don't add GlobalPrefix inside the ToSafeLockName callback + // is for backwards compat with the SystemDistributedLock.GetSafeLockName in 1.0. + // In that version, the global prefix was not exposed as part of the name, and as + // such it was not accounted for in the hashing performed by ToSafeLockName. + + if (name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) + { + var suffix = name.Substring(GlobalPrefix.Length); + var safeSuffix = ConvertToSafeSuffix(suffix); + return safeSuffix == suffix ? name : GlobalPrefix + safeSuffix; + } + + return GlobalPrefix + ConvertToSafeSuffix(name); + + static string ConvertToSafeSuffix(string suffix) => DistributedLockHelpers.ToSafeName( + suffix, + MaxNameLength - GlobalPrefix.Length, + s => s.Length == 0 ? "EMPTY" : s.Replace('\\', '_') + ); + } + + public static string ValidateAndFinalizeName(string name, bool exactName) + { + if (exactName) + { + ValidateName(name); + return name; + } + + return GetSafeName(name); + } + + private static void ValidateName(string name) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + if (!name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) { throw new FormatException($"{nameof(name)}: must start with '{GlobalPrefix}'"); } + if (name == GlobalPrefix) { throw new FormatException($"{nameof(name)} must not be exactly '{GlobalPrefix}'"); } + if (name.IndexOf('\\', startIndex: GlobalPrefix.Length) >= 0) { throw new FormatException(nameof(name) + @": must not contain '\'"); } + } + + public static TimeoutValue ValidateAndFinalizeAbandonmentCheckCadence(TimeSpan? abandonmentCheckCadence) + { + if (abandonmentCheckCadence.HasValue) + { + var result = new TimeoutValue(abandonmentCheckCadence, nameof(abandonmentCheckCadence)); + if (result.IsZero) { throw new ArgumentOutOfRangeException(nameof(abandonmentCheckCadence), "must not be zero"); } + return result; + } + return DefaultAbandonmentCheckCadence; + } + + public static TWaitHandle CreateDistributedWaitHandle( + Func createNew, + TryOpenExisting tryOpenExisting) + where TWaitHandle : WaitHandle + { + const int MaxTries = 3; + var tries = 0; + + while (true) + { + ++tries; + try + { + return createNew(); + } + // fallback handling based on https://stackoverflow.com/questions/1784392/my-eventwaithandle-says-access-to-the-path-is-denied-but-its-not + catch (UnauthorizedAccessException) when (tries <= MaxTries) + { + if (tryOpenExisting(out var existing)) + { + return existing; + } + } + + // if we fail both, we might be in a race. Add in a small random sleep to attempt desynchronization + Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); + } + } + + public delegate bool TryOpenExisting(out TWaitHandle existing) where TWaitHandle : WaitHandle; + + public static async ValueTask CreateAndWaitAsync( + Func createHandle, + TimeoutValue abandonmentCheckCadence, + TimeoutValue timeout, + CancellationToken cancellationToken) + where TWaitHandle : WaitHandle + { + var handle = createHandle(); + var cleanup = true; + try + { + if (abandonmentCheckCadence.IsInfinite) + { + // no abandonment check: just acquire once + if (await handle.WaitOneAsync(timeout, cancellationToken).ConfigureAwait(false)) + { + cleanup = false; + return handle; + } + return null; + } + + if (timeout.IsInfinite) + { + // infinite timeout: just loop forever with the abandonment check + while (true) + { + if (await handle.WaitOneAsync(abandonmentCheckCadence, cancellationToken).ConfigureAwait(false)) + { + cleanup = false; + return handle; + } + + // refresh the event in case it was abandoned by the original owner + RefreshEvent(); + } + } + + // fixed timeout: loop in abandonment check chunks + var elapsedMillis = 0; + do + { + var nextWaitMillis = Math.Min(abandonmentCheckCadence.InMilliseconds, timeout.InMilliseconds - elapsedMillis); + if (await handle.WaitOneAsync(TimeSpan.FromMilliseconds(nextWaitMillis), cancellationToken).ConfigureAwait(false)) + { + cleanup = false; + return handle; + } + + elapsedMillis += nextWaitMillis; + + // refresh the event in case it was abandoned by the original owner + RefreshEvent(); + } + while (elapsedMillis < timeout.InMilliseconds); + + return null; + } + catch + { + // just in case we fail to create a scope or something + cleanup = true; + throw; + } + finally + { + if (cleanup) + { + handle.Dispose(); + } + } + + void RefreshEvent() + { + handle.Dispose(); + handle = createHandle(); + } + } + } +} diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index 8ab3dcd6..3457eec2 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -12,9 +12,6 @@ namespace Medallion.Threading.WaitHandles /// public sealed partial class EventWaitHandleDistributedLock : IInternalDistributedLock { - internal const string GlobalPrefix = @"Global\"; - private static readonly TimeoutValue DefaultAbandonmentCheckCadence = TimeSpan.FromSeconds(2); - private readonly TimeoutValue _abandonmentCheckCadence; /// @@ -27,35 +24,14 @@ public sealed partial class EventWaitHandleDistributedLock : IInternalDistribute /// public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) { - if (exactName) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - if (!name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) { throw new FormatException($"{nameof(name)}: must start with '{GlobalPrefix}'"); } - if (name == GlobalPrefix) { throw new FormatException($"{nameof(name)} must not be exactly '{GlobalPrefix}'"); } - if (name.IndexOf('\\', startIndex: GlobalPrefix.Length) >= 0) { throw new FormatException(nameof(name) + @": must not contain '\'"); } - - this.Name = name; - } - else - { - this.Name = GetSafeName(name); - } - - if (abandonmentCheckCadence.HasValue) - { - this._abandonmentCheckCadence = new TimeoutValue(abandonmentCheckCadence, nameof(abandonmentCheckCadence)); - if (this._abandonmentCheckCadence.IsZero) { throw new ArgumentOutOfRangeException(nameof(abandonmentCheckCadence), "must not be zero"); } - } - else { this._abandonmentCheckCadence = DefaultAbandonmentCheckCadence; } + this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); + this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); } /// /// The maximum allowed length for lock names /// - // 260 based on LINQPad experimentation - public static int MaxNameLength => 260; + public static int MaxNameLength => DistributedWaitHandleHelpers.MaxNameLength; /// /// Implements @@ -67,151 +43,44 @@ public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCad /// /// Equivalent to /// - public static string GetSafeName(string name) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - // Note: the reason we don't add GlobalPrefix inside the ToSafeLockName callback - // is for backwards compat with the SystemDistributedLock.GetSafeLockName in 1.0. - // In that version, the global prefix was not exposed as part of the name, and as - // such it was not accounted for in the hashing performed by ToSafeLockName. - - if (name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) - { - var suffix = name.Substring(GlobalPrefix.Length); - var safeSuffix = ConvertToSafeSuffix(suffix); - return safeSuffix == suffix ? name : GlobalPrefix + safeSuffix; - } - - return GlobalPrefix + ConvertToSafeSuffix(name); - - static string ConvertToSafeSuffix(string suffix) => DistributedLockHelpers.ToSafeName( - suffix, - MaxNameLength - GlobalPrefix.Length, - s => s.Length == 0 ? "EMPTY" : s.Replace('\\', '_') - ); - } + public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); async ValueTask IInternalDistributedLock.InternalTryAcquireAsync( - TimeoutValue timeout, + TimeoutValue timeout, CancellationToken cancellationToken) { - var @event = this.CreateEvent(); - var cleanup = true; - try - { - if (this._abandonmentCheckCadence.IsInfinite) - { - // no abandonment check: just acquire once - if (await @event.WaitOneAsync(timeout, cancellationToken).ConfigureAwait(false)) - { - cleanup = false; - return new EventWaitHandleDistributedLockHandle(@event); - } - return null; - } - - if (timeout.IsInfinite) - { - // infinite timeout: just loop forever with the abandonment check - while (true) - { - if (await @event.WaitOneAsync(this._abandonmentCheckCadence, cancellationToken).ConfigureAwait(false)) - { - cleanup = false; - return new EventWaitHandleDistributedLockHandle(@event); - } - - // refresh the event in case it was abandoned by the original owner - RefreshEvent(); - } - } - - // fixed timeout: loop in abandonment check chunks - var elapsedMillis = 0; - do - { - var nextWaitMillis = Math.Min(this._abandonmentCheckCadence.InMilliseconds, timeout.InMilliseconds - elapsedMillis); - if (await @event.WaitOneAsync(TimeSpan.FromMilliseconds(nextWaitMillis), cancellationToken).ConfigureAwait(false)) - { - cleanup = false; - return new EventWaitHandleDistributedLockHandle(@event); - } - - elapsedMillis += nextWaitMillis; - - // refresh the event in case it was abandoned by the original owner - RefreshEvent(); - } - while (elapsedMillis < timeout.InMilliseconds); - - return null; - } - catch - { - // just in case we fail to create a scope or something - cleanup = true; - throw; - } - finally - { - if (cleanup) - { - @event.Dispose(); - } - } - - void RefreshEvent() - { - @event.Dispose(); - @event = this.CreateEvent(); - } + var @event = await DistributedWaitHandleHelpers.CreateAndWaitAsync( + createHandle: this.CreateEvent, + abandonmentCheckCadence: this._abandonmentCheckCadence, + timeout: timeout, + cancellationToken: cancellationToken + ).ConfigureAwait(false); + return @event != null ? new EventWaitHandleDistributedLockHandle(@event) : null; } - private EventWaitHandle CreateEvent() - { - var security = new EventWaitHandleSecurity(); - // allow anyone to wait on and signal this lock - security.AddAccessRule( - new EventWaitHandleAccessRule( + private EventWaitHandle CreateEvent() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( + createNew: () => + { + // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle + var security = new EventWaitHandleSecurity(); + // allow anyone to wait on and signal this lock + security.AddAccessRule(new EventWaitHandleAccessRule( new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), EventWaitHandleRights.FullControl, // doesn't seem to work without this :-/ AccessControlType.Allow - ) - ); - - const int MaxTries = 3; - var tries = 0; - - while (true) - { - ++tries; - try - { - // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle - var @event = new EventWaitHandle( - // if we create, start as unlocked - initialState: true, - // allow only one thread to hold the lock - mode: EventResetMode.AutoReset, - name: this.Name, - createdNew: out _ - ); - @event.SetAccessControl(security); - return @event; - } - // fallback handling based on https://stackoverflow.com/questions/1784392/my-eventwaithandle-says-access-to-the-path-is-denied-but-its-not - catch (UnauthorizedAccessException) when (tries <= MaxTries) - { - if (EventWaitHandle.TryOpenExisting(this.Name, out var existing)) - { - return existing; - } - } - - // if we fail both, we might be in a race. Add in a small random sleep to attempt desynchronization - Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); - } - } + )); + var @event = new EventWaitHandle( + // if we create, start as unlocked + initialState: true, + // allow only one thread to hold the lock + mode: EventResetMode.AutoReset, + name: this.Name, + createdNew: out var createdNew + ); + if (createdNew) { @event.SetAccessControl(security); } + return @event; + }, + tryOpenExisting: delegate (out EventWaitHandle existing) { return EventWaitHandle.TryOpenExisting(this.Name, out existing); } + ); } } diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs index 248e85b6..216463aa 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs @@ -6,7 +6,7 @@ namespace Medallion.Threading.WaitHandles { /// - /// See + /// Implements /// public sealed class EventWaitHandleDistributedLockHandle : IDistributedLockHandle { diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs new file mode 100644 index 00000000..72ab4c17 --- /dev/null +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.WaitHandles +{ + public partial class WaitHandleDistributedSemaphore + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public WaitHandleDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public WaitHandleDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs new file mode 100644 index 00000000..574e986b --- /dev/null +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -0,0 +1,74 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Security.AccessControl; +using System.Security.Principal; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.WaitHandles +{ + public sealed partial class WaitHandleDistributedSemaphore : IInternalDistributedSemaphore + { + private readonly int _maxCount; + private readonly TimeoutValue _abandonmentCheckCadence; + + /// + /// Constructs a lock with the given . + /// + /// specifies how frequently we refresh our object in case it is abandoned by + /// its original owner. The default is 2s. + /// + /// Unless is specified, will be called on the provided . + /// + public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) + { + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + + this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); + this._maxCount = maxCount; + this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); + } + + /// + /// The maximum length allowed for semaphore names + /// + public static int MaxNameLength => DistributedWaitHandleHelpers.MaxNameLength; + + public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); + + /// + /// The semaphore name + /// + public string Name { get; } + + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var semaphore = await DistributedWaitHandleHelpers.CreateAndWaitAsync( + createHandle: this.CreateSemaphore, + abandonmentCheckCadence: this._abandonmentCheckCadence, + timeout: timeout, + cancellationToken: cancellationToken + ).ConfigureAwait(false); + return semaphore != null ? new WaitHandleDistributedSemaphoreHandle(semaphore) : null; + } + + private Semaphore CreateSemaphore() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( + createNew: () => + { + var security = new SemaphoreSecurity(); + // allow anyone to wait on and signal this semaphore + security.AddAccessRule(new SemaphoreAccessRule( + new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), + SemaphoreRights.FullControl, + AccessControlType.Allow + )); + var semaphore = new Semaphore(initialCount: this._maxCount, maximumCount: this._maxCount, name: this.Name, createdNew: out var createdNew); + if (createdNew) { semaphore.SetAccessControl(security); } + return semaphore; + }, + tryOpenExisting: delegate (out Semaphore existing) { return Semaphore.TryOpenExisting(this.Name, out existing); } + ); + } +} diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs new file mode 100644 index 00000000..cc75aa16 --- /dev/null +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs @@ -0,0 +1,67 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.WaitHandles +{ + /// + /// Implements + /// + public sealed class WaitHandleDistributedSemaphoreHandle : IDistributedLockHandle + { + private readonly SemaphoreReleaser _semaphoreReleaser; + private IDisposable? _finalizerRegistration; + + internal WaitHandleDistributedSemaphoreHandle(Semaphore semaphore) + { + this._semaphoreReleaser = new SemaphoreReleaser(semaphore); + // We need a managed finalizer here because an abandoned Semaphore instance won't release its tickets unless + // all instances of that Semaphore are also abandoned (any one live instance tracks the current ticket count). + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, this._semaphoreReleaser); + } + + public CancellationToken HandleLostToken => + Volatile.Read(ref this._finalizerRegistration) != null ? CancellationToken.None : throw this.ObjectDisposed(); + + public void Dispose() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + this._semaphoreReleaser.Dispose(); + } + + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; + } + + private class SemaphoreReleaser : IDisposable, IAsyncDisposable + { + private Semaphore? _semaphore; + + public SemaphoreReleaser(Semaphore semaphore) + { + this._semaphore = semaphore; + } + + public void Dispose() + { + var semaphore = Interlocked.Exchange(ref this._semaphore, null); + if (semaphore != null) + { + try { semaphore.Release(); } + finally { semaphore.Dispose(); } + } + } + + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; + } + } + } +} diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 167e23b5..f679e0dd 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -12,11 +12,11 @@ namespace DistributedLockCodeGen public class GenerateIDistributedLockImplementations { [Test] - public void GenerateForIDistributedLock() + public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore")] string name) { var files = CodeGenHelpers.EnumerateSolutionFiles() - .Where(f => f.IndexOf("DistributedLock.Core", StringComparison.OrdinalIgnoreCase) < 0) - .Where(f => f.EndsWith("DistributedLock.cs", StringComparison.OrdinalIgnoreCase) && Path.GetFileName(f)[0] != 'I'); + .Where(f => f.IndexOf($"Distributed{name}.Core", StringComparison.OrdinalIgnoreCase) < 0) + .Where(f => f.EndsWith($"Distributed{name}.cs", StringComparison.OrdinalIgnoreCase) && Path.GetFileName(f)[0] != 'I'); var errors = new List(); foreach (var file in files) @@ -28,7 +28,7 @@ public void GenerateForIDistributedLock() continue; } - if (!lockCode.Contains(": IInternalDistributedLock<")) + if (!lockCode.Contains($": IInternalDistributed{name}<")) { errors.Add($"{file} does not implement the expected interface"); continue; @@ -38,10 +38,10 @@ public void GenerateForIDistributedLock() var handleType = lockType + "Handle"; var explicitImplementations = new StringBuilder(); - const string Interface = "IDistributedLock", InterfaceHandle = Interface + "Handle"; + var @interface = $"IDistributed{name}"; foreach (var method in new[] { "TryAcquire", "Acquire", "TryAcquireAsync", "AcquireAsync" }) { - AppendExplicitInterfaceMethod(explicitImplementations, Interface, method, InterfaceHandle); + AppendExplicitInterfaceMethod(explicitImplementations, @interface, method, "IDistributedLockHandle"); } var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; @@ -65,7 +65,7 @@ public partial class {lockType} DistributedLockHelpers.Acquire(this, timeout, cancellationToken); public ValueTask<{handleType}?> TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); public ValueTask<{handleType}> AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); @@ -73,7 +73,7 @@ public partial class {lockType} }}"; code = DocCommentGenerator.AddDocComments(code); - var outputPath = Path.Combine(Path.GetDirectoryName(file)!, Path.GetFileNameWithoutExtension(file) + ".IDistributedLock.cs"); + var outputPath = Path.Combine(Path.GetDirectoryName(file)!, Path.GetFileNameWithoutExtension(file) + $".IDistributed{name}.cs"); if (!File.Exists(outputPath) || File.ReadAllText(outputPath) != code) { File.WriteAllText(outputPath, code); diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 9cd246d3..5c6b30bc 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -43,6 +43,12 @@ public static int Main(string[] args) case nameof(EventWaitHandleDistributedLock): handle = new EventWaitHandleDistributedLock(name).Acquire(); break; + case nameof(WaitHandleDistributedSemaphore) + "1AsMutex": + handle = new WaitHandleDistributedSemaphore(name, maxCount: 1).Acquire(); + break; + case nameof(WaitHandleDistributedSemaphore) + "5AsMutex": + handle = new WaitHandleDistributedSemaphore(name, maxCount: 5).Acquire(); + break; case nameof(AzureBlobLeaseDistributedLock): handle = new AzureBlobLeaseDistributedLock( new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), From b9cbe8e46d95512bec15398e224dabeb1e4c5fcd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 3 Sep 2020 07:12:18 -0400 Subject: [PATCH 009/399] Add test to ensure types are properly sealed --- .../Internal/DistributedLockHelpers.cs | 2 +- DistributedLock.Tests/Tests/ApiTest.cs | 35 ++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index c5d4b8ce..1866846b 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -171,7 +171,7 @@ public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handl private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => - await task.ConfigureAwait(false) ?? throw LockTimeout(); + await task.ConfigureAwait(false) ?? throw LockTimeout(@object); private static async ValueTask ThrowTimeoutIfFalse(this ValueTask task) { diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 29ea228b..d0a8460a 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -7,6 +7,7 @@ namespace Medallion.Threading.Tests.Tests { + [Category("CI")] public class ApiTest { private static object[] DistributedLockAssemblies => typeof(ApiTest).Assembly @@ -17,19 +18,37 @@ public class ApiTest [TestCaseSource(nameof(DistributedLockAssemblies))] public void TestPublicNamespaces(AssemblyName assemblyName) { - var assembly = Assembly.Load(assemblyName); - var publicTypes = assembly.GetTypes() -#if DEBUG - .Where(t => assemblyName.Name != "DistributedLock.Core" || !t.Namespace!.Contains(".Internal")) -#endif - .Where(t => t.IsPublic); - var expectedNamespace = assemblyName.Name!.Replace("DistributedLock", "Medallion.Threading") .Replace(".Core", string.Empty); - foreach (var type in publicTypes) + foreach (var type in GetPublicTypes(Assembly.Load(assemblyName))) { type.Namespace.ShouldEqual(expectedNamespace, $"{type} in {assemblyName}"); } } + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicApisAreSealed(AssemblyName assemblyName) + { + foreach (var type in GetPublicTypes(Assembly.Load(assemblyName)).Where(t => t.IsClass)) + { + if (!type.IsAbstract) + { + Assert.IsTrue(type.IsSealed, $"{type} should be sealed"); + } + else + { + Assert.IsEmpty( + type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) + .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)) + ); + } + } + } + + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() +#if DEBUG + .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) +#endif + .Where(t => t.IsPublic || t.IsNestedPublic); } } From 0dc7fae41ea002c03e6b52713c287ba7ada973f0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 3 Sep 2020 07:38:35 -0400 Subject: [PATCH 010/399] Add test to verify ConfigureAwait(false) usage --- DistributedLock.Tests/Tests/ApiTest.cs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index d0a8460a..7bc1e52a 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -4,6 +4,9 @@ using System.Linq; using System.Reflection; using NUnit.Framework; +using System.Runtime.CompilerServices; +using System.IO; +using System.Text.RegularExpressions; namespace Medallion.Threading.Tests.Tests { @@ -45,10 +48,30 @@ public void TestPublicApisAreSealed(AssemblyName assemblyName) } } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) + { + var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath()), "..", "..", assemblyName.Name)); + var codeFiles = Directory.GetFiles(projectDirectory, "*.cs", SearchOption.AllDirectories); + Assert.IsNotEmpty(codeFiles); + + var awaitRegex = new Regex(@"//.*|(?\bawait\s)"); + var configureAwaitRegex = new Regex(@"\.ConfigureAwait\(false\)|\.TryAwait\(\)"); + foreach (var codeFile in codeFiles) + { + var code = File.ReadAllText(codeFile); + var awaitCount = awaitRegex.Matches(code).Cast().Count(m => m.Groups["await"].Success); + var configureAwaitCount = configureAwaitRegex.Matches(code).Count; + Assert.IsTrue(configureAwaitCount >= awaitCount, $"ConfigureAwait(false) count ({configureAwaitCount}) < await count ({awaitCount}) in {codeFile}"); + } + } + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() #if DEBUG .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) #endif .Where(t => t.IsPublic || t.IsNestedPublic); + + private static string CurrentFilePath([CallerFilePath] string filePath = "") => filePath; } } From edb7fbf2aa1405c0690ea722f47680a6cdfa80a9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 3 Sep 2020 07:49:26 -0400 Subject: [PATCH 011/399] Removed IsReentrant API --- DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs | 2 -- DistributedLock.Core/IDistributedLock.cs | 9 ++------- DistributedLock.Core/IDistributedReaderWriterLock.cs | 7 ------- DistributedLock.Postgres/PostgresDistributedLock.cs | 2 -- .../PostgresDistributedReaderWriterLock.cs | 2 -- DistributedLock.SqlServer/SqlDistributedLock.cs | 2 -- .../SqlDistributedReaderWriterLock.cs | 2 -- .../TestingReaderWriterLockAsMutexProvider.cs | 2 -- .../Infrastructure/TestingSemaphoreAsMutexProvider.cs | 2 -- DistributedLock.Tests/Tests/ApiTest.cs | 2 +- .../EventWaitHandleDistributedLock.cs | 2 -- 11 files changed, 3 insertions(+), 31 deletions(-) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 1185ef61..3dd05e4d 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -51,8 +51,6 @@ public AzureBlobLeaseDistributedLock(BlobContainerClient blobContainerClient, st /// public string Name => this._blobClient.Name; - bool IDistributedLock.IsReentrant => false; - // implementation based on https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#blob-names internal static string GetSafeName(string name, BlobContainerClient blobContainerClient) { diff --git a/DistributedLock.Core/IDistributedLock.cs b/DistributedLock.Core/IDistributedLock.cs index d95c9bb0..ec416ad3 100644 --- a/DistributedLock.Core/IDistributedLock.cs +++ b/DistributedLock.Core/IDistributedLock.cs @@ -15,12 +15,6 @@ public interface IDistributedLock /// string Name { get; } - /// - /// Whether the lock can be acquired multiple times by the same user. - /// Equivalent to - /// - bool IsReentrant { get; } - /// /// Attempts to acquire the lock synchronously. Usage: /// @@ -37,7 +31,8 @@ public interface IDistributedLock IDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// Acquires the lock synchronously, failing + /// with if the attempt times out. Usage: /// /// using (myLock.Acquire(...)) /// { diff --git a/DistributedLock.Core/IDistributedReaderWriterLock.cs b/DistributedLock.Core/IDistributedReaderWriterLock.cs index 06e2309a..062fbcca 100644 --- a/DistributedLock.Core/IDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedReaderWriterLock.cs @@ -14,13 +14,6 @@ public interface IDistributedReaderWriterLock /// string Name { get; } - // todo remove - /// - /// Whether the lock can be acquired multiple times by the same user. - /// Equivalent to - /// - bool IsReentrant { get; } - /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: /// diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index beba3ee1..11df873a 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -51,8 +51,6 @@ private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock string IDistributedLock.Name => this.Key.ToString(); - bool IDistributedLock.IsReentrant => false; - /// /// Equivalent to /// diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 5fc86233..5fafd6d0 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -54,8 +54,6 @@ private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDist /// public static PostgresAdvisoryLockKey GetSafeName(string name) => PostgresDistributedLock.GetSafeName(name); - bool IDistributedReaderWriterLock.IsReentrant => throw new NotImplementedException(); - ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( TimeoutValue timeout, CancellationToken cancellationToken, diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index 72ba1f29..e7f147a9 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -82,8 +82,6 @@ private SqlDistributedLock(string name, bool exactName, Func public string Name { get; } - bool IDistributedLock.IsReentrant => throw new NotImplementedException("todo"); - /// /// Given , constructs a lock name which is safe for use with /// diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs index 3346b259..dfaa42eb 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs @@ -83,8 +83,6 @@ private SqlDistributedReaderWriterLock(string name, bool exactName, Func public string Name { get; } - bool IDistributedReaderWriterLock.IsReentrant => throw new NotImplementedException(); - /// /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx /// diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs index 4538f7d1..11253381 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs @@ -56,8 +56,6 @@ public ReaderWriterLockAsMutex(IDistributedReaderWriterLock readerWriterLock, Te string IDistributedLock.Name => this._readerWriterLock.Name; - bool IDistributedLock.IsReentrant => this._readerWriterLock.IsReentrant; - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.ShouldUseUpgrade(out var upgradeable) ? upgradeable.AcquireUpgradeableReadLock(timeout, cancellationToken) diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index 448c0600..f0093502 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -70,8 +70,6 @@ public SemaphoreAsMutex(IDistributedSemaphore semaphore) string IDistributedLock.Name => throw new NotImplementedException(); - bool IDistributedLock.IsReentrant => throw new NotImplementedException(); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this._semaphore.Acquire(timeout, cancellationToken); diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 7bc1e52a..07f632a4 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -51,7 +51,7 @@ public void TestPublicApisAreSealed(AssemblyName assemblyName) [TestCaseSource(nameof(DistributedLockAssemblies))] public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) { - var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath()), "..", "..", assemblyName.Name)); + var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath())!, "..", "..", assemblyName.Name!)); var codeFiles = Directory.GetFiles(projectDirectory, "*.cs", SearchOption.AllDirectories); Assert.IsNotEmpty(codeFiles); diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index 3457eec2..c3cf29e8 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -38,8 +38,6 @@ public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCad /// public string Name { get; } - bool IDistributedLock.IsReentrant => false; - /// /// Equivalent to /// From 13d6e293f38d1c94f54183c1702b6e8705463044 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 3 Sep 2020 08:46:11 -0400 Subject: [PATCH 012/399] Normalize whitespace in TestSetupTest to try and get it to pass on CI --- DistributedLock.Tests/Tests/TestSetupTest.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 5d89f8cd..581c9657 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -51,12 +51,14 @@ public void VerifyAllTestsAreCreated() )}"; var existingContents = File.Exists(combinatorialTestsFile) ? File.ReadAllText(combinatorialTestsFile) : null; - if (expectedTestContents != existingContents) + if (NormalizeWhitespace(expectedTestContents) != NormalizeWhitespace(existingContents)) { - File.WriteAllText(combinatorialTestsFile, expectedTestContents); Assert.Fail("Updated " + combinatorialTestsFile + $"**** EXPECTED **** \r\n{expectedTestContents}\r\n **** FOUND **** {existingContents ?? "NULL"}"); } + File.WriteAllText(combinatorialTestsFile, expectedTestContents); + + static string NormalizeWhitespace(string code) => Regex.Replace(code, @"\s+", string.Empty); } private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) From 58e660ee9b4ae69f9f75541122bec898fea48139 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 4 Sep 2020 07:24:20 -0400 Subject: [PATCH 013/399] Make semaphore GC test account for managed finalizer --- .../WaitHandles/WaitHandleDistributedSemaphoreTest.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index f4c37912..615deeca 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -1,8 +1,10 @@ -using Medallion.Threading.WaitHandles; +using Medallion.Threading.Internal; +using Medallion.Threading.WaitHandles; using NUnit.Framework; using System; using System.Collections.Generic; using System.Text; +using System.Threading.Tasks; namespace Medallion.Threading.Tests.Tests.WaitHandles { @@ -44,7 +46,7 @@ public void TestMaxLengthNames() } [Test] - public void TestGarbageCollection() + public async Task TestGarbageCollection() { var @lock = CreateAsLock("gc_test", NameStyle.AddPrefix); WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); @@ -52,6 +54,7 @@ public void TestGarbageCollection() var weakHandle = AbandonLock(); GC.Collect(); GC.WaitForPendingFinalizers(); + await ManagedFinalizerQueue.Instance.FinalizeAsync(); weakHandle.IsAlive.ShouldEqual(false); using var handle = @lock.TryAcquire(); From 7fcb958d143327e4a044aa7fff93fde094e7eeea Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 4 Sep 2020 07:35:31 -0400 Subject: [PATCH 014/399] Make DocCommentGenerator more robust to whitespace variation --- DistributedLock.Core/IDistributedLock.cs | 3 +-- DistributedLockCodeGen/CodeGenHelpers.cs | 2 ++ DistributedLockCodeGen/DocCommentGenerator.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Core/IDistributedLock.cs b/DistributedLock.Core/IDistributedLock.cs index ec416ad3..275d03bd 100644 --- a/DistributedLock.Core/IDistributedLock.cs +++ b/DistributedLock.Core/IDistributedLock.cs @@ -31,8 +31,7 @@ public interface IDistributedLock IDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// - /// Acquires the lock synchronously, failing - /// with if the attempt times out. Usage: + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: /// /// using (myLock.Acquire(...)) /// { diff --git a/DistributedLockCodeGen/CodeGenHelpers.cs b/DistributedLockCodeGen/CodeGenHelpers.cs index 620811a1..9d7811bb 100644 --- a/DistributedLockCodeGen/CodeGenHelpers.cs +++ b/DistributedLockCodeGen/CodeGenHelpers.cs @@ -15,6 +15,8 @@ public static IEnumerable EnumerateSolutionFiles() => Directory.Enumerat .Where(d => !Regex.IsMatch(Path.GetFileName(d), "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) .SelectMany(d => Directory.EnumerateFiles(d, "*.cs", SearchOption.AllDirectories)); + public static string NormalizeCodeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); + public static bool HasPublicType(string code, out (string typeName, bool isInterface) info) { var match = Regex.Match(code, @"\n( |\t)public.*?(class|interface)\s+(?\w+)"); diff --git a/DistributedLockCodeGen/DocCommentGenerator.cs b/DistributedLockCodeGen/DocCommentGenerator.cs index 63b2dd04..628b7fac 100644 --- a/DistributedLockCodeGen/DocCommentGenerator.cs +++ b/DistributedLockCodeGen/DocCommentGenerator.cs @@ -16,7 +16,7 @@ public void GenerateDocComments() var changes = CodeGenHelpers.EnumerateSolutionFiles() .Select(f => (file: f, code: File.ReadAllText(f))) .Select(t => (t.file, t.code, updatedCode: AddDocComments(t.code))) - .Where(t => t.updatedCode != t.code) + .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.updatedCode) != CodeGenHelpers.NormalizeCodeWhitespace(t.code)) .ToList(); changes.ForEach(t => File.WriteAllText(t.file, t.updatedCode)); Assert.IsEmpty(changes.Select(t => t.file)); From 67df22e815b02a9574dc39c12d3c542080878d27 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 4 Sep 2020 07:39:18 -0400 Subject: [PATCH 015/399] More whitespace normalization fixes for codegen --- DistributedLock.Core/IDistributedSemaphore.cs | 2 +- DistributedLock.Tests/Tests/TestSetupTest.cs | 2 +- .../GenerateIDistributedLockImplementations.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index e9a284ee..4fb1ee3f 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text; using System.Threading; diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 581c9657..25986c75 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -58,7 +58,7 @@ public void VerifyAllTestsAreCreated() } File.WriteAllText(combinatorialTestsFile, expectedTestContents); - static string NormalizeWhitespace(string code) => Regex.Replace(code, @"\s+", string.Empty); + static string NormalizeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); } private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index f679e0dd..e23cd08a 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -74,7 +74,7 @@ public partial class {lockType} code = DocCommentGenerator.AddDocComments(code); var outputPath = Path.Combine(Path.GetDirectoryName(file)!, Path.GetFileNameWithoutExtension(file) + $".IDistributed{name}.cs"); - if (!File.Exists(outputPath) || File.ReadAllText(outputPath) != code) + if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) { File.WriteAllText(outputPath, code); errors.Add($"updated {file}"); @@ -172,7 +172,7 @@ public partial class {lockType} code = DocCommentGenerator.AddDocComments(code); var outputPath = Path.Combine(Path.GetDirectoryName(file)!, $"{Path.GetFileNameWithoutExtension(file)}.IDistributed{(isUpgradeable ? "Upgradeable" : "")}ReaderWriterLock.cs"); - if (!File.Exists(outputPath) || File.ReadAllText(outputPath) != code) + if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) { File.WriteAllText(outputPath, code); errors.Add($"updated {file}"); From cf3364e0d9e71a8ebf93b365c4e832e340fd95c3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 4 Sep 2020 07:44:27 -0400 Subject: [PATCH 016/399] Add Ubuntu build --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c817ee53..15ba8c12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,8 @@ version: 1.0.{build} -image: Visual Studio 2019 +image: + - Visual Studio 2019 + - Ubuntu before_build: - nuget restore From b57e2767b4cf601b57a4ceeeb5147f938bb82477 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 5 Sep 2020 13:43:47 -0400 Subject: [PATCH 017/399] Attempt ubuntu CI support --- .../SupportsContinuousIntegrationAttribute.cs | 1 + .../WaitHandles/TestingWaitHandleProviders.cs | 4 ++-- .../Tests/CombinatorialTests.cs | 4 ++-- DistributedLock.Tests/Tests/TestSetupTest.cs | 16 ++++++++++------ .../EventWaitHandleDistributedLockTest.cs | 2 +- .../WaitHandleDistributedSemaphoreTest.cs | 2 +- appveyor.yml | 13 ++++++++++++- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs index e23268f9..c3516f65 100644 --- a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs +++ b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs @@ -10,5 +10,6 @@ namespace Medallion.Threading.Tests [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] internal class SupportsContinuousIntegrationAttribute : Attribute { + public bool WindowsOnly { get; set; } } } diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index 90718f07..4b4ae05c 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -5,7 +5,7 @@ namespace Medallion.Threading.Tests.WaitHandles { - [SupportsContinuousIntegration] + [SupportsContinuousIntegration(WindowsOnly = true)] public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockProvider { public override IDistributedLock CreateLockWithExactName(string name) => new EventWaitHandleDistributedLock(name, exactName: true); @@ -13,7 +13,7 @@ public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockP public override string GetSafeName(string name) => EventWaitHandleDistributedLock.GetSafeName(name); } - [SupportsContinuousIntegration] + [SupportsContinuousIntegration(WindowsOnly = true)] public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider { public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index f8371842..61808988 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -168,8 +168,8 @@ public class UpgradeableReaderWriterCore_SqlReaderWriter_OwnedTransactionSynchro namespace Medallion.Threading.Tests.WaitHandles { - [Category("CI")] public class Core_EventWaitHandle_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases { } - [Category("CI")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandlesSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } + [Category("CIWindows")] public class Core_EventWaitHandle_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases { } + [Category("CIWindows")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandlesSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 25986c75..e8989ecb 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -53,12 +53,12 @@ public void VerifyAllTestsAreCreated() var existingContents = File.Exists(combinatorialTestsFile) ? File.ReadAllText(combinatorialTestsFile) : null; if (NormalizeWhitespace(expectedTestContents) != NormalizeWhitespace(existingContents)) { + File.WriteAllText(combinatorialTestsFile, expectedTestContents); Assert.Fail("Updated " + combinatorialTestsFile + $"**** EXPECTED **** \r\n{expectedTestContents}\r\n **** FOUND **** {existingContents ?? "NULL"}"); } - File.WriteAllText(combinatorialTestsFile, expectedTestContents); - static string NormalizeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); + static string? NormalizeWhitespace(string? code) => code?.Trim().Replace("\r\n", "\n"); } private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) @@ -86,10 +86,14 @@ static string GetCSharpName(Type type) // remove words that are very common and therefore don't add much to the name var testClassName = Regex.Replace(GetTestClassName(testClassType), "Distributed|Lock|Testing|TestCases", string.Empty) + "Test"; - var supportsContinousIntegration = testClassType.GetGenericArguments() - .All(a => a.GetCustomAttribute() != null); - - var declaration = $@"{(supportsContinousIntegration ? "[Category(\"CI\")] " : null)}public class {testClassName} : {GetCSharpName(testClassType)} {{ }}"; + var supportsContinuousIntegrationAttributes = testClassType.GetGenericArguments() + .Select(a => a.GetCustomAttribute()) + .ToArray(); + var categoryAttribute = supportsContinuousIntegrationAttributes.Any(a => a == null) ? string.Empty + : supportsContinuousIntegrationAttributes.Any(a => a.WindowsOnly) ? "[Category(\"CIWindows\")] " + : "[Category(\"CI\")] "; + + var declaration = $@"{categoryAttribute}public class {testClassName} : {GetCSharpName(testClassType)} {{ }}"; var namespaces = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) .Select(t => t.Namespace ?? string.Empty) diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index 2dc15033..fc08a264 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -4,7 +4,7 @@ namespace Medallion.Threading.Tests.WaitHandles { - [Category("CI")] + [Category("CIWindows")] public class EventWaitHandleDistributedLockTest { [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 615deeca..55593513 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.Tests.Tests.WaitHandles { - [Category("CI")] + [Category("CIWindows")] public class WaitHandleDistributedSemaphoreTest { [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] diff --git a/appveyor.yml b/appveyor.yml index 15ba8c12..9b6f66f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,4 +12,15 @@ build: # only test categories that don't depend on external things test: categories: - - CI \ No newline at end of file + - CI + +for: +- + matrix: + only: + - image: Visual Studio 2019 + + test: + categories: + - CI + - CIWindows \ No newline at end of file From 52db6c428f93b22b03be7c20f6bb9b956f9c237c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 5 Sep 2020 13:53:55 -0400 Subject: [PATCH 018/399] Fix appveyor.yaml --- appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9b6f66f3..db93e1d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,14 +13,14 @@ build: test: categories: - CI - -for: -- - matrix: - only: - - image: Visual Studio 2019 - - test: - categories: - - CI - - CIWindows \ No newline at end of file + +for: + - + matrix: + only: + - + image: "Visual Studio 2019" + test: + categories: + - CI + - CIWindows \ No newline at end of file From 550e056898b03b5302e6be4f1cb2a1af2ebfba6d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 5 Sep 2020 14:24:07 -0400 Subject: [PATCH 019/399] Minor cleanup --- DistributedLock.Tests/Tests/TestSetupTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index e8989ecb..28b85371 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -90,7 +90,7 @@ static string GetCSharpName(Type type) .Select(a => a.GetCustomAttribute()) .ToArray(); var categoryAttribute = supportsContinuousIntegrationAttributes.Any(a => a == null) ? string.Empty - : supportsContinuousIntegrationAttributes.Any(a => a.WindowsOnly) ? "[Category(\"CIWindows\")] " + : supportsContinuousIntegrationAttributes.Any(a => a!.WindowsOnly) ? "[Category(\"CIWindows\")] " : "[Category(\"CI\")] "; var declaration = $@"{categoryAttribute}public class {testClassName} : {GetCSharpName(testClassType)} {{ }}"; From 0a3cc299d197d960ba246f3879687420cdd0b9e3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 5 Sep 2020 14:24:36 -0400 Subject: [PATCH 020/399] Experimental file lock --- .../Tests/FileSystem/FileLockTest.cs | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs diff --git a/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs new file mode 100644 index 00000000..d1eea51a --- /dev/null +++ b/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs @@ -0,0 +1,60 @@ +using Medallion.Threading.Internal; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Tests.FileSystem +{ + [Category("CI")] + public class FileLockTest + { + [Test] + public void Test() + { + var lockFile = Path.GetTempFileName(); + var @lock = new FileLock(lockFile); + + using var handle1 = @lock.Acquire(TimeSpan.FromSeconds(1)); + var task = Task.Run(() => @lock.Acquire(TimeSpan.FromSeconds(30))); + task.Wait(TimeSpan.FromSeconds(.5)).ShouldEqual(false); + handle1.Dispose(); + task.Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); + task.Result.Dispose(); + } + + private class FileLock + { + private readonly string _path; + + public FileLock(string path) + { + this._path = path; + } + + public IDisposable Acquire(TimeSpan timeout) + { + var result = SyncOverAsync.Run( + state => Threading.Azure.BusyWaitHelper.WaitAsync( + this._path, + (path, token) => + { + token.ThrowIfCancellationRequested(); + try { return new FileStream(path, FileMode.OpenOrCreate, FileAccess.Read, FileShare.None, 1, FileOptions.DeleteOnClose).As().AsValueTask(); } + catch (IOException) { return default; } + }, + timeout, + TimeSpan.FromSeconds(.1), + TimeSpan.FromSeconds(2), + default + ), + (timeout, this._path) + ); + if (result == null) { throw new TimeoutException(); } + return result; + } + } + } +} From c61ba5736662f75d3ed8d63006ee4978a9503359 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Sep 2020 07:12:53 -0400 Subject: [PATCH 021/399] Add file system locks --- DistributedLock.Core/AssemblyAttributes.cs | 1 + .../Internal}/BusyWaitHelper.cs | 11 +- .../Internal/DistributedLockHelpers.cs | 15 +- .../AssemblyAttributes.cs | 6 + .../DistributedLock.FileSystem.csproj | 48 ++++ .../FileDistributedLock.IDistributedLock.cs | 85 +++++++ .../FileDistributedLock.cs | 106 ++++++++ .../FileDistributedLockHandle.cs | 31 +++ .../FileNameValidationHelper.cs | 171 +++++++++++++ .../DistributedLockCoreTestCases.cs | 30 ++- .../FileSystem/TestingFileSystemProviders.cs | 18 ++ .../TestingLockFileSynchronizationStrategy.cs | 11 + .../TestingSemaphoreAsMutexProvider.cs | 2 + .../WaitHandles/TestingWaitHandleProviders.cs | 4 +- ...stingWaitHandleSynchronizationStrategy.cs} | 2 +- .../Tests/CombinatorialTests.cs | 13 +- .../FileSystem/FileDistributedLockTest.cs | 233 ++++++++++++++++++ .../Tests/FileSystem/FileLockTest.cs | 60 ----- DistributedLock.Tests/Tests/TestSetupTest.cs | 3 +- DistributedLock.sln | 8 +- DistributedLock/DistributedLock.csproj | 1 + DistributedLockTaker/Program.cs | 5 + 22 files changed, 781 insertions(+), 83 deletions(-) rename {DistributedLock.Azure => DistributedLock.Core/Internal}/BusyWaitHelper.cs (94%) create mode 100644 DistributedLock.FileSystem/AssemblyAttributes.cs create mode 100644 DistributedLock.FileSystem/DistributedLock.FileSystem.csproj create mode 100644 DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs create mode 100644 DistributedLock.FileSystem/FileDistributedLock.cs create mode 100644 DistributedLock.FileSystem/FileDistributedLockHandle.cs create mode 100644 DistributedLock.FileSystem/FileNameValidationHelper.cs create mode 100644 DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs create mode 100644 DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs rename DistributedLock.Tests/Infrastructure/WaitHandles/{TestingWaitHandlesSynchronizationStrategy.cs => TestingWaitHandleSynchronizationStrategy.cs} (82%) create mode 100644 DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs delete mode 100644 DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/DistributedLock.Core/AssemblyAttributes.cs index 30f8bfc6..469f7d6a 100644 --- a/DistributedLock.Core/AssemblyAttributes.cs +++ b/DistributedLock.Core/AssemblyAttributes.cs @@ -10,4 +10,5 @@ [assembly: InternalsVisibleTo("DistributedLock.SqlServer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Postgres, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Azure, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.FileSystem, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif diff --git a/DistributedLock.Azure/BusyWaitHelper.cs b/DistributedLock.Core/Internal/BusyWaitHelper.cs similarity index 94% rename from DistributedLock.Azure/BusyWaitHelper.cs rename to DistributedLock.Core/Internal/BusyWaitHelper.cs index 94f60d89..45defb7b 100644 --- a/DistributedLock.Azure/BusyWaitHelper.cs +++ b/DistributedLock.Core/Internal/BusyWaitHelper.cs @@ -5,9 +5,14 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Internal { - internal static class BusyWaitHelper +#if DEBUG + public +#else + internal +#endif + static class BusyWaitHelper { public static async ValueTask WaitAsync( TState state, @@ -18,6 +23,8 @@ internal static class BusyWaitHelper CancellationToken cancellationToken) where TResult : class { + Invariant.Require(minSleepTime <= maxSleepTime); + var initialResult = await tryGetValue(state, cancellationToken).ConfigureAwait(false); if (initialResult != null || timeout.IsZero) { diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 1866846b..380db617 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -15,7 +15,7 @@ namespace Medallion.Threading.Internal #endif static class DistributedLockHelpers { - public static string ToSafeName(string name, int maxNameLength, Func convertToValidName) + public static string ToSafeName(string name, int maxNameLength, Func convertToValidName, Func? hashName = null) { if (name == null) { throw new ArgumentNullException(nameof(name)); } @@ -25,8 +25,17 @@ public static string ToSafeName(string name, int maxNameLength, Func= maxNameLength) { diff --git a/DistributedLock.FileSystem/AssemblyAttributes.cs b/DistributedLock.FileSystem/AssemblyAttributes.cs new file mode 100644 index 00000000..398d8ac7 --- /dev/null +++ b/DistributedLock.FileSystem/AssemblyAttributes.cs @@ -0,0 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; + +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj new file mode 100644 index 00000000..1a62f2cd --- /dev/null +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -0,0 +1,48 @@ + + + + net461;netstandard2.0;netstandard2.1 + Medallion.Threading.FileSystem + True + 4 + Latest + enable + + + + 1.0.0-alpha01 + 1.0.0.0 + Michael Adelson + Provides a distributed lock implementation based on file locks + Copyright © 2020 Michael Adelson + MIT + distributed file lock + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + + + False + 1591 + TRACE;DEBUG + + + + + + + + + + \ No newline at end of file diff --git a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..986fbbdb --- /dev/null +++ b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.FileSystem +{ + public partial class FileDistributedLock + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public FileDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public FileDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs new file mode 100644 index 00000000..05007c3d --- /dev/null +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -0,0 +1,106 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.FileSystem +{ + /// + /// A distributed lock based on holding an exclusive handle to a lock file. The file will be deleted when the lock is released. + /// + public sealed partial class FileDistributedLock : IInternalDistributedLock + { + // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock + // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks + // to be used in cases where contention is rare + private static readonly TimeSpan MinBusyWaitSleepTime = TimeSpan.FromMilliseconds(50), + MaxBusyWaitSleepTime = TimeSpan.FromSeconds(1); + + private string? _cachedDirectory; + + /// + /// Constructs a lock which uses the provided as the exact file name. + /// + /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file + /// will similarly be created if it does not already exist, and will be deleted when the lock is released. + /// + public FileDistributedLock(FileInfo lockFile) + { + this.Name = (lockFile ?? throw new ArgumentNullException(nameof(lockFile))).FullName; + if (lockFile.Name.Length == 0) { throw new FormatException($"{nameof(lockFile)}: may not have an empty file name"); } + } + + /// + /// Constructs a lock which will place a lock file in . The file's name + /// will be based on , but with proper escaping/hashing to ensure that a valid file name is produced. + /// + /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file + /// will similarly be created if it does not already exist, and will be deleted when the lock is released. + /// + public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) + { + this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name, exactName: false); + } + + // todo revisit API + public string Name { get; } + + private string Directory => this._cachedDirectory ??= Path.GetDirectoryName(this.Name); + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, token) => @this.TryAcquire(token).AsValueTask(), + timeout: timeout, + minSleepTime: MinBusyWaitSleepTime, + maxSleepTime: MaxBusyWaitSleepTime, + cancellationToken + ); + + private FileDistributedLockHandle? TryAcquire(CancellationToken cancellationToken) + { + while (true) + { + cancellationToken.ThrowIfCancellationRequested(); + + try { System.IO.Directory.CreateDirectory(this.Directory); } + catch (Exception ex) + { + throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); + } + + FileStream lockFileStream; + try + { + // key arguments: + // OpenOrCreate to be robust to the file existing or not + // None to take an exclusive lock + // DeleteOnClose to clean up after ourselves + lockFileStream = new FileStream(this.Name, FileMode.OpenOrCreate, FileAccess.Read, FileShare.None, bufferSize: 1, FileOptions.DeleteOnClose); + } + catch (DirectoryNotFoundException) + { + // this should almost never happen because we just created the directory but in a race condition it could. Just retry + continue; + } + catch (UnauthorizedAccessException) when (System.IO.Directory.Exists(this.Name)) + { + throw new InvalidOperationException($"Failed to create lock file '{this.Name}' because it is already the name of a directory"); + } + // this should never happen because we validate. However if it does (e. g. due to some system configuration change?), throw so that + // this doesn't end up in the IOException block (PathTooLongException is IOException) + catch (PathTooLongException) { throw; } + catch (IOException) + { + // the hope is that if we get here the only failure reason would be that the file is locked + return null; + } + + return new FileDistributedLockHandle(lockFileStream); + } + } + } +} diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/DistributedLock.FileSystem/FileDistributedLockHandle.cs new file mode 100644 index 00000000..8586589c --- /dev/null +++ b/DistributedLock.FileSystem/FileDistributedLockHandle.cs @@ -0,0 +1,31 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.FileSystem +{ + public sealed class FileDistributedLockHandle : IDistributedLockHandle + { + private FileStream? _fileStream; + + internal FileDistributedLockHandle(FileStream fileStream) + { + this._fileStream = fileStream; + } + + CancellationToken IDistributedLockHandle.HandleLostToken => + Volatile.Read(ref this._fileStream) != null ? CancellationToken.None : throw this.ObjectDisposed(); + + public void Dispose() => Interlocked.Exchange(ref this._fileStream, null)?.Dispose(); + + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; + } + } +} diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/DistributedLock.FileSystem/FileNameValidationHelper.cs new file mode 100644 index 00000000..243befe4 --- /dev/null +++ b/DistributedLock.FileSystem/FileNameValidationHelper.cs @@ -0,0 +1,171 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.IO; +using System.Security.Cryptography; +using System.Text; + +namespace Medallion.Threading.FileSystem +{ + internal static class FileNameValidationHelper + { + private static readonly HashSet InvalidFileNameChars = new HashSet(Path.GetInvalidFileNameChars()); + + internal const int MaxPathLengthWindows = 260, + MinFileNameLength = 12, + MaxPathLengthUnix = 4096, + FallbackMaxFileNameLength = 64; + + public static string GetLockFileName(DirectoryInfo lockFileDirectory, string name, bool exactName) + { + if (lockFileDirectory == null) { throw new ArgumentNullException(nameof(lockFileDirectory)); } + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + var directoryPath = lockFileDirectory.FullName; + var directoryHasTrailingSeparator = directoryPath[directoryPath.Length - 1] == Path.DirectorySeparatorChar; + + if (exactName) + { + var validName = ConvertToValidName(name); + if (validName != name) { throw new FormatException($"{nameof(name)}: may not be '', '.', or '..' and may not contain illegal file name characters"); } + try { return Path.GetFullPath(ToPath(name)); } + catch (PathTooLongException ex) { throw new FormatException($"Combined {nameof(lockFileDirectory)} and {nameof(name)} is too long", ex); } + } + + var directoryPathLength = directoryPath.Length + (directoryHasTrailingSeparator ? 0 : 1); + + // if we fit within a traditional (short) windows path, then just use that. This ensures that we get a consistent answer + // even when different processes that have long file names enabled or not consider the same path + if (directoryPathLength + MinFileNameLength <= MaxPathLengthWindows + && TryCreateSafeName(MaxPathLengthWindows - directoryPathLength, out var safeName)) + { + return safeName; + } + + // our next fallback is to do the same, but assuming the unix max path length which is longer + if (directoryPathLength + MinFileNameLength <= MaxPathLengthUnix + && TryCreateSafeName(MaxPathLengthUnix - directoryPathLength, out safeName)) + { + return safeName; + } + + // finally, we iteratively consider a small range of reasonable max lengths + for (var maxNameLength = FallbackMaxFileNameLength; maxNameLength >= MinFileNameLength; --maxNameLength) + { + if (TryCreateSafeName(maxNameLength, out safeName)) + { + return safeName; + } + } + + throw new PathTooLongException($"Unable to construct lock file name because the base directory (length = {directoryPathLength}) does not leave enough room for a {MinFileNameLength} lock name"); + + bool TryCreateSafeName(int maxNameLength, out string safeName) + { + var safeLockFileName = DistributedLockHelpers.ToSafeName(name, maxNameLength, ConvertToValidName, ComputeHash); + safeName = ToPath(safeLockFileName); + return !IsTooLong(safeName); + } + + string ToPath(string safeLockFileName) => directoryPath + + (directoryHasTrailingSeparator ? string.Empty : Path.DirectorySeparatorChar.ToString()) + + safeLockFileName; + } + + private static bool IsTooLong(string name) + { + try + { + Path.GetFullPath(name); + return false; + } + catch (PathTooLongException) + { + return true; + } + } + + private static string ConvertToValidName(string name) + { + if (name.Length == 0) + { + // the suffix here is a random GUID. The idea is to have something fixed that + // is highly unlikely to collide with anything a user might provide + return ConvertToValidName("EMPTY_A4ED4E8E7DBB4757AF1BE51A3C139F84"); + } + + const char ReplacementChar = '_'; + Invariant.Require(!InvalidFileNameChars.Contains(ReplacementChar)); + + // handle special relative path names (which should not be allowed) + switch (name) + { + case ".": + return ReplacementChar.ToString(); + case "..": + return new string(ReplacementChar, count: 2); + // fall through + } + + StringBuilder? builder = null; + var mayNeedCasingMarker = false; + for (var i = 0; i < name.Length; ++i) + { + var @char = name[i]; + if (InvalidFileNameChars.Contains(@char)) + { + builder ??= new StringBuilder(name.Length).Append(name, startIndex: 0, count: i); + builder.Append(ReplacementChar); + } + // we want to respect the casing of lock names. We normalize to upper case + // per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 + else if (builder == null && char.ToUpperInvariant(@char) != @char) + { + mayNeedCasingMarker = true; + } + else if (builder != null) + { + builder.Append(@char); + } + } + + return mayNeedCasingMarker && builder == null + ? name + ReplacementChar + : builder?.ToString() ?? name; + } + + // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char + // name to include a good portion of the original provided name, which is good for debugging. See + // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big + private const int Base32CharBits = 5; + internal const int HashLengthInChars = 160 / Base32CharBits; + + private static string ComputeHash(byte[] bytes) + { + using var sha = SHA512.Create(); + var hashBytes = sha.ComputeHash(bytes); + + // we use Base32 because it is case-insensitive (important for windows files) and a bit more compact than Base16 + // RFC 4648 from https://en.wikipedia.org/wiki/Base32 + const string Base32Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; + + var chars = new char[HashLengthInChars]; + var byteIndex = 0; + var bitBuffer = 0; + var bitsRemaining = 0; + for (var charIndex = 0; charIndex < chars.Length; ++charIndex) + { + if (bitsRemaining < Base32CharBits) + { + bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; + bitsRemaining += 8; + } + chars[charIndex] = Base32Alphabet[bitBuffer & 31]; + bitBuffer >>= Base32CharBits; + bitsRemaining -= Base32CharBits; + } + + return new string(chars); + } + } +} diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index d8bd2507..12a6a7f3 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -224,17 +224,29 @@ public async Task TestLockNamesAreCaseSensitive() // (which only supports very short ASCII string names). Finally, we re-run through GetSafeName to pick up any special prefix // that is needed (e. g. for wait handles) using var sha1 = SHA1.Create(); - var uniqueHashName = Convert.ToBase64String(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))); - var lowerName = this._lockProvider.GetSafeName($"{uniqueHashName.Substring(0, 6)}_a"); - var upperName = this._lockProvider.GetSafeName($"{uniqueHashName.Substring(0, 6)}_A"); - // make sure we succeeded in generating what we set out ot generate + var uniqueHashName = Convert.ToBase64String(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))) + // normalize to upper case per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 + .ToUpperInvariant(); + var lowerBaseName = $"{uniqueHashName.Substring(0, 6)}_a"; + var lowerName = this._lockProvider.GetSafeName(lowerBaseName); + var upperBaseName = $"{uniqueHashName.Substring(0, 6)}_A"; + var upperName = this._lockProvider.GetSafeName(upperBaseName); + // make sure we succeeded in generating what we set out to generate Assert.AreNotEqual(lowerName, upperName); - Assert.IsTrue(StringComparer.OrdinalIgnoreCase.Equals(lowerName, upperName)); - - await using (await this._lockProvider.CreateLockWithExactName(lowerName).AcquireAsync()) - await using (var handle = await this._lockProvider.CreateLockWithExactName(upperName).TryAcquireAsync()) + if (StringComparer.OrdinalIgnoreCase.Equals(lowerName, upperName)) + { + // if the names vary only by case, test that they are different locks + await using (await this._lockProvider.CreateLockWithExactName(lowerName).AcquireAsync()) + await using (var handle = await this._lockProvider.CreateLockWithExactName(upperName).TryAcquireAsync()) + { + Assert.IsNotNull(handle); + } + } + else { - Assert.IsNotNull(handle); + // otherwise, check that the names still contain the suffixes we added + Assert.That(lowerName, Does.Contain(lowerBaseName)); + Assert.That(upperName, Does.Contain(upperBaseName)); } } diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs new file mode 100644 index 00000000..c48c1f9a --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs @@ -0,0 +1,18 @@ +using Medallion.Threading.FileSystem; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +namespace Medallion.Threading.Tests.FileSystem +{ + [SupportsContinuousIntegration] + public sealed class TestingFileDistributedLockProvider : TestingLockProvider + { + public override IDistributedLock CreateLockWithExactName(string name) => + new FileDistributedLock(new FileInfo(name)); + + public override string GetSafeName(string name) => + new FileDistributedLock(new DirectoryInfo(Path.Combine(Path.GetTempPath(), this.GetType().Name)), name).Name; + } +} diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs new file mode 100644 index 00000000..0ed565a9 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.FileSystem +{ + [SupportsContinuousIntegration] + public sealed class TestingLockFileSynchronizationStrategy : TestingSynchronizationStrategy + { + } +} diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index f0093502..536d09ea 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -84,6 +84,7 @@ ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeou } } + [SupportsContinuousIntegration] public sealed class TestingSemaphore1AsMutexProvider : TestingSemaphoreAsMutexProvider where TSemaphoreProvider : TestingSemaphoreProvider, new() where TStrategy : TestingSynchronizationStrategy, new() @@ -91,6 +92,7 @@ public sealed class TestingSemaphore1AsMutexProvider : TestingSemaphoreAsMutexProvider where TSemaphoreProvider : TestingSemaphoreProvider, new() where TStrategy : TestingSynchronizationStrategy, new() diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index 4b4ae05c..9273d9d7 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -6,7 +6,7 @@ namespace Medallion.Threading.Tests.WaitHandles { [SupportsContinuousIntegration(WindowsOnly = true)] - public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockProvider + public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockProvider { public override IDistributedLock CreateLockWithExactName(string name) => new EventWaitHandleDistributedLock(name, exactName: true); @@ -14,7 +14,7 @@ public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockP } [SupportsContinuousIntegration(WindowsOnly = true)] - public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider + public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider { public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs similarity index 82% rename from DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs rename to DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs index 36875cbd..0df45e61 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandlesSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs @@ -5,7 +5,7 @@ namespace Medallion.Threading.Tests.WaitHandles { [SupportsContinuousIntegration] - public sealed class TestingWaitHandlesSynchronizationStrategy : TestingSynchronizationStrategy + public sealed class TestingWaitHandleSynchronizationStrategy : TestingSynchronizationStrategy { // since the wait handle won't be collected by the system until all instances of it are closed, // we won't see abandoned handles release their tickets until the semaphore is fully abandoned diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 61808988..3ecb7dac 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -11,6 +11,11 @@ namespace Medallion.Threading.Tests.Azure public class Core_AzureBlobLease_AzureBlobLeaseSynchronizationStrategyTest : DistributedLockCoreTestCases { } } +namespace Medallion.Threading.Tests.FileSystem +{ + [Category("CI")] public class Core_File_FileSynchronizationStrategyTest : DistributedLockCoreTestCases { } +} + namespace Medallion.Threading.Tests.Postgres { public class ConnectionStringStrategy_Postgres_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } @@ -168,8 +173,8 @@ public class UpgradeableReaderWriterCore_SqlReaderWriter_OwnedTransactionSynchro namespace Medallion.Threading.Tests.WaitHandles { - [Category("CIWindows")] public class Core_EventWaitHandle_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases { } - [Category("CIWindows")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandlesSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } - public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } - public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandlesSynchronizationStrategy_WaitHandlesSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandlesSynchronizationStrategy> { } + [Category("CIWindows")] public class Core_EventWaitHandle_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases { } + [Category("CIWindows")] public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } + [Category("CIWindows")] public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } + [Category("CIWindows")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandleSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs new file mode 100644 index 00000000..d0c13fea --- /dev/null +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -0,0 +1,233 @@ +using Medallion.Threading.FileSystem; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Tests.FileSystem +{ + [Category("CI")] + public class FileDistributedLockTest + { + private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedLockTest), TargetFramework.Current); + private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); + + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (Directory.Exists(LockFileDirectory)) + { + Directory.Delete(LockFileDirectory, recursive: true); + } + } + + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new FileDistributedLock(default!)); + Assert.Throws(() => new FileDistributedLock(new FileInfo(LockFileDirectory + Path.DirectorySeparatorChar))); + + Assert.Throws(() => new FileDistributedLock(default!, "name")); + Assert.Throws(() => new FileDistributedLock(LockFileDirectoryInfo, default!)); + + Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, string.Empty, exactName: true)); + Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, ".", exactName: true)); + Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, "..", exactName: true)); + + try { Path.GetFullPath(Path.Combine(LockFileDirectory, new string('a', 5000))); } + catch (PathTooLongException) + { + Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, new string('a', 5000), exactName: true)); + } + } + + [Test, Combinatorial] + public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDeleted( + [Values("nothing", "directory", "file")] string alreadyExists, + [Values] bool constructFromFileInfo) + { + var directoryName = Path.Combine(LockFileDirectory, Hash("directory")); + var fileName = Path.Combine(directoryName, Hash("file")); + + switch (alreadyExists) + { + case "nothing": + if (Directory.Exists(directoryName)) + { + Directory.Delete(directoryName, recursive: true); + } + break; + case "directory": + Directory.CreateDirectory(directoryName); + File.Delete(fileName); + break; + case "file": + Directory.CreateDirectory(directoryName); + File.WriteAllText(fileName, "text"); + break; + default: + throw new InvalidOperationException("should never get here"); + } + + var @lock = constructFromFileInfo + ? new FileDistributedLock(new FileInfo(fileName)) + : new FileDistributedLock(new DirectoryInfo(directoryName), Path.GetFileName(fileName)); + @lock.Name.ShouldEqual(fileName); + + Directory.Exists(directoryName).ShouldEqual(alreadyExists != "nothing"); + File.Exists(fileName).ShouldEqual(alreadyExists == "file"); + + using (@lock.Acquire()) + { + Assert.IsTrue(Directory.Exists(directoryName)); + Assert.IsTrue(File.Exists(fileName)); + } + + Assert.IsTrue(Directory.Exists(directoryName)); + Assert.IsFalse(File.Exists(fileName)); + + string Hash(string text) + { + using var md5 = MD5.Create(); + var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes($"{text}_{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}")); + return BitConverter.ToString(hashBytes).Replace("-", string.Empty); + } + } + + [Test] + public void TestFileCannotBeModifiedOrDeletedWhileHeld() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestFileCannotBeModifiedOrDeletedWhileHeld)); + using (@lock.Acquire()) + { + Assert.Throws(() => File.WriteAllText(@lock.Name, "contents")); + Assert.Throws(() => File.ReadAllText(@lock.Name)); + Assert.Throws(() => File.Delete(@lock.Name)); + } + } + + [Test] + public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestThrowsIfProvidedFileNameIsAlreadyADirectory)); + Directory.CreateDirectory(@lock.Name); + + var exception = Assert.Throws(() => @lock.Acquire().Dispose()); + Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); + } + + [Test] + public void TestEmptyNameIsAllowed() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, string.Empty); + Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); + } + + [Test] + public void TestLongNamesAreAllowed() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, new string('a', ushort.MaxValue)); + Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); + } + + [Test] + public void TestEscapesBadCharactersInName() + { + Check("A", shouldEscape: false); + Check("A_B", shouldEscape: false); + Check(string.Empty, shouldEscape: true); + Check(".", shouldEscape: true); + Check("..", shouldEscape: true); + Check("/A/", shouldEscape: true); + Check(@"\A\", shouldEscape: true); + Check("<", shouldEscape: true); + Check(">", shouldEscape: true); + + void Check(string name, bool shouldEscape) + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + (@lock.Name == LockFileDirectory + Path.DirectorySeparatorChar + name) + .ShouldEqual(!shouldEscape); + } + } + + [Test] + public void TestForcesCaseSensitivity() + { + Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, "lower").Name) + .ShouldEqual("lower_PRE5SHQAMC324P4C6UKD4R4VMGGJMF6T"); + } + + [TestCase("", ExpectedResult = "EMPTY_A4ED4E8E7DBB4757AF1BE51A3C139F84P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA")] + [TestCase(".", ExpectedResult = "_LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y")] + [TestCase("..", ExpectedResult = "__G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6")] + [TestCase("_", ExpectedResult = "_")] + [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool__!__x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L")] + [TestCase( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + ExpectedResult = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXTSAJQWFKOYRBNXC6DV3HRZWQJANRKCX" + )] + [TestCase("ABC", ExpectedResult = "ABC")] + [TestCase("abc", ExpectedResult = "abc_56LLTQOSBT6ULGHITLS4KQEIRREMO53J")] + public string TestSafeNameCompatibility(string name) + { + // meant to be consistent length across platforms + var consistentDirectory = Path.Combine(LockFileDirectory, new string('b', 100)).Substring(0, 100); + var @lock = new FileDistributedLock(new DirectoryInfo(consistentDirectory), name); + Console.WriteLine(@lock.Name); + Assert.That(@lock.Name, Does.StartWith(consistentDirectory + Path.DirectorySeparatorChar)); + return @lock.Name.Substring(consistentDirectory.Length + 1); + } + + [Test] + public void TestBase32Hashing() + { + const int Iterations = 100000; + + var charCounts = new int[128]; + + var nameChars = new char[] { default, default, Path.GetInvalidFileNameChars()[0] }; + var directoryInfo = LockFileDirectoryInfo; + for (var i = 0; i < Iterations; ++i) + { + if (++nameChars[0] == 0) + { + ++nameChars[1]; + } + + var @lock = new FileDistributedLock(directoryInfo, new string(nameChars)); + var hashStart = @lock.Name.Length - FileNameValidationHelper.HashLengthInChars; + if (@lock.Name[hashStart - 1] != '_') { Assert.Fail("Bad name format"); } + + for (var j = hashStart; j < @lock.Name.Length; ++j) + { + ++charCounts[@lock.Name[j]]; + } + } + + for (var i = 0; i < charCounts.Length; ++i) + { + Console.WriteLine($"{(char.IsLetterOrDigit((char)i) ? ((char)i).ToString() : i.ToString())}: {charCounts[i]}"); + } + + var expectedCount = (Iterations * FileNameValidationHelper.HashLengthInChars) / 32; + for (var @char = default(char); @char < charCounts.Length; ++@char) + { + if ((@char >= '2' && @char <= '7') || (@char >= 'A' && @char <= 'Z')) + { + Assert.AreEqual(actual: charCounts[@char], expected: expectedCount, delta: .1 * expectedCount); + } + else + { + charCounts[@char].ShouldEqual(0); + } + } + } + + // hash char usage (should use all 32 chars about evenly across many hashes) + + } +} diff --git a/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs deleted file mode 100644 index d1eea51a..00000000 --- a/DistributedLock.Tests/Tests/FileSystem/FileLockTest.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Medallion.Threading.Internal; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Tests.FileSystem -{ - [Category("CI")] - public class FileLockTest - { - [Test] - public void Test() - { - var lockFile = Path.GetTempFileName(); - var @lock = new FileLock(lockFile); - - using var handle1 = @lock.Acquire(TimeSpan.FromSeconds(1)); - var task = Task.Run(() => @lock.Acquire(TimeSpan.FromSeconds(30))); - task.Wait(TimeSpan.FromSeconds(.5)).ShouldEqual(false); - handle1.Dispose(); - task.Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); - task.Result.Dispose(); - } - - private class FileLock - { - private readonly string _path; - - public FileLock(string path) - { - this._path = path; - } - - public IDisposable Acquire(TimeSpan timeout) - { - var result = SyncOverAsync.Run( - state => Threading.Azure.BusyWaitHelper.WaitAsync( - this._path, - (path, token) => - { - token.ThrowIfCancellationRequested(); - try { return new FileStream(path, FileMode.OpenOrCreate, FileAccess.Read, FileShare.None, 1, FileOptions.DeleteOnClose).As().AsValueTask(); } - catch (IOException) { return default; } - }, - timeout, - TimeSpan.FromSeconds(.1), - TimeSpan.FromSeconds(2), - default - ), - (timeout, this._path) - ); - if (result == null) { throw new TimeoutException(); } - return result; - } - } - } -} diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 28b85371..ddc7f639 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -86,7 +86,8 @@ static string GetCSharpName(Type type) // remove words that are very common and therefore don't add much to the name var testClassName = Regex.Replace(GetTestClassName(testClassType), "Distributed|Lock|Testing|TestCases", string.Empty) + "Test"; - var supportsContinuousIntegrationAttributes = testClassType.GetGenericArguments() + var supportsContinuousIntegrationAttributes = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) + .Where(t => t != testClassType) .Select(a => a.GetCustomAttribute()) .ToArray(); var categoryAttribute = supportsContinuousIntegrationAttributes.Any(a => a == null) ? string.Empty diff --git a/DistributedLock.sln b/DistributedLock.sln index a712597d..94bd39f2 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -19,7 +19,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLockCodeGen", "D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.SqlServer", "DistributedLock.SqlServer\DistributedLock.SqlServer.csproj", "{A7C39A34-B8FA-48B0-87C4-65FE2A8BD62B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.Azure", "DistributedLock.Azure\DistributedLock.Azure.csproj", "{1C5E80A9-343A-44AA-A40E-00EAFE485D36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Azure", "DistributedLock.Azure\DistributedLock.Azure.csproj", "{1C5E80A9-343A-44AA-A40E-00EAFE485D36}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.FileSystem", "DistributedLock.FileSystem\DistributedLock.FileSystem.csproj", "{6B0DBD7E-3A43-4FED-82BA-9927360E1D92}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -63,6 +65,10 @@ Global {1C5E80A9-343A-44AA-A40E-00EAFE485D36}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C5E80A9-343A-44AA-A40E-00EAFE485D36}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C5E80A9-343A-44AA-A40E-00EAFE485D36}.Release|Any CPU.Build.0 = Release|Any CPU + {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 51c1452f..f8c32934 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -47,6 +47,7 @@ + \ No newline at end of file diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 5c6b30bc..368d6fde 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -5,6 +5,8 @@ using Medallion.Threading.Tests; using Medallion.Threading.Azure; using Azure.Storage.Blobs; +using Medallion.Threading.FileSystem; +using System.IO; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -56,6 +58,9 @@ public static int Main(string[] args) ) .Acquire(); break; + case nameof(FileDistributedLock): + handle = new FileDistributedLock(new FileInfo(name)).Acquire(); + break; default: Console.Error.WriteLine($"type: {type}"); return 123; From 5e53aa5a8cec241e3c66537f85baaba3b2763da8 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Sep 2020 07:24:29 -0400 Subject: [PATCH 022/399] Add doc comments --- DistributedLock.FileSystem/FileDistributedLock.cs | 3 +++ DistributedLock.FileSystem/FileDistributedLockHandle.cs | 9 +++++++++ .../WaitHandleDistributedSemaphore.cs | 7 +++++++ .../WaitHandleDistributedSemaphoreHandle.cs | 9 +++++++++ 4 files changed, 28 insertions(+) diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index 05007c3d..b56ff313 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -46,6 +46,9 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) } // todo revisit API + /// + /// Implements + /// public string Name { get; } private string Directory => this._cachedDirectory ??= Path.GetDirectoryName(this.Name); diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/DistributedLock.FileSystem/FileDistributedLockHandle.cs index 8586589c..0998fd72 100644 --- a/DistributedLock.FileSystem/FileDistributedLockHandle.cs +++ b/DistributedLock.FileSystem/FileDistributedLockHandle.cs @@ -8,6 +8,9 @@ namespace Medallion.Threading.FileSystem { + /// + /// Implements + /// public sealed class FileDistributedLockHandle : IDistributedLockHandle { private FileStream? _fileStream; @@ -20,8 +23,14 @@ internal FileDistributedLockHandle(FileStream fileStream) CancellationToken IDistributedLockHandle.HandleLostToken => Volatile.Read(ref this._fileStream) != null ? CancellationToken.None : throw this.ObjectDisposed(); + /// + /// Releases the lock + /// public void Dispose() => Interlocked.Exchange(ref this._fileStream, null)?.Dispose(); + /// + /// Releases the lock + /// public ValueTask DisposeAsync() { this.Dispose(); diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs index 574e986b..588952a8 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -9,6 +9,9 @@ namespace Medallion.Threading.WaitHandles { + /// + /// Implements a distributed semaphore based on a global + /// public sealed partial class WaitHandleDistributedSemaphore : IInternalDistributedSemaphore { private readonly int _maxCount; @@ -36,6 +39,10 @@ public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? aband /// public static int MaxNameLength => DistributedWaitHandleHelpers.MaxNameLength; + /// + /// Returns either the provided or a transformed version of which + /// is safe to use with the "exactName" constructor parameter. + /// public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); /// diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs index cc75aa16..31441681 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs @@ -23,15 +23,24 @@ internal WaitHandleDistributedSemaphoreHandle(Semaphore semaphore) this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, this._semaphoreReleaser); } + /// + /// Implements + /// public CancellationToken HandleLostToken => Volatile.Read(ref this._finalizerRegistration) != null ? CancellationToken.None : throw this.ObjectDisposed(); + /// + /// Releases the semaphore ticket + /// public void Dispose() { Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); this._semaphoreReleaser.Dispose(); } + /// + /// Releases the semaphore ticket + /// public ValueTask DisposeAsync() { this.Dispose(); From 6ddb2bbf8c8064e966a239e909101e7cc9bafa3c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Sep 2020 07:27:57 -0400 Subject: [PATCH 023/399] Switch to base16 instead of base64 for case sensitivity test because some base64 chars aren't safe for file names (e. g. /) --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 12a6a7f3..7eea1ae0 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -224,7 +224,8 @@ public async Task TestLockNamesAreCaseSensitive() // (which only supports very short ASCII string names). Finally, we re-run through GetSafeName to pick up any special prefix // that is needed (e. g. for wait handles) using var sha1 = SHA1.Create(); - var uniqueHashName = Convert.ToBase64String(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))) + var uniqueHashName = BitConverter.ToString(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))) + .Replace("-", string.Empty) // normalize to upper case per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 .ToUpperInvariant(); var lowerBaseName = $"{uniqueHashName.Substring(0, 6)}_a"; From 08d4b92f809c83ba250dc01f78d9deb7417f5c4d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Sep 2020 07:42:59 -0400 Subject: [PATCH 024/399] Add debug code for unix --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 7eea1ae0..2a769044 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -446,6 +446,14 @@ private Command RunLockTaker(TLockProvider engine, params string[] args) "Release"; #endif var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker.exe"); + + // todo clean up + if (!File.Exists(exePath)) + { + var exes = Directory.GetFiles(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", ".."), "*.exe", SearchOption.AllDirectories); + Assert.Fail($"Could not find {exePath}. Found {string.Join(Environment.NewLine, exes)}"); + } + var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) .RedirectStandardErrorTo(Console.Error); this._cleanupActions.Add(() => From 8f35f0f6b37fdecfa7e5a82a965519bc56535b52 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 18 Sep 2020 05:36:45 -0400 Subject: [PATCH 025/399] Debugging code --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 2a769044..a4a79d75 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -450,8 +450,9 @@ private Command RunLockTaker(TLockProvider engine, params string[] args) // todo clean up if (!File.Exists(exePath)) { - var exes = Directory.GetFiles(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", ".."), "*.exe", SearchOption.AllDirectories); - Assert.Fail($"Could not find {exePath}. Found {string.Join(Environment.NewLine, exes)}"); + var exes = Directory.GetFiles(Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..")), "*", SearchOption.AllDirectories) + .Where(e => e.Contains("bin")); + Assert.Fail($"Could not find {Path.GetFullPath(exePath)}. Found {string.Join(Environment.NewLine, exes)}"); } var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) From a17090538ba3b7c6d4184e5c7bf37eef8efc1799 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 04:38:25 -0400 Subject: [PATCH 026/399] File name validation improvements --- .../FileNameValidationHelper.cs | 63 ++++++++-- .../FileSystem/FileDistributedLockTest.cs | 112 ++++++++++++++++-- 2 files changed, 155 insertions(+), 20 deletions(-) diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/DistributedLock.FileSystem/FileNameValidationHelper.cs index 243befe4..35ba31a1 100644 --- a/DistributedLock.FileSystem/FileNameValidationHelper.cs +++ b/DistributedLock.FileSystem/FileNameValidationHelper.cs @@ -2,14 +2,54 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Security.Cryptography; using System.Text; namespace Medallion.Threading.FileSystem { + /// + /// Helper class for validating file names and converting lock names to valid file names. + /// + /// The approach taken here aims to ensure consistent behavior across platforms wherever possible. This is important + /// to allow for locking files on a shared network drive for example (whether file locks work with the particular NFS + /// is another issue but at least we don't want to be burned by naming discrepancy). + /// internal static class FileNameValidationHelper { - private static readonly HashSet InvalidFileNameChars = new HashSet(Path.GetInvalidFileNameChars()); + /// + /// The set of invalid file name characters for Windows, which is a superset of what is invalid on Unix. + /// For consistent behavior across platforms, we consider all of these characters invalid when constructing + /// lock file names from lock names. Pulled from dotnet/runtime github + /// + internal static readonly IReadOnlyCollection UnixAndWindowsInvalidFileNameChars = new char[] + { + '\"', '<', '>', '|', '\0', + (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10, + (char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20, + (char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30, + (char)31, ':', '*', '?', '\\', '/' + }; + + private static readonly HashSet InvalidFileNameChars = new HashSet( + // we fully expect this union to always be a noop, but I'm putting it here defensively in case + // this runs on a system that returns an invalid char not captured in the above + UnixAndWindowsInvalidFileNameChars.Union(Path.GetInvalidFileNameChars()) + ); + + /// + /// Windows disallows these special names when used exactly or when followed by a . + other characters (an extension). + /// See https://stackoverflow.com/questions/1976007/what-characters-are-forbidden-in-windows-and-linux-directory-names/1976131 + /// + internal static readonly HashSet ReservedWindowsFileNames = new HashSet( + new[] + { + "CON", "CONIN$", "CONOUT$", "PRN", "AUX", "NUL", + "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", + "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" + }, + StringComparer.OrdinalIgnoreCase + ); internal const int MaxPathLengthWindows = 260, MinFileNameLength = 12, @@ -97,14 +137,19 @@ private static string ConvertToValidName(string name) const char ReplacementChar = '_'; Invariant.Require(!InvalidFileNameChars.Contains(ReplacementChar)); - // handle special relative path names (which should not be allowed) - switch (name) + // Handle special relative path names (which should not be allowed). Note that (at least + // on Windows) passing more than 2 dots gets treated like "..'. Windows also does not seem + // to like file name consisting of any mix of dots and/or spaces + if (name.All(ch => ch == '.' || ch == ' ')) + { + return ReplacementChar + name; + } + + // Handle windows reserved names. We do this even on non-windows OS's for consistency across platforms + var firstDotIndex = name.IndexOf('.'); + if (ReservedWindowsFileNames.Contains(firstDotIndex >= 0 ? name.Substring(0, firstDotIndex) : name)) { - case ".": - return ReplacementChar.ToString(); - case "..": - return new string(ReplacementChar, count: 2); - // fall through + return ReplacementChar + name; } StringBuilder? builder = null; @@ -117,7 +162,7 @@ private static string ConvertToValidName(string name) builder ??= new StringBuilder(name.Length).Append(name, startIndex: 0, count: i); builder.Append(ReplacementChar); } - // we want to respect the casing of lock names. We normalize to upper case + // We want to respect the casing of lock names. We normalize to upper case // per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 else if (builder == null && char.ToUpperInvariant(@char) != @char) { diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index d0c13fea..0d1955ad 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; @@ -118,19 +119,83 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() var exception = Assert.Throws(() => @lock.Acquire().Dispose()); Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); } - + + [Test] + public void TestEmptyNameIsAllowed() => AssertCanUseName(string.Empty); + [Test] - public void TestEmptyNameIsAllowed() + public void TestLongNamesAreAllowed() => AssertCanUseName(new string('a', ushort.MaxValue)); + + [TestCase(".")] + [TestCase("..")] + [TestCase("...")] + [TestCase("....")] + [TestCase("A.")] + [TestCase("A..")] + [TestCase(".A")] + [TestCase("..A")] + [TestCase(" ")] + [TestCase(" ")] + [TestCase(" ")] + [TestCase("A ")] + [TestCase(" A")] + [TestCase(" .")] + [TestCase(". ")] + [TestCase(". .")] + [TestCase(" .. ")] + [TestCase("\t.")] + [TestCase(" \t")] + public void TestStrangePaths(string name) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, string.Empty); - Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); + AssertCanUseName(name); + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + CanCreateFileWithName(name).ShouldEqual(Path.GetFileName(@lock.Name) == name, $"Name was {@lock.Name}"); + } } - [Test] - public void TestLongNamesAreAllowed() + [TestCase("CON")] + [TestCase("PRN")] + [TestCase("AUX")] + [TestCase("NUL")] + [TestCase("COM1")] + [TestCase("COM2")] + [TestCase("COM3")] + [TestCase("COM4")] + [TestCase("COM5")] + [TestCase("COM6")] + [TestCase("COM7")] + [TestCase("COM8")] + [TestCase("COM9")] + [TestCase("LPT1")] + [TestCase("LPT2")] + [TestCase("LPT3")] + [TestCase("LPT4")] + [TestCase("LPT5")] + [TestCase("LPT6")] + [TestCase("LPT7")] + [TestCase("LPT8")] + [TestCase("LPT9")] + public void TestReservedWindowsNamesAreAllowed(string name) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, new string('a', ushort.MaxValue)); - Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); + var variants = new[] + { + name, + name.ToLowerInvariant() + ".txt", + name[0] + name.Substring(1).ToLowerInvariant(), + }; + foreach (var variant in variants) + { + AssertCanUseName(variant); + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + Assert.IsFalse(CanCreateFileWithName(variant), variant); + Assert.AreNotEqual(name, Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), variant); + } + } } [Test] @@ -145,6 +210,7 @@ public void TestEscapesBadCharactersInName() Check(@"\A\", shouldEscape: true); Check("<", shouldEscape: true); Check(">", shouldEscape: true); + Check("\0", shouldEscape: true); void Check(string name, bool shouldEscape) { @@ -162,8 +228,11 @@ public void TestForcesCaseSensitivity() } [TestCase("", ExpectedResult = "EMPTY_A4ED4E8E7DBB4757AF1BE51A3C139F84P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA")] - [TestCase(".", ExpectedResult = "_LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y")] - [TestCase("..", ExpectedResult = "__G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6")] + [TestCase(".", ExpectedResult = "_.LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y")] + [TestCase("..", ExpectedResult = "_..G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6")] + [TestCase("...", ExpectedResult = "_...2ZDJLYOT376KUA5OQFR2OERKUXIH4A7R")] + [TestCase("LPT1", ExpectedResult = "_LPT1VUGMI6NJVPIYUGXMY4K6ETA3232OR2B5")] + [TestCase(" ", ExpectedResult = "_ ZPD253R4AYXN6RS7UP6A3FYDCXHBXKUY")] [TestCase("_", ExpectedResult = "_")] [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool__!__x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L")] [TestCase( @@ -227,7 +296,28 @@ public void TestBase32Hashing() } } - // hash char usage (should use all 32 chars about evenly across many hashes) + private static void AssertCanUseName(string name) + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + IDistributedLockHandle? handle = null; + Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); + Assert.IsNotNull(handle, name); + handle!.Dispose(); + } + private static bool CanCreateFileWithName(string name) + { + var path = Path.Combine(LockFileDirectory, name); + try + { + File.OpenWrite(path).Dispose(); + File.Delete(path); + return true; + } + catch + { + return false; + } + } } } From 307d21f3001ba48d8a1b9d5af8800c9b808fa376 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 04:38:45 -0400 Subject: [PATCH 027/399] Linux CI fix for running DistributedLockTaker --- .../DistributedLockCoreTestCases.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index a4a79d75..442f8024 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using System.Threading; @@ -445,15 +446,8 @@ private Command RunLockTaker(TLockProvider engine, params string[] args) #else "Release"; #endif - var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker.exe"); - - // todo clean up - if (!File.Exists(exePath)) - { - var exes = Directory.GetFiles(Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..")), "*", SearchOption.AllDirectories) - .Where(e => e.Contains("bin")); - Assert.Fail($"Could not find {Path.GetFullPath(exePath)}. Found {string.Join(Environment.NewLine, exes)}"); - } + var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; + var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker" + exeExtension); var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) .RedirectStandardErrorTo(Console.Error); From bcd4c9b61e4d66105d488a96eef0bc94e282957e Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 04:49:33 -0400 Subject: [PATCH 028/399] Test fixes --- ...adeableReaderWriterLockConnectionStringStrategyTestCases.cs | 2 +- .../AbstractTestCases/DistributedSemaphoreCoreTestCases.cs | 2 +- DistributedLock.Tests/Tests/ApiTest.cs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index 5457a2e6..2ba6da42 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -21,7 +21,7 @@ public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCas /// Tests the logic where upgrading a connection stops and restarts the keepalive /// [Test] - [NonParallelizable, Retry(tryCount: 3)] // this test is somewhat timing sensitive + [NonParallelizable, Retry(tryCount: 5)] // this test is somewhat timing sensitive public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() { var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index 6de596cb..a02cdb5c 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -82,7 +82,7 @@ public void TestHighTicketCount() } [Test] - [NonParallelizable] // somewhat perf-sensitive + [NonParallelizable, Retry(tryCount: 3)] // somewhat perf-sensitive public void TestSemaphoreParallelism() { const int MaxCount = 10; diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 07f632a4..c3a5e714 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -67,10 +67,11 @@ public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) } private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() + .Where(t => t.IsPublic || t.IsNestedPublic) #if DEBUG .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) #endif - .Where(t => t.IsPublic || t.IsNestedPublic); + ; private static string CurrentFilePath([CallerFilePath] string filePath = "") => filePath; } From 16b6c664020cb087bc70a98886343cae14ad3dfa Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 15:08:53 -0400 Subject: [PATCH 029/399] Linux test fix --- .../Tests/FileSystem/FileDistributedLockTest.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 0d1955ad..e0a87635 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -104,9 +104,20 @@ public void TestFileCannotBeModifiedOrDeletedWhileHeld() var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestFileCannotBeModifiedOrDeletedWhileHeld)); using (@lock.Acquire()) { - Assert.Throws(() => File.WriteAllText(@lock.Name, "contents")); - Assert.Throws(() => File.ReadAllText(@lock.Name)); - Assert.Throws(() => File.Delete(@lock.Name)); + Assert.Throws(() => File.WriteAllText(@lock.Name, "contents"), "write"); + Assert.Throws(() => File.ReadAllText(@lock.Name), "read"); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + Assert.Throws(() => File.Delete(@lock.Name), "delete"); + } + else + { + // on unix, locking a file doesn't prevent unliking + // https://stackoverflow.com/questions/2028874/what-happens-to-an-open-file-handle-on-linux-if-the-pointed-file-gets-moved-or-d + Assert.DoesNotThrow(() => File.Delete(@lock.Name)); + using var reaquireHandle = @lock.TryAcquire(); + Assert.IsNull(reaquireHandle); + } } } From 1c2c8a70dc578876619248c5089c71d75580ddaf Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 15:15:34 -0400 Subject: [PATCH 030/399] Linux test fix --- .../Tests/FileSystem/FileDistributedLockTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index e0a87635..3d8e7c2a 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -112,11 +112,11 @@ public void TestFileCannotBeModifiedOrDeletedWhileHeld() } else { - // on unix, locking a file doesn't prevent unliking + // on unix, locking a file doesn't prevent unliking, so deletion effectively unlocks // https://stackoverflow.com/questions/2028874/what-happens-to-an-open-file-handle-on-linux-if-the-pointed-file-gets-moved-or-d Assert.DoesNotThrow(() => File.Delete(@lock.Name)); using var reaquireHandle = @lock.TryAcquire(); - Assert.IsNull(reaquireHandle); + Assert.IsNotNull(reaquireHandle); } } } From df50ad2be2f685b451f1cc8a2baa6c4d681aae84 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 18:23:07 -0400 Subject: [PATCH 031/399] Fix Nullable package reference --- DistributedLock.FileSystem/DistributedLock.FileSystem.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 1a62f2cd..adf177a0 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -43,6 +43,8 @@ - + + all + \ No newline at end of file From 1688553efa21b0b2d9a09b31eb2db10902d748d9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 19 Sep 2020 18:23:23 -0400 Subject: [PATCH 032/399] Improve test stability --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 442f8024..58d368f2 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -111,7 +111,7 @@ public void TestDisposeHandleIsIdempotent() } [Test] - [NonParallelizable] // timing-sensitive + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public void TestTimeouts() { var @lock = this._lockProvider.CreateLock(nameof(TestTimeouts)); From 39f71ff0f87757135208352290a67e0e7ef69df3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 29 Sep 2020 06:47:15 -0400 Subject: [PATCH 033/399] Improve name handling of file locks --- .../Internal/DistributedLockHelpers.cs | 16 +- .../FileDistributedLock.cs | 2 +- .../FileNameValidationHelper.cs | 182 ++++++------------ .../FileSystem/FileDistributedLockTest.cs | 138 ++++++++----- 4 files changed, 158 insertions(+), 180 deletions(-) diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 380db617..17ad52e5 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -15,7 +15,7 @@ namespace Medallion.Threading.Internal #endif static class DistributedLockHelpers { - public static string ToSafeName(string name, int maxNameLength, Func convertToValidName, Func? hashName = null) + public static string ToSafeName(string name, int maxNameLength, Func convertToValidName) { if (name == null) { throw new ArgumentNullException(nameof(name)); } @@ -25,17 +25,9 @@ public static string ToSafeName(string name, int maxNameLength, Func= maxNameLength) { diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index b56ff313..bd33137f 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -42,7 +42,7 @@ public FileDistributedLock(FileInfo lockFile) /// public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) { - this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name, exactName: false); + this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name); } // todo revisit API diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/DistributedLock.FileSystem/FileNameValidationHelper.cs index 35ba31a1..209fdb2e 100644 --- a/DistributedLock.FileSystem/FileNameValidationHelper.cs +++ b/DistributedLock.FileSystem/FileNameValidationHelper.cs @@ -1,115 +1,83 @@ -using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; +using System; using System.IO; -using System.Linq; using System.Security.Cryptography; using System.Text; namespace Medallion.Threading.FileSystem { /// - /// Helper class for validating file names and converting lock names to valid file names. - /// - /// The approach taken here aims to ensure consistent behavior across platforms wherever possible. This is important - /// to allow for locking files on a shared network drive for example (whether file locks work with the particular NFS - /// is another issue but at least we don't want to be burned by naming discrepancy). + /// Helper class for validating file names and converting lock names to valid file names. /// internal static class FileNameValidationHelper { - /// - /// The set of invalid file name characters for Windows, which is a superset of what is invalid on Unix. - /// For consistent behavior across platforms, we consider all of these characters invalid when constructing - /// lock file names from lock names. Pulled from dotnet/runtime github - /// - internal static readonly IReadOnlyCollection UnixAndWindowsInvalidFileNameChars = new char[] - { - '\"', '<', '>', '|', '\0', - (char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10, - (char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20, - (char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30, - (char)31, ':', '*', '?', '\\', '/' - }; - - private static readonly HashSet InvalidFileNameChars = new HashSet( - // we fully expect this union to always be a noop, but I'm putting it here defensively in case - // this runs on a system that returns an invalid char not captured in the above - UnixAndWindowsInvalidFileNameChars.Union(Path.GetInvalidFileNameChars()) - ); - - /// - /// Windows disallows these special names when used exactly or when followed by a . + other characters (an extension). - /// See https://stackoverflow.com/questions/1976007/what-characters-are-forbidden-in-windows-and-linux-directory-names/1976131 - /// - internal static readonly HashSet ReservedWindowsFileNames = new HashSet( - new[] - { - "CON", "CONIN$", "CONOUT$", "PRN", "AUX", "NUL", - "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", - "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" - }, - StringComparer.OrdinalIgnoreCase - ); - - internal const int MaxPathLengthWindows = 260, - MinFileNameLength = 12, - MaxPathLengthUnix = 4096, - FallbackMaxFileNameLength = 64; - - public static string GetLockFileName(DirectoryInfo lockFileDirectory, string name, bool exactName) + // NOTE: our goal here is to ensure consistent behavior across platforms where possible, in case someone is locking a networked file system + // file. + // + // That means we limit ourselves to just letters, digits and underscores in the name, and we always incorporate a hash component + // (which avoids the various Windows "special" file names. + // + // Length is another thing we have to consider; on Windows we are dealing with max file name lengths on 255 chars and max path lengths of + // either 259 chars or 32000 chars, depending on whether long paths are enabled and whether we're on .NET Core or .NET framework. On unix + // we expect limits of 255 bytes for file names and 4096 bytes for paths. + // + // Another difference is case-sensitivity: on Windows file names are case-insensitive but we want lock names to be case sensitive. + // + // For portability, we prefer to use a fixed name length of 64 chars of the form [clean base name prefix][hash].lock. "clean base name prefix" + // is a prefix of the orginal name with non letter/digit/underscore chars replaced with underscores. The prefix is as long as possible without going + // over the overall name limit. "hash" is a Base 32 hash of the UTF8 bytes of the provided name. This gives us case-sensitivity and a minimal chance + // of collision if the name got truncated or mutated during "cleaning". Finally, the ".lock" extension is a helpful indicator; both this and the name + // prefix are intended to help with debugging. + // + // Sometimes, our base directory will be so long that we can't use this full portable name format. In that case, we fall back to JUST the hash component. + // If that is still too long, we fall back to just the first 12 chars of the hash. If that is still too long, we give up. + + // Chosen because below this the risk of collisions just seems too high. If someone is picking a base directory so long + // that names are limited to < 12 chars, it feels like a mistake + internal const int MinFileNameLength = 12; + + // Chosen because this is both less than the 255 chars allowed by Windows and (because we always incorporate a Base 32 hash) less + // than the 255 bytes allowed by Unix. This is hopefully also short enough to rarely overflow MAX_PATH, even on Windows + private const int PortableFileNameLength = 64; + + public static string GetLockFileName(DirectoryInfo lockFileDirectory, string name) { if (lockFileDirectory == null) { throw new ArgumentNullException(nameof(lockFileDirectory)); } if (name == null) { throw new ArgumentNullException(nameof(name)); } var directoryPath = lockFileDirectory.FullName; - var directoryHasTrailingSeparator = directoryPath[directoryPath.Length - 1] == Path.DirectorySeparatorChar; - - if (exactName) - { - var validName = ConvertToValidName(name); - if (validName != name) { throw new FormatException($"{nameof(name)}: may not be '', '.', or '..' and may not contain illegal file name characters"); } - try { return Path.GetFullPath(ToPath(name)); } - catch (PathTooLongException ex) { throw new FormatException($"Combined {nameof(lockFileDirectory)} and {nameof(name)} is too long", ex); } - } - - var directoryPathLength = directoryPath.Length + (directoryHasTrailingSeparator ? 0 : 1); - - // if we fit within a traditional (short) windows path, then just use that. This ensures that we get a consistent answer - // even when different processes that have long file names enabled or not consider the same path - if (directoryPathLength + MinFileNameLength <= MaxPathLengthWindows - && TryCreateSafeName(MaxPathLengthWindows - directoryPathLength, out var safeName)) - { - return safeName; - } - - // our next fallback is to do the same, but assuming the unix max path length which is longer - if (directoryPathLength + MinFileNameLength <= MaxPathLengthUnix - && TryCreateSafeName(MaxPathLengthUnix - directoryPathLength, out safeName)) + var directoryPathWithTrailingSeparator = directoryPath[directoryPath.Length - 1] == Path.DirectorySeparatorChar + ? directoryPath + : directoryPath + Path.DirectorySeparatorChar; + + var baseName = ConvertToValidBaseName(name); + var nameHash = ComputeHash(Encoding.UTF8.GetBytes(name)); + const string Extension = ".lock"; + + // first, try the full portable name format + var portableLockFileName = directoryPathWithTrailingSeparator + + baseName.Substring(0, Math.Min(PortableFileNameLength - nameHash.Length - Extension.Length, baseName.Length)) + + nameHash + + Extension; + if (!IsTooLong(portableLockFileName)) { - return safeName; + return portableLockFileName; } - // finally, we iteratively consider a small range of reasonable max lengths - for (var maxNameLength = FallbackMaxFileNameLength; maxNameLength >= MinFileNameLength; --maxNameLength) + // next, try using just the hash as the name + var hashOnlyFileName = directoryPathWithTrailingSeparator + nameHash; + if (!IsTooLong(hashOnlyFileName)) { - if (TryCreateSafeName(maxNameLength, out safeName)) - { - return safeName; - } + return hashOnlyFileName; } - throw new PathTooLongException($"Unable to construct lock file name because the base directory (length = {directoryPathLength}) does not leave enough room for a {MinFileNameLength} lock name"); - - bool TryCreateSafeName(int maxNameLength, out string safeName) + // finally, try using just a portion of the hash + var minimumLengthFileName = directoryPathWithTrailingSeparator + nameHash.Substring(0, MinFileNameLength); + if (!IsTooLong(minimumLengthFileName)) { - var safeLockFileName = DistributedLockHelpers.ToSafeName(name, maxNameLength, ConvertToValidName, ComputeHash); - safeName = ToPath(safeLockFileName); - return !IsTooLong(safeName); + return minimumLengthFileName; } - string ToPath(string safeLockFileName) => directoryPath - + (directoryHasTrailingSeparator ? string.Empty : Path.DirectorySeparatorChar.ToString()) - + safeLockFileName; + throw new PathTooLongException($"Unable to construct lock file name because the base directory (length = {directoryPathWithTrailingSeparator.Length}) does not leave enough room for a {MinFileNameLength} lock name"); } private static bool IsTooLong(string name) @@ -125,58 +93,26 @@ private static bool IsTooLong(string name) } } - private static string ConvertToValidName(string name) + private static string ConvertToValidBaseName(string name) { - if (name.Length == 0) - { - // the suffix here is a random GUID. The idea is to have something fixed that - // is highly unlikely to collide with anything a user might provide - return ConvertToValidName("EMPTY_A4ED4E8E7DBB4757AF1BE51A3C139F84"); - } - const char ReplacementChar = '_'; - Invariant.Require(!InvalidFileNameChars.Contains(ReplacementChar)); - - // Handle special relative path names (which should not be allowed). Note that (at least - // on Windows) passing more than 2 dots gets treated like "..'. Windows also does not seem - // to like file name consisting of any mix of dots and/or spaces - if (name.All(ch => ch == '.' || ch == ' ')) - { - return ReplacementChar + name; - } - - // Handle windows reserved names. We do this even on non-windows OS's for consistency across platforms - var firstDotIndex = name.IndexOf('.'); - if (ReservedWindowsFileNames.Contains(firstDotIndex >= 0 ? name.Substring(0, firstDotIndex) : name)) - { - return ReplacementChar + name; - } StringBuilder? builder = null; - var mayNeedCasingMarker = false; for (var i = 0; i < name.Length; ++i) { var @char = name[i]; - if (InvalidFileNameChars.Contains(@char)) + if (!char.IsLetterOrDigit(@char) && @char != ReplacementChar) { builder ??= new StringBuilder(name.Length).Append(name, startIndex: 0, count: i); builder.Append(ReplacementChar); } - // We want to respect the casing of lock names. We normalize to upper case - // per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 - else if (builder == null && char.ToUpperInvariant(@char) != @char) - { - mayNeedCasingMarker = true; - } else if (builder != null) { builder.Append(@char); } } - return mayNeedCasingMarker && builder == null - ? name + ReplacementChar - : builder?.ToString() ?? name; + return builder?.ToString() ?? name; } // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 3d8e7c2a..4edbb28b 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -3,12 +3,13 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Tests.FileSystem +namespace Medallion.Threading.Tests.FileSystem { [Category("CI")] public class FileDistributedLockTest @@ -33,16 +34,6 @@ public void TestValidatesConstructorArguments() Assert.Throws(() => new FileDistributedLock(default!, "name")); Assert.Throws(() => new FileDistributedLock(LockFileDirectoryInfo, default!)); - - Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, string.Empty, exactName: true)); - Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, ".", exactName: true)); - Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, "..", exactName: true)); - - try { Path.GetFullPath(Path.Combine(LockFileDirectory, new string('a', 5000))); } - catch (PathTooLongException) - { - Assert.Throws(() => FileNameValidationHelper.GetLockFileName(LockFileDirectoryInfo, new string('a', 5000), exactName: true)); - } } [Test, Combinatorial] @@ -76,7 +67,10 @@ public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDelet var @lock = constructFromFileInfo ? new FileDistributedLock(new FileInfo(fileName)) : new FileDistributedLock(new DirectoryInfo(directoryName), Path.GetFileName(fileName)); - @lock.Name.ShouldEqual(fileName); + if (constructFromFileInfo) + { + @lock.Name.ShouldEqual(fileName); + } Directory.Exists(directoryName).ShouldEqual(alreadyExists != "nothing"); File.Exists(fileName).ShouldEqual(alreadyExists == "file"); @@ -84,13 +78,13 @@ public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDelet using (@lock.Acquire()) { Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsTrue(File.Exists(fileName)); + Assert.IsTrue(File.Exists(@lock.Name)); } Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsFalse(File.Exists(fileName)); + Assert.IsFalse(File.Exists(@lock.Name)); - string Hash(string text) + static string Hash(string text) { using var md5 = MD5.Create(); var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes($"{text}_{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}")); @@ -137,6 +131,42 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() [Test] public void TestLongNamesAreAllowed() => AssertCanUseName(new string('a', ushort.MaxValue)); + [Test] + public void TestHandlesLongDirectoryNames() + { + var tooLongDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) + ? AppContext.TryGetSwitch("Switch.System.IO.UseLegacyPathHandling", out var useLegacyPathHandling) && useLegacyPathHandling + ? BuildLongDirectory(259 - (FileNameValidationHelper.MinFileNameLength - 1)) + : BuildLongDirectory(short.MaxValue - (FileNameValidationHelper.MinFileNameLength - 1)) + : BuildLongDirectory(4096 - (FileNameValidationHelper.MinFileNameLength - 1)); + + Assert.Throws(() => new FileDistributedLock(tooLongDirectory, new string('a', FileNameValidationHelper.MinFileNameLength))); + + var almostTooLongDirectory = new DirectoryInfo(tooLongDirectory.FullName.Substring(0, tooLongDirectory.FullName.Length - 1)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); + AssertCanUseName(new string('a', 100 * FileNameValidationHelper.MinFileNameLength)); + + var almostTooLongBytesDirectory = new DirectoryInfo(almostTooLongDirectory.FullName.Replace("aaaa", "🦉")); + Encoding.UTF8.GetByteCount(almostTooLongBytesDirectory.FullName).ShouldEqual(Encoding.UTF8.GetByteCount(almostTooLongDirectory.FullName)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength + 1)); + + static DirectoryInfo BuildLongDirectory(int length) + { + var name = new StringBuilder(LockFileDirectory); + while (name.Length < length) + { + name.Append(Path.DirectorySeparatorChar) + .Append('a', 100); // shorter than 255 max name lengths + } + name.Length = length; + // make sure we don't have separators near the end that block trimming + name[name.Length - 1] = 'b'; + name[name.Length - 2] = 'b'; + return new DirectoryInfo(name.ToString()); + } + } + [TestCase(".")] [TestCase("..")] [TestCase("...")] @@ -156,14 +186,17 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() [TestCase(" .. ")] [TestCase("\t.")] [TestCase(" \t")] - public void TestStrangePaths(string name) - { - AssertCanUseName(name); + public void TestStrangePaths(string name) => AssertCanUseName(name); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + [TestCase("a.")] + [TestCase("a ")] + public void TestTrailingWhitespaceOrDotDoesNotCauseCollision(string name) + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + using (@lock.Acquire()) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); - CanCreateFileWithName(name).ShouldEqual(Path.GetFileName(@lock.Name) == name, $"Name was {@lock.Name}"); + using var handle = new FileDistributedLock(LockFileDirectoryInfo, name.Trim('.').Trim(' ')).TryAcquire(); + Assert.IsNotNull(handle); } } @@ -180,6 +213,8 @@ public void TestStrangePaths(string name) [TestCase("COM7")] [TestCase("COM8")] [TestCase("COM9")] + [TestCase("CONIN$")] + [TestCase("CONOUT$")] [TestCase("LPT1")] [TestCase("LPT2")] [TestCase("LPT3")] @@ -214,7 +249,7 @@ public void TestEscapesBadCharactersInName() { Check("A", shouldEscape: false); Check("A_B", shouldEscape: false); - Check(string.Empty, shouldEscape: true); + Check(string.Empty, shouldEscape: false); Check(".", shouldEscape: true); Check("..", shouldEscape: true); Check("/A/", shouldEscape: true); @@ -223,11 +258,16 @@ public void TestEscapesBadCharactersInName() Check(">", shouldEscape: true); Check("\0", shouldEscape: true); - void Check(string name, bool shouldEscape) + foreach (var invalidChar in Path.GetInvalidFileNameChars()) + { + Check("_" + invalidChar, shouldEscape: true); + } + + static void Check(string name, bool shouldEscape) { var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); - (@lock.Name == LockFileDirectory + Path.DirectorySeparatorChar + name) - .ShouldEqual(!shouldEscape); + @lock.Name.StartsWith(LockFileDirectory + Path.DirectorySeparatorChar + name) + .ShouldEqual(!shouldEscape, $"'{name}', {@lock.Name}"); } } @@ -235,23 +275,33 @@ void Check(string name, bool shouldEscape) public void TestForcesCaseSensitivity() { Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, "lower").Name) - .ShouldEqual("lower_PRE5SHQAMC324P4C6UKD4R4VMGGJMF6T"); + .ShouldEqual("lowerPRE5SHQAMC324P4C6UKD4R4VMGGJMF6T.lock"); } - [TestCase("", ExpectedResult = "EMPTY_A4ED4E8E7DBB4757AF1BE51A3C139F84P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA")] - [TestCase(".", ExpectedResult = "_.LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y")] - [TestCase("..", ExpectedResult = "_..G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6")] - [TestCase("...", ExpectedResult = "_...2ZDJLYOT376KUA5OQFR2OERKUXIH4A7R")] - [TestCase("LPT1", ExpectedResult = "_LPT1VUGMI6NJVPIYUGXMY4K6ETA3232OR2B5")] - [TestCase(" ", ExpectedResult = "_ ZPD253R4AYXN6RS7UP6A3FYDCXHBXKUY")] - [TestCase("_", ExpectedResult = "_")] - [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool__!__x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L")] + [TestCase("", ExpectedResult = "P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA.lock")] + [TestCase(".", ExpectedResult = "_LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y.lock")] + [TestCase("..", ExpectedResult = "__G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6.lock")] + [TestCase("...", ExpectedResult = "___2ZDJLYOT376KUA5OQFR2OERKUXIH4A7R.lock")] + [TestCase("LPT1", ExpectedResult = "LPT1VUGMI6NJVPIYUGXMY4K6ETA3232OR2B5.lock")] + [TestCase(" ", ExpectedResult = "_ZPD253R4AYXN6RS7UP6A3FYDCXHBXKUY.lock")] + [TestCase("_", ExpectedResult = "_3VP7XSELHOF3DU4D257KSSAQD3WR4SSL.lock")] + [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool_____x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L.lock")] [TestCase( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - ExpectedResult = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXTSAJQWFKOYRBNXC6DV3HRZWQJANRKCX" + ExpectedResult = "aaaaaaaaaaaaaaaaaaaaaaaaaaaXTSAJQWFKOYRBNXC6DV3HRZWQJANRKCX.lock" + )] + [TestCase("ABC", ExpectedResult = "ABCZJ4QR6TVN4A3KMGQ4BUKHOWQYFRLXSB3.lock")] + [TestCase("abc", ExpectedResult = "abc56LLTQOSBT6ULGHITLS4KQEIRREMO53J.lock")] + // 255 UTF8 bytes + [TestCase( + "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉123", + ExpectedResult = "___________________________VA7XJG3JUQKTL6AU2KWPHVQFK43N4DVW.lock" + )] + // 256 UTF8 bytes + [TestCase( + "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉1234", + ExpectedResult = "___________________________NOLT44QRLWYINT53TY2I4H34X4AU4O46.lock" )] - [TestCase("ABC", ExpectedResult = "ABC")] - [TestCase("abc", ExpectedResult = "abc_56LLTQOSBT6ULGHITLS4KQEIRREMO53J")] public string TestSafeNameCompatibility(string name) { // meant to be consistent length across platforms @@ -279,12 +329,12 @@ public void TestBase32Hashing() } var @lock = new FileDistributedLock(directoryInfo, new string(nameChars)); - var hashStart = @lock.Name.Length - FileNameValidationHelper.HashLengthInChars; - if (@lock.Name[hashStart - 1] != '_') { Assert.Fail("Bad name format"); } + var lockFileNameWithoutExtension = Path.GetFileNameWithoutExtension(@lock.Name); + var hashStart = lockFileNameWithoutExtension.Length - FileNameValidationHelper.HashLengthInChars; - for (var j = hashStart; j < @lock.Name.Length; ++j) + for (var j = hashStart; j < lockFileNameWithoutExtension.Length; ++j) { - ++charCounts[@lock.Name[j]]; + ++charCounts[lockFileNameWithoutExtension[j]]; } } @@ -307,9 +357,9 @@ public void TestBase32Hashing() } } - private static void AssertCanUseName(string name) + private static void AssertCanUseName(string name, DirectoryInfo? directory = null) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); IDistributedLockHandle? handle = null; Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); Assert.IsNotNull(handle, name); @@ -318,9 +368,9 @@ private static void AssertCanUseName(string name) private static bool CanCreateFileWithName(string name) { - var path = Path.Combine(LockFileDirectory, name); try { + var path = Path.Combine(LockFileDirectory, name); File.OpenWrite(path).Dispose(); File.Delete(path); return true; From 5342804e66a2a3b339c1d5f88759843df67871ae Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 29 Sep 2020 06:57:31 -0400 Subject: [PATCH 034/399] Unix test fix --- .../Tests/FileSystem/FileDistributedLockTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 4edbb28b..88497370 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -266,7 +266,8 @@ public void TestEscapesBadCharactersInName() static void Check(string name, bool shouldEscape) { var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); - @lock.Name.StartsWith(LockFileDirectory + Path.DirectorySeparatorChar + name) + // ordinal required for null char comparison (see https://github.com/dotnet/runtime/issues/4673) + @lock.Name.StartsWith(LockFileDirectory + Path.DirectorySeparatorChar + name, StringComparison.Ordinal) .ShouldEqual(!shouldEscape, $"'{name}', {@lock.Name}"); } } From 80979f0ce54eb705891fb2c7851c2e4ae02f8944 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 29 Sep 2020 07:06:47 -0400 Subject: [PATCH 035/399] Unix test fixes --- .../Tests/FileSystem/FileDistributedLockTest.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 88497370..abe9e199 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -134,13 +134,20 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() [Test] public void TestHandlesLongDirectoryNames() { - var tooLongDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) - ? AppContext.TryGetSwitch("Switch.System.IO.UseLegacyPathHandling", out var useLegacyPathHandling) && useLegacyPathHandling + DirectoryInfo tooLongDirectory; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + tooLongDirectory = AppContext.TryGetSwitch("Switch.System.IO.UseLegacyPathHandling", out var useLegacyPathHandling) && useLegacyPathHandling ? BuildLongDirectory(259 - (FileNameValidationHelper.MinFileNameLength - 1)) - : BuildLongDirectory(short.MaxValue - (FileNameValidationHelper.MinFileNameLength - 1)) - : BuildLongDirectory(4096 - (FileNameValidationHelper.MinFileNameLength - 1)); + : BuildLongDirectory(short.MaxValue - (FileNameValidationHelper.MinFileNameLength - 1)); - Assert.Throws(() => new FileDistributedLock(tooLongDirectory, new string('a', FileNameValidationHelper.MinFileNameLength))); + // we only check this on Windows currently since AppVeyor linux does not see to have a length restriction + Assert.Throws(() => new FileDistributedLock(tooLongDirectory, new string('a', FileNameValidationHelper.MinFileNameLength))); + } + else + { + tooLongDirectory = BuildLongDirectory(4096 - (FileNameValidationHelper.MinFileNameLength - 1)); + } var almostTooLongDirectory = new DirectoryInfo(tooLongDirectory.FullName.Substring(0, tooLongDirectory.FullName.Length - 1)); AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); From 31045018671c48e3d2d143c8c106fcf40807a59a Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 29 Sep 2020 07:13:18 -0400 Subject: [PATCH 036/399] Minor cleanup --- DistributedLock.Core/Internal/DistributedLockHelpers.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 17ad52e5..1866846b 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -25,9 +25,8 @@ public static string ToSafeName(string name, int maxNameLength, Func= maxNameLength) { From 6f0bedf4be2c9177d77b1131d9a511400275183c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 17 Oct 2020 17:39:45 -0400 Subject: [PATCH 037/399] Implement redis distributed lock --- .../AzureBlobLeaseDistributedLockHandle.cs | 4 + .../AzureBlobLeaseOptionsBuilder.cs | 2 +- DistributedLock.Core/AssemblyAttributes.cs | 1 + .../DistributedLock.Core.csproj | 6 +- .../IDistributedLockProvider.cs | 1 + DistributedLock.Core/Internal/Helpers.cs | 21 ++ DistributedLock.Core/Internal/LeaseMonitor.cs | 150 ++++++++++++++ .../Internal/SyncOverAsync.cs | 1 + DistributedLock.Redis/AssemblyAttributes.cs | 3 + .../DistributedLock.Redis.csproj | 51 +++++ .../IRedisSynchronizationPrimitive.cs | 23 +++ DistributedLock.Redis/RedLockAcquire.cs | 190 ++++++++++++++++++ DistributedLock.Redis/RedLockExtend.cs | 88 ++++++++ DistributedLock.Redis/RedLockHelper.cs | 30 +++ DistributedLock.Redis/RedLockRelease.cs | 96 +++++++++ .../RedisDistributedLock.IDistributedLock.cs | 85 ++++++++ DistributedLock.Redis/RedisDistributedLock.cs | 118 +++++++++++ .../RedisDistributedLockHandle.cs | 65 ++++++ .../RedisDistributedLockOptionsBuilder.cs | 172 ++++++++++++++++ DistributedLock.Redis/TimeoutTask.cs | 41 ++++ .../DistributedLock.Tests.csproj | 2 +- .../Azure/AzureSetUpFixture.cs | 0 .../Infrastructure/Redis/RedisServer.cs | 74 +++++++ .../Infrastructure/Redis/RedisSetUpFixture.cs | 17 ++ .../Redis/TestingRedisProviders.cs | 73 +++++++ .../TestingRedisSynchronizationStrategy.cs | 76 +++++++ .../Infrastructure/Shared/RedisPorts.cs | 13 ++ DistributedLock.Tests/Tests/ApiTest.cs | 2 +- .../Azure/AzureBlobLeaseOptionsBuilderTest.cs | 8 + .../Tests/CombinatorialTests.cs | 7 + .../Tests/Core/HelpersTest.cs | 38 ++++ .../RedisDistributedLockOptionsBuilderTest.cs | 71 +++++++ .../Tests/Redis/RedisDistributedLockTest.cs | 146 ++++++++++++++ DistributedLock.sln | 8 +- DistributedLock/DistributedLock.csproj | 1 + .../DistributedLockTaker.csproj | 2 +- DistributedLockTaker/Program.cs | 22 ++ 37 files changed, 1702 insertions(+), 6 deletions(-) create mode 100644 DistributedLock.Core/Internal/LeaseMonitor.cs create mode 100644 DistributedLock.Redis/AssemblyAttributes.cs create mode 100644 DistributedLock.Redis/DistributedLock.Redis.csproj create mode 100644 DistributedLock.Redis/IRedisSynchronizationPrimitive.cs create mode 100644 DistributedLock.Redis/RedLockAcquire.cs create mode 100644 DistributedLock.Redis/RedLockExtend.cs create mode 100644 DistributedLock.Redis/RedLockHelper.cs create mode 100644 DistributedLock.Redis/RedLockRelease.cs create mode 100644 DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs create mode 100644 DistributedLock.Redis/RedisDistributedLock.cs create mode 100644 DistributedLock.Redis/RedisDistributedLockHandle.cs create mode 100644 DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs create mode 100644 DistributedLock.Redis/TimeoutTask.cs rename DistributedLock.Tests/{Tests => Infrastructure}/Azure/AzureSetUpFixture.cs (100%) create mode 100644 DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs create mode 100644 DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs create mode 100644 DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs create mode 100644 DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs create mode 100644 DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs create mode 100644 DistributedLock.Tests/Tests/Core/HelpersTest.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index c7796454..bcec5cff 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -18,6 +18,10 @@ public sealed class AzureBlobLeaseDistributedLockHandle : IDistributedLockHandle internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.InternalHandle internalHandle) { this._internalHandle = internalHandle; + // Because this is a lease, managed finalization mostly won't be strictly necessary here. Where it comes in handy is: + // (1) Ensuring blob deletion if we own the blob + // (2) Helping release infinite-duration leases (rare case) + // (3) In testing, avoiding having to wait 15+ seconds for lease expiration this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, internalHandle); } diff --git a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs index fa7e4388..5ce6448d 100644 --- a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs +++ b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs @@ -120,7 +120,7 @@ internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeSpan mi var durationToUse = options?._duration ?? DefaultLeaseDuration; return ( duration: durationToUse, - renewalCadence: options?._renewalCadence ?? TimeSpan.FromMilliseconds(durationToUse.InMilliseconds / 3.0), + renewalCadence: options?._renewalCadence ?? (durationToUse.IsInfinite ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(durationToUse.InMilliseconds / 3.0)), minBusyWaitSleepTime: options?._minBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromMilliseconds(250), maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromSeconds(1) ); diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/DistributedLock.Core/AssemblyAttributes.cs index 469f7d6a..537fbf06 100644 --- a/DistributedLock.Core/AssemblyAttributes.cs +++ b/DistributedLock.Core/AssemblyAttributes.cs @@ -11,4 +11,5 @@ [assembly: InternalsVisibleTo("DistributedLock.Postgres, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Azure, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.FileSystem, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.Redis, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index c7045d08..92e5855f 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -39,7 +39,11 @@ - + + + + + \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedLockProvider.cs b/DistributedLock.Core/IDistributedLockProvider.cs index b9cb74da..51dd4be0 100644 --- a/DistributedLock.Core/IDistributedLockProvider.cs +++ b/DistributedLock.Core/IDistributedLockProvider.cs @@ -15,6 +15,7 @@ public interface IDistributedLockProvider /// IDistributedLock CreateLock(string name, bool exactName = false); + // TODO probably get rid of all GetSafeName APIs; they're not interesting if you can get the lock name from the lock and exactName is off by default /// /// Given an arbitrary , determines whether can be safely /// used as-is by the underlying provider (in other words, if it is safe to call diff --git a/DistributedLock.Core/Internal/Helpers.cs b/DistributedLock.Core/Internal/Helpers.cs index dc88cc35..c935497d 100644 --- a/DistributedLock.Core/Internal/Helpers.cs +++ b/DistributedLock.Core/Internal/Helpers.cs @@ -36,6 +36,27 @@ public readonly struct TaskConversion { } public static ValueTask AsValueTask(this Task task) => new ValueTask(task); public static ValueTask AsValueTask(this T value) => new ValueTask(value); + public static Task SafeCreateTask(Func> taskFactory, TState state) => + InternalSafeCreateTask, TResult>(taskFactory, state); + + public static Task SafeCreateTask(Func taskFactory, TState state) => + InternalSafeCreateTask(taskFactory, state); + + private static TTask InternalSafeCreateTask(Func taskFactory, TState state) + where TTask : Task + { + try { return taskFactory(state); } + catch (OperationCanceledException) + { + // don't use Task.FromCanceled here because oce.CancellationToken is not guaranteed to + // have IsCancellationRequested which FromCanceled requires + var canceledTaskBuilder = new TaskCompletionSource(); + canceledTaskBuilder.SetCanceled(); + return (TTask)canceledTaskBuilder.Task.As(); + } + catch (Exception ex) { return (TTask)Task.FromException(ex).As(); } + } + // todo rethink message here; should this return "handle" or something more generic since it might be an internal type? public static ObjectDisposedException ObjectDisposed(this T _) where T : IAsyncDisposable => throw new ObjectDisposedException(typeof(T).ToString()); diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs new file mode 100644 index 00000000..057f87f9 --- /dev/null +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -0,0 +1,150 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Internal +{ + // todo incorporate into azure + /// + /// Utility for monitoring/renewing a fixed length "lease" lock + /// +#if DEBUG + public +#else + internal +#endif + sealed class LeaseMonitor : IDisposable, IAsyncDisposable + { + private readonly CancellationTokenSource _disposalSource = new CancellationTokenSource(), + _handleLostSource = new CancellationTokenSource(); + + private readonly WeakReference _weakLeaseHandle; + private readonly TimeoutValue _leaseDuration, _monitoringCadence; + private readonly Task _monitoringTask; + + public LeaseMonitor(ILeaseHandle handle) + { + Invariant.Require(handle.LeaseDuration.CompareTo(handle.MonitoringCadence) >= 0); + + this._weakLeaseHandle = new WeakReference(handle); + this._leaseDuration = handle.LeaseDuration; + this._monitoringCadence = handle.MonitoringCadence; + this._monitoringTask = Task.Run(() => this.MonitoringLoop()); + } + + public CancellationToken HandleLostToken => this._handleLostSource.Token; + + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + + public async ValueTask DisposeAsync() + { + try + { + if (!this._disposalSource.IsCancellationRequested) // idempotent + { + this._disposalSource.Cancel(); + } + + if (SyncOverAsync.IsSynchronous) { this._monitoringTask.GetAwaiter().GetResult(); } + else { await this._monitoringTask.ConfigureAwait(false); } + } + finally + { + this._handleLostSource.Dispose(); + this._disposalSource.Dispose(); + } + } + + private async Task MonitoringLoop() + { + var leaseLifetime = Stopwatch.StartNew(); + while (true) + { + // wait until the next monitoring check + await Task.Delay(this._monitoringCadence.InMilliseconds, this._disposalSource.Token).TryAwait(); + if (this._disposalSource.Token.IsCancellationRequested) { return; } + + // lease expired + if (this._leaseDuration.CompareTo(leaseLifetime.Elapsed) < 0) + { + this._handleLostSource.Cancel(); + return; + } + + var leaseState = await this.CheckLeaseAsync().ConfigureAwait(false); + switch (leaseState) + { + // if the handle is GC'd out from under us, then we just clean up after ourselves and exit + case null: + _ = Task.Run(() => this.Dispose()); // cleans up the sources. This can't be called synchronously because Dispose() waits on this task + return; + + case LeaseState.Lost: + this._handleLostSource.Cancel(); + return; + + case LeaseState.Renewed: + leaseLifetime.Restart(); + break; + + // If the lease is held but not renewed or if we don't know (e. g. due to transient failure), + // then just continue. We can't yet say that it is lost but it isn't renewed so we can't reset + // the lifetime either. + case LeaseState.Held: + case LeaseState.Unknown: + break; + + default: + throw new InvalidOperationException("should never get here"); + } + } + } + + private async Task CheckLeaseAsync() + { + if (!this._weakLeaseHandle.TryGetTarget(out var leaseHandle)) + { + return null; + } + + var renewOrValidateTask = Helpers.SafeCreateTask(state => state.leaseHandle.RenewOrValidateLeaseAsync(state.Token), (leaseHandle, this._disposalSource.Token)); + await renewOrValidateTask.TryAwait(); + return this._disposalSource.IsCancellationRequested || renewOrValidateTask.Status != TaskStatus.RanToCompletion + ? LeaseState.Unknown + : renewOrValidateTask.Result; + } + + public interface ILeaseHandle + { + TimeoutValue LeaseDuration { get; } + TimeoutValue MonitoringCadence { get; } + Task RenewOrValidateLeaseAsync(CancellationToken cancellationToken); + } + + public enum LeaseState + { + /// + /// The lease is known to be still held but was not renewed + /// + Held, + + /// + /// The lease has been renewed for + /// + Renewed, + + /// + /// The lease is known to no longer be held + /// + Lost, + + /// + /// The lease may or may not be held any longer + /// + Unknown, + } + } +} diff --git a/DistributedLock.Core/Internal/SyncOverAsync.cs b/DistributedLock.Core/Internal/SyncOverAsync.cs index 97bdbddd..6ad0da82 100644 --- a/DistributedLock.Core/Internal/SyncOverAsync.cs +++ b/DistributedLock.Core/Internal/SyncOverAsync.cs @@ -4,6 +4,7 @@ namespace Medallion.Threading.Internal { + // TODO rename this (SyncViaAsync?) since it really isn't the sync over async antipattern /// /// Helps re-use code across sync and async pathways, leveraging the fact that async code will run synchronously /// unless it actually encounters an async operation. Downstream code should use the diff --git a/DistributedLock.Redis/AssemblyAttributes.cs b/DistributedLock.Redis/AssemblyAttributes.cs new file mode 100644 index 00000000..a9e3a34f --- /dev/null +++ b/DistributedLock.Redis/AssemblyAttributes.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj new file mode 100644 index 00000000..81b8ade3 --- /dev/null +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -0,0 +1,51 @@ + + + + net461;netstandard2.0;netstandard2.1 + Medallion.Threading.Redis + True + 4 + Latest + enable + + + + 1.0.0-alpha01 + 1.0.0.0 + Michael Adelson + Provides distributed locking primitives based on Redis + Copyright © 2020 Michael Adelson + MIT + distributed redis lock redlock + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + + + False + 1591 + TRACE;DEBUG + + + + + + + + + + all + + + \ No newline at end of file diff --git a/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs b/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs new file mode 100644 index 00000000..7a6680ef --- /dev/null +++ b/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs @@ -0,0 +1,23 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + internal interface IRedisSynchronizationPrimitive + { + TimeoutValue AcquireTimeout { get; } + TimeoutValue ExtensionCadence { get; } + TimeoutValue Expiry { get; } + + Task TryAcquireAsync(IDatabaseAsync database); + bool TryAcquire(IDatabase database); + Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget); + void Release(IDatabase database, bool fireAndForget); + Task TryExtendAsync(IDatabaseAsync database); + } +} diff --git a/DistributedLock.Redis/RedLockAcquire.cs b/DistributedLock.Redis/RedLockAcquire.cs new file mode 100644 index 00000000..51055ba7 --- /dev/null +++ b/DistributedLock.Redis/RedLockAcquire.cs @@ -0,0 +1,190 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements the acquire operation in the RedLock algorithm. See https://redis.io/topics/distlock + /// + internal readonly struct RedLockAcquire + { + private readonly IRedisSynchronizationPrimitive _primitive; + private readonly IReadOnlyList _databases; + private readonly CancellationToken _cancellationToken; + + public RedLockAcquire( + IRedisSynchronizationPrimitive primitive, + IReadOnlyList databases, + CancellationToken cancellationToken) + { + this._primitive = primitive; + this._databases = databases; + this._cancellationToken = cancellationToken; + } + + public async ValueTask>?> TryAcquireAsync() + { + this._cancellationToken.ThrowIfCancellationRequested(); + + var isSynchronous = SyncOverAsync.IsSynchronous; + if (isSynchronous && this._databases.Count == 1) + { + return this.TrySingleFullySynchronousAcquire(); + } + + var primitive = this._primitive; + var tryAcquireTasks = this._databases.ToDictionary( + db => db, + db => Helpers.SafeCreateTask(state => state.primitive.TryAcquireAsync(state.db), (primitive, db)) + ); + + var waitForAcquireTask = this.WaitForAcquireAsync(tryAcquireTasks); + + var succeeded = false; + try + { + succeeded = isSynchronous + ? waitForAcquireTask.GetAwaiter().GetResult() + : await waitForAcquireTask.ConfigureAwait(false); + } + finally + { + // clean up + if (!succeeded) + { + List? releaseTasks = null; + foreach (var kvp in tryAcquireTasks) + { + // if the task hasn't finished yet, we don't want to do any releasing now; just + // queue a release command to run when the task eventually completes + if (!kvp.Value.IsCompleted) + { + RedLockHelper.FireAndForgetReleaseUponCompletion(primitive, kvp.Key, kvp.Value); + } + // otherwise, unless we know we failed to acquire, do a release + else if (!RedLockHelper.ReturnedFalse(kvp.Value)) + { + if (isSynchronous) + { + try { primitive.Release(kvp.Key, fireAndForget: true); } + catch { } + } + else + { + (releaseTasks ??= new List()) + .Add(Helpers.SafeCreateTask(state => state.primitive.ReleaseAsync(state.Key, fireAndForget: true), (primitive, kvp.Key))); + } + } + } + + if (releaseTasks != null) + { + await Task.WhenAll(releaseTasks).ConfigureAwait(false); + } + } + } + + return succeeded ? tryAcquireTasks : null; + } + + private async Task WaitForAcquireAsync(IReadOnlyDictionary> tryAcquireTasks) + { + using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); + var incompleteTasks = new HashSet(tryAcquireTasks.Values) { timeout.Task }; + + var successCount = 0; + var failCount = 0; + var faultCount = 0; + var threshold = (this._databases.Count / 2) + 1; + while (true) + { + var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); + + if (completed == timeout.Task) + { + await completed.ConfigureAwait(false); // propagates cancellation + return false; // true timeout + } + + if (completed.Status == TaskStatus.RanToCompletion) + { + var result = await ((Task)completed).ConfigureAwait(false); + if (result) + { + ++successCount; + if (successCount >= threshold) { return true; } + } + else + { + ++failCount; + if (failCount >= threshold) { return false; } + } + } + + // faulted or canceled + + // if we get too many faults, the lock is not possible to acquire, so we should throw + ++faultCount; + if (faultCount >= threshold) + { + var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) + .ToArray(); + if (faultingTasks.Length == 1) + { + await faultingTasks[0].ConfigureAwait(false); // propagate the error + } + + throw new AggregateException(faultingTasks.Select(t => t.Exception ?? new TaskCanceledException(t).As())) + .Flatten(); + } + + ++failCount; + if (failCount >= threshold) { return false; } + + incompleteTasks.Remove(completed); + } + } + + /// + /// We only allow synchronous acquire for a single db because StackExchange.Redis does not currently allow for + /// single-operation timeouts/cancellations. Therefore, one slow response would jeopardize our ability to claim the + /// lock in time. With a single db, the one operation is all that matters so it is fine if we need to wait for it. + /// + private Dictionary>? TrySingleFullySynchronousAcquire() + { + var database = this._databases.Single(); + + bool success; + var stopwatch = Stopwatch.StartNew(); + try { success = this._primitive.TryAcquire(database); } + catch + { + // on failure, still attempt a release just in case + try { this._primitive.Release(database, fireAndForget: true); } + catch { } // do nothing; we're going to throw anyway and the cause of failure is probably the same + + throw; + } + + if (success) + { + // make sure we didn't time out + if (this._primitive.AcquireTimeout.CompareTo(stopwatch.Elapsed) >= 0) + { + return new Dictionary> { [database] = Task.FromResult(true) }; + } + + this._primitive.Release(database, fireAndForget: true); // timed out, so release + } + + return null; + } + } +} diff --git a/DistributedLock.Redis/RedLockExtend.cs b/DistributedLock.Redis/RedLockExtend.cs new file mode 100644 index 00000000..5ae94461 --- /dev/null +++ b/DistributedLock.Redis/RedLockExtend.cs @@ -0,0 +1,88 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements the extend operation in the RedLock algorithm. See https://redis.io/topics/distlock + /// + internal readonly struct RedLockExtend + { + private readonly IRedisSynchronizationPrimitive _primitive; + private readonly Dictionary> _tryAcquireOrRenewTasks; + private readonly CancellationToken _cancellationToken; + + public RedLockExtend( + IRedisSynchronizationPrimitive primitive, + Dictionary> tryAcquireOrRenewTasks, + CancellationToken cancellationToken) + { + this._primitive = primitive; + this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; + this._cancellationToken = cancellationToken; + } + + public async Task TryExtendAsync() + { + Invariant.Require(!SyncOverAsync.IsSynchronous, "should only be called from a background renewal thread which is async"); + + var incompleteTasks = new HashSet(); + foreach (var kvp in this._tryAcquireOrRenewTasks.ToArray()) + { + if (kvp.Value.IsCompleted) + { + incompleteTasks.Add( + this._tryAcquireOrRenewTasks[kvp.Key] = Helpers.SafeCreateTask( + state => state.primitive.TryExtendAsync(state.database), + (primitive: this._primitive, database: kvp.Key) + ) + ); + } + else + { + // if the previous acquire/renew is still going, just keep waiting for that + incompleteTasks.Add(kvp.Value); + } + } + + // For extension we use the same timeout as acquire. This ensures the same min validity time which should be + // sufficient to keep extending + using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); + incompleteTasks.Add(timeout.Task); + + var threshold = (this._tryAcquireOrRenewTasks.Count / 2) + 1; + var successCount = 0; + var failCount = 0; + while (true) + { + var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); + + if (completed == timeout.Task) + { + await completed.ConfigureAwait(false); // propagate cancellation + return null; // inconclusive + } + + if (completed.Status == TaskStatus.RanToCompletion && ((Task)completed).Result) + { + ++successCount; + if (successCount >= threshold) { return true; } + } + else + { + // note that we treat faulted and failed the same in extend. There's no reason to throw, since + // this is just called by the extend loop. While in theory a fault could indicate some kind of post-success + // failure, most likely it means the db is unreachable and so it is safest to consider it a failure + ++failCount; + if (failCount >= threshold) { return false; } + } + } + } + } +} diff --git a/DistributedLock.Redis/RedLockHelper.cs b/DistributedLock.Redis/RedLockHelper.cs new file mode 100644 index 00000000..d9082a8f --- /dev/null +++ b/DistributedLock.Redis/RedLockHelper.cs @@ -0,0 +1,30 @@ +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + internal static class RedLockHelper + { + public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; + + public static void FireAndForgetReleaseUponCompletion(IRedisSynchronizationPrimitive primitive, IDatabase database, Task acquireOrRenewTask) + { + if (ReturnedFalse(acquireOrRenewTask)) { return; } + + acquireOrRenewTask.ContinueWith(async (t, state) => + { + // don't clean up if we know we failed + if (!ReturnedFalse(t)) + { + await primitive.ReleaseAsync((IDatabase)state, fireAndForget: true).ConfigureAwait(false); + } + }, + state: database + ); + } + } +} diff --git a/DistributedLock.Redis/RedLockRelease.cs b/DistributedLock.Redis/RedLockRelease.cs new file mode 100644 index 00000000..310f0f38 --- /dev/null +++ b/DistributedLock.Redis/RedLockRelease.cs @@ -0,0 +1,96 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements the release operation in the RedLock algorithm. See https://redis.io/topics/distlock + /// + internal readonly struct RedLockRelease + { + private readonly IRedisSynchronizationPrimitive _primitive; + private readonly IReadOnlyDictionary> _tryAcquireOrRenewTasks; + + public RedLockRelease( + IRedisSynchronizationPrimitive primitive, + IReadOnlyDictionary> tryAcquireOrRenewTasks) + { + this._primitive = primitive; + this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; + } + + public async ValueTask ReleaseAsync() + { + var isSynchronous = SyncOverAsync.IsSynchronous; + var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + + List? releaseExceptions = null; + var successCount = 0; + var faultCount = 0; + var threshold = (unreleasedTryAcquireOrRenewTasks.Count / 2) + 1; + + try + { + while (true) + { + var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) + // work through non-faulted tasks first, starting with the failed ones since no action is required to release those + .OrderByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) + .ThenBy(kvp => kvp.Value.Result) + .Select(kvp => kvp.Key) + .ToArray(); + foreach (var db in releaseableDatabases) + { + var tryAcquireOrRenewTask = unreleasedTryAcquireOrRenewTasks[db]; + unreleasedTryAcquireOrRenewTasks.Remove(db); + + if (RedLockHelper.ReturnedFalse(tryAcquireOrRenewTask)) + { + // if we failed to acquire, we don't need to release + ++successCount; + } + else + { + try + { + if (isSynchronous) { this._primitive.Release(db, fireAndForget: false); } + else { await this._primitive.ReleaseAsync(db, fireAndForget: false).ConfigureAwait(false); } + ++successCount; + } + catch (Exception ex) + { + (releaseExceptions ??= new List()).Add(ex); + ++faultCount; + if (faultCount >= threshold) + { + throw new AggregateException(releaseExceptions!).Flatten(); + } + } + } + + if (successCount >= threshold) + { + return; + } + } + + // if we haven't released enough yet to be done or certain of success or failure, wait for another to finish + if (isSynchronous) { Task.WaitAny(unreleasedTryAcquireOrRenewTasks.Values.ToArray()); } + else { await Task.WhenAny(unreleasedTryAcquireOrRenewTasks.Values).ConfigureAwait(false); } + } + } + finally // fire and forget the rest + { + foreach (var kvp in unreleasedTryAcquireOrRenewTasks) + { + RedLockHelper.FireAndForgetReleaseUponCompletion(this._primitive, kvp.Key, kvp.Value); + } + } + } + } +} diff --git a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..190e6363 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Redis +{ + public partial class RedisDistributedLock + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public RedisDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public RedisDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs new file mode 100644 index 00000000..da7d7495 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -0,0 +1,118 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using StackExchange.Redis.KeyspaceIsolation; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + public sealed partial class RedisDistributedLock : IInternalDistributedLock + { + private static readonly LuaScript ReleaseScript = LuaScript.Prepare(@" + if redis.call(""get"", @key) == @lockId then + return redis.call(""del"", @key) + else + return 0 + end" + ); + + private static readonly LuaScript ExtendScript = LuaScript.Prepare(@" + if redis.call(""get"", @key) == @lockId then + return redis.call(""pexpire"", @key, @ttl) + else + return 0 + end" + ); + + private static readonly string LockIdPrefix; + + private readonly IReadOnlyList _databases; + private readonly (TimeoutValue expiry, TimeoutValue extensionCadence, TimeoutValue minValidityTime, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) _options; + + static RedisDistributedLock() + { + using var currentProcess = Process.GetCurrentProcess(); + LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; + } + + public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) + : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) + { + } + + public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) + { + if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } + this._databases = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); + if (this._databases.Count == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } + if (this._databases.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + + this.Key = key; + this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + } + + public RedisKey Key { get; } + string IDistributedLock.Name => this.Key.ToString(); + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), + timeout: timeout, + minSleepTime: this._options.minBusyWaitSleepTime, + maxSleepTime: this._options.maxBusyWaitSleepTime, + cancellationToken: cancellationToken + ); + + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) + { + var primitive = new RedisLockPrimitive(this); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null ? new RedisDistributedLockHandle(primitive, tryAcquireTasks) : null; + } + + private sealed class RedisLockPrimitive : IRedisSynchronizationPrimitive + { + private readonly RedisValue _lockId = LockIdPrefix + Guid.NewGuid().ToString("n"); + private readonly RedisDistributedLock _lock; + + private object? _cachedReleaseParameters, _cachedExtendParameters; + + public RedisLockPrimitive(RedisDistributedLock @lock) + { + this._lock = @lock; + } + + private object ReleaseParameters => this._cachedReleaseParameters ??= new { key = this._lock.Key, lockId = this._lockId }; + private object ExtendParameters => this._cachedExtendParameters ??= new { key = this._lock.Key, lockId = this._lockId, ttl = this._lock._options.expiry.InMilliseconds }; + + TimeoutValue IRedisSynchronizationPrimitive.AcquireTimeout => this._lock._options.expiry.TimeSpan - this._lock._options.minValidityTime.TimeSpan; + + TimeoutValue IRedisSynchronizationPrimitive.ExtensionCadence => this._lock._options.extensionCadence; + + TimeoutValue IRedisSynchronizationPrimitive.Expiry => this._lock._options.expiry; + + void IRedisSynchronizationPrimitive.Release(IDatabase database, bool fireAndForget) => + ReleaseScript.Evaluate(database, this.ReleaseParameters, flags: this.ReleaseCommandFlags(fireAndForget)); + + Task IRedisSynchronizationPrimitive.ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => + ReleaseScript.EvaluateAsync(database, this.ReleaseParameters, flags: this.ReleaseCommandFlags(fireAndForget)); + + bool IRedisSynchronizationPrimitive.TryAcquire(IDatabase database) => + database.StringSet(this._lock.Key, this._lockId, this._lock._options.expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + + Task IRedisSynchronizationPrimitive.TryAcquireAsync(IDatabaseAsync database) => + database.StringSetAsync(this._lock.Key, this._lockId, this._lock._options.expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + + async Task IRedisSynchronizationPrimitive.TryExtendAsync(IDatabaseAsync database) => + (bool)await ExtendScript.EvaluateAsync(database, this.ExtendParameters, flags: CommandFlags.DemandMaster).ConfigureAwait(false); + + private CommandFlags ReleaseCommandFlags(bool fireAndForget) => CommandFlags.DemandMaster | (fireAndForget ? CommandFlags.FireAndForget : CommandFlags.None); + } + } +} diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs new file mode 100644 index 00000000..6ca3944d --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -0,0 +1,65 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + public sealed class RedisDistributedLockHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle + { + private readonly IRedisSynchronizationPrimitive _primitive; + private Dictionary>? _tryAcquireTasks; + private readonly LeaseMonitor _monitor; + + internal RedisDistributedLockHandle( + IRedisSynchronizationPrimitive primitive, + Dictionary> tryAcquireTasks) + { + this._primitive = primitive; + this._tryAcquireTasks = tryAcquireTasks; + this._monitor = new LeaseMonitor(this); + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._monitor.HandleLostToken; + + /// + /// Releases the lock + /// + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + + /// + /// Releases the lock asynchronously + /// + public async ValueTask DisposeAsync() + { + await this._monitor.DisposeAsync().ConfigureAwait(false); + var tryAcquireTasks = Interlocked.Exchange(ref this._tryAcquireTasks, null); + if (tryAcquireTasks != null) + { + await new RedLockRelease(this._primitive, tryAcquireTasks).ReleaseAsync().ConfigureAwait(false); + } + } + + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._primitive.Expiry; + + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._primitive.ExtensionCadence; + + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + { + var extendResult = await new RedLockExtend(this._primitive, this._tryAcquireTasks!, cancellationToken).TryExtendAsync().ConfigureAwait(false); + return extendResult switch + { + null => LeaseMonitor.LeaseState.Unknown, + false => LeaseMonitor.LeaseState.Lost, + true => LeaseMonitor.LeaseState.Renewed, + }; + } + } +} diff --git a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs new file mode 100644 index 00000000..2c051eb8 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs @@ -0,0 +1,172 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + // todo consider rename to RedLockOptionsBuilder + /// + /// Options for configuring a redis-based lock + /// + public sealed class RedisDistributedLockOptionsBuilder + { + internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); + /// + /// We don't want to allow expiry to go too low, since then the lock doesn't even work (and the default + /// min observed expiry will end up greater than the default expiry) + /// + internal static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); + + private TimeoutValue? _expiry, + _extensionCadence, + _minValidityTime, + _minBusyWaitSleepTime, + _maxBusyWaitSleepTime; + + internal RedisDistributedLockOptionsBuilder() { } + + /// + /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, + /// this value generally will have little effect on program behavior. However, making the expiry longer means that + /// auto-extension requests can occur less frequently, saving resources. On the other hand, when a lock is abandoned + /// without explicit release (e. g. if the holding process crashes), the expiry determines how long other processes + /// would need to wait in order to acquire it. + /// + /// Defaults to 30s. + /// + public RedisDistributedLockOptionsBuilder Expiry(TimeSpan expiry) + { + var expiryTimeoutValue = new TimeoutValue(expiry, nameof(expiry)); + if (expiryTimeoutValue.IsInfinite || expiryTimeoutValue.CompareTo(MinimumExpiry) < 0) + { + throw new ArgumentOutOfRangeException(nameof(expiry), expiry, $"Must be >= {MinimumExpiry.TimeSpan} and < ∞"); + } + this._expiry = expiryTimeoutValue; + return this; + } + + /// + /// Determines how frequently the lock will be extended while held. More frequent extension means more unnecessary requests + /// but also a lower chance of losing the lock due to the process hanging or otherwise failing to get its extension request in + /// before the lock expiry elapses. + /// + /// Defaults to 1/3 of the specified . + /// + public RedisDistributedLockOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) + { + this._extensionCadence = new TimeoutValue(extensionCadence, nameof(extensionCadence)); + return this; + } + + /// + /// The lock expiry determines how long the lock will be held without being extended. However, since it takes some amount + /// of time to acquire the lock, we will not have all of expiry available upon acquisition. + /// + /// This value sets a minimum amount which we'll be guaranteed to have left once acquisition completes. + /// + /// Defaults to 90% of the specified lock expiry. + /// + public RedisDistributedLockOptionsBuilder MinValidityTime(TimeSpan minValidityTime) + { + var minValidityTimeoutValue = new TimeoutValue(minValidityTime, nameof(minValidityTime)); + if (minValidityTimeoutValue.IsZero) + { + throw new ArgumentOutOfRangeException(nameof(minValidityTime), minValidityTime, "may not be zero"); + } + this._minValidityTime = minValidityTimeoutValue; + return this; + } + + /// + /// Waiting to acquire a lock requires a busy wait that alternates acquire attempts and sleeps. + /// This determines how much time is spent sleeping between attempts. Lower values will raise the + /// volume of acquire requests under contention but will also raise the responsiveness (how long + /// it takes a waiter to notice that a contended the lock has become available). + /// + /// Specifying a range of values allows the implementation to select an actual value in the range + /// at random for each sleep. This helps avoid the case where two clients become "synchronized" + /// in such a way that results in one client monopolizing the lock. + /// + /// The default is [10ms, 800ms] + /// + public RedisDistributedLockOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + { + var minTimeoutValue = new TimeoutValue(min, nameof(min)); + var maxTimeoutValue = new TimeoutValue(max, nameof(max)); + + if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } + if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) + { + throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); + } + + this._minBusyWaitSleepTime = minTimeoutValue; + this._maxBusyWaitSleepTime = maxTimeoutValue; + return this; + } + + internal static (TimeoutValue expiry, TimeoutValue extensionCadence, TimeoutValue minValidityTime, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) + { + RedisDistributedLockOptionsBuilder? options; + if (optionsBuilder != null) + { + options = new RedisDistributedLockOptionsBuilder(); + optionsBuilder(options); + } + else + { + options = null; + } + + var expiry = options?._expiry ?? DefaultExpiry; + + TimeoutValue minValidityTime; + if (options?._minValidityTime is { } specifiedMinValidityTime) + { + if (specifiedMinValidityTime.CompareTo(expiry) >= 0) + { + throw new ArgumentOutOfRangeException( + nameof(minValidityTime), + specifiedMinValidityTime.TimeSpan, + $"{nameof(minValidityTime)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" + ); + } + minValidityTime = specifiedMinValidityTime; + } + else + { + minValidityTime = TimeSpan.FromMilliseconds(Math.Max(0.9 * expiry.InMilliseconds, 1)); + } + + TimeoutValue extensionCadence; + if (options?._extensionCadence is { } specifiedExtensionCadence) + { + if (specifiedExtensionCadence.CompareTo(minValidityTime) >= 0) + { + throw new ArgumentOutOfRangeException( + nameof(extensionCadence), + specifiedExtensionCadence.TimeSpan, + $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan}). To disable auto-extension, specify {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)}" + ); + } + extensionCadence = specifiedExtensionCadence; + } + else + { + extensionCadence = TimeSpan.FromMilliseconds(minValidityTime.InMilliseconds / 3.0); + } + + return ( + expiry, + extensionCadence, + minValidityTime, + minBusyWaitSleepTime: options?._minBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromMilliseconds(10), + maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromSeconds(0.8) + ); + } + } +} diff --git a/DistributedLock.Redis/TimeoutTask.cs b/DistributedLock.Redis/TimeoutTask.cs new file mode 100644 index 00000000..3e2c071c --- /dev/null +++ b/DistributedLock.Redis/TimeoutTask.cs @@ -0,0 +1,41 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Acts as a which is cleaned up when + /// the gets disposed + /// + internal struct TimeoutTask : IDisposable + { + private readonly CancellationTokenSource _cleanupTokenSource; + private readonly CancellationTokenSource? _linkedTokenSource; + + public TimeoutTask(TimeoutValue timeout, CancellationToken cancellationToken) + { + this._cleanupTokenSource = new CancellationTokenSource(); + this._linkedTokenSource = cancellationToken.CanBeCanceled + ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, this._cleanupTokenSource.Token) + : null; + this.Task = Task.Delay(timeout.TimeSpan, this._linkedTokenSource?.Token ?? this._cleanupTokenSource.Token); + } + + public Task Task { get; } + + public void Dispose() + { + try { this._cleanupTokenSource.Cancel(); } + finally + { + this._linkedTokenSource?.Dispose(); + this._cleanupTokenSource.Dispose(); + } + } + } +} diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index e167f197..68d41a4a 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/DistributedLock.Tests/Tests/Azure/AzureSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs similarity index 100% rename from DistributedLock.Tests/Tests/Azure/AzureSetUpFixture.cs rename to DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs new file mode 100644 index 00000000..d3a301b7 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -0,0 +1,74 @@ +using Medallion.Shell; +using StackExchange.Redis; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests.Redis +{ + internal class RedisServer : IDisposable + { + // redis default is 6379, so go one above that + private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; + + private static readonly string WslPath = Directory.GetDirectories(@"C:\Windows\WinSxS") + .Select(d => Path.Combine(d, "wsl.exe")) + .Where(File.Exists) + .OrderByDescending(File.GetCreationTimeUtc) + .First(); + + private static readonly Dictionary ActiveServersByPort = new Dictionary(); + private static readonly RedisServer[] DefaultServers = new RedisServer[RedisPorts.DefaultPorts.Count]; + + private readonly Command _command; + + public RedisServer() : this(null) { } + + private RedisServer(int? port) + { + lock (ActiveServersByPort) + { + this.Port = port ?? Enumerable.Range(MinDynamicPort, count: MaxDynamicPort - MinDynamicPort + 1) + .First(p => !ActiveServersByPort.ContainsKey(p)); + this._command = Command.Run(WslPath, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error); + ActiveServersByPort.Add(this.Port, this); + } + this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}"); + } + + public int ProcessId => this._command.ProcessId; + public int Port { get; } + public ConnectionMultiplexer Multiplexer { get; } + + public void Dispose() + { + this.Multiplexer.Dispose(); + this._command.Kill(); + lock (ActiveServersByPort) + { + ActiveServersByPort.Remove(this.Port); + } + } + + public static RedisServer GetDefaultServer(int index) + { + lock (DefaultServers) + { + return DefaultServers[index] ??= new RedisServer(RedisPorts.DefaultPorts[index]); + } + } + + public static void DisposeAll() + { + lock (ActiveServersByPort) + { + ActiveServersByPort.Values.ToList().ForEach(s => s.Dispose()); + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs new file mode 100644 index 00000000..80157c4a --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs @@ -0,0 +1,17 @@ +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.Redis +{ + [SetUpFixture] + public class RedisSetUpFixture + { + [OneTimeSetUp] + public void OneTimeSetUp() { } + + [OneTimeTearDown] + public void OneTimeTearDown() => RedisServer.DisposeAll(); + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs new file mode 100644 index 00000000..d3834058 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -0,0 +1,73 @@ +using Medallion.Threading.Redis; +using Medallion.Threading.Tests.Redis; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class TestingRedisDistributedLockProvider : TestingLockProvider + { + private readonly IReadOnlyList _databases; + + protected TestingRedisDistributedLockProvider(IEnumerable databases) + { + this._databases = databases.ToArray(); + } + + protected TestingRedisDistributedLockProvider(int serverCount) + : this(Enumerable.Range(0, serverCount).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) + { + } + + public override IDistributedLock CreateLockWithExactName(string name) + { + var @lock = new RedisDistributedLock(name, this._databases, this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this._databases.Take((this._databases.Count / 2) + 1) + .ToList() + .ForEach(db => db.KeyDelete(@lock.Key)) + ); + return @lock; + } + + public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); + + public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedLock)}{this.CrossProcessLockTypeSuffix}"; + + protected virtual string CrossProcessLockTypeSuffix => this._databases.Count.ToString(); + } + + public sealed class TestingRedisSingleServerDistributedLockProvider : TestingRedisDistributedLockProvider + { + public TestingRedisSingleServerDistributedLockProvider() : base(serverCount: 1) { } + } + + public sealed class TestingRedis3ServerDistributedLockProvider : TestingRedisDistributedLockProvider + { + public TestingRedis3ServerDistributedLockProvider() : base(serverCount: 3) { } + } + + public sealed class TestingRedis2x1ServerDistributedLockProvider : TestingRedisDistributedLockProvider + { + private static readonly IDatabase DeadDatabase; + + static TestingRedis2x1ServerDistributedLockProvider() + { + var server = new RedisServer(); + DeadDatabase = server.Multiplexer.GetDatabase(); + using var process = Process.GetProcessById(server.ProcessId); + process.Kill(); + } + + public TestingRedis2x1ServerDistributedLockProvider() + : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) + { + } + + protected override string CrossProcessLockTypeSuffix => "2x1"; + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs new file mode 100644 index 00000000..53573c9d --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -0,0 +1,76 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.Redis +{ + public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + { + private bool _preparedForHandleLost, _preparedForHandleAbandonment; + private Action? _killHandleAction; + + public void Options(RedisDistributedLockOptionsBuilder options) + { + if (this._preparedForHandleLost) + { + options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); + } + if (this._preparedForHandleAbandonment) + { + options.Expiry(TimeSpan.FromSeconds(.2)); + } + } + + public override IDisposable? PrepareForHandleLost() + { + Invariant.Require(!this._preparedForHandleLost); + this._preparedForHandleLost = true; + return new HandleLostScope(this); + } + + public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; + + public override void PerformAdditionalCleanupForHandleAbandonment() + { + Invariant.Require(this._preparedForHandleAbandonment); + Thread.Sleep(TimeSpan.FromSeconds(.5)); + } + + public void RegisterKillHandleAction(Action action) + { + if (this._preparedForHandleLost) + { + this._killHandleAction += action; + } + } + + private class HandleLostScope : IDisposable + { + private TestingRedisSynchronizationStrategy? _strategy; + + public HandleLostScope(TestingRedisSynchronizationStrategy strategy) + { + this._strategy = strategy; + } + + public void Dispose() + { + var strategy = Interlocked.Exchange(ref this._strategy, null); + if (strategy != null) + { + Invariant.Require(strategy._preparedForHandleLost); + try { strategy._killHandleAction?.Invoke(); } + finally + { + strategy._killHandleAction = null; + strategy._preparedForHandleLost = false; + } + } + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs new file mode 100644 index 00000000..436abed5 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests +{ + internal static class RedisPorts + { + // 6379 is the redis default, so don't use that + public static readonly IReadOnlyList DefaultPorts = Enumerable.Range(6380, count: 10).ToArray(); + } +} diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index c3a5e714..00098743 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -8,7 +8,7 @@ using System.IO; using System.Text.RegularExpressions; -namespace Medallion.Threading.Tests.Tests +namespace Medallion.Threading.Tests { [Category("CI")] public class ApiTest diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs index c1529bec..3b961e68 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Azure; +using Medallion.Threading.Internal; using NUnit.Framework; using System; using System.Collections.Generic; @@ -54,5 +55,12 @@ public void TestValidatesBusyWaitSleepTime() Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero)); Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4))); } + + [Test] + public void TestDisablesAutoRenewalIfDurationIsInfinite() + { + var options = AzureBlobLeaseOptionsBuilder.GetOptions(b => b.Duration(Timeout.InfiniteTimeSpan)); + Assert.IsTrue(options.renewalCadence.IsInfinite); + } } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 3ecb7dac..8ec36f77 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -55,6 +55,13 @@ public class ReaderWriterCore_PostgresReaderWriter_OwnedConnectionSynchronizatio public class ReaderWriterCore_PostgresReaderWriter_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDbTest : DistributedReaderWriterLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } } +namespace Medallion.Threading.Tests.Redis +{ + public class Core_Redis2x1Server_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } + public class Core_Redis3Server_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } + public class Core_RedisSingleServer_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } +} + namespace Medallion.Threading.Tests.SqlServer { public class ConnectionStringStrategy_ReaderWriterAsMutex_SqlReaderWriter_ConnectionMultiplexingSynchronizationStrategy_SqlServerDb_SqlServerDb_ConnectionMultiplexingSynchronizationStrategy_SqlServerDb_ConnectionMultiplexingSynchronizationStrategy_SqlServerDb_SqlServerDbTest : ConnectionStringStrategyTestCases, TestingSqlServerDb>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingConnectionMultiplexingSynchronizationStrategy, TestingSqlServerDb> { } diff --git a/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/DistributedLock.Tests/Tests/Core/HelpersTest.cs new file mode 100644 index 00000000..2e2a6ed3 --- /dev/null +++ b/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -0,0 +1,38 @@ +using Medallion.Threading.Internal; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Core +{ + [Category("CI")] + public class HelpersTest + { + [Test] + public void TestSafeCreateTaskPassesThroughSafeTasks() + { + var tasks = new[] { Task.FromResult(14), Task.FromResult(24) }; + var safeTask = Helpers.SafeCreateTask(state => tasks[state], 1); + Assert.AreSame(tasks[1], safeTask); + + var safeNonGenericTask = Helpers.SafeCreateTask(state => tasks[state], 1); + Assert.AreSame(safeNonGenericTask, tasks[1]); + } + + [Test] + public void TestSafeCreateTaskReturnsCaughtExceptionAsFaultedTask() + { + var safeTask = Helpers.SafeCreateTask(state => GetTask(state), "m1"); + Assert.IsInstanceOf(safeTask.Exception!.InnerException); + safeTask.Exception.InnerException!.Message.ShouldEqual("m1"); + + var safeNonGenericTask = Helpers.SafeCreateTask(state => GetTask(state), "m2"); + Assert.IsInstanceOf(safeNonGenericTask.Exception!.InnerException); + safeNonGenericTask.Exception.InnerException!.Message.ShouldEqual("m2"); + + static Task GetTask(string message) => throw new TimeZoneNotFoundException(message); + } + } +} diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs new file mode 100644 index 00000000..e9831ebf --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs @@ -0,0 +1,71 @@ +using Medallion.Threading.Redis; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.Redis +{ + public class RedisDistributedLockOptionsBuilderTest + { + [Test] + public void TestValidatesExpiry() + { + Assert.Throws(() => GetOptions(o => o.Expiry(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.Expiry(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.Expiry(RedisDistributedLockOptionsBuilder.MinimumExpiry.TimeSpan - TimeSpan.FromTicks(1)))); + Assert.DoesNotThrow(() => GetOptions(o => o.Expiry(RedisDistributedLockOptionsBuilder.MinimumExpiry.TimeSpan))); + } + + [Test] + public void TestValidatesMinValidityTime() + { + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.Zero))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan))); + Assert.DoesNotThrow(() => GetOptions( + o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan).Expiry(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan + TimeSpan.FromMilliseconds(1)) + )); + } + + [Test] + public void TestValidatesExtensionCadence() + { + Assert.Throws(() => GetOptions(o => o.ExtensionCadence(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.ExtensionCadence(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(1)).ExtensionCadence(TimeSpan.FromSeconds(1)))); + } + + [Test] + public void TestValidatesBusyWaitSleepTime() + { + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(-1), TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.MaxValue, TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(-1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.MaxValue))); + + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1.1), TimeSpan.FromSeconds(1)))); + + Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero))); + Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4)))); + } + + [Test] + public void TestDefaults() + { + var defaultOptions = RedisDistributedLockOptionsBuilder.GetOptions(null); + defaultOptions.expiry.ShouldEqual(RedisDistributedLockOptionsBuilder.DefaultExpiry); + defaultOptions.minValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); + defaultOptions.extensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); + defaultOptions.minBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); + defaultOptions.maxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); + } + + private static void GetOptions(Action options) => + RedisDistributedLockOptionsBuilder.GetOptions(options); + } +} diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs new file mode 100644 index 00000000..b43530ff --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -0,0 +1,146 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public class RedisDistributedLockTest + { + private static string LockName => TestContext.CurrentContext.Test.FullName + TargetFramework.Current; + + [Test] + public void TestName() + { + var name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedLock(name, CreateDatabaseMock().Object); + @lock.As().Name.ShouldEqual(name); + @lock.Key.ShouldEqual(new RedisKey(name)); + } + + [Test] + public void TestValidatesConstructorParameters() + { + var database = CreateDatabaseMock().Object; + Assert.Throws(() => new RedisDistributedLock(default(RedisKey), database)); + Assert.Throws(() => new RedisDistributedLock(default(RedisKey), new[] { database })); + Assert.Throws(() => new RedisDistributedLock("key", default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedLock("key", default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedLock("key", new[] { database, null! })); + Assert.Throws(() => new RedisDistributedLock("key", Enumerable.Empty())); + } + + [Test] + public void TestMajorityFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); + + var @lock = new RedisDistributedLock(LockName, databases.Select(d => d.Object)); + + // we only get the one exception + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + + // single sync acquire flow is different + var singleDatabaseLock = new RedisDistributedLock(LockName, databases[2].Object); + Assert.Throws(() => singleDatabaseLock.Acquire()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestMajorityHangingDatabasesCauseAcquireToFail() + { + using var @event = new ManualResetEventSlim(initialState: false); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[1], () => { @event.Wait(); return true; }); + MockDatabase(databases[2], () => { @event.Wait(); return false; }); + + // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang + var @lock = new RedisDistributedLock( + LockName, + databases.Select(d => d.Object), + options: o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2)) + ); + + Assert.IsNull(await @lock.TryAcquireAsync()); + + @event.Set(); // just to free the waiting threads + } + + [Test] + public void TestMajorityFaultingDatabasesCauseReleaseToThrow() + { + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); + + var @lock = new RedisDistributedLock(LockName, databases.Select(d => d.Object)); + using var handle = @lock.Acquire(); + + new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); + var aggregateException = Assert.Throws(() => handle.Dispose()); + Assert.IsInstanceOf(aggregateException.InnerException); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) + { + var database = CreateDatabaseMock(); + MockDatabase(database, () => { Thread.Sleep(50); return true; }); + + var @lock = new RedisDistributedLock( + LockName, + database.Object, + options: o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10)) + ); + + // single sync acquire has different timeout logic, so we test it separately + Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() + { + using var @event = new ManualResetEventSlim(); + var failDatabase = CreateDatabaseMock(); + MockDatabase(failDatabase, () => { @event.Wait(); return false; }); + + var @lock = new RedisDistributedLock(LockName, new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }); + var acquireTask = @lock.TryAcquireAsync().AsTask(); + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + @event.Set(); + Assert.IsNull(await acquireTask); + + var singleDatabaseLock = new RedisDistributedLock(LockName, RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase()); + using var handle = await singleDatabaseLock.TryAcquireAsync(); + Assert.IsNotNull(handle); + } + + private static Mock CreateDatabaseMock() + { + var mock = new Mock(MockBehavior.Strict); + MockDatabase(mock, () => true); + return mock; + } + + private static void MockDatabase(Mock mockDatabase, Func returns) + { + mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(returns); + mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(returns)); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + } + } +} diff --git a/DistributedLock.sln b/DistributedLock.sln index 94bd39f2..570b5008 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -21,7 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.SqlServer", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Azure", "DistributedLock.Azure\DistributedLock.Azure.csproj", "{1C5E80A9-343A-44AA-A40E-00EAFE485D36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.FileSystem", "DistributedLock.FileSystem\DistributedLock.FileSystem.csproj", "{6B0DBD7E-3A43-4FED-82BA-9927360E1D92}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.FileSystem", "DistributedLock.FileSystem\DistributedLock.FileSystem.csproj", "{6B0DBD7E-3A43-4FED-82BA-9927360E1D92}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.Redis", "DistributedLock.Redis\DistributedLock.Redis.csproj", "{8ADAA171-8373-432E-8D2B-3DA73E35EB76}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -69,6 +71,10 @@ Global {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B0DBD7E-3A43-4FED-82BA-9927360E1D92}.Release|Any CPU.Build.0 = Release|Any CPU + {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index f8c32934..5fa45c6d 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -48,6 +48,7 @@ + \ No newline at end of file diff --git a/DistributedLockTaker/DistributedLockTaker.csproj b/DistributedLockTaker/DistributedLockTaker.csproj index 10757f14..067cde3b 100644 --- a/DistributedLockTaker/DistributedLockTaker.csproj +++ b/DistributedLockTaker/DistributedLockTaker.csproj @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 368d6fde..ff2f76b0 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -7,6 +7,10 @@ using Azure.Storage.Blobs; using Medallion.Threading.FileSystem; using System.IO; +using Medallion.Threading.Redis; +using StackExchange.Redis; +using System.Linq; +using Medallion.Threading; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -61,6 +65,15 @@ public static int Main(string[] args) case nameof(FileDistributedLock): handle = new FileDistributedLock(new FileInfo(name)).Acquire(); break; + case nameof(RedisDistributedLock) + "1": + handle = AcquireRedisLock(name, serverCount: 1); + break; + case nameof(RedisDistributedLock) + "3": + handle = AcquireRedisLock(name, serverCount: 3); + break; + case nameof(RedisDistributedLock) + "2x1": + handle = AcquireRedisLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) + break; default: Console.Error.WriteLine($"type: {type}"); return 123; @@ -76,5 +89,14 @@ public static int Main(string[] args) return 0; } + + private static IDistributedLockHandle AcquireRedisLock(string name, int serverCount) => + new RedisDistributedLock( + name, + RedisPorts.DefaultPorts.Take(serverCount) + .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()), + o => o.Expiry(TimeSpan.FromSeconds(.5)) + ) + .Acquire(); } } From 8a3c9f2d5d7309e49010b21cb7c8dbc1f8c75c97 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 20 Oct 2020 07:22:26 -0400 Subject: [PATCH 038/399] Leverage common LeaseMonitor infrastructure in Azure locks --- .../AzureBlobLeaseDistributedLock.cs | 114 ++++-------------- DistributedLock.Core/Internal/LeaseMonitor.cs | 114 ++++++++++-------- 2 files changed, 83 insertions(+), 145 deletions(-) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 3dd05e4d..9e80a750 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -159,47 +159,39 @@ static string ConvertToValidName(string name) return new AzureBlobLeaseDistributedLockHandle(internalHandle); } - internal sealed class InternalHandle : IDistributedLockHandle + internal sealed class InternalHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle { - private readonly CancellationTokenSource _renewalCancellationSource = new CancellationTokenSource(); private readonly BlobLeaseClientWrapper _leaseClient; private readonly bool _ownsBlob; private readonly AzureBlobLeaseDistributedLock _lock; - private readonly Task _renewalTask; + private readonly LeaseMonitor _leaseMonitor; public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBlobLeaseDistributedLock @lock) { this._leaseClient = leaseClient; this._ownsBlob = ownsBlob; this._lock = @lock; - var handleLostSource = new CancellationTokenSource(); - this.HandleLostToken = handleLostSource.Token; - this._renewalTask = StartRenewalOrHandleCheckTask(new WeakReference(this), handleLostSource, this._renewalCancellationSource.Token); - - // static function to make sure we don't capture this - static Task StartRenewalOrHandleCheckTask(WeakReference weakThis, CancellationTokenSource handleLostSource, CancellationToken cancellationToken) => - Task.Run(() => RenewalOrHandleCheckLoop(weakThis, handleLostSource, cancellationToken)); + this._leaseMonitor = new LeaseMonitor(this); } - public CancellationToken HandleLostToken { get; } + public CancellationToken HandleLostToken => this._leaseMonitor.HandleLostToken; private bool RenewalEnabled => !this._lock._options.renewalCadence.IsInfinite; public string LeaseId => this._leaseClient.LeaseId; + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.duration; + + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this.RenewalEnabled ? this._lock._options.renewalCadence : this._lock._options.duration; + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); public async ValueTask DisposeAsync() { - if (this._renewalCancellationSource.IsCancellationRequested) - { - return; // already disposed - } + // note that we're not trying to be idempotent here since we'll be wrapped + // by AzureBlobLeaseDistributedLockHandle which provides idempotence - this._renewalCancellationSource.Cancel(); - if (SyncOverAsync.IsSynchronous) { this._renewalTask.GetAwaiter().GetResult(); } - else { await this._renewalTask.ConfigureAwait(false); } - this._renewalCancellationSource.Dispose(); + await this._leaseMonitor.DisposeAsync().ConfigureAwait(false); // if we own the blob, release by just deleting it if (this._ownsBlob) @@ -212,84 +204,20 @@ public async ValueTask DisposeAsync() } } - private static async Task RenewalOrHandleCheckLoop( - WeakReference weakThis, - CancellationTokenSource handleLostSource, - CancellationToken cancellationToken) - { - if (!TryGetCadence(weakThis, out var cadence)) - { - handleLostSource.Dispose(); - return; - } - - while (true) - { - // avoid throwing since this will be canceled very commonly and since this task is awaited on dispose - await Task.Delay(cadence.InMilliseconds, cancellationToken).TryAwait(); - if (cancellationToken.IsCancellationRequested) - { - handleLostSource.Dispose(); - return; - } - - var renewOrCheckStatus = await TryRenewOrCheckHandleAsync(weakThis, cancellationToken).ConfigureAwait(false); - if (renewOrCheckStatus != RenewOrCheckStatus.Continue) - { - if (renewOrCheckStatus == RenewOrCheckStatus.HandleLost) - { - // offload cancel to a background thread to avoid hangs or errors - var ignored = Task.Run(() => - { - try { handleLostSource.Cancel(); } - finally { handleLostSource.Dispose(); } - }); - } - else - { - handleLostSource.Dispose(); - } - return; - } - } - - // separate function to avoid taking a strong reference - static bool TryGetCadence(WeakReference weakThis, out TimeoutValue renewalCadence) - { - if (weakThis.TryGetTarget(out var @this)) - { - renewalCadence = @this.RenewalEnabled ? @this._lock._options.renewalCadence : @this._lock._options.duration; - return true; - } - - renewalCadence = default; - return false; - } - } - - private static async ValueTask TryRenewOrCheckHandleAsync( - WeakReference weakThis, - CancellationToken cancellationToken) + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) { - if (!weakThis.TryGetTarget(out var @this)) { return RenewOrCheckStatus.HandleGarbageCollected; } - - var task = @this.RenewalEnabled - ? @this._leaseClient.RenewAsync(cancellationToken).AsTask() + var task = this.RenewalEnabled + ? this._leaseClient.RenewAsync(cancellationToken).AsTask() // if we're not renewing, then just touch the blob using the lease to see if someone else has renewed it - : @this._lock._blobClient.GetMetadataAsync(@this._leaseClient.LeaseId, cancellationToken).AsTask(); + : this._lock._blobClient.GetMetadataAsync(this._leaseClient.LeaseId, cancellationToken).AsTask(); await task.TryAwait(); - return task.Status == TaskStatus.RanToCompletion ? RenewOrCheckStatus.Continue - : cancellationToken.IsCancellationRequested ? RenewOrCheckStatus.Canceled - : RenewOrCheckStatus.HandleLost; - } - - private enum RenewOrCheckStatus - { - Continue, - Canceled, - HandleLost, - HandleGarbageCollected, + cancellationToken.ThrowIfCancellationRequested(); // if the cancellation caused failure, don't confuse that with losing the handle + return task.Status == TaskStatus.RanToCompletion + ? this.RenewalEnabled + ? LeaseMonitor.LeaseState.Renewed + : LeaseMonitor.LeaseState.Held + : LeaseMonitor.LeaseState.Lost; } } } diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index 057f87f9..b83e0f36 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -20,19 +21,17 @@ sealed class LeaseMonitor : IDisposable, IAsyncDisposable { private readonly CancellationTokenSource _disposalSource = new CancellationTokenSource(), _handleLostSource = new CancellationTokenSource(); - - private readonly WeakReference _weakLeaseHandle; - private readonly TimeoutValue _leaseDuration, _monitoringCadence; + + private readonly ILeaseHandle _leaseHandle; private readonly Task _monitoringTask; + private Task? _cancellationTask; - public LeaseMonitor(ILeaseHandle handle) + public LeaseMonitor(ILeaseHandle leaseHandle) { - Invariant.Require(handle.LeaseDuration.CompareTo(handle.MonitoringCadence) >= 0); + Invariant.Require(leaseHandle.LeaseDuration.CompareTo(leaseHandle.MonitoringCadence) >= 0); - this._weakLeaseHandle = new WeakReference(handle); - this._leaseDuration = handle.LeaseDuration; - this._monitoringCadence = handle.MonitoringCadence; - this._monitoringTask = Task.Run(() => this.MonitoringLoop()); + this._leaseHandle = leaseHandle; + this._monitoringTask = CreateMonitoringLoopTask(new WeakReference(this), leaseHandle.MonitoringCadence, this._disposalSource.Token); } public CancellationToken HandleLostToken => this._handleLostSource.Token; @@ -53,64 +52,75 @@ public async ValueTask DisposeAsync() } finally { - this._handleLostSource.Dispose(); + if (this._cancellationTask != null) + { + _ = this._cancellationTask.ContinueWith((_, state) => ((CancellationTokenSource)state).Dispose(), state: this._handleLostSource); + } + else + { + this._handleLostSource.Dispose(); + } this._disposalSource.Dispose(); } } - private async Task MonitoringLoop() + private static Task CreateMonitoringLoopTask(WeakReference weakMonitor, TimeoutValue monitoringCadence, CancellationToken disposalToken) { - var leaseLifetime = Stopwatch.StartNew(); - while (true) - { - // wait until the next monitoring check - await Task.Delay(this._monitoringCadence.InMilliseconds, this._disposalSource.Token).TryAwait(); - if (this._disposalSource.Token.IsCancellationRequested) { return; } - - // lease expired - if (this._leaseDuration.CompareTo(leaseLifetime.Elapsed) < 0) - { - this._handleLostSource.Cancel(); - return; - } + return Task.Run(() => MonitoringLoop()); - var leaseState = await this.CheckLeaseAsync().ConfigureAwait(false); - switch (leaseState) + async Task MonitoringLoop() + { + var leaseLifetime = Stopwatch.StartNew(); + do { - // if the handle is GC'd out from under us, then we just clean up after ourselves and exit - case null: - _ = Task.Run(() => this.Dispose()); // cleans up the sources. This can't be called synchronously because Dispose() waits on this task - return; - - case LeaseState.Lost: - this._handleLostSource.Cancel(); - return; - - case LeaseState.Renewed: - leaseLifetime.Restart(); - break; - - // If the lease is held but not renewed or if we don't know (e. g. due to transient failure), - // then just continue. We can't yet say that it is lost but it isn't renewed so we can't reset - // the lifetime either. - case LeaseState.Held: - case LeaseState.Unknown: - break; - - default: - throw new InvalidOperationException("should never get here"); + // wait until the next monitoring check + await Task.Delay(monitoringCadence.InMilliseconds, disposalToken).TryAwait(); } + while (!disposalToken.IsCancellationRequested && await RunMonitoringLoopIterationAsync(weakMonitor, leaseLifetime).ConfigureAwait(false)); } } - private async Task CheckLeaseAsync() + private static async Task RunMonitoringLoopIterationAsync(WeakReference weakMonitor, Stopwatch leaseLifetime) { - if (!this._weakLeaseHandle.TryGetTarget(out var leaseHandle)) + // if the monitor has been GC'd, just exit + if (!weakMonitor.TryGetTarget(out var monitor)) { return false; } + + // lease expired + if (monitor._leaseHandle.LeaseDuration.CompareTo(leaseLifetime.Elapsed) < 0) + { + OnHandleLost(); + return false; + } + + var leaseState = await monitor.CheckLeaseAsync().ConfigureAwait(false); + switch (leaseState) { - return null; + case LeaseState.Lost: + OnHandleLost(); + return false; + + case LeaseState.Renewed: + leaseLifetime.Restart(); + return true; + + // If the lease is held but not renewed or if we don't know (e. g. due to transient failure), + // then just continue. We can't yet say that it is lost but it isn't renewed so we can't reset + // the lifetime either. + case LeaseState.Held: + case LeaseState.Unknown: + return true; + + default: + throw new InvalidOperationException("should never get here"); } - var renewOrValidateTask = Helpers.SafeCreateTask(state => state.leaseHandle.RenewOrValidateLeaseAsync(state.Token), (leaseHandle, this._disposalSource.Token)); + // offload cancel to a background thread to avoid hangs or errors + void OnHandleLost() => monitor._cancellationTask = Task.Run(() => monitor._handleLostSource.Cancel()); + } + + private async Task CheckLeaseAsync() + { + var renewOrValidateTask = Helpers.SafeCreateTask(state => state.leaseHandle.RenewOrValidateLeaseAsync(state.Token), (leaseHandle: this._leaseHandle, this._disposalSource.Token)); await renewOrValidateTask.TryAwait(); return this._disposalSource.IsCancellationRequested || renewOrValidateTask.Status != TaskStatus.RanToCompletion ? LeaseState.Unknown From bb69f842bd23e8b888639a7035c432925e560e0f Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 1 Nov 2020 19:35:58 -0500 Subject: [PATCH 039/399] Implement redis RW lock --- DistributedLock.Core/Internal/Helpers.cs | 7 + .../IRedisSynchronizationPrimitive.cs | 23 --- .../Primitives/RedisMutexPrimitive.cs | 53 ++++++ .../RedisReaderWriterLockPrimitives.cs | 150 +++++++++++++++++ .../Primitives/RedisScript.cs | 32 ++++ .../{ => RedLock}/RedLockAcquire.cs | 15 +- .../{ => RedLock}/RedLockExtend.cs | 12 +- .../RedLock/RedLockHandle.cs | 71 ++++++++ .../RedLock/RedLockHelper.cs | 46 +++++ .../{ => RedLock}/RedLockRelease.cs | 12 +- .../RedLock/RedLockTimeouts.cs | 24 +++ DistributedLock.Redis/RedLockHelper.cs | 30 ---- DistributedLock.Redis/RedisDistributedLock.cs | 84 ++-------- .../RedisDistributedLockHandle.cs | 48 ++---- .../RedisDistributedLockOptionsBuilder.cs | 30 +++- ...WriterLock.IDistributedReaderWriterLock.cs | 158 ++++++++++++++++++ .../RedisDistributedReaderWriterLock.cs | 153 +++++++++++++++++ .../RedisDistributedReaderWriterLockHandle.cs | 40 +++++ DistributedLock.SqlServer/SqlSemaphore.cs | 8 +- .../Data/ConnectionStringStrategyTestCases.cs | 1 + .../DistributedLockCoreTestCases.cs | 9 +- ...istributedReaderWriterLockCoreTestCases.cs | 25 ++- .../RedisSynchronizationCoreTestCases.cs | 135 +++++++++++++++ .../Infrastructure/Redis/RedisServer.cs | 5 + .../Redis/TestingRedisDatabaseProvider.cs | 58 +++++++ .../Redis/TestingRedisProviders.cs | 68 +++----- .../TestingRedisSynchronizationStrategy.cs | 23 ++- .../Infrastructure/TestHelper.cs | 21 ++- .../Tests/CombinatorialTests.cs | 14 +- .../RedisDistributedLockOptionsBuilderTest.cs | 10 +- .../Tests/Redis/RedisDistributedLockTest.cs | 123 +------------- .../RedisDistributedReaderWriterLockTest.cs | 36 ++++ .../Tests/Redis/RedisLibraryTest.cs | 28 ++++ DistributedLockTaker/Program.cs | 29 +++- 34 files changed, 1217 insertions(+), 364 deletions(-) delete mode 100644 DistributedLock.Redis/IRedisSynchronizationPrimitive.cs create mode 100644 DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs create mode 100644 DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs create mode 100644 DistributedLock.Redis/Primitives/RedisScript.cs rename DistributedLock.Redis/{ => RedLock}/RedLockAcquire.cs (93%) rename DistributedLock.Redis/{ => RedLock}/RedLockExtend.cs (89%) create mode 100644 DistributedLock.Redis/RedLock/RedLockHandle.cs create mode 100644 DistributedLock.Redis/RedLock/RedLockHelper.cs rename DistributedLock.Redis/{ => RedLock}/RedLockRelease.cs (90%) create mode 100644 DistributedLock.Redis/RedLock/RedLockTimeouts.cs delete mode 100644 DistributedLock.Redis/RedLockHelper.cs create mode 100644 DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs create mode 100644 DistributedLock.Redis/RedisDistributedReaderWriterLock.cs create mode 100644 DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs create mode 100644 DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs create mode 100644 DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs diff --git a/DistributedLock.Core/Internal/Helpers.cs b/DistributedLock.Core/Internal/Helpers.cs index c935497d..07ad1a76 100644 --- a/DistributedLock.Core/Internal/Helpers.cs +++ b/DistributedLock.Core/Internal/Helpers.cs @@ -95,6 +95,13 @@ public TTask GetResult() public void OnCompleted(Action continuation) => this._taskAwaiter.OnCompleted(continuation); public void UnsafeOnCompleted(Action continuation) => this._taskAwaiter.UnsafeOnCompleted(continuation); } + + public static bool TryGetValue(this T? nullable, out T value) + where T : struct + { + value = nullable.GetValueOrDefault(); + return nullable.HasValue; + } } /// diff --git a/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs b/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs deleted file mode 100644 index 7a6680ef..00000000 --- a/DistributedLock.Redis/IRedisSynchronizationPrimitive.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Medallion.Threading.Internal; -using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Redis -{ - internal interface IRedisSynchronizationPrimitive - { - TimeoutValue AcquireTimeout { get; } - TimeoutValue ExtensionCadence { get; } - TimeoutValue Expiry { get; } - - Task TryAcquireAsync(IDatabaseAsync database); - bool TryAcquire(IDatabase database); - Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget); - void Release(IDatabase database, bool fireAndForget); - Task TryExtendAsync(IDatabaseAsync database); - } -} diff --git a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs new file mode 100644 index 00000000..8d5f6cef --- /dev/null +++ b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs @@ -0,0 +1,53 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.Primitives +{ + internal class RedisMutexPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + private readonly RedisKey _key; + private readonly RedisValue _lockId; + private readonly RedLockTimeouts _timeouts; + + public RedisMutexPrimitive(RedisKey key, RedisValue lockId, RedLockTimeouts timeouts) + { + this._key = key; + this._lockId = lockId; + this._timeouts = timeouts; + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + private static readonly RedisScript ReleaseScript = new RedisScript(@" + if redis.call('get', @key) == @lockId then + return redis.call('del', @key) + end + return 0", + p => new { key = p._key, lockId = p._lockId } + ); + + public void Release(IDatabase database, bool fireAndForget) => ReleaseScript.Execute(database, this, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseScript.ExecuteAsync(database, this, fireAndForget); + + public bool TryAcquire(IDatabase database) => + database.StringSet(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + public Task TryAcquireAsync(IDatabaseAsync database) => + database.StringSetAsync(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + + private static readonly RedisScript ExtendScript = new RedisScript(@" + if redis.call('get', @key) == @lockId then + return redis.call('pexpire', @key, @expiryMillis) + end + return 0", + p => new { key = p._key, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); + + public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); + } +} diff --git a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs new file mode 100644 index 00000000..bd92af39 --- /dev/null +++ b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -0,0 +1,150 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.Primitives +{ + internal class RedisReadLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); + private readonly RedisKey _readerKey, _writerKey; + private readonly RedLockTimeouts _timeouts; + + public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTimeouts timeouts) + { + this._readerKey = readerKey; + this._writerKey = writerKey; + this._timeouts = timeouts; + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + /// + /// RELEASE READ + /// + /// Just remove our ID from the reader set (noop if it wasn't there or the set DNE) + /// + private static readonly RedisScript ReleaseReadScript = new RedisScript( + @"redis.call('srem', @readerKey, @lockId)", + p => new { readerKey = p._readerKey, lockId = p._lockId } + ); + + public void Release(IDatabase database, bool fireAndForget) => ReleaseReadScript.Execute(database, this, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseReadScript.ExecuteAsync(database, this, fireAndForget); + + /// + /// TRY EXTEND READ + /// + /// First, check if the reader set exists and our ID is still a member. If not, we fail. + /// + /// Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) + /// + private static readonly RedisScript TryExtendReadScript = new RedisScript(@" + if redis.call('sismember', @readerKey, @lockId) == 0 then + return 0 + end + if readerTtl < @expiryMillis then + redis.call('pexpire', @readerKey, @expiryMillis) + end + return 1", + p => new { readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); + + public Task TryExtendAsync(IDatabaseAsync database) => TryExtendReadScript.ExecuteAsync(database, this).AsBooleanTask(); + + /// + /// TRY ACQUIRE READ + /// + /// First, check the writer lock value: if it exists then we fail. + /// + /// Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL + /// of the reader set to be at least our expiry. Return success. + /// + private static readonly RedisScript TryAcquireReadScript = new RedisScript($@" + if redis.call('exists', @writerKey) == 1 then + return 0 + end + redis.call('sadd', @readerKey, @lockId) + local readerTtl = redis.call('pttl', @readerKey) + if readerTtl < tonumber(@expiryMillis) then + redis.call('pexpire', @readerKey, @expiryMillis) + end + return 1", + p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); + + public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireReadScript.ExecuteAsync(database, this).AsBooleanTask(); + public bool TryAcquire(IDatabase database) => (bool)TryAcquireReadScript.Execute(database, this); + } + + internal class RedisWriterWaitingPrimitive : RedisMutexPrimitive + { + public const string LockIdSuffix = "_WRITERWAITING"; + + public RedisWriterWaitingPrimitive(RedisKey writerKey, RedisValue baseLockId, RedLockTimeouts timeouts) + : base(writerKey, baseLockId + LockIdSuffix, timeouts) + { + } + } + + internal class RedisWriteLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + private readonly RedisKey _readerKey, _writerKey; + private readonly RedisValue _lockId; + private readonly RedLockTimeouts _timeouts; + private readonly RedisMutexPrimitive _mutexPrimitive; + + public RedisWriteLockPrimitive( + RedisKey readerKey, + RedisKey writerKey, + RedisValue lockId, + RedLockTimeouts timeouts) + { + this._readerKey = readerKey; + this._writerKey = writerKey; + this._lockId = lockId; + this._timeouts = timeouts; + this._mutexPrimitive = new RedisMutexPrimitive(this._writerKey, this._lockId, this._timeouts); + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + public void Release(IDatabase database, bool fireAndForget) => this._mutexPrimitive.Release(database, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => this._mutexPrimitive.ReleaseAsync(database, fireAndForget); + + /// + /// TRY ACQUIRE WRITE + /// + /// First, check if writerValue exists. If so, fail unless it's our waiting ID. + /// + /// Then, check if there are no readers. If so, then set writerValue to our ID and return success. If not, then if the lock + /// has our waiting ID re-up the expiry (avoids the need to extend the writer waiting lock). + /// + /// Finally, return failure. + /// + private static readonly RedisScript TryAcquireWriteScript = new RedisScript($@" + local writerValue = redis.call('get', @writerKey) + if writerValue == false or writerValue == @lockId .. '{RedisWriterWaitingPrimitive.LockIdSuffix}' then + if redis.call('scard', @readerKey) == 0 then + redis.call('set', @writerKey, @lockId, 'px', @expiryMillis) + return 1 + end + if writerValue ~= false then + redis.call('pexpire', @writerKey, @expiryMillis) + end + end + return 0", + p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); + + public bool TryAcquire(IDatabase database) => (bool)TryAcquireWriteScript.Execute(database, this); + public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireWriteScript.ExecuteAsync(database, this).AsBooleanTask(); + + public Task TryExtendAsync(IDatabaseAsync database) => this._mutexPrimitive.TryExtendAsync(database); + } +} diff --git a/DistributedLock.Redis/Primitives/RedisScript.cs b/DistributedLock.Redis/Primitives/RedisScript.cs new file mode 100644 index 00000000..0f2916a4 --- /dev/null +++ b/DistributedLock.Redis/Primitives/RedisScript.cs @@ -0,0 +1,32 @@ +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.Primitives +{ + internal class RedisScript + { + private readonly LuaScript _script; + private readonly Func _parameters; + + public RedisScript(string script, Func parameters) + { + this._script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); + this._parameters = parameters; + } + + public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => + this._script.Evaluate(database, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + + public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => + this._script.EvaluateAsync(database, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + + // send the smallest possible script to the server + private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); + } +} diff --git a/DistributedLock.Redis/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs similarity index 93% rename from DistributedLock.Redis/RedLockAcquire.cs rename to DistributedLock.Redis/RedLock/RedLockAcquire.cs index 51055ba7..d6619d56 100644 --- a/DistributedLock.Redis/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -8,19 +8,26 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis.RedLock { + internal interface IRedLockAcquirableSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive + { + TimeoutValue AcquireTimeout { get; } + Task TryAcquireAsync(IDatabaseAsync database); + bool TryAcquire(IDatabase database); + } + /// /// Implements the acquire operation in the RedLock algorithm. See https://redis.io/topics/distlock /// internal readonly struct RedLockAcquire { - private readonly IRedisSynchronizationPrimitive _primitive; + private readonly IRedLockAcquirableSynchronizationPrimitive _primitive; private readonly IReadOnlyList _databases; private readonly CancellationToken _cancellationToken; public RedLockAcquire( - IRedisSynchronizationPrimitive primitive, + IRedLockAcquirableSynchronizationPrimitive primitive, IReadOnlyList databases, CancellationToken cancellationToken) { @@ -178,7 +185,7 @@ private async Task WaitForAcquireAsync(IReadOnlyDictionary= 0) { - return new Dictionary> { [database] = Task.FromResult(true) }; + return new Dictionary> { [database] = Task.FromResult(success) }; } this._primitive.Release(database, fireAndForget: true); // timed out, so release diff --git a/DistributedLock.Redis/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs similarity index 89% rename from DistributedLock.Redis/RedLockExtend.cs rename to DistributedLock.Redis/RedLock/RedLockExtend.cs index 5ae94461..aa6bcf31 100644 --- a/DistributedLock.Redis/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -7,19 +7,25 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis.RedLock { + internal interface IRedLockExtensibleSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive + { + TimeoutValue AcquireTimeout { get; } + Task TryExtendAsync(IDatabaseAsync database); + } + /// /// Implements the extend operation in the RedLock algorithm. See https://redis.io/topics/distlock /// internal readonly struct RedLockExtend { - private readonly IRedisSynchronizationPrimitive _primitive; + private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; private readonly Dictionary> _tryAcquireOrRenewTasks; private readonly CancellationToken _cancellationToken; public RedLockExtend( - IRedisSynchronizationPrimitive primitive, + IRedLockExtensibleSynchronizationPrimitive primitive, Dictionary> tryAcquireOrRenewTasks, CancellationToken cancellationToken) { diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/DistributedLock.Redis/RedLock/RedLockHandle.cs new file mode 100644 index 00000000..c1aa4c3e --- /dev/null +++ b/DistributedLock.Redis/RedLock/RedLockHandle.cs @@ -0,0 +1,71 @@ +using Medallion.Threading.Internal; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.RedLock +{ + internal sealed class RedLockHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle + { + private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; + private Dictionary>? _tryAcquireTasks; + private readonly TimeoutValue _extensionCadence, _expiry; + private readonly LeaseMonitor _monitor; + + public RedLockHandle( + IRedLockExtensibleSynchronizationPrimitive primitive, + Dictionary> tryAcquireTasks, + TimeoutValue extensionCadence, + TimeoutValue expiry) + { + this._primitive = primitive; + this._tryAcquireTasks = tryAcquireTasks; + this._extensionCadence = extensionCadence; + this._expiry = expiry; + // important to set this last, since the monitor constructor will read other fields of this + this._monitor = new LeaseMonitor(this); + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._monitor.HandleLostToken; + + /// + /// Releases the lock + /// + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + + /// + /// Releases the lock asynchronously + /// + public async ValueTask DisposeAsync() + { + await this._monitor.DisposeAsync().ConfigureAwait(false); + var tryAcquireTasks = Interlocked.Exchange(ref this._tryAcquireTasks, null); + if (tryAcquireTasks != null) + { + await new RedLockRelease(this._primitive, tryAcquireTasks).ReleaseAsync().ConfigureAwait(false); + } + } + + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._expiry; + + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._extensionCadence; + + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + { + var extendResult = await new RedLockExtend(this._primitive, this._tryAcquireTasks!, cancellationToken).TryExtendAsync().ConfigureAwait(false); + return extendResult switch + { + null => LeaseMonitor.LeaseState.Unknown, + false => LeaseMonitor.LeaseState.Lost, + true => LeaseMonitor.LeaseState.Renewed, + }; + } + } +} diff --git a/DistributedLock.Redis/RedLock/RedLockHelper.cs b/DistributedLock.Redis/RedLock/RedLockHelper.cs new file mode 100644 index 00000000..358f8c58 --- /dev/null +++ b/DistributedLock.Redis/RedLock/RedLockHelper.cs @@ -0,0 +1,46 @@ +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.RedLock +{ + internal static class RedLockHelper + { + private static readonly string LockIdPrefix; + + static RedLockHelper() + { + using var currentProcess = Process.GetCurrentProcess(); + LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; + } + + public static RedisValue CreateLockId() => LockIdPrefix + Guid.NewGuid().ToString("n"); + + public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; + + public static void FireAndForgetReleaseUponCompletion(IRedLockReleasableSynchronizationPrimitive primitive, IDatabase database, Task acquireOrRenewTask) + { + if (ReturnedFalse(acquireOrRenewTask)) { return; } + + acquireOrRenewTask.ContinueWith(async (t, state) => + { + // don't clean up if we know we failed + if (!ReturnedFalse(t)) + { + await primitive.ReleaseAsync((IDatabase) state, fireAndForget: true).ConfigureAwait(false); + } + }, + state: database + ); + } + + public static CommandFlags GetCommandFlags(bool fireAndForget) => + CommandFlags.DemandMaster | (fireAndForget ? CommandFlags.FireAndForget : CommandFlags.None); + + public static async Task AsBooleanTask(this Task redisResultTask) => (bool)await redisResultTask.ConfigureAwait(false); + } +} diff --git a/DistributedLock.Redis/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs similarity index 90% rename from DistributedLock.Redis/RedLockRelease.cs rename to DistributedLock.Redis/RedLock/RedLockRelease.cs index 310f0f38..9bc00018 100644 --- a/DistributedLock.Redis/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -6,18 +6,24 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis.RedLock { + internal interface IRedLockReleasableSynchronizationPrimitive + { + Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget); + void Release(IDatabase database, bool fireAndForget); + } + /// /// Implements the release operation in the RedLock algorithm. See https://redis.io/topics/distlock /// internal readonly struct RedLockRelease { - private readonly IRedisSynchronizationPrimitive _primitive; + private readonly IRedLockReleasableSynchronizationPrimitive _primitive; private readonly IReadOnlyDictionary> _tryAcquireOrRenewTasks; public RedLockRelease( - IRedisSynchronizationPrimitive primitive, + IRedLockReleasableSynchronizationPrimitive primitive, IReadOnlyDictionary> tryAcquireOrRenewTasks) { this._primitive = primitive; diff --git a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs new file mode 100644 index 00000000..224d5fc6 --- /dev/null +++ b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs @@ -0,0 +1,24 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.RedLock +{ + internal readonly struct RedLockTimeouts + { + public RedLockTimeouts( + TimeoutValue expiry, + TimeoutValue minValidityTime) + { + this.Expiry = expiry; + this.MinValidityTime = minValidityTime; + } + + public TimeoutValue Expiry { get; } + public TimeoutValue MinValidityTime { get; } + public TimeoutValue AcquireTimeout => this.Expiry.TimeSpan - this.MinValidityTime.TimeSpan; + } +} diff --git a/DistributedLock.Redis/RedLockHelper.cs b/DistributedLock.Redis/RedLockHelper.cs deleted file mode 100644 index d9082a8f..00000000 --- a/DistributedLock.Redis/RedLockHelper.cs +++ /dev/null @@ -1,30 +0,0 @@ -using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Redis -{ - internal static class RedLockHelper - { - public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; - - public static void FireAndForgetReleaseUponCompletion(IRedisSynchronizationPrimitive primitive, IDatabase database, Task acquireOrRenewTask) - { - if (ReturnedFalse(acquireOrRenewTask)) { return; } - - acquireOrRenewTask.ContinueWith(async (t, state) => - { - // don't clean up if we know we failed - if (!ReturnedFalse(t)) - { - await primitive.ReleaseAsync((IDatabase)state, fireAndForget: true).ConfigureAwait(false); - } - }, - state: database - ); - } - } -} diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index da7d7495..7258a23d 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -1,9 +1,9 @@ using Medallion.Threading.Internal; +using Medallion.Threading.Redis.Primitives; +using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using StackExchange.Redis.KeyspaceIsolation; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; using System.Threading; @@ -11,34 +11,13 @@ namespace Medallion.Threading.Redis { + /// + /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// public sealed partial class RedisDistributedLock : IInternalDistributedLock { - private static readonly LuaScript ReleaseScript = LuaScript.Prepare(@" - if redis.call(""get"", @key) == @lockId then - return redis.call(""del"", @key) - else - return 0 - end" - ); - - private static readonly LuaScript ExtendScript = LuaScript.Prepare(@" - if redis.call(""get"", @key) == @lockId then - return redis.call(""pexpire"", @key, @ttl) - else - return 0 - end" - ); - - private static readonly string LockIdPrefix; - private readonly IReadOnlyList _databases; - private readonly (TimeoutValue expiry, TimeoutValue extensionCadence, TimeoutValue minValidityTime, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) _options; - - static RedisDistributedLock() - { - using var currentProcess = Process.GetCurrentProcess(); - LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; - } + private readonly RedisDistributedLockOptions _options; public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) @@ -57,62 +36,25 @@ public RedisDistributedLock(RedisKey key, IEnumerable databases, Acti } public RedisKey Key { get; } - string IDistributedLock.Name => this.Key.ToString(); + public string Name => this.Key.ToString(); ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => BusyWaitHelper.WaitAsync( state: this, tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), timeout: timeout, - minSleepTime: this._options.minBusyWaitSleepTime, - maxSleepTime: this._options.maxBusyWaitSleepTime, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, cancellationToken: cancellationToken ); private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { - var primitive = new RedisLockPrimitive(this); + var primitive = new RedisMutexPrimitive(this.Key, RedLockHelper.CreateLockId(), this._options.RedLockTimeouts); var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); - return tryAcquireTasks != null ? new RedisDistributedLockHandle(primitive, tryAcquireTasks) : null; - } - - private sealed class RedisLockPrimitive : IRedisSynchronizationPrimitive - { - private readonly RedisValue _lockId = LockIdPrefix + Guid.NewGuid().ToString("n"); - private readonly RedisDistributedLock _lock; - - private object? _cachedReleaseParameters, _cachedExtendParameters; - - public RedisLockPrimitive(RedisDistributedLock @lock) - { - this._lock = @lock; - } - - private object ReleaseParameters => this._cachedReleaseParameters ??= new { key = this._lock.Key, lockId = this._lockId }; - private object ExtendParameters => this._cachedExtendParameters ??= new { key = this._lock.Key, lockId = this._lockId, ttl = this._lock._options.expiry.InMilliseconds }; - - TimeoutValue IRedisSynchronizationPrimitive.AcquireTimeout => this._lock._options.expiry.TimeSpan - this._lock._options.minValidityTime.TimeSpan; - - TimeoutValue IRedisSynchronizationPrimitive.ExtensionCadence => this._lock._options.extensionCadence; - - TimeoutValue IRedisSynchronizationPrimitive.Expiry => this._lock._options.expiry; - - void IRedisSynchronizationPrimitive.Release(IDatabase database, bool fireAndForget) => - ReleaseScript.Evaluate(database, this.ReleaseParameters, flags: this.ReleaseCommandFlags(fireAndForget)); - - Task IRedisSynchronizationPrimitive.ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => - ReleaseScript.EvaluateAsync(database, this.ReleaseParameters, flags: this.ReleaseCommandFlags(fireAndForget)); - - bool IRedisSynchronizationPrimitive.TryAcquire(IDatabase database) => - database.StringSet(this._lock.Key, this._lockId, this._lock._options.expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - - Task IRedisSynchronizationPrimitive.TryAcquireAsync(IDatabaseAsync database) => - database.StringSetAsync(this._lock.Key, this._lockId, this._lock._options.expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - - async Task IRedisSynchronizationPrimitive.TryExtendAsync(IDatabaseAsync database) => - (bool)await ExtendScript.EvaluateAsync(database, this.ExtendParameters, flags: CommandFlags.DemandMaster).ConfigureAwait(false); - - private CommandFlags ReleaseCommandFlags(bool fireAndForget) => CommandFlags.DemandMaster | (fireAndForget ? CommandFlags.FireAndForget : CommandFlags.None); + return tryAcquireTasks != null + ? new RedisDistributedLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; } } } diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs index 6ca3944d..3a57ce10 100644 --- a/DistributedLock.Redis/RedisDistributedLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; using System; using System.Collections.Generic; @@ -9,57 +10,32 @@ namespace Medallion.Threading.Redis { - public sealed class RedisDistributedLockHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle + /// + /// Implements for + /// + public sealed class RedisDistributedLockHandle : IDistributedLockHandle { - private readonly IRedisSynchronizationPrimitive _primitive; - private Dictionary>? _tryAcquireTasks; - private readonly LeaseMonitor _monitor; + private RedLockHandle? _innerHandle; - internal RedisDistributedLockHandle( - IRedisSynchronizationPrimitive primitive, - Dictionary> tryAcquireTasks) + internal RedisDistributedLockHandle(RedLockHandle innerHandle) { - this._primitive = primitive; - this._tryAcquireTasks = tryAcquireTasks; - this._monitor = new LeaseMonitor(this); + this._innerHandle = innerHandle; } /// /// Implements /// - public CancellationToken HandleLostToken => this._monitor.HandleLostToken; + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); /// /// Releases the lock asynchronously /// - public async ValueTask DisposeAsync() - { - await this._monitor.DisposeAsync().ConfigureAwait(false); - var tryAcquireTasks = Interlocked.Exchange(ref this._tryAcquireTasks, null); - if (tryAcquireTasks != null) - { - await new RedLockRelease(this._primitive, tryAcquireTasks).ReleaseAsync().ConfigureAwait(false); - } - } - - TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._primitive.Expiry; - - TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._primitive.ExtensionCadence; - - async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) - { - var extendResult = await new RedLockExtend(this._primitive, this._tryAcquireTasks!, cancellationToken).TryExtendAsync().ConfigureAwait(false); - return extendResult switch - { - null => LeaseMonitor.LeaseState.Unknown, - false => LeaseMonitor.LeaseState.Lost, - true => LeaseMonitor.LeaseState.Renewed, - }; - } + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } } diff --git a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs index 2c051eb8..3c822928 100644 --- a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; using System; using System.Collections.Generic; using System.Linq; @@ -109,7 +110,7 @@ public RedisDistributedLockOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSp return this; } - internal static (TimeoutValue expiry, TimeoutValue extensionCadence, TimeoutValue minValidityTime, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) + internal static RedisDistributedLockOptions GetOptions(Action? optionsBuilder) { RedisDistributedLockOptionsBuilder? options; if (optionsBuilder != null) @@ -160,13 +161,32 @@ internal static (TimeoutValue expiry, TimeoutValue extensionCadence, TimeoutValu extensionCadence = TimeSpan.FromMilliseconds(minValidityTime.InMilliseconds / 3.0); } - return ( - expiry, - extensionCadence, - minValidityTime, + return new RedisDistributedLockOptions( + redLockTimeouts: new RedLockTimeouts(expiry: expiry, minValidityTime: minValidityTime), + extensionCadence: extensionCadence, minBusyWaitSleepTime: options?._minBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromMilliseconds(10), maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromSeconds(0.8) ); } } + + internal readonly struct RedisDistributedLockOptions + { + public RedisDistributedLockOptions( + RedLockTimeouts redLockTimeouts, + TimeoutValue extensionCadence, + TimeSpan minBusyWaitSleepTime, + TimeSpan maxBusyWaitSleepTime) + { + this.RedLockTimeouts = redLockTimeouts; + this.ExtensionCadence = extensionCadence; + this.MinBusyWaitSleepTime = minBusyWaitSleepTime; + this.MaxBusyWaitSleepTime = maxBusyWaitSleepTime; + } + + public RedLockTimeouts RedLockTimeouts { get; } + public TimeoutValue ExtensionCadence { get; } + public TimeSpan MinBusyWaitSleepTime { get; } + public TimeSpan MaxBusyWaitSleepTime { get; } + } } diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs new file mode 100644 index 00000000..7c763c93 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -0,0 +1,158 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Redis +{ + public partial class RedisDistributedReaderWriterLock + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedLockHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedLockHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireReadLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public RedisDistributedReaderWriterLockHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: false); + + /// + /// Acquires a READ lock synchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (myLock.AcquireReadLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public RedisDistributedReaderWriterLockHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: false); + + /// + /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: false); + + /// + /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: false); + + /// + /// Attempts to acquire a WRITE lock synchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireWriteLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public RedisDistributedReaderWriterLockHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: true); + + /// + /// Acquires a WRITE lock synchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (myLock.AcquireWriteLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public RedisDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: true); + + /// + /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireWriteLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: true); + + /// + /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (await myLock.AcquireWriteLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); + + } +} \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs new file mode 100644 index 00000000..e1a54aab --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -0,0 +1,153 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.Primitives; +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// + public sealed partial class RedisDistributedReaderWriterLock : IInternalDistributedReaderWriterLock + { + private readonly IReadOnlyList _databases; + private readonly RedisDistributedLockOptions _options; + + public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) + : this(name, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) + { + } + + public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + this._databases = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); + if (this._databases.Count == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } + if (this._databases.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + + this.ReaderKey = name + ".readers"; + this.WriterKey = name + ".writer"; + this.Name = name; + this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + + // We insist on this rule to ensure that when we take the writer waiting lock it won't expire between attempts + // to upgrade it to the write lock. This avoids the need to extend the writer waiting lock + if (this._options.RedLockTimeouts.MinValidityTime.CompareTo(this._options.MaxBusyWaitSleepTime) <= 0) + { + throw new ArgumentException($"{nameof(RedisDistributedLockOptionsBuilder.BusyWaitSleepTime)} must be <= {nameof(RedisDistributedLockOptionsBuilder.MinValidityTime)}", nameof(options)); + } + } + + internal RedisKey ReaderKey { get; } + internal RedisKey WriterKey { get; } + + public string Name { get; } + + ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) + { + return isWrite + ? this.TryAcquireWriteLockAsync(timeout, cancellationToken) + : BusyWaitHelper.WaitAsync( + this, + (@lock, cancellationToken) => @lock.TryAcquireAsync(new RedisReadLockPrimitive(@lock.ReaderKey, @lock.WriterKey, @lock._options.RedLockTimeouts), cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken + ); + } + + private async ValueTask TryAcquireWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var acquireWriteLockState = new AcquireWriteLockState(canRetry: !timeout.IsZero); + RedisDistributedReaderWriterLockHandle? handle = null; + try + { + return handle = await BusyWaitHelper.WaitAsync( + (Lock: this, State: acquireWriteLockState), + (state, cancellationToken) => state.Lock.TryAcquireWriteLockAsync(state.State, cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken + ).ConfigureAwait(false); + } + finally + { + // If we failed to take the write lock but we took the writer waiting lock, release + // the writer waiting lock on our way out. + if (handle == null && acquireWriteLockState.WriterWaiting.TryGetValue(out var writerWaiting)) + { + await new RedLockRelease(writerWaiting.Primitive, writerWaiting.TryAcquireTasks).ReleaseAsync().ConfigureAwait(false); + } + } + } + + private async ValueTask TryAcquireWriteLockAsync(AcquireWriteLockState state, CancellationToken cancellationToken) + { + // The first time, through, just try to acquire the write lock. This covers the TryAcquire(0) case and ensures that we + // don't bother with taking the writer waiting lock if we don't need to. + if (state.IsFirstTry) + { + state.IsFirstTry = false; + var firstTryResult = await TryAcquireWriteLockAsync(RedLockHelper.CreateLockId()).ConfigureAwait(false); + if (firstTryResult != null) { return firstTryResult; } + // if we're not going to retry the acquire, don't bother attempting the writer waiting lock + if (!state.CanRetry) { return null; } + } + + Invariant.Require(state.CanRetry); + + // Otherwise, if we don't have the writer waiting lock yet, try to take that + if (!state.WriterWaiting.HasValue) + { + var lockId = RedLockHelper.CreateLockId(); + var primitive = new RedisWriterWaitingPrimitive(this.WriterKey, lockId, this._options.RedLockTimeouts); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + if (tryAcquireTasks == null) { return null; } + + // if we took writer waiting, save off the info and just keep going + state.WriterWaiting = (primitive, tryAcquireTasks, lockId); + } + + // If we get here, we have the writer waiting lock. Try to "upgrade" that to an actual writer lock + return await TryAcquireWriteLockAsync(state.WriterWaiting.Value.LockId).ConfigureAwait(false); + + ValueTask TryAcquireWriteLockAsync(RedisValue lockId) => + this.TryAcquireAsync(new RedisWriteLockPrimitive(this.ReaderKey, this.WriterKey, lockId, this._options.RedLockTimeouts), cancellationToken); + } + + private async ValueTask TryAcquireAsync(TPrimitive primitive, CancellationToken cancellationToken) + where TPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null + ? new RedisDistributedReaderWriterLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; + } + + private class AcquireWriteLockState + { + public AcquireWriteLockState(bool canRetry) + { + this.CanRetry = canRetry; + } + + public bool CanRetry { get; } + + public bool IsFirstTry { get; set; } = true; + + public (RedisWriterWaitingPrimitive Primitive, IReadOnlyDictionary> TryAcquireTasks, RedisValue LockId)? WriterWaiting { get; set; } + } + } +} diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs new file mode 100644 index 00000000..c69968df --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs @@ -0,0 +1,40 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements for + /// + public sealed class RedisDistributedReaderWriterLockHandle : IDistributedLockHandle + { + private RedLockHandle? _innerHandle; + + internal RedisDistributedReaderWriterLockHandle(RedLockHandle innerHandle) + { + this._innerHandle = innerHandle; + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + + /// + /// Releases the lock asynchronously + /// + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } +} diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index 5e98449e..4537c431 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -174,9 +174,9 @@ private void AddCommonParameters(DatabaseCommand command, string semaphoreName, { command.AddParameter(SemaphoreNameParameter, semaphoreName); command.AddParameter(MaxCountParameter, this._maxCount); - if (timeout.HasValue) + if (timeout.TryGetValue(out var timeoutValue)) { - command.AddParameter(TimeoutMillisParameter, timeout.Value.InMilliseconds); + command.AddParameter(TimeoutMillisParameter, timeoutValue.InMilliseconds); } command.AddParameter(ResultCodeParameter, type: DbType.Int32, direction: ParameterDirection.Output); @@ -367,8 +367,8 @@ IF @waiterCount < @{MaxCountParameter} {( // if this is the end of the query, we have to set an exit code. If we are going to retry we indicate the special code that will trigger that and otherwise we indicate // timeout. If this is not the end of the query, we just release the preamble lock and keep going - willRetryInSeparateQueryAfterPreamble.HasValue - ? $@"SET @{ResultCodeParameter} = {(willRetryInSeparateQueryAfterPreamble.Value ? FinishedPreambleWithoutAcquiringCode : SqlApplicationLock.TimeoutExitCode)}" + willRetryInSeparateQueryAfterPreamble.TryGetValue(out var willRetryInSeparateQueryAfterPreambleValue) + ? $@"SET @{ResultCodeParameter} = {(willRetryInSeparateQueryAfterPreambleValue ? FinishedPreambleWithoutAcquiringCode : SqlApplicationLock.TimeoutExitCode)}" : $"EXEC sys.sp_releaseapplock @{PreambleLockNameVariable}, @{LockScopeVariable}" )}"; } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 1ec3169b..343dd61b 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -61,6 +61,7 @@ public void TestConnectionDoesNotLeak() } [Test] + [NonParallelizable, Retry(3)] // timing-sensitive public void TestKeepaliveProtectsFromIdleSessionKiller() { var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 58d368f2..08228c45 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -3,7 +3,6 @@ using NUnit.Framework; using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; @@ -74,7 +73,7 @@ public async Task BasicAsyncTest() Assert.IsNull(nestedHandle, this.GetType().Name); } - await using var nestedHandle2 = lock2.TryAcquireAsync().Result; + await using var nestedHandle2 = lock2.TryAcquireAsync().AsTask().Result; Assert.IsNotNull(nestedHandle2, this.GetType().Name); } @@ -178,7 +177,11 @@ public void TestParallelism() await using (await @lock.AcquireAsync()) { // increment going in - Interlocked.Increment(ref counter); + if (Interlocked.Increment(ref counter) == 2) + { + Assert.Fail("Concurrent lock acquisitions"); + } + // hang out for a bit to ensure concurrency await Task.Delay(TimeSpan.FromMilliseconds(10)); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index f89a6ac0..6138da04 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -14,12 +14,12 @@ public abstract class DistributedReaderWriterLockCoreTestCases this._lockProvider.Dispose(); [Test] - public void TestMultipleReadersSingleWriter() + public async Task TestMultipleReadersSingleWriter() { IDistributedReaderWriterLock Lock() => this._lockProvider.CreateReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); - using var readHandle1 = Lock().TryAcquireReadLockAsync().AsTask().Result; + using var readHandle1 = await Lock().TryAcquireReadLockAsync(); Assert.IsNotNull(readHandle1, this.GetType().ToString()); using var readHandle2 = Lock().TryAcquireReadLock(); Assert.IsNotNull(readHandle2, this.GetType().ToString()); @@ -46,6 +46,27 @@ IDistributedReaderWriterLock Lock() => Assert.IsNotNull(writeHandle4); } + [Test] + public async Task TestWriterTrumpsReader() + { + IDistributedReaderWriterLock Lock() => + this._lockProvider.CreateReaderWriterLock(nameof(this.TestWriterTrumpsReader)); + + await using var readerHandle = await Lock().AcquireReadLockAsync(); + + var writerHandleTask = Lock().AcquireWriteLockAsync().AsTask(); + Assert.IsFalse(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(0.2))); + + // trying to take a read lock here fails because there is a writer waiting + await using var readerHandle2 = await Lock().TryAcquireReadLockAsync(); + Assert.IsNull(readerHandle2); + + await readerHandle.DisposeAsync(); + + Assert.IsTrue(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + await writerHandleTask.Result.DisposeAsync(); + } + [Test] public void TestReaderWriterLockBadArguments() { diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs new file mode 100644 index 00000000..8d6c4aee --- /dev/null +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -0,0 +1,135 @@ +using Medallion.Threading.Redis; +using Medallion.Threading.Tests.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class RedisSynchronizationCoreTestCases + // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't + // want to see cases for each possible db provider type + where TLockProvider : TestingLockProvider>, new() + { + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + public void TestMajorityFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("multi"); + + // we only get the one exception + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + + // single sync acquire flow is different + this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; + var singleDatabaseLock = this._provider.CreateLock("single"); + Assert.Throws(() => singleDatabaseLock.Acquire()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestMajorityHangingDatabasesCauseAcquireToFail() + { + using var @event = new ManualResetEventSlim(initialState: false); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[1], () => { @event.Wait(); return true; }); + MockDatabase(databases[2], () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); + var @lock = this._provider.CreateLock("lock"); + + Assert.IsNull(await @lock.TryAcquireAsync()); + + @event.Set(); // just to free the waiting threads + } + + [Test] + public void TestMajorityFaultingDatabasesCauseReleaseToThrow() + { + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("lock"); + using var handle = @lock.Acquire(); + + new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); + var aggregateException = Assert.Throws(() => handle.Dispose()); + Assert.IsInstanceOf(aggregateException.InnerException); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) + { + var database = CreateDatabaseMock(); + MockDatabase(database, () => { Thread.Sleep(50); return true; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); + var @lock = this._provider.CreateLock("lock"); + + // single sync acquire has different timeout logic, so we test it separately + Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() + { + using var @event = new ManualResetEventSlim(); + var failDatabase = CreateDatabaseMock(); + MockDatabase(failDatabase, () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; + var @lock = this._provider.CreateLock("lock"); + + var acquireTask = @lock.TryAcquireAsync().AsTask(); + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + @event.Set(); + Assert.IsNull(await acquireTask); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; + var singleDatabaseLock = this._provider.CreateLock("lock"); + using var handle = await singleDatabaseLock.TryAcquireAsync(); + Assert.IsNotNull(handle); + } + + private static Mock CreateDatabaseMock() + { + var mock = new Mock(MockBehavior.Strict); + MockDatabase(mock, () => true); + return mock; + } + + private static void MockDatabase(Mock mockDatabase, Func returns) + { + mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(returns); + mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(returns)); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index d3a301b7..b92ce9f0 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -39,6 +39,11 @@ private RedisServer(int? port) ActiveServersByPort.Add(this.Port, this); } this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}"); + // Run an arbitrary command ensure that the db successfully spun up before + // we proceed (Connect seemingly can complete before that happens). This is + // particularly important for cross-process locking where the lock taker process + // assumes we've already started a server on certain ports. + this.Multiplexer.GetDatabase().KeyExists("test"); } public int ProcessId => this._command.ProcessId; diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs new file mode 100644 index 00000000..0cc030a1 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -0,0 +1,58 @@ +using Medallion.Threading.Tests.Redis; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class TestingRedisDatabaseProvider + { + protected TestingRedisDatabaseProvider(IEnumerable databases) + { + this.Databases = databases.ToArray(); + } + + protected TestingRedisDatabaseProvider(int count) + : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) + { + } + + // publicly settable so that callers can alter the dbs in use + public IReadOnlyList Databases { get; set; } + + public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); + } + + public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider + { + public TestingRedisSingleDatabaseProvider() : base(count: 1) { } + } + + public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider + { + public TestingRedis3DatabaseProvider() : base(count: 3) { } + } + + public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider + { + private static readonly IDatabase DeadDatabase; + + static TestingRedis2x1DatabaseProvider() + { + var server = new RedisServer(); + DeadDatabase = server.Multiplexer.GetDatabase(); + using var process = Process.GetProcessById(server.ProcessId); + process.Kill(); + } + + public TestingRedis2x1DatabaseProvider() + : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) + { + } + + public override string CrossProcessLockTypeSuffix => "2x1"; + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs index d3834058..6c9138c3 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -1,73 +1,51 @@ using Medallion.Threading.Redis; -using Medallion.Threading.Tests.Redis; -using StackExchange.Redis; +using NUnit.Framework; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; namespace Medallion.Threading.Tests.Redis { - public abstract class TestingRedisDistributedLockProvider : TestingLockProvider + public sealed class TestingRedisDistributedLockProvider : TestingLockProvider> + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { - private readonly IReadOnlyList _databases; - - protected TestingRedisDistributedLockProvider(IEnumerable databases) - { - this._databases = databases.ToArray(); - } - - protected TestingRedisDistributedLockProvider(int serverCount) - : this(Enumerable.Range(0, serverCount).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) - { - } - public override IDistributedLock CreateLockWithExactName(string name) { - var @lock = new RedisDistributedLock(name, this._databases, this.Strategy.Options); + var @lock = new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); this.Strategy.RegisterKillHandleAction( - () => this._databases.Take((this._databases.Count / 2) + 1) + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) .ToList() .ForEach(db => db.KeyDelete(@lock.Key)) ); return @lock; } - public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); - - public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedLock)}{this.CrossProcessLockTypeSuffix}"; + public override string GetSafeName(string name) => new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases).Name; - protected virtual string CrossProcessLockTypeSuffix => this._databases.Count.ToString(); - } - - public sealed class TestingRedisSingleServerDistributedLockProvider : TestingRedisDistributedLockProvider - { - public TestingRedisSingleServerDistributedLockProvider() : base(serverCount: 1) { } + public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; } - public sealed class TestingRedis3ServerDistributedLockProvider : TestingRedisDistributedLockProvider + public sealed class TestingRedisDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider> + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { - public TestingRedis3ServerDistributedLockProvider() : base(serverCount: 3) { } - } - - public sealed class TestingRedis2x1ServerDistributedLockProvider : TestingRedisDistributedLockProvider - { - private static readonly IDatabase DeadDatabase; - - static TestingRedis2x1ServerDistributedLockProvider() + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) { - var server = new RedisServer(); - DeadDatabase = server.Multiplexer.GetDatabase(); - using var process = Process.GetProcessById(server.ProcessId); - process.Kill(); + var @lock = new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) + .ToList() + .ForEach(db => + { + db.KeyDelete(@lock.ReaderKey); + db.KeyDelete(@lock.WriterKey); + }) + ); + return @lock; } - public TestingRedis2x1ServerDistributedLockProvider() - : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) - { - } + public override string GetSafeName(string name) => new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases).Name; - protected override string CrossProcessLockTypeSuffix => "2x1"; + public override string GetCrossProcessLockType(ReaderWriterLockType type) => $"{type}{nameof(RedisDistributedReaderWriterLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index 53573c9d..df5b6992 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -8,10 +8,19 @@ namespace Medallion.Threading.Tests.Redis { - public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { private bool _preparedForHandleLost, _preparedForHandleAbandonment; private Action? _killHandleAction; + private Action? _options; + + public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); + + public void SetOptions(Action? options) + { + this._options = options; + } public void Options(RedisDistributedLockOptionsBuilder options) { @@ -21,8 +30,14 @@ public void Options(RedisDistributedLockOptionsBuilder options) } if (this._preparedForHandleAbandonment) { - options.Expiry(TimeSpan.FromSeconds(.2)); + options.Expiry(TimeSpan.FromSeconds(.2)) + // the reader writer lock requires that the busy wait sleep time is shorter + // than the expiry, so adjust for that + // todo should this be more automatic? + .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); } + + this._options?.Invoke(options); } public override IDisposable? PrepareForHandleLost() @@ -50,9 +65,9 @@ public void RegisterKillHandleAction(Action action) private class HandleLostScope : IDisposable { - private TestingRedisSynchronizationStrategy? _strategy; + private TestingRedisSynchronizationStrategy? _strategy; - public HandleLostScope(TestingRedisSynchronizationStrategy strategy) + public HandleLostScope(TestingRedisSynchronizationStrategy strategy) { this._strategy = strategy; } diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/DistributedLock.Tests/Infrastructure/TestHelper.cs index 49e50722..333cc329 100644 --- a/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -1,4 +1,8 @@ -using NUnit.Framework; +using Medallion.Threading.Internal; +using Medallion.Threading.Redis; +using NUnit.Framework; +using System.Threading; +using System.Threading.Tasks; namespace Medallion.Threading.Tests { @@ -15,5 +19,20 @@ public static bool IsHeld(this IDistributedLock @lock) using var handle = @lock.TryAcquire(); return handle == null; } + + public static async Task WaitAsync(this Task task, TimeoutValue timeout) + { + if (!task.IsCompleted) + { + using var timeoutTask = new TimeoutTask(timeout, CancellationToken.None); + if (await Task.WhenAny(task, timeoutTask.Task) != task) + { + return false; + } + } + + await task; + return true; + } } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 8ec36f77..099113ff 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -57,9 +57,17 @@ public class ReaderWriterCore_PostgresReaderWriter_OwnedTransactionSynchronizati namespace Medallion.Threading.Tests.Redis { - public class Core_Redis2x1Server_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } - public class Core_Redis3Server_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } - public class Core_RedisSingleServer_RedisSynchronizationStrategyTest : DistributedLockCoreTestCases { } + public class Core_ReaderWriterAsMutex_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Redis_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class Core_Redis_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class Core_Redis_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class ReaderWriterCore_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class ReaderWriterCore_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class ReaderWriterCore_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class RedisSynchronizationCore_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } + public class RedisSynchronizationCore_Redis_Redis3DatabaseTest : RedisSynchronizationCoreTestCases> { } } namespace Medallion.Threading.Tests.SqlServer diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs index e9831ebf..d180b87d 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs @@ -58,11 +58,11 @@ public void TestValidatesBusyWaitSleepTime() public void TestDefaults() { var defaultOptions = RedisDistributedLockOptionsBuilder.GetOptions(null); - defaultOptions.expiry.ShouldEqual(RedisDistributedLockOptionsBuilder.DefaultExpiry); - defaultOptions.minValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); - defaultOptions.extensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); - defaultOptions.minBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); - defaultOptions.maxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); + defaultOptions.RedLockTimeouts.Expiry.ShouldEqual(RedisDistributedLockOptionsBuilder.DefaultExpiry); + defaultOptions.RedLockTimeouts.MinValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); + defaultOptions.ExtensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); + defaultOptions.MinBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); + defaultOptions.MaxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); } private static void GetOptions(Action options) => diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index b43530ff..9bcd2d08 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -12,135 +12,28 @@ namespace Medallion.Threading.Tests.Redis { + [Category("CI")] public class RedisDistributedLockTest { - private static string LockName => TestContext.CurrentContext.Test.FullName + TargetFramework.Current; - [Test] public void TestName() { - var name = "\0🐉汉字\b\r\n\\"; - var @lock = new RedisDistributedLock(name, CreateDatabaseMock().Object); - @lock.As().Name.ShouldEqual(name); - @lock.Key.ShouldEqual(new RedisKey(name)); + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedLock(Name, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + @lock.Key.ShouldEqual(new RedisKey(Name)); } [Test] public void TestValidatesConstructorParameters() { - var database = CreateDatabaseMock().Object; - Assert.Throws(() => new RedisDistributedLock(default(RedisKey), database)); - Assert.Throws(() => new RedisDistributedLock(default(RedisKey), new[] { database })); + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedLock(default, database)); + Assert.Throws(() => new RedisDistributedLock(default, new[] { database })); Assert.Throws(() => new RedisDistributedLock("key", default(IDatabase)!)); Assert.Throws(() => new RedisDistributedLock("key", default(IEnumerable)!)); Assert.Throws(() => new RedisDistributedLock("key", new[] { database, null! })); Assert.Throws(() => new RedisDistributedLock("key", Enumerable.Empty())); } - - [Test] - public void TestMajorityFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); - - var @lock = new RedisDistributedLock(LockName, databases.Select(d => d.Object)); - - // we only get the one exception - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); - - // single sync acquire flow is different - var singleDatabaseLock = new RedisDistributedLock(LockName, databases[2].Object); - Assert.Throws(() => singleDatabaseLock.Acquire()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestMajorityHangingDatabasesCauseAcquireToFail() - { - using var @event = new ManualResetEventSlim(initialState: false); - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[1], () => { @event.Wait(); return true; }); - MockDatabase(databases[2], () => { @event.Wait(); return false; }); - - // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang - var @lock = new RedisDistributedLock( - LockName, - databases.Select(d => d.Object), - options: o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2)) - ); - - Assert.IsNull(await @lock.TryAcquireAsync()); - - @event.Set(); // just to free the waiting threads - } - - [Test] - public void TestMajorityFaultingDatabasesCauseReleaseToThrow() - { - var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); - - var @lock = new RedisDistributedLock(LockName, databases.Select(d => d.Object)); - using var handle = @lock.Acquire(); - - new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); - var aggregateException = Assert.Throws(() => handle.Dispose()); - Assert.IsInstanceOf(aggregateException.InnerException); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) - { - var database = CreateDatabaseMock(); - MockDatabase(database, () => { Thread.Sleep(50); return true; }); - - var @lock = new RedisDistributedLock( - LockName, - database.Object, - options: o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10)) - ); - - // single sync acquire has different timeout logic, so we test it separately - Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() - { - using var @event = new ManualResetEventSlim(); - var failDatabase = CreateDatabaseMock(); - MockDatabase(failDatabase, () => { @event.Wait(); return false; }); - - var @lock = new RedisDistributedLock(LockName, new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }); - var acquireTask = @lock.TryAcquireAsync().AsTask(); - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); - @event.Set(); - Assert.IsNull(await acquireTask); - - var singleDatabaseLock = new RedisDistributedLock(LockName, RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase()); - using var handle = await singleDatabaseLock.TryAcquireAsync(); - Assert.IsNotNull(handle); - } - - private static Mock CreateDatabaseMock() - { - var mock = new Mock(MockBehavior.Strict); - MockDatabase(mock, () => true); - return mock; - } - - private static void MockDatabase(Mock mockDatabase, Func returns) - { - mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(returns); - mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(returns)); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - } } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs new file mode 100644 index 00000000..9fee77e0 --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -0,0 +1,36 @@ +using Medallion.Threading.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests.Tests.Redis +{ + [Category("CI")] + public class RedisDistributedReaderWriterLockTest + { + [Test] + public void TestName() + { + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedReaderWriterLock(Name, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + } + + [Test] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedReaderWriterLock(default, database)); + Assert.Throws(() => new RedisDistributedReaderWriterLock(default, new[] { database })); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database, null! })); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", Enumerable.Empty())); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database }, o => o.Expiry(TimeSpan.FromSeconds(0.2)))); + } + } +} diff --git a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs new file mode 100644 index 00000000..961be981 --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs @@ -0,0 +1,28 @@ +using Medallion.Threading.Redis.Primitives; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Medallion.Threading.Tests.Redis +{ + [Category("CI")] + public class RedisLibraryTest + { + // ensures that we are caching the preparation of these + [Test] + public void TestAllRedisScriptFieldsAreStatic() + { + var redisScriptFields = typeof(RedisScript<>).Assembly + .GetTypes() + .SelectMany(t => t.GetFields(BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)) + .Where(f => f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == typeof(RedisScript<>)); + foreach (var field in redisScriptFields) + { + Assert.IsTrue(field.IsStatic, field.ToString()); + } + } + } +} diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index ff2f76b0..5c50dd7e 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -11,6 +11,8 @@ using StackExchange.Redis; using System.Linq; using Medallion.Threading; +using System.Drawing.Text; +using System.Collections.Generic; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -74,6 +76,15 @@ public static int Main(string[] args) case nameof(RedisDistributedLock) + "2x1": handle = AcquireRedisLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "1": + handle = AcquireRedisWriteLock(name, serverCount: 1); + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "3": + handle = AcquireRedisWriteLock(name, serverCount: 3); + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "2x1": + handle = AcquireRedisWriteLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) + break; default: Console.Error.WriteLine($"type: {type}"); return 123; @@ -91,12 +102,16 @@ public static int Main(string[] args) } private static IDistributedLockHandle AcquireRedisLock(string name, int serverCount) => - new RedisDistributedLock( - name, - RedisPorts.DefaultPorts.Take(serverCount) - .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()), - o => o.Expiry(TimeSpan.FromSeconds(.5)) - ) - .Acquire(); + new RedisDistributedLock(name, GetRedisDatabases(serverCount), RedisOptions).Acquire(); + + private static IDistributedLockHandle AcquireRedisWriteLock(string name, int serverCount) => + new RedisDistributedReaderWriterLock(name, GetRedisDatabases(serverCount), RedisOptions).AcquireWriteLock(); + + private static IEnumerable GetRedisDatabases(int serverCount) => RedisPorts.DefaultPorts.Take(serverCount) + .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()); + + private static void RedisOptions(RedisDistributedLockOptionsBuilder options) => + options.Expiry(TimeSpan.FromSeconds(.5)) // short expiry for abandonment testing + .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); } } From 7aafb2d83ad2779067f9d34e28d8ac2d7e5d71cd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 2 Nov 2020 06:45:55 -0500 Subject: [PATCH 040/399] Switch BusyWaitHelper to use TimeoutValue for sleep times --- .../AzureBlobLeaseDistributedLock.cs | 2 +- .../AzureBlobLeaseOptionsBuilder.cs | 6 +++--- DistributedLock.Core/Internal/BusyWaitHelper.cs | 11 ++++++----- DistributedLock.FileSystem/FileDistributedLock.cs | 2 +- .../RedisDistributedLockOptionsBuilder.cs | 12 ++++++------ 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 9e80a750..4a7c1a46 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -23,7 +23,7 @@ public sealed partial class AzureBlobLeaseDistributedLock : IInternalDistributed private static readonly string CreatedMetadataKey = $"__DistributedLock"; private readonly BlobClientWrapper _blobClient; - private readonly (TimeoutValue duration, TimeoutValue renewalCadence, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) _options; + private readonly (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) _options; /// /// Constructs a lock that will lease the provided diff --git a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs index 5ce6448d..0d3e8463 100644 --- a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs +++ b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs @@ -91,7 +91,7 @@ public AzureBlobLeaseOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max return this; } - internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeSpan minBusyWaitSleepTime, TimeSpan maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) + internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) { AzureBlobLeaseOptionsBuilder? options; if (optionsBuilder != null) @@ -121,8 +121,8 @@ internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeSpan mi return ( duration: durationToUse, renewalCadence: options?._renewalCadence ?? (durationToUse.IsInfinite ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(durationToUse.InMilliseconds / 3.0)), - minBusyWaitSleepTime: options?._minBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromMilliseconds(250), - maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime?.TimeSpan ?? TimeSpan.FromSeconds(1) + minBusyWaitSleepTime: options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(250), + maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(1) ); } } diff --git a/DistributedLock.Core/Internal/BusyWaitHelper.cs b/DistributedLock.Core/Internal/BusyWaitHelper.cs index 45defb7b..bf6f4a43 100644 --- a/DistributedLock.Core/Internal/BusyWaitHelper.cs +++ b/DistributedLock.Core/Internal/BusyWaitHelper.cs @@ -18,12 +18,13 @@ static class BusyWaitHelper TState state, Func> tryGetValue, TimeoutValue timeout, - TimeSpan minSleepTime, - TimeSpan maxSleepTime, + TimeoutValue minSleepTime, + TimeoutValue maxSleepTime, CancellationToken cancellationToken) where TResult : class { - Invariant.Require(minSleepTime <= maxSleepTime); + Invariant.Require(minSleepTime.CompareTo(maxSleepTime) <= 0); + Invariant.Require(!maxSleepTime.IsInfinite); var initialResult = await tryGetValue(state, cancellationToken).ConfigureAwait(false); if (initialResult != null || timeout.IsZero) @@ -34,10 +35,10 @@ static class BusyWaitHelper using var _ = CreateMergedCancellationTokenSourceSource(timeout, cancellationToken, out var mergedCancellationToken); var random = new Random(Guid.NewGuid().GetHashCode()); - var sleepRangeMillis = maxSleepTime.TotalMilliseconds - minSleepTime.TotalMilliseconds; + var sleepRangeMillis = maxSleepTime.InMilliseconds - minSleepTime.InMilliseconds; while (true) { - var sleepTime = minSleepTime + TimeSpan.FromMilliseconds(random.NextDouble() * sleepRangeMillis); + var sleepTime = minSleepTime.TimeSpan + TimeSpan.FromMilliseconds(random.NextDouble() * sleepRangeMillis); try { await SyncOverAsync.Delay(sleepTime, mergedCancellationToken).ConfigureAwait(false); diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index bd33137f..f74a9b73 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -16,7 +16,7 @@ public sealed partial class FileDistributedLock : IInternalDistributedLock Date: Mon, 2 Nov 2020 07:02:43 -0500 Subject: [PATCH 041/399] Fixed bug with reader extension --- .../RedisReaderWriterLockPrimitives.cs | 2 +- .../Data/ConnectionStringStrategyTestCases.cs | 2 +- .../Infrastructure/ITestingNameProvider.cs | 2 +- .../Infrastructure/TestHelper.cs | 5 ++ .../RedisDistributedReaderWriterLockTest.cs | 47 ++++++++++++++++++- 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs index bd92af39..004a0bb9 100644 --- a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs +++ b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -48,7 +48,7 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim if redis.call('sismember', @readerKey, @lockId) == 0 then return 0 end - if readerTtl < @expiryMillis then + if redis.call('pttl', @readerKey) < tonumber(@expiryMillis) then redis.call('pexpire', @readerKey, @expiryMillis) end return 1", diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 343dd61b..b48877e2 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -61,7 +61,7 @@ public void TestConnectionDoesNotLeak() } [Test] - [NonParallelizable, Retry(3)] // timing-sensitive + [NonParallelizable, Retry(5)] // timing-sensitive public void TestKeepaliveProtectsFromIdleSessionKiller() { var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); diff --git a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs index 6d43e629..5a0e9cc1 100644 --- a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs +++ b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs @@ -17,6 +17,6 @@ internal static class TestingNameProviderExtensions /// test and framework name, thus avoiding potential collisions between test cases /// public static string GetUniqueSafeName(this ITestingNameProvider provider, string baseName = "") => - provider.GetSafeName($"{baseName}_{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}"); + provider.GetSafeName($"{baseName}_{TestHelper.UniqueName}"); } } diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/DistributedLock.Tests/Infrastructure/TestHelper.cs index 333cc329..5311bcc5 100644 --- a/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -8,6 +8,11 @@ namespace Medallion.Threading.Tests { internal static class TestHelper { + /// + /// Returns a name that is unique to the current test and target framework but stable otherwise. + /// + public static string UniqueName => $"{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}"; + public static T ShouldEqual(this T @this, T that, string? message = null) { Assert.AreEqual(actual: @this, expected: that, message: message); diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 9fee77e0..31bc4cdc 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Redis; +using Medallion.Threading.Tests.Redis; using Moq; using NUnit.Framework; using StackExchange.Redis; @@ -6,13 +7,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading.Tasks; namespace Medallion.Threading.Tests.Tests.Redis { - [Category("CI")] public class RedisDistributedReaderWriterLockTest { [Test] + [Category("CI")] public void TestName() { const string Name = "\0🐉汉字\b\r\n\\"; @@ -21,6 +23,7 @@ public void TestName() } [Test] + [Category("CI")] public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; @@ -32,5 +35,47 @@ public void TestValidatesConstructorParameters() Assert.Throws(() => new RedisDistributedReaderWriterLock("key", Enumerable.Empty())); Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database }, o => o.Expiry(TimeSpan.FromSeconds(0.2)))); } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestCanExtendReadLock() + { + var @lock = new RedisDistributedReaderWriterLock( + TestHelper.UniqueName, + RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), + o => o.Expiry(TimeSpan.FromSeconds(0.3)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5)) + ); + + await using var readHandle = await @lock.AcquireReadLockAsync(); + + var writeHandleTask = @lock.AcquireWriteLockAsync().AsTask(); + _ = writeHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup + Assert.IsFalse(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); + + await readHandle.DisposeAsync(); + + Assert.IsTrue(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + } + + [Test] + public async Task TestReadLockAbandonment() + { + var @lock = new RedisDistributedReaderWriterLock( + TestHelper.UniqueName, + RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), + o => o.Expiry(TimeSpan.FromSeconds(0.3)) + .ExtensionCadence(TimeSpan.FromSeconds(0.1)) + .BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5)) + ); + + await AcquireReadLockAsync(); + GC.Collect(); + GC.WaitForPendingFinalizers(); + + await using var writeHandle = await @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(10)); + Assert.IsNotNull(writeHandle); // indicates read lock was released + + async Task AcquireReadLockAsync() => await @lock.AcquireReadLockAsync(); + } } } From 7415b2c8a85b003291a8bd2bd10f9bf016142417 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 2 Nov 2020 07:10:59 -0500 Subject: [PATCH 042/399] Added redis extension test cases --- .../Redis/RedisExtensionTestCases.cs | 40 +++++++++++++++++++ .../Tests/CombinatorialTests.cs | 6 +++ .../RedisDistributedReaderWriterLockTest.cs | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs new file mode 100644 index 00000000..35a00cc0 --- /dev/null +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -0,0 +1,40 @@ +using Medallion.Threading.Tests.Redis; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class RedisExtensionTestCases + where TLockProvider : TestingLockProvider>, new() + where TDatabaseProvider : TestingRedisDatabaseProvider, new() + { + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestCanExtendLock() + { + this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(0.3)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5))); + var @lock = this._provider.CreateLock("lock"); + + await using var handle = await @lock.AcquireAsync(); + + var secondHandleTask = @lock.AcquireAsync().AsTask(); + _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup + Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); + + await handle.DisposeAsync(); + + Assert.IsTrue(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + } + } +} diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 099113ff..5d078d57 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -66,6 +66,12 @@ public class Core_Redis_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSi public class ReaderWriterCore_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } + public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } + public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Redis_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedis2x1DatabaseProvider> { } + public class RedisExtension_Redis_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedis3DatabaseProvider> { } + public class RedisExtension_Redis_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSingleDatabaseProvider> { } public class RedisSynchronizationCore_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } public class RedisSynchronizationCore_Redis_Redis3DatabaseTest : RedisSynchronizationCoreTestCases> { } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 31bc4cdc..6690ed8c 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Tests.Redis +namespace Medallion.Threading.Tests.Redis { public class RedisDistributedReaderWriterLockTest { From c6bdda5188914e6b8a2e332206d31648ab6cd754 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 2 Nov 2020 07:11:17 -0500 Subject: [PATCH 043/399] Minor cleanup --- .../Tests/Redis/RedisDistributedReaderWriterLockTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 6690ed8c..cbde99df 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -1,5 +1,4 @@ using Medallion.Threading.Redis; -using Medallion.Threading.Tests.Redis; using Moq; using NUnit.Framework; using StackExchange.Redis; From ff3e84602bce71492f9c8ad9349713140d130b9f Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 15:46:19 -0500 Subject: [PATCH 044/399] Update version of Microsoft.Data.SqlClient per #58 --- DistributedLock.Azure/DistributedLock.Azure.csproj | 2 +- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- DistributedLock.FileSystem/DistributedLock.FileSystem.csproj | 2 +- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 4 ++-- DistributedLock.Tests/DistributedLock.Tests.csproj | 2 +- .../DistributedLock.WaitHandles.csproj | 2 +- DistributedLock/DistributedLock.csproj | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index 99642960..f4cf00d1 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Provides a distributed locking implementation based on Azure blob leases diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index c7045d08..c4df687a 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index adf177a0..f779bf64 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on file locks diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index c2453f50..33408098 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 1ec8264b..f56f4022 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server @@ -39,7 +39,7 @@ - + diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index e167f197..20628645 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 9017e95c..f31f5909 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0-alpha02 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on global WaitHandle objects in Windows diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index f8c32934..eceaeb1d 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.0.0-alpha01 + 2.0.0-alpha02 2.0.0.0 Michael Adelson From 909218ab1b000ab1f34bdb2b4d4817f1e1ceba63 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 17:48:41 -0500 Subject: [PATCH 045/399] Add redis distributed semaphore --- DistributedLock.Core/IDistributedSemaphore.cs | 2 + .../Primitives/RedisSemaphorePrimitive.cs | 85 +++++++++++++++++++ ...tributedSemaphore.IDistributedSemaphore.cs | 85 +++++++++++++++++++ .../RedisDistributedSemaphore.cs | 63 ++++++++++++++ .../RedisDistributedSemaphoreHandle.cs | 37 ++++++++ .../Data/ConnectionStringStrategyTestCases.cs | 4 +- .../DistributedLockCoreTestCases.cs | 1 - .../DistributedSemaphoreCoreTestCases.cs | 1 + .../Redis/RedisExtensionTestCases.cs | 4 +- .../RedisSynchronizationCoreTestCases.cs | 25 ++++++ .../Infrastructure/Redis/RedisServer.cs | 8 +- .../Redis/TestingRedisProviders.cs | 19 +++++ .../TestingRedisSynchronizationStrategy.cs | 1 - .../Tests/CombinatorialTests.cs | 17 ++++ .../RedisDistributedReaderWriterLockTest.cs | 4 +- .../Redis/RedisDistributedSemaphoreTest.cs | 41 +++++++++ .../Tests/Redis/RedisLibraryTest.cs | 2 + DistributedLockTaker/Program.cs | 16 ++++ 18 files changed, 403 insertions(+), 12 deletions(-) create mode 100644 DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs create mode 100644 DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs create mode 100644 DistributedLock.Redis/RedisDistributedSemaphore.cs create mode 100644 DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index 4fb1ee3f..b73bf6b8 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -12,6 +12,8 @@ namespace Medallion.Threading /// public interface IDistributedSemaphore { + // TODO maxcount? + /// /// A name that uniquely identifies the semaphore /// diff --git a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs new file mode 100644 index 00000000..8a1c7717 --- /dev/null +++ b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -0,0 +1,85 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis.Primitives +{ + /// + /// The semaphore algorithm looks similar to the mutex implementation except that the value stored at the key is a + /// sorted set (sorted by timeout). Because elements aren't automatically removed from the set when they time out, + /// would-be acquirers must first purge the set of any expired values before they check whether the set has space + /// for them. + /// + internal class RedisSemaphorePrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + // replicate_commands is necessary to call before calling non-deterministic functions + private const string GetNowMillisScriptFragment = @" + redis.replicate_commands() + local nowResult = redis.call('time') + local nowMillis = (tonumber(nowResult[1]) * 1000.0) + (tonumber(nowResult[2]) / 1000.0)"; + + private const string RenewSetScriptFragment = @" + local keyTtl = redis.call('pttl', @key) + if keyTtl < tonumber(@setExpiryMillis) then + redis.call('pexpire', @key, @setExpiryMillis) + end"; + + private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); + private readonly RedisKey _key; + private readonly int _maxCount; + private readonly RedLockTimeouts _timeouts; + + public RedisSemaphorePrimitive(RedisKey key, int maxCount, RedLockTimeouts timeouts) + { + this._key = key; + this._maxCount = maxCount; + this._timeouts = timeouts; + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + /// + /// The actual expiry is determined by the entry in the timeouts set. However, we also don't want to pollute the db by leaving + /// the sets around forever. Therefore, we give the sets an expiry of 3x the individual entry expiry. The reason to be extra + /// conservative with sets is that there is more disruption from losing them then from having one key time out. + /// + private TimeoutValue SetExpiry => TimeSpan.FromMilliseconds((int)Math.Min(int.MaxValue, 3L * this._timeouts.Expiry.InMilliseconds)); + + public void Release(IDatabase database, bool fireAndForget) => + database.SortedSetRemove(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); + + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => + database.SortedSetRemoveAsync(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); + + private static readonly RedisScript AcquireScript = new RedisScript($@" + {GetNowMillisScriptFragment} + redis.call('zremrangebyscore', @key, '-inf', nowMillis) + if redis.call('zcard', @key) < tonumber(@maxCount) then + redis.call('zadd', @key, nowMillis + tonumber(@expiryMillis), @lockId) + {RenewSetScriptFragment} + return 1 + end + return 0", + p => new { key = p._key, maxCount = p._maxCount, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } + ); + + public bool TryAcquire(IDatabase database) => (bool)AcquireScript.Execute(database, this); + + public Task TryAcquireAsync(IDatabaseAsync database) => AcquireScript.ExecuteAsync(database, this).AsBooleanTask(); + + private static readonly RedisScript ExtendScript = new RedisScript($@" + {GetNowMillisScriptFragment} + local result = redis.call('zadd', @key, 'XX', 'CH', nowMillis + tonumber(@expiryMillis), @lockId) + {RenewSetScriptFragment} + return result", + p => new { key = p._key, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } + ); + + public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); + } +} diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs new file mode 100644 index 00000000..b420f633 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Redis +{ + public partial class RedisDistributedSemaphore + { + // AUTO-GENERATED + + IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public RedisDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public RedisDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs new file mode 100644 index 00000000..6050c805 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -0,0 +1,63 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.Primitives; +using Medallion.Threading.Redis.RedLock; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + /// + /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// + public sealed partial class RedisDistributedSemaphore : IInternalDistributedSemaphore + { + private readonly int _maxCount; + private readonly IReadOnlyList _databases; + private readonly RedisDistributedLockOptions _options; + + public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) + : this(key, maxCount, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) + { + } + + public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable databases, Action? options = null) + { + if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + this._databases = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); + if (this._databases.Count == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } + if (this._databases.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + + this.Key = key; + this._maxCount = maxCount; + this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + } + + internal RedisKey Key { get; } + public string Name => this.Key.ToString(); + + ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken: cancellationToken + ); + + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) + { + var primitive = new RedisSemaphorePrimitive(this.Key, this._maxCount, this._options.RedLockTimeouts); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null + ? new RedisDistributedSemaphoreHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; + } + } +} diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs new file mode 100644 index 00000000..43d666c5 --- /dev/null +++ b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Redis +{ + public sealed class RedisDistributedSemaphoreHandle : IDistributedLockHandle + { + private RedLockHandle? _innerHandle; + + internal RedisDistributedSemaphoreHandle(RedLockHandle innerHandle) + { + this._innerHandle = innerHandle; + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + + /// + /// Releases the lock asynchronously + /// + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } +} diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index b48877e2..be326cbe 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -69,10 +69,10 @@ public void TestKeepaliveProtectsFromIdleSessionKiller() this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); var @lock = this._lockProvider.CreateLock(nameof(TestKeepaliveProtectsFromIdleSessionKiller)); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.25)); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); var handle = @lock.Acquire(); - Thread.Sleep(TimeSpan.FromSeconds(1)); + Thread.Sleep(TimeSpan.FromSeconds(2)); Assert.DoesNotThrow(() => handle.Dispose()); } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 08228c45..8fd1fe4f 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -182,7 +182,6 @@ public void TestParallelism() Assert.Fail("Concurrent lock acquisitions"); } - // hang out for a bit to ensure concurrency await Task.Delay(TimeSpan.FromMilliseconds(10)); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index a02cdb5c..e4ff046b 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -19,6 +19,7 @@ public abstract class DistributedSemaphoreCoreTestCases this._semaphoreProvider.Dispose(); [Test] + [NonParallelizable] // timing-sensitive public void TestConcurrencyHandling() { const int MaxCount = 3; diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index 35a00cc0..849fa35c 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -23,14 +23,14 @@ public abstract class RedisExtensionTestCases [NonParallelizable] // timing-sensitive public async Task TestCanExtendLock() { - this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(0.3)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5))); + this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5))); var @lock = this._provider.CreateLock("lock"); await using var handle = await @lock.AcquireAsync(); var secondHandleTask = @lock.AcquireAsync().AsTask(); _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); + Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(1.5))); await handle.DisposeAsync(); diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 8d6c4aee..974f5068 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -28,6 +28,8 @@ public abstract class RedisSynchronizationCoreTestCases [Test] public void TestMajorityFaultingDatabasesCauseAcquireToThrow() { + CheckProviderCompatibility(); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); @@ -48,6 +50,8 @@ public void TestMajorityFaultingDatabasesCauseAcquireToThrow() [NonParallelizable] // timing-sensitive public async Task TestMajorityHangingDatabasesCauseAcquireToFail() { + CheckProviderCompatibility(); + using var @event = new ManualResetEventSlim(initialState: false); var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); MockDatabase(databases[1], () => { @event.Wait(); return true; }); @@ -66,6 +70,8 @@ public async Task TestMajorityHangingDatabasesCauseAcquireToFail() [Test] public void TestMajorityFaultingDatabasesCauseReleaseToThrow() { + CheckProviderCompatibility(); + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); var @lock = this._provider.CreateLock("lock"); @@ -80,6 +86,8 @@ public void TestMajorityFaultingDatabasesCauseReleaseToThrow() [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) { + CheckProviderCompatibility(); + var database = CreateDatabaseMock(); MockDatabase(database, () => { Thread.Sleep(50); return true; }); @@ -95,6 +103,8 @@ public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) [NonParallelizable] // timing-sensitive public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() { + CheckProviderCompatibility(); + using var @event = new ManualResetEventSlim(); var failDatabase = CreateDatabaseMock(); MockDatabase(failDatabase, () => { @event.Wait(); return false; }); @@ -130,6 +140,21 @@ private static void MockDatabase(Mock mockDatabase, Func return .Returns(() => RedisResult.Create(returns())); mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => (bool)RedisResult.Create(returns())); + mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); + } + + private static void CheckProviderCompatibility() + { + // The semaphore5 provider is not compatible with this test class because it will attempt to acquire locks upon creation + // which will fail due to our mocked DB setup. + if (typeof(TLockProvider).IsConstructedGenericType + && typeof(TLockProvider).GetGenericTypeDefinition() == typeof(TestingSemaphore5AsMutexProvider<,>)) + { + Assert.Pass("The provider is incompatible"); + } } } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index b92ce9f0..33c5f8ea 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -39,11 +39,11 @@ private RedisServer(int? port) ActiveServersByPort.Add(this.Port, this); } this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}"); - // Run an arbitrary command ensure that the db successfully spun up before - // we proceed (Connect seemingly can complete before that happens). This is - // particularly important for cross-process locking where the lock taker process + // Clean the db to ensure it is empty. Running an arbitrary command also ensures that + // the db successfully spun up before we proceed (Connect seemingly can complete before that happens). + // This is particularly important for cross-process locking where the lock taker process // assumes we've already started a server on certain ports. - this.Multiplexer.GetDatabase().KeyExists("test"); + this.Multiplexer.GetDatabase().Execute("flushall"); } public int ProcessId => this._command.ProcessId; diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs index 6c9138c3..7053e648 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -48,4 +48,23 @@ public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName public override string GetCrossProcessLockType(ReaderWriterLockType type) => $"{type}{nameof(RedisDistributedReaderWriterLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; } + + public sealed class TestingRedisDistributedSemaphoreProvider : TestingSemaphoreProvider> + where TDatabaseProvider : TestingRedisDatabaseProvider, new() + { + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) + { + var semaphore = new RedisDistributedSemaphore(name, maxCount, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) + .ToList() + .ForEach(db => db.KeyDelete(semaphore.Key)) + ); + return semaphore; + } + + public override string GetSafeName(string name) => new RedisDistributedSemaphore(name, 1, this.Strategy.DatabaseProvider.Databases).Name; + + public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedSemaphore)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; + } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index df5b6992..9ad1aa7d 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -33,7 +33,6 @@ public void Options(RedisDistributedLockOptionsBuilder options) options.Expiry(TimeSpan.FromSeconds(.2)) // the reader writer lock requires that the busy wait sleep time is shorter // than the expiry, so adjust for that - // todo should this be more automatic? .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 5d078d57..54623e5f 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -63,6 +63,12 @@ public class Core_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_Redi public class Core_Redis_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore1AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore1AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } @@ -72,8 +78,19 @@ public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDat public class RedisExtension_Redis_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedis2x1DatabaseProvider> { } public class RedisExtension_Redis_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedis3DatabaseProvider> { } public class RedisExtension_Redis_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } + public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } + public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } + public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } + public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } public class RedisSynchronizationCore_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } public class RedisSynchronizationCore_Redis_Redis3DatabaseTest : RedisSynchronizationCoreTestCases> { } + public class RedisSynchronizationCore_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } + public class RedisSynchronizationCore_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } + public class SemaphoreCore_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class SemaphoreCore_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class SemaphoreCore_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } } namespace Medallion.Threading.Tests.SqlServer diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index cbde99df..873e892b 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -26,8 +26,8 @@ public void TestName() public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; - Assert.Throws(() => new RedisDistributedReaderWriterLock(default, database)); - Assert.Throws(() => new RedisDistributedReaderWriterLock(default, new[] { database })); + Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, database)); + Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, new[] { database })); Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IDatabase)!)); Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IEnumerable)!)); Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database, null! })); diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs new file mode 100644 index 00000000..c2b82511 --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -0,0 +1,41 @@ +using Medallion.Threading.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public class RedisDistributedSemaphoreTest + { + [Test] + [Category("CI")] + public void TestName() + { + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedSemaphore(Name, 1, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + } + + [Test] + [Category("CI")] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, database)); + Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, new[] { database })); + Assert.Throws(() => new RedisDistributedSemaphore("key", 0, database)); + Assert.Throws(() => new RedisDistributedSemaphore("key", 0, new[] { database })); + Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); + Assert.Throws(() => new RedisDistributedSemaphore("key", -1, new[] { database })); + Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedSemaphore("key", 2, new[] { database, null! })); + Assert.Throws(() => new RedisDistributedSemaphore("key", 2, Enumerable.Empty())); + } + } +} diff --git a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs index 961be981..f28343f8 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Runtime.CompilerServices; using System.Text; namespace Medallion.Threading.Tests.Redis @@ -17,6 +18,7 @@ public void TestAllRedisScriptFieldsAreStatic() { var redisScriptFields = typeof(RedisScript<>).Assembly .GetTypes() + .Where(t => t.GetCustomAttribute() == null) .SelectMany(t => t.GetFields(BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)) .Where(f => f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == typeof(RedisScript<>)); foreach (var field in redisScriptFields) diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 5c50dd7e..70d31e23 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -85,6 +85,22 @@ public static int Main(string[] args) case "Write" + nameof(RedisDistributedReaderWriterLock) + "2x1": handle = AcquireRedisWriteLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) break; + case string _ when type.StartsWith(nameof(RedisDistributedSemaphore)): + { + var maxCount = type.EndsWith("1AsMutex") ? 1 + : type.EndsWith("5AsMutex") ? 5 + : throw new ArgumentException(type); + var serverCount = int.Parse(type.Substring(nameof(RedisDistributedSemaphore).Length, 1)); + handle = new RedisDistributedSemaphore( + name, + maxCount, + GetRedisDatabases(serverCount), + // in order to see abandonment work in a reasonable timeframe, use very short expiry + options => options.Expiry(TimeSpan.FromSeconds(1)) + .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)) + ).Acquire(); + break; + } default: Console.Error.WriteLine($"type: {type}"); return 123; From ed7b5f8725426dadf80954b607fbeab0399acd44 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 17:51:45 -0500 Subject: [PATCH 046/399] Fix API test --- DistributedLock.Tests/Tests/ApiTest.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 00098743..4975674e 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -67,12 +67,15 @@ public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) } private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() - .Where(t => t.IsPublic || t.IsNestedPublic) + .Where(IsInPublicApi) #if DEBUG .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) #endif ; private static string CurrentFilePath([CallerFilePath] string filePath = "") => filePath; + + private static bool IsInPublicApi(Type type) => type.IsPublic + || ((type.IsNestedPublic || type.IsNestedFamily || type.IsNestedFamORAssem) && IsInPublicApi(type.DeclaringType!)); } } From 3a875dfccf6024639c9e50e9cb4a266dd9c32c18 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 18:16:29 -0500 Subject: [PATCH 047/399] Try to use dotnet build through appveyor --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index db93e1d2..0df4aea6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,8 +6,9 @@ image: before_build: - nuget restore -build: - verbosity: minimal + +build_script: + - dotnet build DistributedLock.sln -c Release # only test categories that don't depend on external things test: From 935a2b603cd14c4dff8054991a7f4e8a90bc3723 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 18:35:29 -0500 Subject: [PATCH 048/399] Build fixes --- DistributedLock.Redis/RedisDistributedLock.cs | 13 +++++++++++++ DistributedLock.Redis/RedisDistributedLockHandle.cs | 1 - .../RedisDistributedReaderWriterLock.cs | 10 +++++++++- DistributedLock.Redis/RedisDistributedSemaphore.cs | 10 ++++++++++ .../RedisDistributedSemaphoreHandle.cs | 3 +++ appveyor.yml | 3 --- 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index 7258a23d..ce0cd677 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -19,11 +19,17 @@ public sealed partial class RedisDistributedLock : IInternalDistributedLock _databases; private readonly RedisDistributedLockOptions _options; + /// + /// Constructs a lock named using the provided and . + /// public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } + /// + /// Constructs a lock named using the provided and . + /// public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } @@ -35,7 +41,14 @@ public RedisDistributedLock(RedisKey key, IEnumerable databases, Acti this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); } + /// + /// The Redis key used to implement the lock + /// public RedisKey Key { get; } + + /// + /// Implements + /// public string Name => this.Key.ToString(); ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs index 3a57ce10..8dcaf2aa 100644 --- a/DistributedLock.Redis/RedisDistributedLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -1,6 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; -using StackExchange.Redis; using System; using System.Collections.Generic; using System.Linq; diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index e1a54aab..73a4b269 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -4,7 +4,6 @@ using StackExchange.Redis; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; using System.Threading; @@ -20,11 +19,17 @@ public sealed partial class RedisDistributedReaderWriterLock : IInternalDistribu private readonly IReadOnlyList _databases; private readonly RedisDistributedLockOptions _options; + /// + /// Constructs a lock named using the provided and . + /// public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) : this(name, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } + /// + /// Constructs a lock named using the provided and . + /// public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) { if (name == null) { throw new ArgumentNullException(nameof(name)); } @@ -48,6 +53,9 @@ public RedisDistributedReaderWriterLock(string name, IEnumerable data internal RedisKey ReaderKey { get; } internal RedisKey WriterKey { get; } + /// + /// Implements + /// public string Name { get; } ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index 6050c805..cb0ad5f5 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -20,11 +20,17 @@ public sealed partial class RedisDistributedSemaphore : IInternalDistributedSema private readonly IReadOnlyList _databases; private readonly RedisDistributedLockOptions _options; + /// + /// Constructs a semaphore named using the provided , , and . + /// public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) : this(key, maxCount, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } + /// + /// Constructs a semaphore named using the provided , , and . + /// public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable databases, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } @@ -39,6 +45,10 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable + /// Implements + /// public string Name => this.Key.ToString(); ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs index 43d666c5..d7e9da9f 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs @@ -9,6 +9,9 @@ namespace Medallion.Threading.Redis { + /// + /// Implements for a + /// public sealed class RedisDistributedSemaphoreHandle : IDistributedLockHandle { private RedLockHandle? _innerHandle; diff --git a/appveyor.yml b/appveyor.yml index 0df4aea6..b9361417 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,6 @@ image: - Visual Studio 2019 - Ubuntu -before_build: - - nuget restore - build_script: - dotnet build DistributedLock.sln -c Release From 2ce0b0456a7deab6490e53601ea734d9472d4237 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 23 Dec 2020 22:26:28 -0500 Subject: [PATCH 049/399] Add test for console logs --- DistributedLock.Tests/Tests/ApiTest.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 4975674e..9012efa5 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -66,6 +66,19 @@ public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) } } + [Test] + public void TestLibraryFilesDoNotWriteToConsole() + { + var projectDirectory = Path.GetDirectoryName(Path.GetDirectoryName(CurrentFilePath())); + var solutionDirectory = Path.GetDirectoryName(projectDirectory!); + var libraryCsFiles = Directory.GetFiles(solutionDirectory, "*.cs", SearchOption.AllDirectories) + .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); + Assert.IsEmpty( + libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) + .Select(Path.GetFileName) + ); + } + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() .Where(IsInPublicApi) #if DEBUG From 897df2079a43f2ebacf15c00ce148e3e742d51d0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 31 Dec 2020 16:24:11 -0500 Subject: [PATCH 050/399] Add provider interfaces and implementations (#13). --- ...LeaseDistributedSynchronizationProvider.cs | 32 ++++++ .../DistributedLockProviderExtensions.cs | 64 ++++-------- ...butedReaderWriterLockProviderExtensions.cs | 69 +++++++++++++ .../DistributedSemaphoreProviderExtensions.cs | 41 ++++++++ ...eableReaderWriterLockProviderExtensions.cs | 41 ++++++++ .../IDistributedLockProvider.cs | 26 +---- .../IDistributedReaderWriterLockProvider.cs | 15 +++ .../IDistributedSemaphoreProvider.cs | 15 +++ ...utedUpgradeableReaderWriterLockProvider.cs | 15 +++ .../FileDistributedSynchronizationProvider.cs | 32 ++++++ .../PostgresDistributedLock.cs | 2 +- ...tgresDistributedSynchronizationProvider.cs | 55 +++++++++++ DistributedLock.Redis/RedisDistributedLock.cs | 12 ++- .../RedisDistributedReaderWriterLock.cs | 4 +- .../RedisDistributedSemaphore.cs | 4 +- ...RedisDistributedSynchronizationProvider.cs | 63 ++++++++++++ .../SqlDistributedSynchronizationProvider.cs | 84 ++++++++++++++++ DistributedLock.Tests/Tests/ApiTest.cs | 25 +++++ ...eDistributedSynchronizationProviderTest.cs | 33 +++++++ ... DistributedLockProviderExtensionsTest.cs} | 23 ++--- ...eDistributedSynchronizationProviderTest.cs | 42 ++++++++ ...sDistributedSynchronizationProviderTest.cs | 40 ++++++++ .../RedisDistributedReaderWriterLockTest.cs | 5 +- ...sDistributedSynchronizationProviderTest.cs | 52 ++++++++++ ...lDistributedSynchronizationProviderTest.cs | 51 ++++++++++ ...eDistributedSynchronizationProviderTest.cs | 35 +++++++ .../EventWaitHandleDistributedLock.cs | 2 +- ...andleDistributedSynchronizationProvider.cs | 43 ++++++++ DistributedLockCodeGen/GenerateProviders.cs | 99 +++++++++++++++++++ 29 files changed, 935 insertions(+), 89 deletions(-) create mode 100644 DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs create mode 100644 DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs create mode 100644 DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs create mode 100644 DistributedLock.Core/IDistributedReaderWriterLockProvider.cs create mode 100644 DistributedLock.Core/IDistributedSemaphoreProvider.cs create mode 100644 DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs create mode 100644 DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs rename DistributedLock.Tests/Tests/Core/{DistributedLockExtensionsTest.cs => DistributedLockProviderExtensionsTest.cs} (59%) create mode 100644 DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs create mode 100644 DistributedLockCodeGen/GenerateProviders.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..721f0c07 --- /dev/null +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs @@ -0,0 +1,32 @@ +using Azure.Storage.Blobs; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Azure +{ + /// + /// Implements for + /// + public sealed class AzureBlobLeaseDistributedSynchronizationProvider : IDistributedLockProvider + { + private readonly BlobContainerClient _blobContainerClient; + private readonly Action? _options; + + /// + /// Constructs a provider that scopes blobs within the provided and uses the provided . + /// + public AzureBlobLeaseDistributedSynchronizationProvider(BlobContainerClient blobContainerClient, Action? options = null) + { + this._blobContainerClient = blobContainerClient ?? throw new ArgumentNullException(nameof(blobContainerClient)); + this._options = options; + } + + /// + /// Constructs an with the given . + /// + public AzureBlobLeaseDistributedLock CreateLock(string name) => new AzureBlobLeaseDistributedLock(this._blobContainerClient, name, this._options); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + } +} diff --git a/DistributedLock.Core/DistributedLockProviderExtensions.cs b/DistributedLock.Core/DistributedLockProviderExtensions.cs index 5cfe1c7c..a4fbfdde 100644 --- a/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -1,65 +1,41 @@ -using System; +// AUTO-GENERATED +using System; using System.Threading; using System.Threading.Tasks; namespace Medallion.Threading { /// - /// Productivity helper methods for + /// Productivity helper methods for /// public static class DistributedLockProviderExtensions { - // todo review hiding of these methods vs. implementation-specific APIs - /// - /// Equivalent to calling and then - /// + /// Equivalent to calling and then + /// . /// - public static IDistributedLockHandle? TryAcquire( - this IDistributedLockProvider provider, - string name, - TimeSpan timeout = default, - CancellationToken cancellationToken = default, - bool exactName = false) => - CreateLock(provider, name, exactName).TryAcquire(timeout, cancellationToken); + public static IDistributedLockHandle? TryAcquireLock(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquire(timeout, cancellationToken); /// - /// Equivalent to calling and then - /// + /// Equivalent to calling and then + /// . /// - public static IDistributedLockHandle Acquire( - this IDistributedLockProvider provider, - string name, - TimeSpan? timeout = default, - CancellationToken cancellationToken = default, - bool exactName = false) => - CreateLock(provider, name, exactName).Acquire(timeout, cancellationToken); + public static IDistributedLockHandle AcquireLock(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).Acquire(timeout, cancellationToken); /// - /// Equivalent to calling and then - /// + /// Equivalent to calling and then + /// . /// - public static ValueTask TryAcquireAsync( - this IDistributedLockProvider provider, - string name, - TimeSpan timeout = default, - CancellationToken cancellationToken = default, - bool exactName = false) => - CreateLock(provider, name, exactName).TryAcquireAsync(timeout, cancellationToken); + public static ValueTask TryAcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquireAsync(timeout, cancellationToken); /// - /// Equivalent to calling and then - /// + /// Equivalent to calling and then + /// . /// - public static ValueTask AcquireAsync( - this IDistributedLockProvider provider, - string name, - TimeSpan? timeout = default, - CancellationToken cancellationToken = default, - bool exactName = false) => - CreateLock(provider, name, exactName).AcquireAsync(timeout, cancellationToken); - - private static IDistributedLock CreateLock(IDistributedLockProvider provider, string name, bool exactName) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name, exactName); + public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); } -} +} \ No newline at end of file diff --git a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs new file mode 100644 index 00000000..7994765e --- /dev/null +++ b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -0,0 +1,69 @@ +// AUTO-GENERATED +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading +{ + /// + /// Productivity helper methods for + /// + public static class DistributedReaderWriterLockProviderExtensions + { + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle? TryAcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle AcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLockAsync(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLockAsync(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle? TryAcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle AcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLockAsync(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs new file mode 100644 index 00000000..7fc36cc5 --- /dev/null +++ b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -0,0 +1,41 @@ +// AUTO-GENERATED +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading +{ + /// + /// Productivity helper methods for + /// + public static class DistributedSemaphoreProviderExtensions + { + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle? TryAcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquire(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockHandle AcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).Acquire(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquireAsync(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs new file mode 100644 index 00000000..344364e5 --- /dev/null +++ b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -0,0 +1,41 @@ +// AUTO-GENERATED +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading +{ + /// + /// Productivity helper methods for + /// + public static class DistributedUpgradeableReaderWriterLockProviderExtensions + { + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockUpgradeableHandle? TryAcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLock(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken); + + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLockAsync(timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedLockProvider.cs b/DistributedLock.Core/IDistributedLockProvider.cs index 51dd4be0..70e6f0d0 100644 --- a/DistributedLock.Core/IDistributedLockProvider.cs +++ b/DistributedLock.Core/IDistributedLockProvider.cs @@ -1,7 +1,6 @@ -namespace Medallion.Threading +// AUTO-GENERATED +namespace Medallion.Threading { - // todo implementations - /// /// Acts as a factory for instances of a certain type. This interface may be /// easier to use than in dependency injection scenarios. @@ -9,23 +8,8 @@ public interface IDistributedLockProvider { /// - /// Constructs an instance with the given . Unless - /// is set to true, will be used to - /// ensure that the name will work with the underlying locking system. + /// Constructs an instance with the given . /// - IDistributedLock CreateLock(string name, bool exactName = false); - - // TODO probably get rid of all GetSafeName APIs; they're not interesting if you can get the lock name from the lock and exactName is off by default - /// - /// Given an arbitrary , determines whether can be safely - /// used as-is by the underlying provider (in other words, if it is safe to call - /// with exactName: true). - /// - /// If is safe to use, returns . Otherwise, returns a new name which - /// is safe to use and incorporates as much of the uniqueness of as possible. For example, this - /// may be a hash of that fits within the length and character requirements for the underlying - /// locking mechanism. - /// - string GetSafeLockName(string name); + IDistributedLock CreateLock(string name); } -} +} \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs b/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs new file mode 100644 index 00000000..f5344d24 --- /dev/null +++ b/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs @@ -0,0 +1,15 @@ +// AUTO-GENERATED +namespace Medallion.Threading +{ + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface IDistributedReaderWriterLockProvider + { + /// + /// Constructs an instance with the given . + /// + IDistributedReaderWriterLock CreateReaderWriterLock(string name); + } +} \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedSemaphoreProvider.cs b/DistributedLock.Core/IDistributedSemaphoreProvider.cs new file mode 100644 index 00000000..b68d8ca3 --- /dev/null +++ b/DistributedLock.Core/IDistributedSemaphoreProvider.cs @@ -0,0 +1,15 @@ +// AUTO-GENERATED +namespace Medallion.Threading +{ + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface IDistributedSemaphoreProvider + { + /// + /// Constructs an instance with the given . + /// + IDistributedSemaphore CreateSemaphore(string name, int maxCount); + } +} \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs new file mode 100644 index 00000000..47c5d66c --- /dev/null +++ b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs @@ -0,0 +1,15 @@ +// AUTO-GENERATED +namespace Medallion.Threading +{ + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface IDistributedUpgradeableReaderWriterLockProvider: IDistributedReaderWriterLockProvider + { + /// + /// Constructs an instance with the given . + /// + IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLock(string name); + } +} \ No newline at end of file diff --git a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..d4682382 --- /dev/null +++ b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.FileSystem +{ + /// + /// Implements for + /// + public sealed class FileDistributedSynchronizationProvider : IDistributedLockProvider + { + private readonly DirectoryInfo _lockFileDirectory; + + /// + /// Constructs a provider that scopes lock files within the provided . + /// + public FileDistributedSynchronizationProvider(DirectoryInfo lockFileDirectory) + { + this._lockFileDirectory = lockFileDirectory ?? throw new ArgumentNullException(nameof(lockFileDirectory)); + } + + /// + /// Constructs a with the given . + /// + public FileDistributedLock CreateLock(string name) => new FileDistributedLock(this._lockFileDirectory, name); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + } +} diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index 11df873a..fee093dc 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -52,7 +52,7 @@ private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock string IDistributedLock.Name => this.Key.ToString(); /// - /// Equivalent to + /// TODO probably remove this API /// public static PostgresAdvisoryLockKey GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true); diff --git a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..ca127640 --- /dev/null +++ b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Medallion.Threading.Postgres +{ + /// + /// Implements for and + /// for . + /// + public sealed class PostgresDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider + { + private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; + + /// + /// Constructs a provider which connects to Postgres using the provided and . + /// + public PostgresDistributedSynchronizationProvider(string connectionString, Action? options = null) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = key => new PostgresDistributedLock(key, connectionString, options); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connectionString, options); + } + + /// + /// Constructs a provider which connects to Postgres using the provided . + /// + public PostgresDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = key => new PostgresDistributedLock(key, connection); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); + } + + /// + /// Creates a with the provided . + /// + public PostgresDistributedLock CreateLock(PostgresAdvisoryLockKey key) => this._lockFactory(key); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => + this.CreateLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); + + /// + /// Creates a with the provided . + /// + public PostgresDistributedReaderWriterLock CreateReaderWriterLock(PostgresAdvisoryLockKey key) => this._readerWriterLockFactory(key); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); + } +} diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index ce0cd677..a8634b01 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -33,14 +33,20 @@ public RedisDistributedLock(RedisKey key, IDatabase database, Action databases, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } - this._databases = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); - if (this._databases.Count == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } - if (this._databases.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + this._databases = ValidateDatabases(databases); this.Key = key; this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); } + internal static IReadOnlyList ValidateDatabases(IEnumerable databases) + { + var databasesArray = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); + if (databasesArray.Length == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } + if (databasesArray.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + return databasesArray; + } + /// /// The Redis key used to implement the lock /// diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index 73a4b269..654b9b89 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -33,9 +33,7 @@ public RedisDistributedReaderWriterLock(string name, IDatabase database, Action< public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) { if (name == null) { throw new ArgumentNullException(nameof(name)); } - this._databases = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); - if (this._databases.Count == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } - if (this._databases.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + this._databases = RedisDistributedLock.ValidateDatabases(databases); this.ReaderKey = name + ".readers"; this.WriterKey = name + ".writer"; diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index cb0ad5f5..2967e660 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -35,9 +35,7 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable + /// Implements for , + /// for , + /// and for . + /// + public sealed class RedisDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider + { + private readonly IReadOnlyList _databases; + private readonly Action? _options; + + /// + /// Constructs a that connects to the provided + /// and uses the provided . + /// + public RedisDistributedSynchronizationProvider(IDatabase database, Action? options = null) + : this(new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) + { + } + + /// + /// Constructs a that connects to the provided + /// and uses the provided . + /// + public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) + { + this._databases = RedisDistributedLock.ValidateDatabases(databases); + this._options = options; + } + + /// + /// Creates a using the given . + /// + public RedisDistributedLock CreateLock(RedisKey key) => new RedisDistributedLock(key, this._databases, this._options); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Creates a using the given . + /// + public RedisDistributedReaderWriterLock CreateReaderWriterLock(string name) => + new RedisDistributedReaderWriterLock(name, this._databases, this._options); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); + + /// + /// Creates a using the provided and . + /// + public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases, this._options); + + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => + this.CreateSemaphore(name, maxCount); + } +} diff --git a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..c21520b0 --- /dev/null +++ b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.SqlServer +{ + /// + /// Implements for , + /// for , + /// and for . + /// + public sealed class SqlDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider, IDistributedSemaphoreProvider + { + private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; + private readonly Func _semaphoreFactory; + + /// + /// Constructs a provider that connects with and . + /// + public SqlDistributedSynchronizationProvider(string connectionString, Action? options = null) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connectionString, options, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connectionString, options, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connectionString, options); + } + + /// + /// Constructs a provider that connects with . + /// + public SqlDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connection, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connection, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connection); + } + + /// + /// Constructs a provider that connects with . + /// + public SqlDistributedSynchronizationProvider(IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, transaction, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, transaction, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, transaction); + } + + /// + /// Constructs an instance of with the provided . Unless + /// is specified, invalid applock names will be escaped/hashed. + /// + public SqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Constructs an instance of with the provided . Unless + /// is specified, invalid applock names will be escaped/hashed. + /// + public SqlDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); + + IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); + + /// + /// Constructs an instance of with the provided and . + /// + public SqlDistributedSemaphore CreateSemaphore(string name, int maxCount) => this._semaphoreFactory(name, maxCount); + + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); + } +} diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 9012efa5..875f588c 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -48,6 +48,31 @@ public void TestPublicApisAreSealed(AssemblyName assemblyName) } } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestProviderApisAreAvailable(AssemblyName assemblyName) + { + var providerTypesToProvidedTypes = typeof(IDistributedLockProvider).Assembly + .GetTypes() + .Where(t => t.IsInterface && t.IsPublic && t.Name.EndsWith("Provider")) + .ToDictionary(t => t, t => t.GetMethods().Single(m => m.Name.StartsWith("Create")).ReturnType); + + var types = GetPublicTypes(Assembly.Load(assemblyName)); + + foreach (var kvp in providerTypesToProvidedTypes) + { + var providers = types.Where(t => !t.IsInterface && kvp.Key.IsAssignableFrom(t)).ToArray(); + var provided = types.Where(t => !t.IsInterface && kvp.Value.IsAssignableFrom(t)).ToArray(); + CollectionAssert.AreEquivalent( + provided, + providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType)); + + foreach (var provider in providers) + { + Assert.That(provider.Name, Does.EndWith("DistributedSynchronizationProvider")); + } + } + } + [TestCaseSource(nameof(DistributedLockAssemblies))] public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) { diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..df77a770 --- /dev/null +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs @@ -0,0 +1,33 @@ +using Azure.Storage.Blobs; +using Medallion.Threading.Azure; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Azure +{ + public class AzureBlobLeaseDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new AzureBlobLeaseDistributedSynchronizationProvider(null!)); + } + + [Test] + public async Task BasicTest() + { + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + + var container = new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName); + var provider = new AzureBlobLeaseDistributedSynchronizationProvider(container); + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/Core/DistributedLockExtensionsTest.cs b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs similarity index 59% rename from DistributedLock.Tests/Tests/Core/DistributedLockExtensionsTest.cs rename to DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index ab45599d..4c66befc 100644 --- a/DistributedLock.Tests/Tests/Core/DistributedLockExtensionsTest.cs +++ b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -5,15 +5,16 @@ namespace Medallion.Threading.Tests.Core { - public class DistributedLockExtensionsTest + // Note: we don't bother testing the extensions for the other providers since they are all auto-generated by the same component. + public class DistributedLockProviderExtensionsTest { [Test] public void TestArgumentValidation() { - Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireAsync(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.TryAcquire(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.AcquireAsync(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.Acquire(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLockAsync(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLock(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireLockAsync(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireLock(null!, "name")); } [Test, Combinatorial] @@ -21,7 +22,7 @@ public void TestCallThrough([Values] bool isTry, [Values] bool isAsync) { var mockLock = new Mock(); var mockProvider = new Mock(); - mockProvider.Setup(p => p.CreateLock("name", false)) + mockProvider.Setup(p => p.CreateLock("name")) .Returns(mockLock.Object) .Verifiable(); @@ -29,22 +30,22 @@ public void TestCallThrough([Values] bool isTry, [Values] bool isAsync) { if (isAsync) { - Test(p => p.TryAcquireAsync("name", default, default, false), l => l.TryAcquireAsync(default, default)); + Test(p => p.TryAcquireLockAsync("name", default, default), l => l.TryAcquireAsync(default, default)); } else { - Test(p => p.TryAcquire("name", default, default, false), l => l.TryAcquire(default, default)); + Test(p => p.TryAcquireLock("name", default, default), l => l.TryAcquire(default, default)); } } else { if (isAsync) { - Test(p => p.AcquireAsync("name", default, default, false), l => l.AcquireAsync(default, default)); + Test(p => p.AcquireLockAsync("name", default, default), l => l.AcquireAsync(default, default)); } else { - Test(p => p.Acquire("name", default, default, false), l => l.Acquire(default, default)); + Test(p => p.AcquireLock("name", default, default), l => l.Acquire(default, default)); } } @@ -54,7 +55,7 @@ void Test( { providerFunction.Compile()(mockProvider.Object); - mockProvider.Verify(p => p.CreateLock("name", false), Times.Once); + mockProvider.Verify(p => p.CreateLock("name"), Times.Once); mockLock.Verify(lockFunction, Times.Once()); } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..ca2252ad --- /dev/null +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs @@ -0,0 +1,42 @@ +using Medallion.Threading.FileSystem; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.FileSystem +{ + public class FileDistributedSynchronizationProviderTest + { + private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedSynchronizationProviderTest), TargetFramework.Current); + private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); + + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (Directory.Exists(LockFileDirectory)) + { + Directory.Delete(LockFileDirectory, recursive: true); + } + } + + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new FileDistributedSynchronizationProvider(null!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new FileDistributedSynchronizationProvider(LockFileDirectoryInfo); + await using (await provider.AcquireLockAsync("ProviderBasicTest")) + { + await using var handle = await provider.TryAcquireLockAsync("ProviderBasicTest"); + Assert.IsNull(handle); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..c0ba80c5 --- /dev/null +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -0,0 +1,40 @@ +using Medallion.Threading.Postgres; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Postgres +{ + public class PostgresDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(IDbConnection)!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new PostgresDistributedSynchronizationProvider(TestingPostgresDb.ConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) + { + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 873e892b..131538f3 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -57,14 +57,15 @@ public async Task TestCanExtendReadLock() } [Test] + [NonParallelizable] // timing-sensitive public async Task TestReadLockAbandonment() { var @lock = new RedisDistributedReaderWriterLock( TestHelper.UniqueName, RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), - o => o.Expiry(TimeSpan.FromSeconds(0.3)) + o => o.Expiry(TimeSpan.FromSeconds(1)) .ExtensionCadence(TimeSpan.FromSeconds(0.1)) - .BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5)) + .BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(50)) ); await AcquireReadLockAsync(); diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..4134b41b --- /dev/null +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs @@ -0,0 +1,52 @@ +using Medallion.Threading.Redis; +using NUnit.Framework; +using StackExchange.Redis; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public class RedisDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(new[] { default(IDatabase)! })); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(Array.Empty())); + } + + [Test] + public async Task BasicTest() + { + var provider = new RedisDistributedSynchronizationProvider(RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase()); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) + { + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); + } + + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); + + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..b6b610fa --- /dev/null +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs @@ -0,0 +1,51 @@ +using Medallion.Threading.SqlServer; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.SqlServer +{ + public class SqlDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbConnection)!)); + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbTransaction)!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new SqlDistributedSynchronizationProvider(TestingSqlServerDb.ConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) + { + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); + } + + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); + + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..47954c46 --- /dev/null +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs @@ -0,0 +1,35 @@ +using Medallion.Threading.WaitHandles; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.WaitHandles +{ + public class WaitHandleDistributedSynchronizationProviderTest + { + [Test] + public async Task BasicTest() + { + var provider = new WaitHandleDistributedSynchronizationProvider(); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); + + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); + } + } + } +} diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index c3cf29e8..159e4a29 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -39,7 +39,7 @@ public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCad public string Name { get; } /// - /// Equivalent to + /// TODO probably remove this API /// public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..dc86f8fa --- /dev/null +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.WaitHandles +{ + /// + /// Implements for + /// and for . + /// + public sealed class WaitHandleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedSemaphoreProvider + { + private readonly TimeSpan? _abandonmentCheckCadence; + + /// + /// Constructs a using the provided . + /// + public WaitHandleDistributedSynchronizationProvider(TimeSpan? abandonmentCheckCadence = null) + { + this._abandonmentCheckCadence = abandonmentCheckCadence; + } + + /// + /// Creates a with the given . Unless + /// is specified, invalid wait handle names will be escaped/hashed. + /// + public EventWaitHandleDistributedLock CreateLock(string name, bool exactName = false) => + new EventWaitHandleDistributedLock(name, this._abandonmentCheckCadence, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Creates a with the given + /// and . Unless is specified, invalid wait + /// handle names will be escaped/hashed. + /// + public WaitHandleDistributedSemaphore CreateSemaphore(string name, int maxCount, bool exactName = false) => + new WaitHandleDistributedSemaphore(name, maxCount, this._abandonmentCheckCadence, exactName); + + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => + this.CreateSemaphore(name, maxCount); + } +} diff --git a/DistributedLockCodeGen/GenerateProviders.cs b/DistributedLockCodeGen/GenerateProviders.cs new file mode 100644 index 00000000..fa7cb8c9 --- /dev/null +++ b/DistributedLockCodeGen/GenerateProviders.cs @@ -0,0 +1,99 @@ +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; + +namespace DistributedLockCodeGen +{ + [Category("CI")] + public class GenerateProviders + { + public static readonly IReadOnlyList Interfaces = new[] + { + "IDistributedLock", + "IDistributedReaderWriterLock", + "IDistributedUpgradeableReaderWriterLock", + "IDistributedSemaphore" + }; + + [TestCaseSource(nameof(Interfaces))] + public void GenerateProviderInterfaceAndExtensions(string interfaceName) + { + var interfaceFile = Directory.GetFiles(CodeGenHelpers.SolutionDirectory, interfaceName + ".cs", SearchOption.AllDirectories) + .Single(); + var providerInterfaceName = interfaceName + "Provider"; + + var createMethodName = $"Create{interfaceName.Replace("IDistributed", string.Empty)}"; + var providerInterfaceCode = $@"// AUTO-GENERATED +namespace Medallion.Threading +{{ + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface {providerInterfaceName}{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)} + {{ + /// + /// Constructs an instance with the given . + /// + {interfaceName} {createMethodName}(string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}); + }} +}}"; + + var interfaceMethods = Regex.Matches( + File.ReadAllText(interfaceFile), + @"(?\S+) (?\S+)\((?((?\S*) (?\w+)[^,)]*(\, )?)*)\);", + RegexOptions.ExplicitCapture + ); + var extensionMethodBodies = interfaceMethods.Cast() + .Select(m => +$@" /// + /// Equivalent to calling and then + /// ().Select(c => c.Value))})"" />. + /// + public static {m.Groups["returnType"].Value} {GetExtensionMethodName(m.Groups["name"].Value)}(this {providerInterfaceName} provider, string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => + (provider ?? throw new ArgumentNullException(nameof(provider))).{createMethodName}(name{(interfaceName.Contains("Semaphore") ? ", maxCount" : string.Empty)}).{m.Groups["name"].Value}({string.Join(", ", m.Groups["parameterName"].Captures.Cast().Select(c => c.Value))});" + ); + + var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; + var providerExtensionsCode = $@"// AUTO-GENERATED +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading +{{ + /// + /// Productivity helper methods for + /// + public static class {providerExtensionsName} + {{ +{string.Join(Environment.NewLine + Environment.NewLine, extensionMethodBodies)} + }} +}}"; + + var changes = new[] + { + (name: providerInterfaceName, code: providerInterfaceCode), + (name: providerExtensionsName, code: providerExtensionsCode) + } + .Select(t => (file: Path.Combine(Path.GetDirectoryName(interfaceFile)!, t.name + ".cs"), t.code)) + .Select(t => (t.file, t.code, originalCode: File.Exists(t.file) ? File.ReadAllText(t.file) : string.Empty)) + .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) + .ToList(); + changes.ForEach(t => File.WriteAllText(t.file, t.code)); + Assert.IsEmpty(changes.Select(t => t.file)); + + string GetExtensionMethodName(string interfaceMethodName) => + Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$") + // make it more specific to differentiate when one concrete provider implements multiple provider interfaces + ? interfaceMethodName.Replace("Async", string.Empty) + + interfaceName.Replace("IDistributed", string.Empty) + + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) + : interfaceMethodName; + } + } +} From 3c4ceb2409a0297e789e2016436b571bb112602c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 31 Dec 2020 16:33:50 -0500 Subject: [PATCH 051/399] Added support for debugging via sourcelink (#57) --- DistributedLock.Azure/DistributedLock.Azure.csproj | 3 +++ DistributedLock.Core/DistributedLock.Core.csproj | 7 ++++++- .../DistributedLock.FileSystem.csproj | 3 +++ DistributedLock.Postgres/DistributedLock.Postgres.csproj | 3 +++ DistributedLock.Redis/DistributedLock.Redis.csproj | 3 +++ DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 3 +++ .../DistributedLock.WaitHandles.csproj | 3 +++ DistributedLock/DistributedLock.csproj | 5 +++++ 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index f4cf00d1..48c2ca2a 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -40,6 +42,7 @@ + diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 7e800065..a8662d80 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -45,5 +47,8 @@ - + + + + \ No newline at end of file diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index f779bf64..eacde210 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -46,5 +48,6 @@ all + \ No newline at end of file diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 33408098..035e063d 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -40,6 +42,7 @@ + diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 81b8ade3..03858e1e 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -47,5 +49,6 @@ all + \ No newline at end of file diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index f56f4022..935b99a7 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -40,6 +42,7 @@ + diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index f31f5909..047f0d58 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -30,6 +30,8 @@ True True + + embedded @@ -40,6 +42,7 @@ + diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index a06de9e2..22cba909 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -34,6 +34,8 @@ True True + + embedded @@ -51,4 +53,7 @@ + + + \ No newline at end of file From 466df500c7de79532253fe7014795892fa389fe8 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 31 Dec 2020 21:50:19 -0500 Subject: [PATCH 052/399] Fix test namespace --- .../Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 55593513..730d441b 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles { [Category("CIWindows")] public class WaitHandleDistributedSemaphoreTest From a4ef576323cb757a2a35cd0dffc704a74ff77ff5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 2 Jan 2021 14:59:35 -0500 Subject: [PATCH 053/399] Copy packages to publish folder for easy publishing --- DistributedLock.Azure/DistributedLock.Azure.csproj | 6 ++++++ DistributedLock.Core/DistributedLock.Core.csproj | 6 ++++++ .../DistributedLock.FileSystem.csproj | 6 ++++++ DistributedLock.Postgres/DistributedLock.Postgres.csproj | 6 ++++++ DistributedLock.Redis/DistributedLock.Redis.csproj | 6 ++++++ DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 6 ++++++ .../DistributedLock.WaitHandles.csproj | 6 ++++++ DistributedLock/DistributedLock.csproj | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index 48c2ca2a..3785853c 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -48,4 +48,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index a8662d80..2e979a3e 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -51,4 +51,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index eacde210..1bfa1f41 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -50,4 +50,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 035e063d..725956e2 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -48,4 +48,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 03858e1e..68afb8f8 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -51,4 +51,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 935b99a7..38b4807f 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -48,4 +48,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 047f0d58..c4171d9b 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -48,4 +48,10 @@ + + + + + \ No newline at end of file diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 22cba909..9d2bcd4f 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -56,4 +56,10 @@ + + + + + \ No newline at end of file From 53c6c7644be66160ac0d280525176c5f3ee1bd54 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 2 Jan 2021 15:44:38 -0500 Subject: [PATCH 054/399] Fix package generation to have proper dependency bounds between Core and other packages. --- CopyPackageToPublishDirectory.targets | 7 +++++++ .../DistributedLock.Azure.csproj | 9 +++----- .../DistributedLock.Core.csproj | 6 +----- .../DistributedLock.FileSystem.csproj | 7 ++----- .../DistributedLock.Postgres.csproj | 7 ++----- .../DistributedLock.Redis.csproj | 7 ++----- .../DistributedLock.SqlServer.csproj | 7 ++----- .../DistributedLock.WaitHandles.csproj | 7 ++----- DistributedLock.sln | 8 ++++++- DistributedLock/DistributedLock.csproj | 6 +----- ...stributedLockCoreDependencyVersion.targets | 21 +++++++++++++++++++ 11 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 CopyPackageToPublishDirectory.targets create mode 100644 FixDistributedLockCoreDependencyVersion.targets diff --git a/CopyPackageToPublishDirectory.targets b/CopyPackageToPublishDirectory.targets new file mode 100644 index 00000000..619b08c6 --- /dev/null +++ b/CopyPackageToPublishDirectory.targets @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index 3785853c..45b53e09 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -42,16 +42,13 @@ - + - - - - + + \ No newline at end of file diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 2e979a3e..d4a3b963 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -52,9 +52,5 @@ - - - - + \ No newline at end of file diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 1bfa1f41..b7c42227 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -51,9 +51,6 @@ - - - - + + \ No newline at end of file diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 725956e2..db18b068 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -49,9 +49,6 @@ - - - - + + \ No newline at end of file diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 68afb8f8..b1f37aac 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -52,9 +52,6 @@ - - - - + + \ No newline at end of file diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 38b4807f..2944faa0 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -49,9 +49,6 @@ - - - - + + \ No newline at end of file diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index c4171d9b..36f085e9 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -49,9 +49,6 @@ - - - - + + \ No newline at end of file diff --git a/DistributedLock.sln b/DistributedLock.sln index 570b5008..76250022 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -23,7 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Azure", "Di EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.FileSystem", "DistributedLock.FileSystem\DistributedLock.FileSystem.csproj", "{6B0DBD7E-3A43-4FED-82BA-9927360E1D92}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.Redis", "DistributedLock.Redis\DistributedLock.Redis.csproj", "{8ADAA171-8373-432E-8D2B-3DA73E35EB76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Redis", "DistributedLock.Redis\DistributedLock.Redis.csproj", "{8ADAA171-8373-432E-8D2B-3DA73E35EB76}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D14FE348-E866-4784-8345-DD15FB697E4E}" + ProjectSection(SolutionItems) = preProject + CopyPackageToPublishDirectory.targets = CopyPackageToPublishDirectory.targets + FixDistributedLockCoreDependencyVersion.targets = FixDistributedLockCoreDependencyVersion.targets + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 9d2bcd4f..e7ba4c08 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -57,9 +57,5 @@ - - - - + \ No newline at end of file diff --git a/FixDistributedLockCoreDependencyVersion.targets b/FixDistributedLockCoreDependencyVersion.targets new file mode 100644 index 00000000..e1c66967 --- /dev/null +++ b/FixDistributedLockCoreDependencyVersion.targets @@ -0,0 +1,21 @@ + + + + + + <_ProjectReferencesWithExactVersions Include="@(_ProjectReferencesWithVersions)"> + [%(_ProjectReferencesWithVersions.ProjectVersion), $([MSBuild]::Add($([System.Text.RegularExpressions.Regex]::Match('%(_ProjectReferencesWithVersions.ProjectVersion)', '^\d+\.\d+').Value), '0.1'))) + + + + <_ProjectReferencesWithVersions Remove="@(_ProjectReferencesWithVersions)" /> + <_ProjectReferencesWithVersions Include="@(_ProjectReferencesWithExactVersions)" /> + + + \ No newline at end of file From 84905362c900d729e74ed4681a22c88cea49e613 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 3 Jan 2021 16:49:58 -0500 Subject: [PATCH 055/399] Rename IDistributedLockHandle to account for non-lock primitives --- ...obLeaseDistributedLock.IDistributedLock.cs | 12 +++---- .../AzureBlobLeaseDistributedLock.cs | 2 +- .../AzureBlobLeaseDistributedLockHandle.cs | 6 ++-- .../DistributedLockProviderExtensions.cs | 8 ++--- ...butedReaderWriterLockProviderExtensions.cs | 16 ++++----- .../DistributedSemaphoreProviderExtensions.cs | 8 ++--- DistributedLock.Core/IDistributedLock.cs | 16 ++++----- .../IDistributedReaderWriterLock.cs | 32 ++++++++--------- DistributedLock.Core/IDistributedSemaphore.cs | 16 ++++----- ...s => IDistributedSynchronizationHandle.cs} | 8 ++--- .../IDistributedUpgradeableReadLockHandle.cs | 4 +-- .../Internal/Data/ConnectionMonitor.cs | 2 +- ...onnectionOrTransactionDbDistributedLock.cs | 10 +++--- .../Internal/Data/IDbDistributedLock.cs | 2 +- .../Data/MultiplexedConnectionLock.cs | 6 ++-- .../Data/MultiplexedConnectionLockPool.cs | 2 +- ...ConnectionMultiplexingDbDistributedLock.cs | 4 +-- .../Internal/DistributedLockHelpers.cs | 34 +++++++++---------- .../Internal/IInternalDistributedLock.cs | 2 +- .../IInternalDistributedReaderWriterLock.cs | 2 +- .../Internal/IInternalDistributedSemaphore.cs | 2 +- ...lDistributedUpgradeableReaderWriterLock.cs | 2 +- .../FileDistributedLock.IDistributedLock.cs | 12 +++---- .../FileDistributedLockHandle.cs | 6 ++-- ...ostgresDistributedLock.IDistributedLock.cs | 12 +++---- .../PostgresDistributedLockHandle.cs | 10 +++--- ...WriterLock.IDistributedReaderWriterLock.cs | 24 ++++++------- ...stgresDistributedReaderWriterLockHandle.cs | 10 +++--- .../RedLock/RedLockHandle.cs | 4 +-- .../RedisDistributedLock.IDistributedLock.cs | 12 +++---- .../RedisDistributedLockHandle.cs | 6 ++-- ...WriterLock.IDistributedReaderWriterLock.cs | 24 ++++++------- .../RedisDistributedReaderWriterLockHandle.cs | 6 ++-- ...tributedSemaphore.IDistributedSemaphore.cs | 12 +++---- .../RedisDistributedSemaphoreHandle.cs | 6 ++-- .../SqlDistributedLock.IDistributedLock.cs | 12 +++---- .../SqlDistributedLockHandle.cs | 10 +++--- ...IDistributedUpgradeableReaderWriterLock.cs | 24 ++++++------- .../SqlDistributedReaderWriterLockHandle.cs | 18 +++++----- ...tributedSemaphore.IDistributedSemaphore.cs | 12 +++---- .../SqlDistributedSemaphoreHandle.cs | 10 +++--- ...pgradeableReaderWriterLockCoreTestCases.cs | 2 +- .../TestingReaderWriterLockAsMutexProvider.cs | 12 +++---- .../TestingSemaphoreAsMutexProvider.cs | 12 +++---- .../FileSystem/FileDistributedLockTest.cs | 2 +- ...tHandleDistributedLock.IDistributedLock.cs | 12 +++---- .../EventWaitHandleDistributedLockHandle.cs | 6 ++-- ...tributedSemaphore.IDistributedSemaphore.cs | 12 +++---- .../WaitHandleDistributedSemaphoreHandle.cs | 6 ++-- ...GenerateIDistributedLockImplementations.cs | 4 +-- DistributedLockTaker/Program.cs | 4 +-- 51 files changed, 248 insertions(+), 250 deletions(-) rename DistributedLock.Core/{IDistributedLockHandle.cs => IDistributedSynchronizationHandle.cs} (84%) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs index 8314ce08..6b939d6b 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class AzureBlobLeaseDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 4a7c1a46..c93dd917 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -159,7 +159,7 @@ static string ConvertToValidName(string name) return new AzureBlobLeaseDistributedLockHandle(internalHandle); } - internal sealed class InternalHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle + internal sealed class InternalHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle { private readonly BlobLeaseClientWrapper _leaseClient; private readonly bool _ownsBlob; diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index bcec5cff..c1a54cc3 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -8,9 +8,9 @@ namespace Medallion.Threading.Azure { /// - /// Implements + /// Implements /// - public sealed class AzureBlobLeaseDistributedLockHandle : IDistributedLockHandle + public sealed class AzureBlobLeaseDistributedLockHandle : IDistributedSynchronizationHandle { private AzureBlobLeaseDistributedLock.InternalHandle? _internalHandle; private IDisposable? _finalizerRegistration; @@ -26,7 +26,7 @@ internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.Inter } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => (this._internalHandle ?? throw this.ObjectDisposed()).HandleLostToken; diff --git a/DistributedLock.Core/DistributedLockProviderExtensions.cs b/DistributedLock.Core/DistributedLockProviderExtensions.cs index a4fbfdde..a4aa7648 100644 --- a/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -14,28 +14,28 @@ public static class DistributedLockProviderExtensions /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle? TryAcquireLock(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle? TryAcquireLock(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquire(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle AcquireLock(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle AcquireLock(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).Acquire(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask TryAcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static ValueTask TryAcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquireAsync(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); } } \ No newline at end of file diff --git a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index 7994765e..9f31f44e 100644 --- a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -14,56 +14,56 @@ public static class DistributedReaderWriterLockProviderExtensions /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle? TryAcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle? TryAcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLock(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle AcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle AcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLock(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask TryAcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static ValueTask TryAcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLockAsync(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask AcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static ValueTask AcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLockAsync(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle? TryAcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle? TryAcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLock(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle AcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle AcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLock(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask TryAcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static ValueTask TryAcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLockAsync(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); } } \ No newline at end of file diff --git a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index 7fc36cc5..d4b6b7e3 100644 --- a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -14,28 +14,28 @@ public static class DistributedSemaphoreProviderExtensions /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle? TryAcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle? TryAcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquire(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static IDistributedLockHandle AcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static IDistributedSynchronizationHandle AcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).Acquire(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask TryAcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + public static ValueTask TryAcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquireAsync(timeout, cancellationToken); /// /// Equivalent to calling and then /// . /// - public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); } } \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedLock.cs b/DistributedLock.Core/IDistributedLock.cs index 275d03bd..77e99245 100644 --- a/DistributedLock.Core/IDistributedLock.cs +++ b/DistributedLock.Core/IDistributedLock.cs @@ -27,8 +27,8 @@ public interface IDistributedLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires the lock synchronously, failing with if the attempt times out. Usage: @@ -42,8 +42,8 @@ public interface IDistributedLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); /// /// Attempts to acquire the lock asynchronously. Usage: @@ -57,8 +57,8 @@ public interface IDistributedLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: @@ -72,7 +72,7 @@ public interface IDistributedLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } } diff --git a/DistributedLock.Core/IDistributedReaderWriterLock.cs b/DistributedLock.Core/IDistributedReaderWriterLock.cs index 062fbcca..7bd98644 100644 --- a/DistributedLock.Core/IDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedReaderWriterLock.cs @@ -26,8 +26,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedLockHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a READ lock synchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -41,8 +41,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedLockHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + IDistributedSynchronizationHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); /// /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -56,8 +56,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -71,8 +71,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); /// /// Attempts to acquire a WRITE lock synchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: @@ -86,8 +86,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedLockHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a WRITE lock synchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: @@ -101,8 +101,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedLockHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + IDistributedSynchronizationHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); /// /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: @@ -116,8 +116,8 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: @@ -131,7 +131,7 @@ public interface IDistributedReaderWriterLock /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the lock + ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } } diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index b73bf6b8..9e986e24 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -31,8 +31,8 @@ public interface IDistributedSemaphore /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket or null on failure - IDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the ticket or null on failure + IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: @@ -46,8 +46,8 @@ public interface IDistributedSemaphore /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket - IDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the ticket + IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); /// /// Attempts to acquire a semaphore ticket asynchronously. Usage: @@ -61,8 +61,8 @@ public interface IDistributedSemaphore /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket or null on failure - ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// An which can be used to release the ticket or null on failure + ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); /// /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: @@ -76,7 +76,7 @@ public interface IDistributedSemaphore /// /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket - ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// An which can be used to release the ticket + ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } } diff --git a/DistributedLock.Core/IDistributedLockHandle.cs b/DistributedLock.Core/IDistributedSynchronizationHandle.cs similarity index 84% rename from DistributedLock.Core/IDistributedLockHandle.cs rename to DistributedLock.Core/IDistributedSynchronizationHandle.cs index d5001024..9996ca0b 100644 --- a/DistributedLock.Core/IDistributedLockHandle.cs +++ b/DistributedLock.Core/IDistributedSynchronizationHandle.cs @@ -3,13 +3,12 @@ namespace Medallion.Threading { - // todo IDistributedSynchronizationHandle? - /// /// A handle to a distributed lock or other synchronization primitive. To unlock/release, - /// simply dispose the handle + /// simply dispose the handle. /// - public interface IDistributedLockHandle : IDisposable, IAsyncDisposable + public interface IDistributedSynchronizationHandle + : IDisposable, IAsyncDisposable { /// /// Gets a instance which may be used to @@ -25,7 +24,6 @@ public interface IDistributedLockHandle : IDisposable, IAsyncDisposable /// For lock types that do support this, accessing this property may incur additional /// costs, such as polling to detect connectivity loss. /// - // TODO revisit naming CancellationToken HandleLostToken { get; } } } diff --git a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs index f4dafccd..e0d79c78 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs @@ -5,9 +5,9 @@ namespace Medallion.Threading { /// - /// A that can be upgraded to a write lock + /// A that can be upgraded to a write lock /// - public interface IDistributedLockUpgradeableHandle : IDistributedLockHandle + public interface IDistributedLockUpgradeableHandle : IDistributedSynchronizationHandle { /// /// Attempts to upgrade a WRITE lock synchronously. Not compatible with another WRITE lock or a UPGRADE lock diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index edd2d89f..0e7a412b 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -11,7 +11,7 @@ namespace Medallion.Threading.Internal.Data /// Implements keepalive for a which is important for certain providers /// such as SQL Azure. /// - /// Also supports more active monitoring for the purposes of implementing + /// Also supports more active monitoring for the purposes of implementing /// internal sealed class ConnectionMonitor : IAsyncDisposable { diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 8ebb046d..01ceb7ee 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -40,18 +40,18 @@ public DedicatedConnectionOrTransactionDbDistributedLock( this._keepaliveCadence = keepaliveCadence; } - public async ValueTask TryAcquireAsync( + public async ValueTask TryAcquireAsync( TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, - IDistributedLockHandle? contextHandle) + IDistributedSynchronizationHandle? contextHandle) where TLockCookie : class { // todo revisit how this works with managed finalization. We want to avoid the case where the upgraded handle and the original handle get // finalized in the wrong order. Perhaps it would be simpler to make upgradestrategy its own different interface, and then make the idblock return // a handle type that might be able to self-upgrade if it has the right internal strategy - IDistributedLockHandle? result = null; + IDistributedSynchronizationHandle? result = null; IAsyncDisposable? connectionResource = null; try { @@ -107,7 +107,7 @@ public DedicatedConnectionOrTransactionDbDistributedLock( return result; } - private DatabaseConnection GetContextHandleConnection(IDistributedLockHandle contextHandle) + private DatabaseConnection GetContextHandleConnection(IDistributedSynchronizationHandle contextHandle) where TLockCookie : class { var connection = ((Handle)contextHandle).Connection; @@ -115,7 +115,7 @@ private DatabaseConnection GetContextHandleConnection(IDistributedL return connection; } - private sealed class Handle : IDistributedLockHandle + private sealed class Handle : IDistributedSynchronizationHandle where TLockCookie : class { private InnerHandle? _innerHandle; diff --git a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs index b5e1b4f7..88a5d6d0 100644 --- a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs @@ -19,7 +19,7 @@ interface IDbDistributedLock // from an upgradeable read lock to a write lock. This allows the implementation to use the same connection // for the nested lock - ValueTask TryAcquireAsync(TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, IDistributedLockHandle? contextHandle) + ValueTask TryAcquireAsync(TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, IDistributedSynchronizationHandle? contextHandle) where TLockCookie : class; } } diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 6ab32ec2..c9abec85 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -173,7 +173,7 @@ private void SetKeepaliveCadenceNoLock() public readonly struct Result { - public Result(IDistributedLockHandle handle) + public Result(IDistributedSynchronizationHandle handle) { this.Handle = handle; this.Retry = MultiplexedConnectionLockRetry.NoRetry; @@ -187,12 +187,12 @@ public Result(MultiplexedConnectionLockRetry retry, bool canSafelyDispose) this.CanSafelyDispose = canSafelyDispose; } - public IDistributedLockHandle? Handle { get; } + public IDistributedSynchronizationHandle? Handle { get; } public MultiplexedConnectionLockRetry Retry { get; } public bool CanSafelyDispose { get; } } - private sealed class Handle : IDistributedLockHandle + private sealed class Handle : IDistributedSynchronizationHandle where TLockCookie : class { private readonly string _name; diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index 328cea71..76fa56e8 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -40,7 +40,7 @@ public MultiplexedConnectionLockPool(Func connection internal Func ConnectionFactory { get; } - public async ValueTask TryAcquireAsync( + public async ValueTask TryAcquireAsync( string connectionString, string name, TimeoutValue timeout, diff --git a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs index 49818ac1..f9dee743 100644 --- a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs @@ -36,11 +36,11 @@ public OptimisticConnectionMultiplexingDbDistributedLock( ); } - public ValueTask TryAcquireAsync( + public ValueTask TryAcquireAsync( TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, - IDistributedLockHandle? contextHandle) + IDistributedSynchronizationHandle? contextHandle) where TLockCookie : class { // cannot multiplex for updates, since we cannot predict whether or not there will be a request to elevate diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 1866846b..fb355d2a 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -38,7 +38,7 @@ public static string ToSafeName(string name, int maxNameLength, Func Wrap(this ValueTask handleTask, Func factory) + public static async ValueTask Wrap(this ValueTask handleTask, Func factory) where THandle : class { var handle = await handleTask.ConfigureAwait(false); @@ -46,18 +46,18 @@ public static string ToSafeName(string name, int maxNameLength, Func AcquireAsync(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); public static THandle Acquire(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); public static THandle? TryAcquire(IInternalDistributedLock @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) @@ -96,18 +96,18 @@ public static THandle Acquire(IInternalDistributedLock @lock, #region ---- IInternalDistributedReaderWriterLock implementations ---- public static ValueTask AcquireAsync(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => @lock.InternalTryAcquireAsync(timeout, cancellationToken, isWrite).ThrowTimeoutIfNull(); public static THandle Acquire(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken, state.isWrite), (@lock, timeout, cancellationToken, isWrite) ); public static THandle? TryAcquire(IInternalDistributedReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken, state.isWrite), (@lock, timeout, cancellationToken, isWrite) @@ -116,12 +116,12 @@ public static THandle Acquire(IInternalDistributedReaderWriterLock AcquireUpgradeableReadLockAsync(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => @lock.InternalTryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); public static TUpgradeableHandle AcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => SyncOverAsync.Run( state => AcquireUpgradeableReadLockAsync(state.@lock, state.timeout, state.cancellationToken), @@ -129,7 +129,7 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireUpgradeableReadLockAsync(state.timeout, state.cancellationToken), @@ -139,18 +139,18 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock AcquireAsync(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(@object: "semaphore"); public static THandle Acquire(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); public static THandle? TryAcquire(IInternalDistributedSemaphore @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedLockHandle => + where THandle : class, IDistributedSynchronizationHandle => SyncOverAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) diff --git a/DistributedLock.Core/Internal/IInternalDistributedLock.cs b/DistributedLock.Core/Internal/IInternalDistributedLock.cs index ecaf765e..073fa49e 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLock.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Internal internal #endif interface IInternalDistributedLock : IDistributedLock - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle { new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); diff --git a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs index d7c75d14..ec6e4566 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Internal internal #endif interface IInternalDistributedReaderWriterLock : IDistributedReaderWriterLock - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle { new THandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); new THandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); diff --git a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs index 617de1b8..04bb2ba2 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Internal internal #endif interface IInternalDistributedSemaphore : IDistributedSemaphore - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle { new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); diff --git a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs index e21d656c..b3b25d7a 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Internal internal #endif interface IInternalDistributedUpgradeableReaderWriterLock : IDistributedUpgradeableReaderWriterLock, IInternalDistributedReaderWriterLock - where THandle : class, IDistributedLockHandle + where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle { new TUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); diff --git a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs index 986fbbdb..b7247bfa 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class FileDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/DistributedLock.FileSystem/FileDistributedLockHandle.cs index 0998fd72..7d71fbfa 100644 --- a/DistributedLock.FileSystem/FileDistributedLockHandle.cs +++ b/DistributedLock.FileSystem/FileDistributedLockHandle.cs @@ -9,9 +9,9 @@ namespace Medallion.Threading.FileSystem { /// - /// Implements + /// Implements /// - public sealed class FileDistributedLockHandle : IDistributedLockHandle + public sealed class FileDistributedLockHandle : IDistributedSynchronizationHandle { private FileStream? _fileStream; @@ -20,7 +20,7 @@ internal FileDistributedLockHandle(FileStream fileStream) this._fileStream = fileStream; } - CancellationToken IDistributedLockHandle.HandleLostToken => + CancellationToken IDistributedSynchronizationHandle.HandleLostToken => Volatile.Read(ref this._fileStream) != null ? CancellationToken.None : throw this.ObjectDisposed(); /// diff --git a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs index 8709c22a..1d72d8d1 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class PostgresDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs index 86699d97..7dad7fc4 100644 --- a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs @@ -9,19 +9,19 @@ namespace Medallion.Threading.Postgres { // todo this whole file could be auto-generated /// - /// Implements + /// Implements /// - public sealed class PostgresDistributedLockHandle : IDistributedLockHandle + public sealed class PostgresDistributedLockHandle : IDistributedSynchronizationHandle { - private IDistributedLockHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal PostgresDistributedLockHandle(IDistributedLockHandle innerHandle) + internal PostgresDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) { this._innerHandle = innerHandle; } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index ee5dc2ca..832f4a71 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -9,22 +9,22 @@ public partial class PostgresDistributedReaderWriterLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs index df22f50f..29ecad03 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs @@ -8,19 +8,19 @@ namespace Medallion.Threading.Postgres { /// - /// Implements + /// Implements /// - public sealed class PostgresDistributedReaderWriterLockHandle : IDistributedLockHandle + public sealed class PostgresDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { - private IDistributedLockHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal PostgresDistributedReaderWriterLockHandle(IDistributedLockHandle innerHandle) + internal PostgresDistributedReaderWriterLockHandle(IDistributedSynchronizationHandle innerHandle) { this._innerHandle = innerHandle; } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/DistributedLock.Redis/RedLock/RedLockHandle.cs index c1aa4c3e..b897b11d 100644 --- a/DistributedLock.Redis/RedLock/RedLockHandle.cs +++ b/DistributedLock.Redis/RedLock/RedLockHandle.cs @@ -9,7 +9,7 @@ namespace Medallion.Threading.Redis.RedLock { - internal sealed class RedLockHandle : IDistributedLockHandle, LeaseMonitor.ILeaseHandle + internal sealed class RedLockHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle { private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; private Dictionary>? _tryAcquireTasks; @@ -31,7 +31,7 @@ public RedLockHandle( } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => this._monitor.HandleLostToken; diff --git a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs index 190e6363..e9cdb7af 100644 --- a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class RedisDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs index 8dcaf2aa..5a160798 100644 --- a/DistributedLock.Redis/RedisDistributedLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -10,9 +10,9 @@ namespace Medallion.Threading.Redis { /// - /// Implements for + /// Implements for /// - public sealed class RedisDistributedLockHandle : IDistributedLockHandle + public sealed class RedisDistributedLockHandle : IDistributedSynchronizationHandle { private RedLockHandle? _innerHandle; @@ -22,7 +22,7 @@ internal RedisDistributedLockHandle(RedLockHandle innerHandle) } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index 7c763c93..dc025e8b 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -9,22 +9,22 @@ public partial class RedisDistributedReaderWriterLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs index c69968df..959001fd 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs @@ -10,9 +10,9 @@ namespace Medallion.Threading.Redis { /// - /// Implements for + /// Implements for /// - public sealed class RedisDistributedReaderWriterLockHandle : IDistributedLockHandle + public sealed class RedisDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { private RedLockHandle? _innerHandle; @@ -22,7 +22,7 @@ internal RedisDistributedReaderWriterLockHandle(RedLockHandle innerHandle) } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs index b420f633..42fc0694 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs @@ -9,14 +9,14 @@ public partial class RedisDistributedSemaphore { // AUTO-GENERATED - IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a semaphore ticket synchronously. Usage: diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs index d7e9da9f..8a2de772 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs @@ -10,9 +10,9 @@ namespace Medallion.Threading.Redis { /// - /// Implements for a + /// Implements for a /// - public sealed class RedisDistributedSemaphoreHandle : IDistributedLockHandle + public sealed class RedisDistributedSemaphoreHandle : IDistributedSynchronizationHandle { private RedLockHandle? _innerHandle; @@ -22,7 +22,7 @@ internal RedisDistributedSemaphoreHandle(RedLockHandle innerHandle) } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs index 09eb21dd..93fd4d14 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class SqlDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs index 3b0d90dc..a0f4e379 100644 --- a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs @@ -5,19 +5,19 @@ namespace Medallion.Threading.SqlServer { /// - /// Implements + /// Implements /// - public sealed class SqlDistributedLockHandle : IDistributedLockHandle + public sealed class SqlDistributedLockHandle : IDistributedSynchronizationHandle { - private IDistributedLockHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal SqlDistributedLockHandle(IDistributedLockHandle innerHandle) + internal SqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) { this._innerHandle = innerHandle; } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs index ed36e0e8..a288250f 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -9,14 +9,14 @@ public partial class SqlDistributedReaderWriterLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => @@ -25,14 +25,14 @@ IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.Acquir this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedLockHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index 58b7c1ed..924226f3 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -7,15 +7,15 @@ namespace Medallion.Threading.SqlServer { /// - /// Implements + /// Implements /// - public abstract class SqlDistributedReaderWriterLockHandle : IDistributedLockHandle + public abstract class SqlDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { // forbid external inheritors internal SqlDistributedReaderWriterLockHandle() { } /// - /// Implements + /// Implements /// public abstract CancellationToken HandleLostToken { get; } @@ -33,9 +33,9 @@ internal SqlDistributedReaderWriterLockHandle() { } internal sealed class SqlDistributedReaderWriterLockNonUpgradeableHandle : SqlDistributedReaderWriterLockHandle { - private IDistributedLockHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal SqlDistributedReaderWriterLockNonUpgradeableHandle(IDistributedLockHandle? handle) + internal SqlDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) { this._innerHandle = handle; } @@ -50,15 +50,15 @@ internal SqlDistributedReaderWriterLockNonUpgradeableHandle(IDistributedLockHand /// public sealed class SqlDistributedReaderWriterLockUpgradeableHandle : SqlDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle { - private RefBox<(IDistributedLockHandle innerHandle, IDbDistributedLock @lock, IDistributedLockHandle? upgradedHandle)>? _box; + private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; - internal SqlDistributedReaderWriterLockUpgradeableHandle(IDistributedLockHandle innerHandle, IDbDistributedLock @lock) + internal SqlDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) { - this._box = RefBox.Create((innerHandle, @lock, default(IDistributedLockHandle?))); + this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); } /// - /// Implements + /// Implements /// public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs index 3034ebdd..fef63440 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs @@ -9,14 +9,14 @@ public partial class SqlDistributedSemaphore { // AUTO-GENERATED - IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a semaphore ticket synchronously. Usage: diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs index bedefbd8..7def7857 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs @@ -5,19 +5,19 @@ namespace Medallion.Threading.SqlServer { /// - /// Implements + /// Implements /// - public sealed class SqlDistributedSemaphoreHandle : IDistributedLockHandle + public sealed class SqlDistributedSemaphoreHandle : IDistributedSynchronizationHandle { - private IDistributedLockHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal SqlDistributedSemaphoreHandle(IDistributedLockHandle innerHandle) + internal SqlDistributedSemaphoreHandle(IDistributedSynchronizationHandle innerHandle) { this._innerHandle = innerHandle; } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index 7881fae4..a788ba25 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -55,7 +55,7 @@ IDistributedUpgradeableReaderWriterLock Lock() => var readHandle = Lock().AcquireReadLock(); - Task readTask; + Task readTask; using (var upgradeableHandle = Lock().AcquireUpgradeableReadLockAsync().AsTask().Result) { upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(false); // read lock still held diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs index 11253381..9abf9b05 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs @@ -56,24 +56,24 @@ public ReaderWriterLockAsMutex(IDistributedReaderWriterLock readerWriterLock, Te string IDistributedLock.Name => this._readerWriterLock.Name; - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.ShouldUseUpgrade(out var upgradeable) ? upgradeable.AcquireUpgradeableReadLock(timeout, cancellationToken) : this._readerWriterLock.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) + ? upgradeable.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) : this._readerWriterLock.AcquireWriteLockAsync(timeout, cancellationToken); - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.ShouldUseUpgrade(out var upgradeable) ? upgradeable.TryAcquireUpgradeableReadLock(timeout, cancellationToken) : this._readerWriterLock.TryAcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) + ? upgradeable.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) : this._readerWriterLock.TryAcquireWriteLockAsync(timeout, cancellationToken); private bool ShouldUseUpgrade(out IDistributedUpgradeableReaderWriterLock upgradeable) diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index 536d09ea..b4511eab 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -70,17 +70,17 @@ public SemaphoreAsMutex(IDistributedSemaphore semaphore) string IDistributedLock.Name => throw new NotImplementedException(); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this._semaphore.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this._semaphore.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this._semaphore.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this._semaphore.TryAcquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this._semaphore.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this._semaphore.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index abe9e199..5123f22e 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -368,7 +368,7 @@ public void TestBase32Hashing() private static void AssertCanUseName(string name, DirectoryInfo? directory = null) { var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); - IDistributedLockHandle? handle = null; + IDistributedSynchronizationHandle? handle = null; Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); Assert.IsNotNull(handle, name); handle!.Dispose(); diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs index d226d583..e97a977b 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs @@ -9,14 +9,14 @@ public partial class EventWaitHandleDistributedLock { // AUTO-GENERATED - IDistributedLockHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire the lock synchronously. Usage: diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs index 216463aa..0d446d80 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs @@ -6,9 +6,9 @@ namespace Medallion.Threading.WaitHandles { /// - /// Implements + /// Implements /// - public sealed class EventWaitHandleDistributedLockHandle : IDistributedLockHandle + public sealed class EventWaitHandleDistributedLockHandle : IDistributedSynchronizationHandle { private EventWaitHandle? _event; @@ -17,7 +17,7 @@ internal EventWaitHandleDistributedLockHandle(EventWaitHandle @event) this._event = @event; } - CancellationToken IDistributedLockHandle.HandleLostToken => + CancellationToken IDistributedSynchronizationHandle.HandleLostToken => Volatile.Read(ref this._event) != null ? CancellationToken.None : throw this.ObjectDisposed(); /// diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs index 72ab4c17..0454e3fc 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs @@ -9,14 +9,14 @@ public partial class WaitHandleDistributedSemaphore { // AUTO-GENERATED - IDistributedLockHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => this.TryAcquire(timeout, cancellationToken); - IDistributedLockHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a semaphore ticket synchronously. Usage: diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs index 31441681..73cc9ecf 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs @@ -8,9 +8,9 @@ namespace Medallion.Threading.WaitHandles { /// - /// Implements + /// Implements /// - public sealed class WaitHandleDistributedSemaphoreHandle : IDistributedLockHandle + public sealed class WaitHandleDistributedSemaphoreHandle : IDistributedSynchronizationHandle { private readonly SemaphoreReleaser _semaphoreReleaser; private IDisposable? _finalizerRegistration; @@ -24,7 +24,7 @@ internal WaitHandleDistributedSemaphoreHandle(Semaphore semaphore) } /// - /// Implements + /// Implements /// public CancellationToken HandleLostToken => Volatile.Read(ref this._finalizerRegistration) != null ? CancellationToken.None : throw this.ObjectDisposed(); diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index e23cd08a..8b688204 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -41,7 +41,7 @@ public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore") var @interface = $"IDistributed{name}"; foreach (var method in new[] { "TryAcquire", "Acquire", "TryAcquireAsync", "AcquireAsync" }) { - AppendExplicitInterfaceMethod(explicitImplementations, @interface, method, "IDistributedLockHandle"); + AppendExplicitInterfaceMethod(explicitImplementations, @interface, method, "IDistributedSynchronizationHandle"); } var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; @@ -132,7 +132,7 @@ public void GenerateForIDistributedReaderWriterLock() explicitImplementations, $"IDistributed{upgradeableText}ReaderWriterLock", methodName, - $"IDistributedLock{upgradeableText}Handle" + $"IDistributed{(methodLockType == LockType.Upgrade ? "LockUpgradeable" : "Synchronization")}Handle" ); var simplifiedMethodName = methodLockType == LockType.Upgrade ? methodName : methodName.Replace("ReadLock", "").Replace("WriteLock", ""); diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 70d31e23..97d7903a 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -117,10 +117,10 @@ public static int Main(string[] args) return 0; } - private static IDistributedLockHandle AcquireRedisLock(string name, int serverCount) => + private static IDistributedSynchronizationHandle AcquireRedisLock(string name, int serverCount) => new RedisDistributedLock(name, GetRedisDatabases(serverCount), RedisOptions).Acquire(); - private static IDistributedLockHandle AcquireRedisWriteLock(string name, int serverCount) => + private static IDistributedSynchronizationHandle AcquireRedisWriteLock(string name, int serverCount) => new RedisDistributedReaderWriterLock(name, GetRedisDatabases(serverCount), RedisOptions).AcquireWriteLock(); private static IEnumerable GetRedisDatabases(int serverCount) => RedisPorts.DefaultPorts.Take(serverCount) From f256c66684039863aa0bb7b13e9a874b23d5c67d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 3 Jan 2021 17:04:20 -0500 Subject: [PATCH 056/399] Add MaxCount API for semaphores --- DistributedLock.Core/IDistributedSemaphore.cs | 8 ++++++-- DistributedLock.Redis/RedisDistributedSemaphore.cs | 12 ++++++++---- .../SqlDistributedSemaphore.cs | 7 ++++++- DistributedLock.SqlServer/SqlSemaphore.cs | 8 ++++---- .../DistributedSemaphoreCoreTestCases.cs | 7 +++++++ .../WaitHandleDistributedSemaphore.cs | 13 +++++++++---- 6 files changed, 40 insertions(+), 15 deletions(-) diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index 9e986e24..5877f0e2 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -12,13 +12,17 @@ namespace Medallion.Threading /// public interface IDistributedSemaphore { - // TODO maxcount? - /// /// A name that uniquely identifies the semaphore /// string Name { get; } + /// + /// The maximum number of "tickets" available for the semaphore (ie the number of processes which can acquire + /// the semaphore concurrently). + /// + int MaxCount { get; } + /// /// Attempts to acquire a semaphore ticket synchronously. Usage: /// diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index 2967e660..652ec900 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -16,7 +16,6 @@ namespace Medallion.Threading.Redis /// public sealed partial class RedisDistributedSemaphore : IInternalDistributedSemaphore { - private readonly int _maxCount; private readonly IReadOnlyList _databases; private readonly RedisDistributedLockOptions _options; @@ -38,17 +37,22 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable - /// Implements + /// Implements /// public string Name => this.Key.ToString(); + /// + /// Implements + /// + public int MaxCount { get; } + ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => BusyWaitHelper.WaitAsync( state: this, @@ -61,7 +65,7 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable TryAcquireAsync(CancellationToken cancellationToken) { - var primitive = new RedisSemaphorePrimitive(this.Key, this._maxCount, this._options.RedLockTimeouts); + var primitive = new RedisSemaphorePrimitive(this.Key, this.MaxCount, this._options.RedLockTimeouts); var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); return tryAcquireTasks != null ? new RedisDistributedSemaphoreHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs index 4e3d247b..08df4e79 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs @@ -58,10 +58,15 @@ private SqlDistributedSemaphore(string name, int maxCount, Func - /// Implements + /// Implements /// public string Name { get; } + /// + /// Implements + /// + public int MaxCount => this._strategy.MaxCount; + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { var handle = await this._internalLock.TryAcquireAsync(timeout, this._strategy, cancellationToken, contextHandle: null).ConfigureAwait(false); diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index 4537c431..42009a03 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -11,13 +11,13 @@ namespace Medallion.Threading.SqlServer { internal sealed class SqlSemaphore : IDbSynchronizationStrategy { - private readonly int _maxCount; - public SqlSemaphore(int maxCount) { - this._maxCount = maxCount; + this.MaxCount = maxCount; } + public int MaxCount { get; } + #region ---- Execution ---- public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) { @@ -173,7 +173,7 @@ private static DatabaseCommand CreateTextCommand(DatabaseConnection connection, private void AddCommonParameters(DatabaseCommand command, string semaphoreName, TimeoutValue? timeout = null, string? markerTableName = null, string? ticketLockName = null) { command.AddParameter(SemaphoreNameParameter, semaphoreName); - command.AddParameter(MaxCountParameter, this._maxCount); + command.AddParameter(MaxCountParameter, this.MaxCount); if (timeout.TryGetValue(out var timeoutValue)) { command.AddParameter(TimeoutMillisParameter, timeoutValue.InMilliseconds); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index e4ff046b..14f06b82 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -18,6 +18,13 @@ public abstract class DistributedSemaphoreCoreTestCases this._semaphoreProvider = new TSemaphoreProvider(); [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); + [Test] + public void TestMaxCount() + { + this._semaphoreProvider.CreateSemaphore(string.Empty, 5).MaxCount.ShouldEqual(5); + this._semaphoreProvider.CreateSemaphore(string.Empty, 23).MaxCount.ShouldEqual(23); + } + [Test] [NonParallelizable] // timing-sensitive public void TestConcurrencyHandling() diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs index 588952a8..f4bc084d 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -14,7 +14,6 @@ namespace Medallion.Threading.WaitHandles /// public sealed partial class WaitHandleDistributedSemaphore : IInternalDistributedSemaphore { - private readonly int _maxCount; private readonly TimeoutValue _abandonmentCheckCadence; /// @@ -30,10 +29,11 @@ public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? aband if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); - this._maxCount = maxCount; + this.MaxCount = maxCount; this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); } + // todo static APIs /// /// The maximum length allowed for semaphore names /// @@ -46,10 +46,15 @@ public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? aband public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); /// - /// The semaphore name + /// Implements /// public string Name { get; } + /// + /// Implements + /// + public int MaxCount { get; } + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { var semaphore = await DistributedWaitHandleHelpers.CreateAndWaitAsync( @@ -71,7 +76,7 @@ private Semaphore CreateSemaphore() => DistributedWaitHandleHelpers.CreateDistri SemaphoreRights.FullControl, AccessControlType.Allow )); - var semaphore = new Semaphore(initialCount: this._maxCount, maximumCount: this._maxCount, name: this.Name, createdNew: out var createdNew); + var semaphore = new Semaphore(initialCount: this.MaxCount, maximumCount: this.MaxCount, name: this.Name, createdNew: out var createdNew); if (createdNew) { semaphore.SetAccessControl(security); } return semaphore; }, From 8b5afd3047a2f08cf543c79194be86d854b59bd8 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 3 Jan 2021 17:39:14 -0500 Subject: [PATCH 057/399] Add test for Postgres 5 issue --- .../Tests/Postgres/PostgresBehaviorTest.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index cbfd32f4..cb46af58 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; +using System.Data; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -164,5 +165,35 @@ public async Task TestPrepareThrowsNullReferenceExceptionOnTerminatedConnection( Assert.ThrowsAsync(() => getPidCommand.PrepareAsync()); } + + // See https://github.com/npgsql/npgsql/issues/3442. Until that's resolved, connection monitoring + // is broken in 5.x + [Test] + public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() + { + using var stateChangedEvent = new ManualResetEventSlim(initialState: false); + + using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + await connection.OpenAsync(); + connection.StateChange += (o, e) => stateChangedEvent.Set(); + + using var getPidCommand = connection.CreateCommand(); + getPidCommand.CommandText = "SELECT pg_backend_pid()"; + var pid = (int)(await getPidCommand.ExecuteScalarAsync()); + + Assert.AreEqual(ConnectionState.Open, connection.State); + + // kill the connection from the back end + using var killingConnection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + await killingConnection.OpenAsync(); + using var killCommand = killingConnection.CreateCommand(); + killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; + await killCommand.ExecuteNonQueryAsync(); + + Assert.ThrowsAsync(() => getPidCommand.ExecuteScalarAsync()); + Assert.AreNotEqual(ConnectionState.Open, connection.State); + + Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); // assertion passes in 4.1.4, fails in 5.0.1.1 + } } } From 2a9b0a9fa0904f248ace5144eeaaac7ed41b44b0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 5 Jan 2021 07:27:08 -0500 Subject: [PATCH 058/399] Resolve several TODOs --- ...onnectionOrTransactionDbDistributedLock.cs | 6 ---- .../Data/MultiplexedConnectionLock.cs | 24 +++++++++++++- .../Data/MultiplexedConnectionLockPool.cs | 1 - .../Internal/DistributedLockHelpers.cs | 32 ------------------- DistributedLock.Core/Internal/Helpers.cs | 1 - DistributedLock.Core/Internal/LeaseMonitor.cs | 1 - 6 files changed, 23 insertions(+), 42 deletions(-) diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 01ceb7ee..8d8193fc 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -5,8 +5,6 @@ namespace Medallion.Threading.Internal.Data { - // todo logic in this class is pretty complex. Could we factor some of the branches out into a connectionpolicy object or similar? - /// /// Implements by giving each lock acquisition a dedicated /// or @@ -47,10 +45,6 @@ public DedicatedConnectionOrTransactionDbDistributedLock( IDistributedSynchronizationHandle? contextHandle) where TLockCookie : class { - // todo revisit how this works with managed finalization. We want to avoid the case where the upgraded handle and the original handle get - // finalized in the wrong order. Perhaps it would be simpler to make upgradestrategy its own different interface, and then make the idblock return - // a handle type that might be able to self-upgrade if it has the right internal strategy - IDistributedSynchronizationHandle? result = null; IAsyncDisposable? connectionResource = null; try diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index c9abec85..81223fc7 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -61,7 +61,7 @@ public async ValueTask TryAcquireAsync( var lockCookie = await strategy.TryAcquireAsync(this._connection, name, opportunistic ? TimeSpan.Zero : timeout, cancellationToken).ConfigureAwait(false); if (lockCookie != null) { - var handle = new Handle(this, strategy, name, lockCookie).WithManagedFinalizer(); + var handle = new ManagedFinalizationDistributedLockHandle(new Handle(this, strategy, name, lockCookie)); this._heldLocksToKeepaliveCadences.Add(name, keepaliveCadence); if (!keepaliveCadence.IsInfinite) { this.SetKeepaliveCadenceNoLock(); } return new Result(handle); @@ -245,6 +245,28 @@ public ValueTask DisposeAsync() void IDisposable.Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); } + + private sealed class ManagedFinalizationDistributedLockHandle : IDistributedSynchronizationHandle + { + private readonly IDistributedSynchronizationHandle _innerHandle; + private readonly IDisposable _finalizerRegistration; + + public ManagedFinalizationDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } + + public CancellationToken HandleLostToken => this._innerHandle.HandleLostToken; + + public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + + public ValueTask DisposeAsync() + { + this._finalizerRegistration.Dispose(); + return this._innerHandle.DisposeAsync(); + } + } } internal enum MultiplexedConnectionLockRetry diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index 76fa56e8..a8fc6281 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -172,7 +172,6 @@ private bool IsDueForPruningNoLock() return pruningCost > 64 && this._storeCountSinceLastPrune >= pruningCost; } - // todo test private async ValueTask PrunePoolsNoLockAsync() { this._storeCountSinceLastPrune = 0; // reset diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index fb355d2a..29b3d8fa 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -6,8 +6,6 @@ namespace Medallion.Threading.Internal { - // todo revisit whether these should be copied or generated files vs internal APIs - #if DEBUG public #else @@ -37,7 +35,6 @@ public static string ToSafeName(string name, int maxNameLength, Func Wrap(this ValueTask handleTask, Func factory) where THandle : class { @@ -45,35 +42,6 @@ public static string ToSafeName(string name, int maxNameLength, Func this._innerHandle.HandleLostToken; - - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); - - public ValueTask DisposeAsync() - { - this._finalizerRegistration.Dispose(); - return this._innerHandle.DisposeAsync(); - } - } - #region ---- IInternalDistributedLock implementations ---- public static ValueTask AcquireAsync(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle => diff --git a/DistributedLock.Core/Internal/Helpers.cs b/DistributedLock.Core/Internal/Helpers.cs index 07ad1a76..e84d145e 100644 --- a/DistributedLock.Core/Internal/Helpers.cs +++ b/DistributedLock.Core/Internal/Helpers.cs @@ -57,7 +57,6 @@ private static TTask InternalSafeCreateTask(Func(ex).As(); } } - // todo rethink message here; should this return "handle" or something more generic since it might be an internal type? public static ObjectDisposedException ObjectDisposed(this T _) where T : IAsyncDisposable => throw new ObjectDisposedException(typeof(T).ToString()); diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index b83e0f36..d0465663 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -8,7 +8,6 @@ namespace Medallion.Threading.Internal { - // todo incorporate into azure /// /// Utility for monitoring/renewing a fixed length "lease" lock /// From d63aa2983312a11144ad6e0a806c72e38e8455e5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 5 Jan 2021 07:34:31 -0500 Subject: [PATCH 059/399] Resolve RefBox TODOs --- DistributedLock.Core/Internal/RefBox.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Core/Internal/RefBox.cs b/DistributedLock.Core/Internal/RefBox.cs index 64e15720..1b66fa78 100644 --- a/DistributedLock.Core/Internal/RefBox.cs +++ b/DistributedLock.Core/Internal/RefBox.cs @@ -1,8 +1,11 @@ -using System.Threading; +using System; +using System.Threading; namespace Medallion.Threading.Internal { - // todo use in more places or get rid of + /// + /// Wraps a value tuple to be a read/write reference + /// #if DEBUG public #else @@ -20,6 +23,9 @@ internal RefBox(T value) public ref readonly T Value => ref this._value; } + /// + /// Simplifies storing state in certain s. + /// #if DEBUG public #else @@ -29,6 +35,10 @@ sealed class RefBox { public static RefBox Create(T value) where T : struct => new RefBox(value); + /// + /// Thread-safely checks if is non-null and if so sets it to null and outputs + /// the value as . + /// public static bool TryConsume(ref RefBox? boxRef, out T value) where T : struct { From 5e20533d6df2061ae5a73ff996f30c4e83506372 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 6 Jan 2021 06:44:21 -0500 Subject: [PATCH 060/399] Rename SyncOverAsync to SyncViaAsync --- .../AzureBlobLeaseDistributedLock.cs | 2 +- .../AzureBlobLeaseDistributedLockHandle.cs | 2 +- DistributedLock.Azure/BlobClientWrapper.cs | 14 +++++----- .../BlobLeaseClientWrapper.cs | 8 +++--- DistributedLock.Core/Internal/AsyncLock.cs | 4 +-- .../Internal/BusyWaitHelper.cs | 2 +- .../Internal/Data/ConnectionMonitor.cs | 2 +- .../Internal/Data/DatabaseCommand.cs | 4 +-- .../Internal/Data/DatabaseConnection.cs | 10 +++---- ...onnectionOrTransactionDbDistributedLock.cs | 2 +- .../Data/MultiplexedConnectionLock.cs | 4 +-- .../Internal/DistributedLockHelpers.cs | 20 ++++++------- DistributedLock.Core/Internal/LeaseMonitor.cs | 4 +-- .../{SyncOverAsync.cs => SyncViaAsync.cs} | 28 +++++++++++++++---- .../PostgresAdvisoryLock.cs | 2 +- .../RedLock/RedLockAcquire.cs | 2 +- .../RedLock/RedLockExtend.cs | 2 +- .../RedLock/RedLockHandle.cs | 2 +- .../RedLock/RedLockRelease.cs | 2 +- .../SqlApplicationLock.cs | 2 +- .../SqlDistributedReaderWriterLockHandle.cs | 3 +- DistributedLock.SqlServer/SqlSemaphore.cs | 2 +- .../Data/ConnectionStringStrategyTestCases.cs | 3 +- .../AzureBlobLeaseDistributedLockTest.cs | 2 +- ...ncOverAsyncTest.cs => SyncViaAsyncTest.cs} | 8 +++--- .../Tests/Data/SqlDatabaseConnectionTest.cs | 4 +-- .../WaitHandleExtensions.cs | 2 +- 27 files changed, 78 insertions(+), 64 deletions(-) rename DistributedLock.Core/Internal/{SyncOverAsync.cs => SyncViaAsync.cs} (69%) rename DistributedLock.Tests/Tests/Core/{SyncOverAsyncTest.cs => SyncViaAsyncTest.cs} (85%) diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index c93dd917..9f1de96f 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -184,7 +184,7 @@ public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBl TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this.RenewalEnabled ? this._lock._options.renewalCadence : this._lock._options.duration; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); public async ValueTask DisposeAsync() { diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index c1a54cc3..9321aa42 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -38,7 +38,7 @@ internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.Inter /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); /// /// Releases the lock asynchronously diff --git a/DistributedLock.Azure/BlobClientWrapper.cs b/DistributedLock.Azure/BlobClientWrapper.cs index 9dd45b30..58af63b1 100644 --- a/DistributedLock.Azure/BlobClientWrapper.cs +++ b/DistributedLock.Azure/BlobClientWrapper.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Azure { /// - /// Adds support to + /// Adds support to /// internal class BlobClientWrapper { @@ -30,7 +30,7 @@ public BlobClientWrapper(BlobBaseClient blobClient) public async ValueTask> GetMetadataAsync(string leaseId, CancellationToken cancellationToken) { var conditions = new BlobRequestConditions { LeaseId = leaseId }; - var properties = SyncOverAsync.IsSynchronous + var properties = SyncViaAsync.IsSynchronous ? this._blobClient.GetProperties(conditions, cancellationToken) : await this._blobClient.GetPropertiesAsync(conditions, cancellationToken).ConfigureAwait(false); return properties.Value.Metadata; @@ -41,28 +41,28 @@ public ValueTask CreateIfNotExistsAsync(IDictionary metadata, Ca switch (this._blobClient) { case BlobClient blobClient: - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { blobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); return default; } return new ValueTask(blobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); case BlockBlobClient blockBlobClient: - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { blockBlobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); return default; } return new ValueTask(blockBlobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); case PageBlobClient pageBlobClient: - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { pageBlobClient.CreateIfNotExists(size: 0, metadata: metadata, cancellationToken: cancellationToken); return default; } return new ValueTask(pageBlobClient.CreateIfNotExistsAsync(size: 0, metadata: metadata, cancellationToken: cancellationToken)); case AppendBlobClient appendBlobClient: - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { appendBlobClient.CreateIfNotExists(metadata: metadata, cancellationToken: cancellationToken); return default; @@ -81,7 +81,7 @@ public ValueTask CreateIfNotExistsAsync(IDictionary metadata, Ca public ValueTask DeleteIfExistsAsync(string? leaseId = null) { var conditions = leaseId != null ? new BlobRequestConditions { LeaseId = leaseId } : null; - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { this._blobClient.DeleteIfExists(conditions: conditions); return default; diff --git a/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/DistributedLock.Azure/BlobLeaseClientWrapper.cs index aca95c32..2e2dc218 100644 --- a/DistributedLock.Azure/BlobLeaseClientWrapper.cs +++ b/DistributedLock.Azure/BlobLeaseClientWrapper.cs @@ -9,7 +9,7 @@ namespace Medallion.Threading.Azure { /// - /// Adds support to + /// Adds support to /// internal sealed class BlobLeaseClientWrapper { @@ -24,7 +24,7 @@ public BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) { - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { this._blobLeaseClient.Acquire(duration.TimeSpan, cancellationToken: cancellationToken); return default; @@ -34,7 +34,7 @@ public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellat public ValueTask RenewAsync(CancellationToken cancellationToken) { - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { this._blobLeaseClient.Renew(cancellationToken: cancellationToken); return default; @@ -44,7 +44,7 @@ public ValueTask RenewAsync(CancellationToken cancellationToken) public ValueTask ReleaseAsync() { - if (SyncOverAsync.IsSynchronous) + if (SyncViaAsync.IsSynchronous) { this._blobLeaseClient.Release(); return default; diff --git a/DistributedLock.Core/Internal/AsyncLock.cs b/DistributedLock.Core/Internal/AsyncLock.cs index 5f74ea06..8377e9a5 100644 --- a/DistributedLock.Core/Internal/AsyncLock.cs +++ b/DistributedLock.Core/Internal/AsyncLock.cs @@ -7,7 +7,7 @@ namespace Medallion.Threading.Internal { /// - /// An async-based, -friendly mutex based on . We don't expose a + /// An async-based, -friendly mutex based on . We don't expose a /// method because does not require disposal unless its /// is accessed /// @@ -31,7 +31,7 @@ public async ValueTask AcquireAsync(CancellationToken cancellationT public async ValueTask TryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { - var acquired = SyncOverAsync.IsSynchronous + var acquired = SyncViaAsync.IsSynchronous ? this._semaphore.Wait(timeout.InMilliseconds, cancellationToken) : await this._semaphore.WaitAsync(timeout.InMilliseconds, cancellationToken).ConfigureAwait(false); return acquired ? new Handle(this._semaphore) : null; diff --git a/DistributedLock.Core/Internal/BusyWaitHelper.cs b/DistributedLock.Core/Internal/BusyWaitHelper.cs index bf6f4a43..fc0440e5 100644 --- a/DistributedLock.Core/Internal/BusyWaitHelper.cs +++ b/DistributedLock.Core/Internal/BusyWaitHelper.cs @@ -41,7 +41,7 @@ static class BusyWaitHelper var sleepTime = minSleepTime.TimeSpan + TimeSpan.FromMilliseconds(random.NextDouble() * sleepRangeMillis); try { - await SyncOverAsync.Delay(sleepTime, mergedCancellationToken).ConfigureAwait(false); + await SyncViaAsync.Delay(sleepTime, mergedCancellationToken).ConfigureAwait(false); } catch (OperationCanceledException) when (IsTimedOut()) { diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 0e7a412b..67418930 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -260,7 +260,7 @@ private async ValueTask StopOrDisposeAsync(bool isDispose) if (task != null) { - if (SyncOverAsync.IsSynchronous) { task.GetAwaiter().GetResult(); } + if (SyncViaAsync.IsSynchronous) { task.GetAwaiter().GetResult(); } else { await task.ConfigureAwait(false); } } } diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index ecdf8937..6684c269 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -79,7 +79,7 @@ private async ValueTask ExecuteAsync( bool disallowAsyncCancellation, bool isConnectionMonitoringQuery) { - if (!SyncOverAsync.IsSynchronous && this._command is DbCommand dbCommand) + if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) { if (!cancellationToken.CanBeCanceled) { @@ -183,7 +183,7 @@ private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) if (this._connection.ShouldPrepareCommands) { #if NETSTANDARD2_1 - if (!SyncOverAsync.IsSynchronous && this._command is DbCommand dbCommand) + if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) { // todo does canceling prepareasync doom pg transaction? return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 66b48a98..2bfbe254 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Internal.Data { /// /// Abstraction over that abstracts away the varying async support - /// across platforms, smooths over cancellation behavior, and integrates with + /// across platforms, smooths over cancellation behavior, and integrates with /// #if DEBUG public @@ -67,7 +67,7 @@ public async ValueTask BeginTransactionAsync() this._transaction = #if NETSTANDARD2_1 - !SyncOverAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection + !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) : #elif NETSTANDARD2_0 || NET461 @@ -79,7 +79,7 @@ public async ValueTask BeginTransactionAsync() public async ValueTask OpenAsync(CancellationToken cancellationToken) { - if ((cancellationToken.CanBeCanceled || !SyncOverAsync.IsSynchronous) + if ((cancellationToken.CanBeCanceled || !SyncViaAsync.IsSynchronous) && this.InnerConnection is DbConnection dbConnection) { await dbConnection.OpenAsync(cancellationToken).ConfigureAwait(false); @@ -112,7 +112,7 @@ private async ValueTask DisposeOrCloseAsync(bool isDispose) finally { #if NETSTANDARD2_1 - if (!SyncOverAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) + if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) { await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); } @@ -150,7 +150,7 @@ private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnect : await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); #if NETSTANDARD2_1 - if (!SyncOverAsync.IsSynchronous && transaction is DbTransaction dbTransaction) + if (!SyncViaAsync.IsSynchronous && transaction is DbTransaction dbTransaction) { await dbTransaction.DisposeAsync().ConfigureAwait(false); return; diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 8d8193fc..e0c38190 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -133,7 +133,7 @@ public Handle( public DatabaseConnection? Connection => Volatile.Read(ref this._innerHandle)?.Connection; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); public ValueTask DisposeAsync() { diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 81223fc7..991c42b9 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -243,7 +243,7 @@ public ValueTask DisposeAsync() return default; } - void IDisposable.Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); } private sealed class ManagedFinalizationDistributedLockHandle : IDistributedSynchronizationHandle @@ -259,7 +259,7 @@ public ManagedFinalizationDistributedLockHandle(IDistributedSynchronizationHandl public CancellationToken HandleLostToken => this._innerHandle.HandleLostToken; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); public ValueTask DisposeAsync() { diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 29b3d8fa..854f8ebb 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -49,14 +49,14 @@ public static ValueTask AcquireAsync(IInternalDistributedLock< public static THandle Acquire(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); public static THandle? TryAcquire(IInternalDistributedLock @lock, TimeSpan timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); @@ -69,14 +69,14 @@ public static ValueTask AcquireAsync(IInternalDistributedReade public static THandle Acquire(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken, state.isWrite), (@lock, timeout, cancellationToken, isWrite) ); public static THandle? TryAcquire(IInternalDistributedReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken, bool isWrite) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken, state.isWrite), (@lock, timeout, cancellationToken, isWrite) ); @@ -91,7 +91,7 @@ public static ValueTask AcquireUpgradeableReadLockAsync(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => AcquireUpgradeableReadLockAsync(state.@lock, state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); @@ -99,7 +99,7 @@ public static TUpgradeableHandle AcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => state.@lock.InternalTryAcquireUpgradeableReadLockAsync(state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); @@ -112,14 +112,14 @@ public static ValueTask AcquireAsync(IInternalDistributedSemap public static THandle Acquire(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); public static THandle? TryAcquire(IInternalDistributedSemaphore @lock, TimeSpan timeout, CancellationToken cancellationToken) where THandle : class, IDistributedSynchronizationHandle => - SyncOverAsync.Run( + SyncViaAsync.Run( state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), (@lock, timeout, cancellationToken) ); @@ -130,10 +130,10 @@ public static ValueTask UpgradeToWriteLockAsync(IInternalDistributedLockUpgradea handle.InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken).ThrowTimeoutIfFalse(); public static void UpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => - SyncOverAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); + SyncViaAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan timeout, CancellationToken cancellationToken) => - SyncOverAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); + SyncViaAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); #endregion private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index d0465663..f0d09057 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -35,7 +35,7 @@ public LeaseMonitor(ILeaseHandle leaseHandle) public CancellationToken HandleLostToken => this._handleLostSource.Token; - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); public async ValueTask DisposeAsync() { @@ -46,7 +46,7 @@ public async ValueTask DisposeAsync() this._disposalSource.Cancel(); } - if (SyncOverAsync.IsSynchronous) { this._monitoringTask.GetAwaiter().GetResult(); } + if (SyncViaAsync.IsSynchronous) { this._monitoringTask.GetAwaiter().GetResult(); } else { await this._monitoringTask.ConfigureAwait(false); } } finally diff --git a/DistributedLock.Core/Internal/SyncOverAsync.cs b/DistributedLock.Core/Internal/SyncViaAsync.cs similarity index 69% rename from DistributedLock.Core/Internal/SyncOverAsync.cs rename to DistributedLock.Core/Internal/SyncViaAsync.cs index 6ad0da82..3bcbeede 100644 --- a/DistributedLock.Core/Internal/SyncOverAsync.cs +++ b/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -4,27 +4,29 @@ namespace Medallion.Threading.Internal { - // TODO rename this (SyncViaAsync?) since it really isn't the sync over async antipattern /// /// Helps re-use code across sync and async pathways, leveraging the fact that async code will run synchronously /// unless it actually encounters an async operation. Downstream code should use the - /// to choose between sync and async operations + /// to choose between sync and async operations. + /// + /// This class does not incur the overhead of the sync-over-async anti-pattern; the only overhead is using s + /// in a synchronous manner. /// #if DEBUG public #else internal #endif - static class SyncOverAsync + static class SyncViaAsync { [ThreadStatic] private static bool _isSynchronous; public static bool IsSynchronous => _isSynchronous; - // todo get rid of WillGoAsync, replace with a debug-only API for turning on these assertions that a test can use - // e. g. using (SyncOverAsync.SyncMode()) { Assert.DoesNotThrow(() => handle.Dispose()); } - + /// + /// Runs synchronously + /// public static void Run(Func action, TState state) { Run( @@ -37,6 +39,9 @@ public static void Run(Func action, TState state) ); } + /// + /// Runs synchronously + /// public static TResult Run(Func> action, TState state) { Invariant.Require(!_isSynchronous); @@ -65,6 +70,9 @@ public static TResult Run(Func> acti } } + /// + /// A -compatible implementation of . + /// public static ValueTask Delay(TimeoutValue timeout, CancellationToken cancellationToken) { if (!IsSynchronous) @@ -86,5 +94,13 @@ public static ValueTask Delay(TimeoutValue timeout, CancellationToken cancellati return default; } + + /// + /// For a type which implements both and , + /// provides an implementation of using . + /// + public static void DisposeSyncViaAsync(this TDisposable disposable) + where TDisposable : IAsyncDisposable, IDisposable => + Run(@this => @this.DisposeAsync(), disposable); } } diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index e7337087..632ee3c9 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -99,7 +99,7 @@ private PostgresAdvisoryLock(bool isShared) // todo revisit this behavior. Probably should throw deadlock to be consistent with Semaphore. See also SqlApplicationLock if (timeout.IsZero) { return null; } if (timeout.IsInfinite) { throw new InvalidOperationException("Attempted to acquire a lock that is already held on the same connection"); } - await SyncOverAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); return null; default: throw new InvalidOperationException($"Unexpected return code {acquireCommandResult}"); diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index d6619d56..e173592f 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -40,7 +40,7 @@ public RedLockAcquire( { this._cancellationToken.ThrowIfCancellationRequested(); - var isSynchronous = SyncOverAsync.IsSynchronous; + var isSynchronous = SyncViaAsync.IsSynchronous; if (isSynchronous && this._databases.Count == 1) { return this.TrySingleFullySynchronousAcquire(); diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs index aa6bcf31..c0b1fead 100644 --- a/DistributedLock.Redis/RedLock/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -36,7 +36,7 @@ public RedLockExtend( public async Task TryExtendAsync() { - Invariant.Require(!SyncOverAsync.IsSynchronous, "should only be called from a background renewal thread which is async"); + Invariant.Require(!SyncViaAsync.IsSynchronous, "should only be called from a background renewal thread which is async"); var incompleteTasks = new HashSet(); foreach (var kvp in this._tryAcquireOrRenewTasks.ToArray()) diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/DistributedLock.Redis/RedLock/RedLockHandle.cs index b897b11d..ab38ea5e 100644 --- a/DistributedLock.Redis/RedLock/RedLockHandle.cs +++ b/DistributedLock.Redis/RedLock/RedLockHandle.cs @@ -38,7 +38,7 @@ public RedLockHandle( /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); /// /// Releases the lock asynchronously diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs index 9bc00018..25686bca 100644 --- a/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -32,7 +32,7 @@ public RedLockRelease( public async ValueTask ReleaseAsync() { - var isSynchronous = SyncOverAsync.IsSynchronous; + var isSynchronous = SyncViaAsync.IsSynchronous; var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); List? releaseExceptions = null; diff --git a/DistributedLock.SqlServer/SqlApplicationLock.cs b/DistributedLock.SqlServer/SqlApplicationLock.cs index 9b3180e0..89457172 100644 --- a/DistributedLock.SqlServer/SqlApplicationLock.cs +++ b/DistributedLock.SqlServer/SqlApplicationLock.cs @@ -197,7 +197,7 @@ public static async ValueTask ParseExitCodeAsync(int exitCode, TimeoutValu async ValueTask WaitThenReturnFalseAsync() { - await SyncOverAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); return false; } } diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index 924226f3..38d730c9 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -19,11 +19,10 @@ internal SqlDistributedReaderWriterLockHandle() { } /// public abstract CancellationToken HandleLostToken { get; } - // todo should we have a common DisposeSyncOverAsync() extension for this? /// /// Releases the lock /// - public void Dispose() => SyncOverAsync.Run(@this => @this.DisposeAsync(), this); + public void Dispose() => this.DisposeSyncViaAsync(); /// /// Releases the lock asynchronously diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index 42009a03..537a7424 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -141,7 +141,7 @@ private static ValueTask ProcessAcquireResultAsync( async ValueTask DelayFalseAsync() { - await SyncOverAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); return false; } return DelayFalseAsync(); diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index be326cbe..6affece3 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -68,10 +68,9 @@ public void TestKeepaliveProtectsFromIdleSessionKiller() this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); var @lock = this._lockProvider.CreateLock(nameof(TestKeepaliveProtectsFromIdleSessionKiller)); - - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); var handle = @lock.Acquire(); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); Thread.Sleep(TimeSpan.FromSeconds(2)); Assert.DoesNotThrow(() => handle.Dispose()); } diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 4d8578eb..c8808bf2 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -51,7 +51,7 @@ public async Task TestLockOnDifferentBlobClientTypes( } else { - SyncOverAsync.Run(_ => TestAsync(), default(object)); + SyncViaAsync.Run(_ => TestAsync(), default(object)); } async ValueTask TestAsync() diff --git a/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs similarity index 85% rename from DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs rename to DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs index f7e2844e..e3e73fb2 100644 --- a/DistributedLock.Tests/Tests/Core/SyncOverAsyncTest.cs +++ b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs @@ -6,13 +6,13 @@ namespace Medallion.Threading.Tests.Core { [Category("CI")] - public class SyncOverAsyncTest + public class SyncViaAsyncTest { [Test] public void TestSyncOverAsyncVoid() { var currentThread = Thread.CurrentThread; - SyncOverAsync.Run<(int a, int b, Thread startingThread, bool expectAsync)>( + SyncViaAsync.Run<(int a, int b, Thread startingThread, bool expectAsync)>( async state => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), (1, 2, currentThread, false) ); @@ -22,7 +22,7 @@ public void TestSyncOverAsyncVoid() public void TestSyncOverAsyncWithResult() { var currentThread = Thread.CurrentThread; - var result = SyncOverAsync.Run( + var result = SyncViaAsync.Run( async ((int a, int b, Thread startingThread, bool expectAsync) state) => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), (1, 2, currentThread, false) ); @@ -38,7 +38,7 @@ private async ValueTask AddAsync(int a, int b, Thread startingThread, bool private async ValueTask AddHelperAsync(int a, bool expectAsync) { - Assert.AreNotEqual(expectAsync, SyncOverAsync.IsSynchronous); + Assert.AreNotEqual(expectAsync, SyncViaAsync.IsSynchronous); if (expectAsync) { await Task.Delay(1); } else { Thread.Sleep(1); } diff --git a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs index f0e66eb6..9f100639 100644 --- a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs @@ -39,7 +39,7 @@ public async Task TestExecuteNonQueryAlreadyCanceled( } else { - Assert.Catch(() => SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0)); + Assert.Catch(() => SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0)); } } @@ -61,7 +61,7 @@ public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] b var task = Task.Run(async () => { if (isAsync) { await command.ExecuteNonQueryAsync(cancellationTokenSource.Token, disallowAsyncCancellation: true); } - else { SyncOverAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } + else { SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } }); Assert.IsFalse(task.Wait(TimeSpan.FromSeconds(.1))); diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/DistributedLock.WaitHandles/WaitHandleExtensions.cs index 155d5719..16ce40da 100644 --- a/DistributedLock.WaitHandles/WaitHandleExtensions.cs +++ b/DistributedLock.WaitHandles/WaitHandleExtensions.cs @@ -9,7 +9,7 @@ internal static class WaitHandleExtensions { public static async ValueTask WaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) { - return SyncOverAsync.IsSynchronous + return SyncViaAsync.IsSynchronous ? waitHandle.InternalWaitOne(timeout, cancellationToken) : await waitHandle.InternalWaitOneAsync(timeout, cancellationToken).ConfigureAwait(false); } From c395db24d6d9cb9c0ca83fff785daf867e30e7ca Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 6 Jan 2021 07:26:23 -0500 Subject: [PATCH 061/399] Test improvements --- .../Data/ConnectionStringStrategyTestCases.cs | 2 +- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 7 +++++-- .../AbstractTestCases/Redis/RedisExtensionTestCases.cs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 6affece3..84b42607 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -67,7 +67,7 @@ public void TestKeepaliveProtectsFromIdleSessionKiller() var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); - var @lock = this._lockProvider.CreateLock(nameof(TestKeepaliveProtectsFromIdleSessionKiller)); + var @lock = this._lockProvider.CreateLock(Guid.NewGuid().ToString()); // use unique name due to retry var handle = @lock.Acquire(); using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 8fd1fe4f..c8ec343b 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -113,9 +113,12 @@ public void TestDisposeHandleIsIdempotent() [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public void TestTimeouts() { - var @lock = this._lockProvider.CreateLock(nameof(TestTimeouts)); + // use a randomized name in case we end up retrying + var lockName = Guid.NewGuid().ToString(); + + var @lock = this._lockProvider.CreateLock(lockName); // acquire with a different lock instance to avoid reentrancy mattering - using (this._lockProvider.CreateLock(nameof(TestTimeouts)).Acquire()) + using (this._lockProvider.CreateLock(lockName).Acquire()) { var timeout = TimeSpan.FromSeconds(.1); var waitTime = TimeSpan.FromSeconds(.4); diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index 849fa35c..196c7209 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -23,7 +23,7 @@ public abstract class RedisExtensionTestCases [NonParallelizable] // timing-sensitive public async Task TestCanExtendLock() { - this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5))); + this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(50))); var @lock = this._provider.CreateLock("lock"); await using var handle = await @lock.AcquireAsync(); From 7723114ef1197ce404e4c7df23c6608c1d7bfbdc Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 7 Jan 2021 07:11:50 -0500 Subject: [PATCH 062/399] Test stability --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 4 ++-- .../Infrastructure/Data/TestingDbSynchronizationStrategy.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index c8ec343b..2de3240f 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -120,8 +120,8 @@ public void TestTimeouts() // acquire with a different lock instance to avoid reentrancy mattering using (this._lockProvider.CreateLock(lockName).Acquire()) { - var timeout = TimeSpan.FromSeconds(.1); - var waitTime = TimeSpan.FromSeconds(.4); + var timeout = TimeSpan.FromSeconds(.2); + var waitTime = TimeSpan.FromSeconds(.5); var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire"); diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 24690f7f..53396cbb 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -24,8 +24,9 @@ protected TestingDbSynchronizationStrategy(ITestingDb db) public string SetUniqueApplicationName(string baseName = "") { + // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool var applicationName = DistributedLockHelpers.ToSafeName( - $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}", + $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", maxNameLength: this.Db.MaxApplicationNameLength, s => s ); From 9c5147d406c6e520898eb0bf9a4b5a8be07e4e8b Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 9 Jan 2021 11:04:43 -0500 Subject: [PATCH 063/399] Increase test stability --- .../AbstractTestCases/Redis/RedisExtensionTestCases.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index 196c7209..bafbdf82 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -23,14 +23,14 @@ public abstract class RedisExtensionTestCases [NonParallelizable] // timing-sensitive public async Task TestCanExtendLock() { - this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(50))); + this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(50), TimeSpan.FromMilliseconds(50))); var @lock = this._provider.CreateLock("lock"); await using var handle = await @lock.AcquireAsync(); var secondHandleTask = @lock.AcquireAsync().AsTask(); _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(1.5))); + Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(2))); await handle.DisposeAsync(); From db405c0311af8e69999859fa1e76eb15b2c468d1 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 9 Jan 2021 20:17:21 -0500 Subject: [PATCH 064/399] - Fix bug in RedLockAcquire where we were double-counting some success tasks as faults - Fix bug in RedLockExtend where we were only waiting for a single success task - Fix bug in RedLockRelease where we were checking Task.Result on tasks that could be faulted - Identify incompatibility between multi-database redlock and our semaphore algorithm - Identify improper handling of an even-numbered db pool - Fix RedisServer to properly shut down Redis databases - Fix Redis 2x1 database provider to properly kill its one "broken" redis server - Update Redis client package --- .../DistributedLock.Core.csproj | 2 +- .../DistributedLock.Redis.csproj | 2 +- .../RedLock/RedLockAcquire.cs | 32 ++++++------- .../RedLock/RedLockExtend.cs | 4 +- .../RedLock/RedLockRelease.cs | 7 +-- .../RedisDistributedLockOptionsBuilder.cs | 2 +- .../RedisDistributedSemaphore.cs | 21 +++++++++ .../RedisSynchronizationCoreTestCases.cs | 2 + .../Infrastructure/Redis/RedisServer.cs | 45 ++++++++++++------- .../Redis/TestingRedisDatabaseProvider.cs | 7 ++- .../DistributedLockTaker.csproj | 4 -- 11 files changed, 82 insertions(+), 46 deletions(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index d4a3b963..719c6dbc 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -41,7 +41,7 @@ - + diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index b1f37aac..bef97299 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -45,7 +45,7 @@ - + all diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index e173592f..554d444a 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -134,26 +134,26 @@ private async Task WaitForAcquireAsync(IReadOnlyDictionary= threshold) { return false; } } } - - // faulted or canceled - - // if we get too many faults, the lock is not possible to acquire, so we should throw - ++faultCount; - if (faultCount >= threshold) + else // faulted or canceled { - var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) - .ToArray(); - if (faultingTasks.Length == 1) + // if we get too many faults, the lock is not possible to acquire, so we should throw + ++faultCount; + if (faultCount >= threshold) { - await faultingTasks[0].ConfigureAwait(false); // propagate the error + var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) + .ToArray(); + if (faultingTasks.Length == 1) + { + await faultingTasks[0].ConfigureAwait(false); // propagate the error + } + + throw new AggregateException(faultingTasks.Select(t => t.Exception ?? new TaskCanceledException(t).As())) + .Flatten(); } - - throw new AggregateException(faultingTasks.Select(t => t.Exception ?? new TaskCanceledException(t).As())) - .Flatten(); - } - ++failCount; - if (failCount >= threshold) { return false; } + ++failCount; + if (failCount >= threshold) { return false; } + } incompleteTasks.Remove(completed); } diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs index c0b1fead..c5871875 100644 --- a/DistributedLock.Redis/RedLock/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -74,7 +74,7 @@ public RedLockExtend( await completed.ConfigureAwait(false); // propagate cancellation return null; // inconclusive } - + if (completed.Status == TaskStatus.RanToCompletion && ((Task)completed).Result) { ++successCount; @@ -88,6 +88,8 @@ public RedLockExtend( ++failCount; if (failCount >= threshold) { return false; } } + + incompleteTasks.Remove(completed); } } } diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs index 25686bca..c828b0df 100644 --- a/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -34,7 +34,7 @@ public async ValueTask ReleaseAsync() { var isSynchronous = SyncViaAsync.IsSynchronous; var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - + List? releaseExceptions = null; var successCount = 0; var faultCount = 0; @@ -45,9 +45,10 @@ public async ValueTask ReleaseAsync() while (true) { var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) - // work through non-faulted tasks first, starting with the failed ones since no action is required to release those + // work through non-faulted tasks first .OrderByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) - .ThenBy(kvp => kvp.Value.Result) + // then start with failed since no action is required to release those + .ThenBy(kvp => kvp.Value.Status == TaskStatus.RanToCompletion && kvp.Value.Result) .Select(kvp => kvp.Key) .ToArray(); foreach (var db in releaseableDatabases) diff --git a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs index e6689d5c..1fc38d26 100644 --- a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs @@ -9,7 +9,7 @@ namespace Medallion.Threading.Redis { - // todo consider rename to RedLockOptionsBuilder + // todo consider rename to RedLockOptionsBuilder (except maybe semaphore won't be redlock...) /// /// Options for configuring a redis-based lock /// diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index 652ec900..e8bfdd04 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -11,6 +11,9 @@ namespace Medallion.Threading.Redis { + // TODO this does not work with multi-database because being in a majority of semaphores does not mean that < max count + // users are in the semaphore (e. g. with 3 dbs and 2 tickets, we can have 3 users acquiring AB, BC, and AC. Each database + // sees 2 tickets taken!). Let's change this back to the "official" fair semaphore implementation /// /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. /// @@ -70,6 +73,24 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable CreateDatabaseMock() { var mock = new Mock(MockBehavior.Strict); diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 33c5f8ea..550fdbba 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -6,10 +6,11 @@ using System.IO; using System.Linq; using System.Text; +using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis { - internal class RedisServer : IDisposable + internal class RedisServer { // redis default is 6379, so go one above that private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; @@ -25,9 +26,9 @@ internal class RedisServer : IDisposable private readonly Command _command; - public RedisServer() : this(null) { } + public RedisServer(bool allowAdmin = false) : this(null, allowAdmin) { } - private RedisServer(int? port) + private RedisServer(int? port, bool allowAdmin) { lock (ActiveServersByPort) { @@ -38,33 +39,23 @@ private RedisServer(int? port) .RedirectStandardErrorTo(Console.Error); ActiveServersByPort.Add(this.Port, this); } - this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}"); + this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}{(allowAdmin ? ",allowAdmin=true" : string.Empty)}"); // Clean the db to ensure it is empty. Running an arbitrary command also ensures that // the db successfully spun up before we proceed (Connect seemingly can complete before that happens). // This is particularly important for cross-process locking where the lock taker process // assumes we've already started a server on certain ports. - this.Multiplexer.GetDatabase().Execute("flushall"); + this.Multiplexer.GetDatabase().Execute("flushall", Array.Empty(), CommandFlags.DemandMaster); } public int ProcessId => this._command.ProcessId; public int Port { get; } public ConnectionMultiplexer Multiplexer { get; } - public void Dispose() - { - this.Multiplexer.Dispose(); - this._command.Kill(); - lock (ActiveServersByPort) - { - ActiveServersByPort.Remove(this.Port); - } - } - public static RedisServer GetDefaultServer(int index) { lock (DefaultServers) { - return DefaultServers[index] ??= new RedisServer(RedisPorts.DefaultPorts[index]); + return DefaultServers[index] ??= new RedisServer(RedisPorts.DefaultPorts[index], allowAdmin: false); } } @@ -72,7 +63,27 @@ public static void DisposeAll() { lock (ActiveServersByPort) { - ActiveServersByPort.Values.ToList().ForEach(s => s.Dispose()); + var shutdownTasks = ActiveServersByPort.Values + .Select(async server => + { + server.Multiplexer.Dispose(); + try + { + using var adminMultiplexer = await ConnectionMultiplexer.ConnectAsync($"localhost:{server.Port},allowAdmin=true"); + adminMultiplexer.GetServer("localhost", server.Port).Shutdown(ShutdownMode.Never); + } + finally + { + if (!await server._command.Task.WaitAsync(TimeSpan.FromSeconds(5))) + { + server._command.Kill(); + throw new InvalidOperationException("Forced to kill Redis server"); + } + } + }) + .ToArray(); + ActiveServersByPort.Clear(); + Task.WaitAll(shutdownTasks); } } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 0cc030a1..183bd106 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -1,10 +1,12 @@ using Medallion.Threading.Tests.Redis; +using NUnit.Framework; using StackExchange.Redis; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; +using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis { @@ -42,10 +44,11 @@ public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvid static TestingRedis2x1DatabaseProvider() { - var server = new RedisServer(); + var server = new RedisServer(allowAdmin: true); DeadDatabase = server.Multiplexer.GetDatabase(); using var process = Process.GetProcessById(server.ProcessId); - process.Kill(); + server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); + Assert.IsTrue(process.WaitForExit(5000)); } public TestingRedis2x1DatabaseProvider() diff --git a/DistributedLockTaker/DistributedLockTaker.csproj b/DistributedLockTaker/DistributedLockTaker.csproj index 067cde3b..c3a8be47 100644 --- a/DistributedLockTaker/DistributedLockTaker.csproj +++ b/DistributedLockTaker/DistributedLockTaker.csproj @@ -30,8 +30,4 @@ - - - - \ No newline at end of file From f5ca36c4bd3040313149b5ec9ab3a864144b6c7d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 10 Jan 2021 10:44:19 -0500 Subject: [PATCH 065/399] Fix bug with our RedLock handling of operations with a even number of databases --- .../RedLock/RedLockAcquire.cs | 10 ++++---- .../RedLock/RedLockExtend.cs | 6 ++--- .../RedLock/RedLockHelper.cs | 25 ++++++++++++++++++- .../RedLock/RedLockRelease.cs | 6 ++--- .../RedisDistributedSemaphore.cs | 18 ------------- .../RedisSynchronizationCoreTestCases.cs | 16 ++++++++++-- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index 554d444a..0bd2c8b9 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -109,7 +109,6 @@ private async Task WaitForAcquireAsync(IReadOnlyDictionary WaitForAcquireAsync(IReadOnlyDictionary= threshold) { return true; } + if (RedLockHelper.HasSufficientSuccesses(successCount, this._databases.Count)) { return true; } } else { ++failCount; - if (failCount >= threshold) { return false; } + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } } } else // faulted or canceled { // if we get too many faults, the lock is not possible to acquire, so we should throw ++faultCount; - if (faultCount >= threshold) + if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, this._databases.Count)) { var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) .ToArray(); @@ -152,10 +151,11 @@ private async Task WaitForAcquireAsync(IReadOnlyDictionary= threshold) { return false; } + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } } incompleteTasks.Remove(completed); + Invariant.Require(incompleteTasks.Count > 1, "should be more than just timeout left"); } } diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs index c5871875..10d681b6 100644 --- a/DistributedLock.Redis/RedLock/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -62,7 +62,7 @@ public RedLockExtend( using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); incompleteTasks.Add(timeout.Task); - var threshold = (this._tryAcquireOrRenewTasks.Count / 2) + 1; + var databaseCount = this._tryAcquireOrRenewTasks.Count; var successCount = 0; var failCount = 0; while (true) @@ -78,7 +78,7 @@ public RedLockExtend( if (completed.Status == TaskStatus.RanToCompletion && ((Task)completed).Result) { ++successCount; - if (successCount >= threshold) { return true; } + if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) { return true; } } else { @@ -86,7 +86,7 @@ public RedLockExtend( // this is just called by the extend loop. While in theory a fault could indicate some kind of post-success // failure, most likely it means the db is unreachable and so it is safest to consider it a failure ++failCount; - if (failCount >= threshold) { return false; } + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, databaseCount)) { return false; } } incompleteTasks.Remove(completed); diff --git a/DistributedLock.Redis/RedLock/RedLockHelper.cs b/DistributedLock.Redis/RedLock/RedLockHelper.cs index 358f8c58..89fc1357 100644 --- a/DistributedLock.Redis/RedLock/RedLockHelper.cs +++ b/DistributedLock.Redis/RedLock/RedLockHelper.cs @@ -1,4 +1,5 @@ -using StackExchange.Redis; +using Medallion.Threading.Internal; +using StackExchange.Redis; using System; using System.Collections.Generic; using System.Diagnostics; @@ -18,6 +19,28 @@ static RedLockHelper() LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; } + public static bool HasSufficientSuccesses(int successCount, int databaseCount) + { + // a majority is required + var threshold = (databaseCount / 2) + 1; + // While in theory this should return true if we have more than enough, we never expect this to be + // called except with just enough or not enough due to how we've implemented our approaches. + Invariant.Require(successCount <= threshold); + return successCount >= threshold; + } + + public static bool HasTooManyFailuresOrFaults(int failureOrFaultCount, int databaseCount) + { + // For an odd number of databases, we need a majority to make success impossible. For an + // even number, however, getting to 50% failures/faults is sufficient to rule out getting + // a majority of successes. + var threshold = (databaseCount / 2) + (databaseCount % 2); + // While in theory this should return true if we have more than enough, we never expect this to be + // called except with just enough or not enough due to how we've implemented our approaches. + Invariant.Require(failureOrFaultCount <= threshold); + return failureOrFaultCount >= threshold; + } + public static RedisValue CreateLockId() => LockIdPrefix + Guid.NewGuid().ToString("n"); public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs index c828b0df..5d4f0a33 100644 --- a/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -38,7 +38,7 @@ public async ValueTask ReleaseAsync() List? releaseExceptions = null; var successCount = 0; var faultCount = 0; - var threshold = (unreleasedTryAcquireOrRenewTasks.Count / 2) + 1; + var databaseCount = unreleasedTryAcquireOrRenewTasks.Count; try { @@ -73,14 +73,14 @@ public async ValueTask ReleaseAsync() { (releaseExceptions ??= new List()).Add(ex); ++faultCount; - if (faultCount >= threshold) + if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, databaseCount)) { throw new AggregateException(releaseExceptions!).Flatten(); } } } - if (successCount >= threshold) + if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) { return; } diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index e8bfdd04..be8a8e27 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -73,24 +73,6 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable(aggregateException.InnerException); } + [Test] + public void TestHalfFaultingDatabasesCauseAcquireToThrow() + { + CheckProviderCompatibility(); + + var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + + var @lock = this._provider.CreateLock("lock"); + Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); + } + [Test] [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) @@ -123,8 +136,6 @@ public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() Assert.IsNotNull(handle); } - // todo test even number of dbs with 2 failing - private static Mock CreateDatabaseMock() { var mock = new Mock(MockBehavior.Strict); @@ -148,6 +159,7 @@ private static void MockDatabase(Mock mockDatabase, Func return .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); } + // todo may be able to remove this if semaphore doesn't use multiple dbs private static void CheckProviderCompatibility() { // The semaphore5 provider is not compatible with this test class because it will attempt to acquire locks upon creation From 4adb299f4e08b96077ad965b6ef4b56cc14cb887 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 10 Jan 2021 17:03:02 -0500 Subject: [PATCH 066/399] Fixed bug where redis semaphore allowed multiple databases --- .../RedisDistributedSemaphore.cs | 22 +++++++---------- ...RedisDistributedSynchronizationProvider.cs | 5 +++- .../RedisSynchronizationCoreTestCases.cs | 24 ------------------- .../Redis/TestingRedisProviders.cs | 9 +++---- .../Tests/CombinatorialTests.cs | 22 ++++------------- .../Redis/RedisDistributedSemaphoreTest.cs | 6 ----- DistributedLockTaker/Program.cs | 3 +-- 7 files changed, 21 insertions(+), 70 deletions(-) diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index be8a8e27..d91925e0 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -11,14 +11,16 @@ namespace Medallion.Threading.Redis { - // TODO this does not work with multi-database because being in a majority of semaphores does not mean that < max count - // users are in the semaphore (e. g. with 3 dbs and 2 tickets, we can have 3 users acquiring AB, BC, and AC. Each database - // sees 2 tickets taken!). Let's change this back to the "official" fair semaphore implementation /// - /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// Implements a using Redis. /// public sealed partial class RedisDistributedSemaphore : IInternalDistributedSemaphore { + /// + /// Note: while we store this as a list to simplify the interactions with the RedLock components, in fact the semaphore + /// algorithm only works with a single database. With multiple databases, we risk violating our . + /// For example, with 3 dbs and 2 tickets, we can have 3 users acquiring AB, BC, and AC. Each database sees 2 tickets taken! + /// private readonly IReadOnlyList _databases; private readonly RedisDistributedLockOptions _options; @@ -26,24 +28,16 @@ public sealed partial class RedisDistributedSemaphore : IInternalDistributedSema /// Constructs a semaphore named using the provided , , and . /// public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) - : this(key, maxCount, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) - { - } - - /// - /// Constructs a semaphore named using the provided , , and . - /// - public RedisDistributedSemaphore(RedisKey key, int maxCount, IEnumerable databases, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } - this._databases = RedisDistributedLock.ValidateDatabases(databases); + this._databases = new[] { database ?? throw new ArgumentNullException(nameof(database)) }; this.Key = key; this.MaxCount = maxCount; this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); } - + internal RedisKey Key { get; } /// diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs index 4c1d509c..a324cedb 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs @@ -29,6 +29,9 @@ public RedisDistributedSynchronizationProvider(IDatabase database, Action /// Constructs a that connects to the provided /// and uses the provided . + /// + /// Note that if multiple s are provided, will use only the first + /// . /// public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) { @@ -55,7 +58,7 @@ IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWr /// /// Creates a using the provided and . /// - public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases, this._options); + public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases[0], this._options); IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index f8d89d7f..5d8b49d7 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -28,8 +28,6 @@ public abstract class RedisSynchronizationCoreTestCases [Test] public void TestMajorityFaultingDatabasesCauseAcquireToThrow() { - CheckProviderCompatibility(); - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); @@ -50,8 +48,6 @@ public void TestMajorityFaultingDatabasesCauseAcquireToThrow() [NonParallelizable] // timing-sensitive public async Task TestMajorityHangingDatabasesCauseAcquireToFail() { - CheckProviderCompatibility(); - using var @event = new ManualResetEventSlim(initialState: false); var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); MockDatabase(databases[1], () => { @event.Wait(); return true; }); @@ -70,8 +66,6 @@ public async Task TestMajorityHangingDatabasesCauseAcquireToFail() [Test] public void TestMajorityFaultingDatabasesCauseReleaseToThrow() { - CheckProviderCompatibility(); - var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); var @lock = this._provider.CreateLock("lock"); @@ -85,8 +79,6 @@ public void TestMajorityFaultingDatabasesCauseReleaseToThrow() [Test] public void TestHalfFaultingDatabasesCauseAcquireToThrow() { - CheckProviderCompatibility(); - var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); @@ -99,8 +91,6 @@ public void TestHalfFaultingDatabasesCauseAcquireToThrow() [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) { - CheckProviderCompatibility(); - var database = CreateDatabaseMock(); MockDatabase(database, () => { Thread.Sleep(50); return true; }); @@ -116,8 +106,6 @@ public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) [NonParallelizable] // timing-sensitive public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() { - CheckProviderCompatibility(); - using var @event = new ManualResetEventSlim(); var failDatabase = CreateDatabaseMock(); MockDatabase(failDatabase, () => { @event.Wait(); return false; }); @@ -158,17 +146,5 @@ private static void MockDatabase(Mock mockDatabase, Func return mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); } - - // todo may be able to remove this if semaphore doesn't use multiple dbs - private static void CheckProviderCompatibility() - { - // The semaphore5 provider is not compatible with this test class because it will attempt to acquire locks upon creation - // which will fail due to our mocked DB setup. - if (typeof(TLockProvider).IsConstructedGenericType - && typeof(TLockProvider).GetGenericTypeDefinition() == typeof(TestingSemaphore5AsMutexProvider<,>)) - { - Assert.Pass("The provider is incompatible"); - } - } } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs index 7053e648..4da35203 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -49,12 +49,11 @@ public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName public override string GetCrossProcessLockType(ReaderWriterLockType type) => $"{type}{nameof(RedisDistributedReaderWriterLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; } - public sealed class TestingRedisDistributedSemaphoreProvider : TestingSemaphoreProvider> - where TDatabaseProvider : TestingRedisDatabaseProvider, new() + public sealed class TestingRedisDistributedSemaphoreProvider : TestingSemaphoreProvider> { public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) { - var semaphore = new RedisDistributedSemaphore(name, maxCount, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); + var semaphore = new RedisDistributedSemaphore(name, maxCount, this.Strategy.DatabaseProvider.Databases.Single(), this.Strategy.Options); this.Strategy.RegisterKillHandleAction( () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) .ToList() @@ -63,8 +62,6 @@ public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, return semaphore; } - public override string GetSafeName(string name) => new RedisDistributedSemaphore(name, 1, this.Strategy.DatabaseProvider.Databases).Name; - - public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedSemaphore)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; + public override string GetSafeName(string name) => new RedisDistributedSemaphore(name, 1, this.Strategy.DatabaseProvider.Databases.Single()).Name; } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 54623e5f..ccfb40d6 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -63,12 +63,8 @@ public class Core_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_Redi public class Core_Redis_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore1AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore1AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore5AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } - public class Core_Semaphore5AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore1AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases>, TestingRedisSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases>, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } @@ -78,19 +74,11 @@ public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDat public class RedisExtension_Redis_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedis2x1DatabaseProvider> { } public class RedisExtension_Redis_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedis3DatabaseProvider> { } public class RedisExtension_Redis_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSingleDatabaseProvider> { } - public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } - public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } - public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } - public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } - public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } - public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases>, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases>, TestingRedisSingleDatabaseProvider> { } public class RedisSynchronizationCore_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } public class RedisSynchronizationCore_Redis_Redis3DatabaseTest : RedisSynchronizationCoreTestCases> { } - public class RedisSynchronizationCore_Semaphore1AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } - public class RedisSynchronizationCore_Semaphore5AsMutex_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } - public class SemaphoreCore_RedisSemaphore_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } - public class SemaphoreCore_RedisSemaphore_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } - public class SemaphoreCore_RedisSemaphore_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedSemaphoreCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class SemaphoreCore_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedSemaphoreCoreTestCases> { } } namespace Medallion.Threading.Tests.SqlServer diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index c2b82511..9f942fd4 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -27,15 +27,9 @@ public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, database)); - Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, new[] { database })); Assert.Throws(() => new RedisDistributedSemaphore("key", 0, database)); - Assert.Throws(() => new RedisDistributedSemaphore("key", 0, new[] { database })); Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); - Assert.Throws(() => new RedisDistributedSemaphore("key", -1, new[] { database })); Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); - Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IEnumerable)!)); - Assert.Throws(() => new RedisDistributedSemaphore("key", 2, new[] { database, null! })); - Assert.Throws(() => new RedisDistributedSemaphore("key", 2, Enumerable.Empty())); } } } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 97d7903a..1ef9de54 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -90,11 +90,10 @@ public static int Main(string[] args) var maxCount = type.EndsWith("1AsMutex") ? 1 : type.EndsWith("5AsMutex") ? 5 : throw new ArgumentException(type); - var serverCount = int.Parse(type.Substring(nameof(RedisDistributedSemaphore).Length, 1)); handle = new RedisDistributedSemaphore( name, maxCount, - GetRedisDatabases(serverCount), + GetRedisDatabases(serverCount: 1).Single(), // in order to see abandonment work in a reasonable timeframe, use very short expiry options => options.Expiry(TimeSpan.FromSeconds(1)) .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)) From b995725c2b75d4150ceaa97a95aea82d857542fa Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 10 Jan 2021 20:21:16 -0500 Subject: [PATCH 067/399] Resolve TODOs --- DistributedLock.Core/Internal/Data/DatabaseCommand.cs | 1 - DistributedLock.Core/Internal/TimeoutValue.cs | 1 - DistributedLock.FileSystem/FileDistributedLock.cs | 1 - DistributedLock.Postgres/PostgresAdvisoryLock.cs | 3 +-- DistributedLock.Postgres/PostgresDistributedLock.cs | 6 +----- .../PostgresDistributedLockHandle.cs | 1 - .../PostgresDistributedReaderWriterLock.cs | 6 ++---- DistributedLock.SqlServer/SqlApplicationLock.cs | 8 ++++---- DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs | 2 -- DistributedLock.SqlServer/SqlDistributedLock.cs | 3 --- .../SqlDistributedReaderWriterLock.cs | 2 -- .../SqlDistributedReaderWriterLockHandle.cs | 1 - .../ExternalConnectionOrTransactionStrategyTestCases.cs | 9 +++++++++ .../Data/MultiplexingConnectionStrategyTestCases.cs | 3 +-- .../Tests/Postgres/PostgresDistributedLockTest.cs | 4 ---- .../Tests/Redis/RedisDistributedReaderWriterLockTest.cs | 1 + .../{Data => SqlServer}/SqlDatabaseConnectionTest.cs | 3 +-- 17 files changed, 20 insertions(+), 35 deletions(-) rename DistributedLock.Tests/Tests/{Data => SqlServer}/SqlDatabaseConnectionTest.cs (95%) diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 6684c269..3cf82b6f 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -185,7 +185,6 @@ private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) #if NETSTANDARD2_1 if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) { - // todo does canceling prepareasync doom pg transaction? return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); } #elif !NETSTANDARD2_0 && !NET461 diff --git a/DistributedLock.Core/Internal/TimeoutValue.cs b/DistributedLock.Core/Internal/TimeoutValue.cs index 0aa6c1cb..fc304dc4 100644 --- a/DistributedLock.Core/Internal/TimeoutValue.cs +++ b/DistributedLock.Core/Internal/TimeoutValue.cs @@ -3,7 +3,6 @@ namespace Medallion.Threading.Internal { - // todo test /// /// A type which can only store a valid timeout value /// diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index f74a9b73..80b00f0d 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -45,7 +45,6 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name); } - // todo revisit API /// /// Implements /// diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 632ee3c9..2b97387b 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -96,9 +96,8 @@ private PostgresAdvisoryLock(bool isShared) case 0: return null; case 1: return Cookie; case AlreadyHeldReturnCode: - // todo revisit this behavior. Probably should throw deadlock to be consistent with Semaphore. See also SqlApplicationLock if (timeout.IsZero) { return null; } - if (timeout.IsInfinite) { throw new InvalidOperationException("Attempted to acquire a lock that is already held on the same connection"); } + if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); return null; default: diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index fee093dc..6e660a86 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -9,8 +9,6 @@ namespace Medallion.Threading.Postgres { - // todo integrate into all appropriate abstract test cases (will want a new provider concept to abstract away pool clearing, credentials, DbProviderFactory, etc) - /// /// Implements a distributed lock using Postgres advisory locks /// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) @@ -19,7 +17,6 @@ public sealed partial class PostgresDistributedLock : IInternalDistributedLock

/// Constructs a lock with the given (effectively the lock name), , /// and @@ -43,9 +40,8 @@ private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock this._internalLock = internalLock; } - // todo consider API with name ///

- /// The lock name + /// The that uniquely identifies the lock on the database /// public PostgresAdvisoryLockKey Key { get; } diff --git a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs index 7dad7fc4..4ba64e68 100644 --- a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs @@ -7,7 +7,6 @@ namespace Medallion.Threading.Postgres { - // todo this whole file could be auto-generated /// /// Implements /// diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 5fafd6d0..e39e9527 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -17,7 +17,6 @@ public sealed partial class PostgresDistributedReaderWriterLock : IInternalDistr { private readonly IDbDistributedLock _internalLock; - // todo revisit API /// /// Constructs a lock with the given (effectively the lock name), , /// and @@ -41,16 +40,15 @@ private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDist this._internalLock = internalLock; } - // todo consider API with name /// - /// Equivalent to + /// The that uniquely identifies the lock on the database /// public PostgresAdvisoryLockKey Key { get; } string IDistributedReaderWriterLock.Name => this.Key.ToString(); /// - /// Equivalent to TODO + /// Equivalent to TODO remove /// public static PostgresAdvisoryLockKey GetSafeName(string name) => PostgresDistributedLock.GetSafeName(name); diff --git a/DistributedLock.SqlServer/SqlApplicationLock.cs b/DistributedLock.SqlServer/SqlApplicationLock.cs index 89457172..d72fe964 100644 --- a/DistributedLock.SqlServer/SqlApplicationLock.cs +++ b/DistributedLock.SqlServer/SqlApplicationLock.cs @@ -182,16 +182,16 @@ public static async ValueTask ParseExitCodeAsync(int exitCode, TimeoutValu case -999: // parameter / unknown throw new ArgumentException(GetErrorMessage(exitCode, "parameter validation or other error")); - case InvalidUpgradeExitCode: // todo add test that hits this case (requires releasing on the connection or acquiring write before upgrade) + case InvalidUpgradeExitCode: + // should never happen unless something goes wrong (e. g. user manually releases the lock on an externally-owned connection) throw new InvalidOperationException("Cannot upgrade to an exclusive lock because the update lock is not held"); case AlreadyHeldExitCode: return timeout.IsZero ? false - : timeout.IsInfinite ? throw new InvalidOperationException("Attempted to acquire a lock that is already held on the same connection") + : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") : await WaitThenReturnFalseAsync().ConfigureAwait(false); default: - if (exitCode <= 0) - throw new InvalidOperationException(GetErrorMessage(exitCode, "unknown")); + if (exitCode <= 0) { throw new InvalidOperationException(GetErrorMessage(exitCode, "unknown")); } return true; // unknown success code } diff --git a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs index 2962054f..b94213e5 100644 --- a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs +++ b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs @@ -72,8 +72,6 @@ public SqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) return this; } - // todo access token? access token factory? - internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions(Action? optionsBuilder) { SqlConnectionOptionsBuilder? options; diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index e7f147a9..74624a2a 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -15,8 +15,6 @@ public sealed partial class SqlDistributedLock : IInternalDistributedLock /// Constructs a new lock using the provided . /// @@ -76,7 +74,6 @@ private SqlDistributedLock(string name, bool exactName, Func public static int MaxNameLength => 255; - // todo should this be the safe name or the user-provided name? Should we even expose this? /// /// Implements /// diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs index dfaa42eb..a18e3d04 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs @@ -7,8 +7,6 @@ namespace Medallion.Threading.SqlServer { - // todo rename assembly to .SqlServer - /// /// Implements reader-writer lock semantics using a SQL server application lock /// (see https://msdn.microsoft.com/en-us/library/ms189823.aspx). diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index 38d730c9..220d1a38 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -101,7 +101,6 @@ ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWr { var box = this._box ?? throw this.ObjectDisposed(); var contents = box.Value; - // todo ensure test for this if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } return TryPerformUpgradeAsync(); diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index b927780a..ff91cd4b 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -55,6 +55,15 @@ Task RunDeadlock(bool isFirst) tasks.Count(t => t.Status == TaskStatus.RanToCompletion).ShouldEqual(1); } + [Test] + public async Task TestReAcquireLockOnSameConnection() + { + var @lock = this._lockProvider.CreateLock("lock"); + await using var handle = await @lock.AcquireAsync(); + Assert.ThrowsAsync(() => @lock.AcquireAsync().AsTask()); + Assert.ThrowsAsync(() => @lock.AcquireAsync(TimeSpan.FromSeconds(.01)).AsTask()); + } + /// /// Currently, we leverage to track handle loss. This test /// validates that the handler is properly removed when the lock handle is disposed diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index 2b5cf905..924f3da5 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -22,8 +22,7 @@ public abstract class MultiplexingConnectionStrategyTestCases but demonstrates /// the time-based cleanup loop rather than forcing a cleanup /// - [Test] - // todo if we parallelize we need to make sure this test blocks anyone else from calling MFQ.FinalizeAsync() since that defeats the point + [Test, NonParallelizable] // timing sensitive public void TestLockAbandonmentWithTimeBasedCleanupRun() { var lock1 = this._lockProvider.CreateLock(nameof(this.TestLockAbandonmentWithTimeBasedCleanupRun)); diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index 148529c9..cb915692 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -13,8 +13,6 @@ namespace Medallion.Threading.Tests.Postgres { public class PostgresDistributedLockTest { - // todo promote some cases to abstract postgres or general cases - [Test] public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() { @@ -73,7 +71,5 @@ static Task GetTimeoutAsync(NpgsqlCommand command) return command.ExecuteScalarAsync(); } } - - // todo idle pruning interval? } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 131538f3..3b4126a1 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -69,6 +69,7 @@ public async Task TestReadLockAbandonment() ); await AcquireReadLockAsync(); + await Task.Delay(20); // seems to help ensure that the GC works GC.Collect(); GC.WaitForPendingFinalizers(); diff --git a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs similarity index 95% rename from DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs rename to DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 9f100639..0d4940e9 100644 --- a/DistributedLock.Tests/Tests/Data/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -7,9 +7,8 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.SqlServer { - // todo should this be extended to cover all DatabaseConnections? if not it should move out of Data public class SqlDatabaseConnectionTest { [Test, Combinatorial] From 47e8808789ff16e72075e3027c6ac8c8a8617ad1 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 10 Jan 2021 22:57:35 -0500 Subject: [PATCH 068/399] Resolve naming todo --- DistributedLock.Redis/RedisDistributedLock.cs | 6 +++--- .../RedisDistributedReaderWriterLock.cs | 8 +++---- .../RedisDistributedSemaphore.cs | 4 ++-- ...stributedSynchronizationOptionsBuilder.cs} | 21 +++++++++---------- ...RedisDistributedSynchronizationProvider.cs | 6 +++--- .../RedisSynchronizationCoreTestCases.cs | 4 ++-- .../TestingRedisSynchronizationStrategy.cs | 6 +++--- ...butedSynchronizationOptionsBuilderTest.cs} | 16 +++++++------- DistributedLockTaker/Program.cs | 2 +- 9 files changed, 36 insertions(+), 37 deletions(-) rename DistributedLock.Redis/{RedisDistributedLockOptionsBuilder.cs => RedisDistributedSynchronizationOptionsBuilder.cs} (90%) rename DistributedLock.Tests/Tests/Redis/{RedisDistributedLockOptionsBuilderTest.cs => RedisDistributedSynchronizationOptionsBuilderTest.cs} (81%) diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index a8634b01..016a6b84 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -22,7 +22,7 @@ public sealed partial class RedisDistributedLock : IInternalDistributedLock /// Constructs a lock named using the provided and . /// - public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) + public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } @@ -30,13 +30,13 @@ public RedisDistributedLock(RedisKey key, IDatabase database, Action /// Constructs a lock named using the provided and . /// - public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) + public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } this._databases = ValidateDatabases(databases); this.Key = key; - this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); } internal static IReadOnlyList ValidateDatabases(IEnumerable databases) diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index 654b9b89..31b7aad3 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -22,7 +22,7 @@ public sealed partial class RedisDistributedReaderWriterLock : IInternalDistribu /// /// Constructs a lock named using the provided and . /// - public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) + public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) : this(name, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } @@ -30,7 +30,7 @@ public RedisDistributedReaderWriterLock(string name, IDatabase database, Action< /// /// Constructs a lock named using the provided and . /// - public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) + public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) { if (name == null) { throw new ArgumentNullException(nameof(name)); } this._databases = RedisDistributedLock.ValidateDatabases(databases); @@ -38,13 +38,13 @@ public RedisDistributedReaderWriterLock(string name, IEnumerable data this.ReaderKey = name + ".readers"; this.WriterKey = name + ".writer"; this.Name = name; - this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); // We insist on this rule to ensure that when we take the writer waiting lock it won't expire between attempts // to upgrade it to the write lock. This avoids the need to extend the writer waiting lock if (this._options.RedLockTimeouts.MinValidityTime.CompareTo(this._options.MaxBusyWaitSleepTime) <= 0) { - throw new ArgumentException($"{nameof(RedisDistributedLockOptionsBuilder.BusyWaitSleepTime)} must be <= {nameof(RedisDistributedLockOptionsBuilder.MinValidityTime)}", nameof(options)); + throw new ArgumentException($"{nameof(RedisDistributedSynchronizationOptionsBuilder.BusyWaitSleepTime)} must be <= {nameof(RedisDistributedSynchronizationOptionsBuilder.MinValidityTime)}", nameof(options)); } } diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index d91925e0..4117cced 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -27,7 +27,7 @@ public sealed partial class RedisDistributedSemaphore : IInternalDistributedSema /// /// Constructs a semaphore named using the provided , , and . /// - public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) + public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) { if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } @@ -35,7 +35,7 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, this.Key = key; this.MaxCount = maxCount; - this._options = RedisDistributedLockOptionsBuilder.GetOptions(options); + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); } internal RedisKey Key { get; } diff --git a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs similarity index 90% rename from DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs rename to DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs index 1fc38d26..c46bdf8c 100644 --- a/DistributedLock.Redis/RedisDistributedLockOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs @@ -9,11 +9,10 @@ namespace Medallion.Threading.Redis { - // todo consider rename to RedLockOptionsBuilder (except maybe semaphore won't be redlock...) /// - /// Options for configuring a redis-based lock + /// Options for configuring a redis-based distributed synchronization algorithm /// - public sealed class RedisDistributedLockOptionsBuilder + public sealed class RedisDistributedSynchronizationOptionsBuilder { internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); /// @@ -28,7 +27,7 @@ public sealed class RedisDistributedLockOptionsBuilder _minBusyWaitSleepTime, _maxBusyWaitSleepTime; - internal RedisDistributedLockOptionsBuilder() { } + internal RedisDistributedSynchronizationOptionsBuilder() { } /// /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, @@ -39,7 +38,7 @@ internal RedisDistributedLockOptionsBuilder() { } /// /// Defaults to 30s. /// - public RedisDistributedLockOptionsBuilder Expiry(TimeSpan expiry) + public RedisDistributedSynchronizationOptionsBuilder Expiry(TimeSpan expiry) { var expiryTimeoutValue = new TimeoutValue(expiry, nameof(expiry)); if (expiryTimeoutValue.IsInfinite || expiryTimeoutValue.CompareTo(MinimumExpiry) < 0) @@ -57,7 +56,7 @@ public RedisDistributedLockOptionsBuilder Expiry(TimeSpan expiry) /// /// Defaults to 1/3 of the specified . /// - public RedisDistributedLockOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) + public RedisDistributedSynchronizationOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) { this._extensionCadence = new TimeoutValue(extensionCadence, nameof(extensionCadence)); return this; @@ -71,7 +70,7 @@ public RedisDistributedLockOptionsBuilder ExtensionCadence(TimeSpan extensionCad /// /// Defaults to 90% of the specified lock expiry. /// - public RedisDistributedLockOptionsBuilder MinValidityTime(TimeSpan minValidityTime) + public RedisDistributedSynchronizationOptionsBuilder MinValidityTime(TimeSpan minValidityTime) { var minValidityTimeoutValue = new TimeoutValue(minValidityTime, nameof(minValidityTime)); if (minValidityTimeoutValue.IsZero) @@ -94,7 +93,7 @@ public RedisDistributedLockOptionsBuilder MinValidityTime(TimeSpan minValidityTi /// /// The default is [10ms, 800ms] /// - public RedisDistributedLockOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + public RedisDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) { var minTimeoutValue = new TimeoutValue(min, nameof(min)); var maxTimeoutValue = new TimeoutValue(max, nameof(max)); @@ -110,12 +109,12 @@ public RedisDistributedLockOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSp return this; } - internal static RedisDistributedLockOptions GetOptions(Action? optionsBuilder) + internal static RedisDistributedLockOptions GetOptions(Action? optionsBuilder) { - RedisDistributedLockOptionsBuilder? options; + RedisDistributedSynchronizationOptionsBuilder? options; if (optionsBuilder != null) { - options = new RedisDistributedLockOptionsBuilder(); + options = new RedisDistributedSynchronizationOptionsBuilder(); optionsBuilder(options); } else diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs index a324cedb..e0b948d6 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs @@ -15,13 +15,13 @@ namespace Medallion.Threading.Redis public sealed class RedisDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider { private readonly IReadOnlyList _databases; - private readonly Action? _options; + private readonly Action? _options; /// /// Constructs a that connects to the provided /// and uses the provided . /// - public RedisDistributedSynchronizationProvider(IDatabase database, Action? options = null) + public RedisDistributedSynchronizationProvider(IDatabase database, Action? options = null) : this(new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { } @@ -33,7 +33,7 @@ public RedisDistributedSynchronizationProvider(IDatabase database, Actions are provided, will use only the first /// . /// - public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) + public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) { this._databases = RedisDistributedLock.ValidateDatabases(databases); this._options = options; diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 5d8b49d7..4d53ea37 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -55,7 +55,7 @@ public async Task TestMajorityHangingDatabasesCauseAcquireToFail() this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); var @lock = this._provider.CreateLock("lock"); Assert.IsNull(await @lock.TryAcquireAsync()); @@ -95,7 +95,7 @@ public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) MockDatabase(database, () => { Thread.Sleep(50); return true; }); this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); var @lock = this._provider.CreateLock("lock"); // single sync acquire has different timeout logic, so we test it separately diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index 9ad1aa7d..2e346df9 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -13,16 +13,16 @@ public sealed class TestingRedisSynchronizationStrategy : Tes { private bool _preparedForHandleLost, _preparedForHandleAbandonment; private Action? _killHandleAction; - private Action? _options; + private Action? _options; public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); - public void SetOptions(Action? options) + public void SetOptions(Action? options) { this._options = options; } - public void Options(RedisDistributedLockOptionsBuilder options) + public void Options(RedisDistributedSynchronizationOptionsBuilder options) { if (this._preparedForHandleLost) { diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs similarity index 81% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs rename to DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs index d180b87d..7a007f29 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs @@ -14,8 +14,8 @@ public void TestValidatesExpiry() { Assert.Throws(() => GetOptions(o => o.Expiry(TimeSpan.FromSeconds(-2)))); Assert.Throws(() => GetOptions(o => o.Expiry(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.Expiry(RedisDistributedLockOptionsBuilder.MinimumExpiry.TimeSpan - TimeSpan.FromTicks(1)))); - Assert.DoesNotThrow(() => GetOptions(o => o.Expiry(RedisDistributedLockOptionsBuilder.MinimumExpiry.TimeSpan))); + Assert.Throws(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan - TimeSpan.FromTicks(1)))); + Assert.DoesNotThrow(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan))); } [Test] @@ -24,9 +24,9 @@ public void TestValidatesMinValidityTime() Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(-2)))); Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.Zero))); Assert.Throws(() => GetOptions(o => o.MinValidityTime(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan))); Assert.DoesNotThrow(() => GetOptions( - o => o.MinValidityTime(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan).Expiry(RedisDistributedLockOptionsBuilder.DefaultExpiry.TimeSpan + TimeSpan.FromMilliseconds(1)) + o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan).Expiry(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan + TimeSpan.FromMilliseconds(1)) )); } @@ -57,15 +57,15 @@ public void TestValidatesBusyWaitSleepTime() [Test] public void TestDefaults() { - var defaultOptions = RedisDistributedLockOptionsBuilder.GetOptions(null); - defaultOptions.RedLockTimeouts.Expiry.ShouldEqual(RedisDistributedLockOptionsBuilder.DefaultExpiry); + var defaultOptions = RedisDistributedSynchronizationOptionsBuilder.GetOptions(null); + defaultOptions.RedLockTimeouts.Expiry.ShouldEqual(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry); defaultOptions.RedLockTimeouts.MinValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); defaultOptions.ExtensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); defaultOptions.MinBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); defaultOptions.MaxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); } - private static void GetOptions(Action options) => - RedisDistributedLockOptionsBuilder.GetOptions(options); + private static void GetOptions(Action options) => + RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); } } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 1ef9de54..1d826c79 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -125,7 +125,7 @@ private static IDistributedSynchronizationHandle AcquireRedisWriteLock(string na private static IEnumerable GetRedisDatabases(int serverCount) => RedisPorts.DefaultPorts.Take(serverCount) .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()); - private static void RedisOptions(RedisDistributedLockOptionsBuilder options) => + private static void RedisOptions(RedisDistributedSynchronizationOptionsBuilder options) => options.Expiry(TimeSpan.FromSeconds(.5)) // short expiry for abandonment testing .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); } From f3dda1ce4c734fbe5ede1c41f202cb4c4e55a3fd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 11 Jan 2021 07:25:36 -0500 Subject: [PATCH 069/399] Remove legacy GetSafeName/MaxNameLength APIs now that exactName is optional --- .../PostgresDistributedLock.cs | 5 ----- .../PostgresDistributedReaderWriterLock.cs | 5 ----- .../SqlDistributedLock.cs | 13 +++++-------- .../SqlDistributedReaderWriterLock.cs | 13 +++++-------- .../Postgres/TestingPostgresProviders.cs | 4 ++-- .../WaitHandles/TestingWaitHandleProviders.cs | 4 ++-- DistributedLock.Tests/Tests/ApiTest.cs | 12 ++++++++++++ ...ributedSynchronizationOptionsBuilderTest.cs | 2 +- .../EventWaitHandleDistributedLockTest.cs | 16 +++++++--------- .../WaitHandleDistributedSemaphoreTest.cs | 18 ++++++++---------- .../DistributedWaitHandleHelpers.cs | 2 +- .../EventWaitHandleDistributedLock.cs | 12 +----------- .../WaitHandleDistributedSemaphore.cs | 14 +------------- 13 files changed, 45 insertions(+), 75 deletions(-) diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index 6e660a86..02eac64b 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -47,11 +47,6 @@ private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock string IDistributedLock.Name => this.Key.ToString(); - /// - /// TODO probably remove this API - /// - public static PostgresAdvisoryLockKey GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true); - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => this._internalLock.TryAcquireAsync(timeout, PostgresAdvisoryLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new PostgresDistributedLockHandle(h)); diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index e39e9527..592e614f 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -47,11 +47,6 @@ private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDist string IDistributedReaderWriterLock.Name => this.Key.ToString(); - /// - /// Equivalent to TODO remove - /// - public static PostgresAdvisoryLockKey GetSafeName(string name) => PostgresDistributedLock.GetSafeName(name); - ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( TimeoutValue timeout, CancellationToken cancellationToken, diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index 74624a2a..6c623621 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -20,7 +20,7 @@ public sealed partial class SqlDistributedLock : IInternalDistributedLock will be used to connect to the database. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) @@ -33,7 +33,7 @@ public SqlDistributedLock(string name, string connectionString, Action will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and /// will not be opened or closed. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedLock(string name, IDbConnection connection, bool exactName = false) : this(name, exactName, n => CreateInternalLock(n, connection)) @@ -46,7 +46,7 @@ public SqlDistributedLock(string name, IDbConnection connection, bool exactName /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and /// will not be committed or rolled back. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) : this(name, exactName, n => CreateInternalLock(n, transaction)) @@ -72,17 +72,14 @@ private SqlDistributedLock(string name, bool exactName, Func /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx /// - public static int MaxNameLength => 255; + internal static int MaxNameLength => 255; /// /// Implements /// public string Name { get; } - /// - /// Given , constructs a lock name which is safe for use with - /// - public static string GetSafeName(string name) => + internal static string GetSafeName(string name) => DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs index a18e3d04..3998b851 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs @@ -26,7 +26,7 @@ public sealed partial class SqlDistributedReaderWriterLock : IInternalDistribute /// /// The provided will be used to connect to the database. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connectionString, options)) @@ -39,7 +39,7 @@ public SqlDistributedReaderWriterLock(string name, string connectionString, Acti /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and /// will not be opened or closed. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connection)) @@ -52,7 +52,7 @@ public SqlDistributedReaderWriterLock(string name, IDbConnection connection, boo /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and /// will not be committed or rolled back. /// - /// Unless is specified, will be used to ensure name validity. + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public SqlDistributedReaderWriterLock(string name, IDbTransaction transaction, bool exactName = false) : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, transaction)) @@ -84,12 +84,9 @@ private SqlDistributedReaderWriterLock(string name, bool exactName, Func /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx /// - public static int MaxNameLength => SqlDistributedLock.MaxNameLength; + internal static int MaxNameLength => SqlDistributedLock.MaxNameLength; - /// - /// Given , constructs a lock name which is safe for use with - /// - public static string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); + internal static string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( TimeoutValue timeout, diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index 769b1bf9..3dfd6b78 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -21,7 +21,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => transaction => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) ); - public override string GetSafeName(string name) => PostgresDistributedLock.GetSafeName(name).ToString(); + public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan keepaliveCadence) options) => o => o.UseMultiplexing(options.useMultiplexing).KeepaliveCadence(options.keepaliveCadence); @@ -43,6 +43,6 @@ public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName transaction => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) ); - public override string GetSafeName(string name) => PostgresDistributedReaderWriterLock.GetSafeName(name).ToString(); + public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); } } diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index 9273d9d7..e0ac215e 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -10,7 +10,7 @@ public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockP { public override IDistributedLock CreateLockWithExactName(string name) => new EventWaitHandleDistributedLock(name, exactName: true); - public override string GetSafeName(string name) => EventWaitHandleDistributedLock.GetSafeName(name); + public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); } [SupportsContinuousIntegration(WindowsOnly = true)] @@ -18,6 +18,6 @@ public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemap { public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); - public override string GetSafeName(string name) => WaitHandleDistributedSemaphore.GetSafeName(name); + public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); } } diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 875f588c..a12da8f9 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -104,6 +104,18 @@ public void TestLibraryFilesDoNotWriteToConsole() ); } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + var publicTypes = GetPublicTypes(assembly); + foreach (var publicType in publicTypes) + { + Assert.IsNull(publicType.GetMethod("GetSafeName", BindingFlags.Public | BindingFlags.Static)); + Assert.IsNull(publicType.GetProperty("MaxNameLength", BindingFlags.Public | BindingFlags.Static)); + } + } + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() .Where(IsInPublicApi) #if DEBUG diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs index 7a007f29..2634f9df 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs @@ -7,7 +7,7 @@ namespace Medallion.Threading.Tests.Redis { - public class RedisDistributedLockOptionsBuilderTest + public class RedisDistributedSynchronizationOptionsBuilderTest { [Test] public void TestValidatesExpiry() diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index fc08a264..0c4ab9ad 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -33,10 +33,8 @@ public void TestWorkingName(string name, NameStyle nameStyle) => [Test] public void TestMaxLengthNames() { - EventWaitHandleDistributedLock.MaxNameLength.ShouldEqual(DistributedWaitHandleHelpers.MaxNameLength); - var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix - + new string('a', EventWaitHandleDistributedLock.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); + + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); this.TestWorkingName(maxLengthName, NameStyle.Exact); this.TestBadName(maxLengthName + "a", NameStyle.Exact); } @@ -64,14 +62,14 @@ public void TestGetSafeLockNameCompat() (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); - EventWaitHandleDistributedLock.GetSafeName("").ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); - EventWaitHandleDistributedLock.GetSafeName("abc").ShouldEqual(@"Global\abc"); - EventWaitHandleDistributedLock.GetSafeName("\\").ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); - EventWaitHandleDistributedLock.GetSafeName(new string('a', MaxNameLengthWithoutGlobalPrefix)) + new EventWaitHandleDistributedLock("").Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + new EventWaitHandleDistributedLock("abc").Name.ShouldEqual(@"Global\abc"); + new EventWaitHandleDistributedLock("\\").Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); + new EventWaitHandleDistributedLock(new string('a', MaxNameLengthWithoutGlobalPrefix)).Name .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); - EventWaitHandleDistributedLock.GetSafeName(new string('\\', MaxNameLengthWithoutGlobalPrefix)) + new EventWaitHandleDistributedLock(new string('\\', MaxNameLengthWithoutGlobalPrefix)).Name .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); - EventWaitHandleDistributedLock.GetSafeName(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)) + new EventWaitHandleDistributedLock(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)).Name .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); } diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 730d441b..f2c6665e 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -37,10 +37,8 @@ public void TestWorkingName(string name, NameStyle nameStyle) => [Test] public void TestMaxLengthNames() { - WaitHandleDistributedSemaphore.MaxNameLength.ShouldEqual(DistributedWaitHandleHelpers.MaxNameLength); - var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix - + new string('a', WaitHandleDistributedSemaphore.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); + + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); this.TestWorkingName(maxLengthName, NameStyle.Exact); this.TestBadName(maxLengthName + "a", NameStyle.Exact); } @@ -69,20 +67,20 @@ public void TestGetSafeLockNameCompat() (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); - WaitHandleDistributedSemaphore.GetSafeName("").ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); - WaitHandleDistributedSemaphore.GetSafeName("abc").ShouldEqual(@"Global\abc"); - WaitHandleDistributedSemaphore.GetSafeName("\\").ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); - WaitHandleDistributedSemaphore.GetSafeName(new string('a', MaxNameLengthWithoutGlobalPrefix)) + new WaitHandleDistributedSemaphore("", 1).Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + new WaitHandleDistributedSemaphore("abc", 1).Name.ShouldEqual(@"Global\abc"); + new WaitHandleDistributedSemaphore("\\", 1).Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); + new WaitHandleDistributedSemaphore(new string('a', MaxNameLengthWithoutGlobalPrefix), 1).Name .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); - WaitHandleDistributedSemaphore.GetSafeName(new string('\\', MaxNameLengthWithoutGlobalPrefix)) + new WaitHandleDistributedSemaphore(new string('\\', MaxNameLengthWithoutGlobalPrefix), 1).Name .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); - WaitHandleDistributedSemaphore.GetSafeName(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)) + new WaitHandleDistributedSemaphore(new string('x', MaxNameLengthWithoutGlobalPrefix + 1), 1).Name .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); } private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => new WaitHandleDistributedSemaphore( - (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), + nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name, maxCount: 1, abandonmentCheckCadence: TimeSpan.FromSeconds(.3), exactName: nameStyle != NameStyle.Safe diff --git a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs index e7026708..2e761f28 100644 --- a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs +++ b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs @@ -13,7 +13,7 @@ internal static class DistributedWaitHandleHelpers private static readonly TimeoutValue DefaultAbandonmentCheckCadence = TimeSpan.FromSeconds(2); // 260 based on LINQPad experimentation - public static int MaxNameLength => 260; + public const int MaxNameLength = 260; public static string GetSafeName(string name) { diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index 159e4a29..843f751e 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -20,7 +20,7 @@ public sealed partial class EventWaitHandleDistributedLock : IInternalDistribute /// specifies how frequently we refresh our object in case it is abandoned by /// its original owner. The default is 2s. /// - /// Unless is specified, will be called on the provided . + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) { @@ -28,21 +28,11 @@ public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCad this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); } - /// - /// The maximum allowed length for lock names - /// - public static int MaxNameLength => DistributedWaitHandleHelpers.MaxNameLength; - /// /// Implements /// public string Name { get; } - /// - /// TODO probably remove this API - /// - public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); - async ValueTask IInternalDistributedLock.InternalTryAcquireAsync( TimeoutValue timeout, CancellationToken cancellationToken) diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs index f4bc084d..256e2377 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -22,7 +22,7 @@ public sealed partial class WaitHandleDistributedSemaphore : IInternalDistribute /// specifies how frequently we refresh our object in case it is abandoned by /// its original owner. The default is 2s. /// - /// Unless is specified, will be called on the provided . + /// Unless is specified, will be escaped/hashed to ensure name validity. /// public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) { @@ -33,18 +33,6 @@ public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? aband this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); } - // todo static APIs - /// - /// The maximum length allowed for semaphore names - /// - public static int MaxNameLength => DistributedWaitHandleHelpers.MaxNameLength; - - /// - /// Returns either the provided or a transformed version of which - /// is safe to use with the "exactName" constructor parameter. - /// - public static string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); - /// /// Implements /// From 007657f935ee0b33818b90fbb6ec3186ed5c1938 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 06:43:18 -0500 Subject: [PATCH 070/399] Resolve TODO --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 6 +++--- .../DistributedUpgradeableReaderWriterLockCoreTestCases.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 2de3240f..70b5d139 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -306,7 +306,7 @@ public async Task TestHandleLostTriggersCorrectly() Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); } - // todo revisit behavior here and in similar cases; do we want to fail hard on Dispose if the handle is lost? + // when the handle is lost, Dispose() may throw try { await handle.DisposeAsync(); } catch { } @@ -335,8 +335,8 @@ public async Task TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost() using var canceledEvent = new ManualResetEventSlim(initialState: false); handle.HandleLostToken.Register(canceledEvent.Set); Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(5))); - - // todo revisit + + // when the handle is lost, Dispose() may throw try { handle.Dispose(); } catch { } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index a788ba25..9ca2af09 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -144,7 +144,7 @@ public async Task TestCanUpgradeHandleWhileMonitoring() Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); } - // todo revisit + // when the handle is lost, Dispose() may throw try { await handle.DisposeAsync(); } catch { } } From 7ed8701a5ddaa057c636c18f81680123c227848a Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 07:00:05 -0500 Subject: [PATCH 071/399] Resolve TODO --- DistributedLock.Postgres/PostgresAdvisoryLockKey.cs | 9 +++++---- .../Tests/Postgres/PostgresAdvisoryLockKeyTest.cs | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs index 26eab543..1fe8364c 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs @@ -16,7 +16,8 @@ namespace Medallion.Threading.Postgres private readonly KeyEncoding _keyEncoding; /// - /// Constructs a key from a single 64-bit value + /// Constructs a key from a single 64-bit value. This is a separate key space + /// than . /// public PostgresAdvisoryLockKey(long key) { @@ -25,7 +26,8 @@ public PostgresAdvisoryLockKey(long key) } /// - /// Constructs a key from a pair of 32-bit values + /// Constructs a key from a pair of 32-bit values. This is a separate key space + /// than . /// public PostgresAdvisoryLockKey(int key1, int key2) { @@ -33,7 +35,6 @@ public PostgresAdvisoryLockKey(int key1, int key2) this._keyEncoding = KeyEncoding.Int32Pair; } - // todo should allow hashing be default (exact name)? /// /// Constructs a key based on a string . /// @@ -65,7 +66,7 @@ public PostgresAdvisoryLockKey(string name, bool allowHashing = false) else { throw new FormatException($"Name '{name}' could not be encoded as a {nameof(PostgresAdvisoryLockKey)}. Please specify {nameof(allowHashing)} or use one of the following formats:" - + $" or (1) a 0-{MaxAsciiLength} character string using only non-0 ASCII characters" + + $" or (1) a 0-{MaxAsciiLength} character string using only ASCII characters" + $", (2) a {HashStringLength} character hex string, such as the result of Int64.MaxValue.ToString(\"x{HashStringLength}\")" + $", or (3) a 2-part, {SeparatedHashStringLength} character string of the form XXXXXXXX{HashStringSeparator}XXXXXXXX, where the X's are {HashPartLength} hex strings" + $" such as the result of Int32.MaxValue.ToString(\"x{HashPartLength}\")." diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs index 1fe37471..386fa050 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs @@ -87,6 +87,9 @@ public void TestEquality() AssertEquality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCII")); AssertInequality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCIi")); + AssertInequality(new PostgresAdvisoryLockKey(string.Empty), new PostgresAdvisoryLockKey("\0")); + AssertInequality(new PostgresAdvisoryLockKey("\0"), new PostgresAdvisoryLockKey("a")); + AssertEquality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("some very long name", allowHashing: true)); AssertInequality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("same very long name", allowHashing: true)); From 70a2daf4fc4b6683ebd3e9a573ad41af76232cd1 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 07:04:44 -0500 Subject: [PATCH 072/399] Clean up NuGet references --- DistributedLock.Tests/DistributedLock.Tests.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index 9cb8c58c..f3a979b6 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -17,12 +17,9 @@ - - - From 8529c8c2a612724b58650a0b062eaf68e3b3dcf0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 07:20:20 -0500 Subject: [PATCH 073/399] Add test for internal member implementation --- DistributedLock.Tests/Tests/ApiTest.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index a12da8f9..37234e25 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -104,6 +104,20 @@ public void TestLibraryFilesDoNotWriteToConsole() ); } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestInternalNamedMembersAreInternal(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + var publicTypes = GetPublicTypes(assembly); + foreach (var publicType in publicTypes) + { + Assert.IsEmpty( + publicType.GetMembers(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance) + .Where(m => m.Name.Contains("Internal")) + ); + } + } + [TestCaseSource(nameof(DistributedLockAssemblies))] public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) { From 9a2d7ae509cf259d3b268137298065bea7e4f0e9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 07:45:50 -0500 Subject: [PATCH 074/399] Update versions of consumed packages --- DistributedLock.Azure/DistributedLock.Azure.csproj | 2 +- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index 45b53e09..62d12f19 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -41,7 +41,7 @@ - + diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index db18b068..f69c5e15 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -41,7 +41,7 @@ - + diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 36f085e9..30ad84c2 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -41,7 +41,7 @@ - + From f9043935fa29ebff3d5d9527be73c82d93c1bc79 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 20:37:32 -0500 Subject: [PATCH 075/399] Remove alpha versions --- DistributedLock.Azure/DistributedLock.Azure.csproj | 2 +- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- DistributedLock.FileSystem/DistributedLock.FileSystem.csproj | 4 ++-- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock.Redis/DistributedLock.Redis.csproj | 4 ++-- DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 2 +- .../DistributedLock.WaitHandles.csproj | 4 ++-- DistributedLock/DistributedLock.csproj | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index 62d12f19..fdb1ec87 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Provides a distributed locking implementation based on Azure blob leases diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 719c6dbc..54a90171 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index b7c42227..6d6db76d 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on file locks @@ -45,7 +45,7 @@ - + all diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index f69c5e15..1ac6b661 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index bef97299..16446001 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha01 + 1.0.0 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis @@ -46,7 +46,7 @@ - + all diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 2944faa0..2ce82baa 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 30ad84c2..db7dbb67 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -10,7 +10,7 @@ - 1.0.0-alpha02 + 1.0.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on global WaitHandle objects in Windows @@ -41,7 +41,7 @@ - + diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index e7ba4c08..e5f58eb6 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.0.0-alpha02 + 2.0.0 2.0.0.0 Michael Adelson From d36cc05f8632a3f74aff2d9d140eb8acd05f7a86 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 13 Jan 2021 21:03:52 -0500 Subject: [PATCH 076/399] Minor test stability improvements --- ...deableReaderWriterLockConnectionStringStrategyTestCases.cs | 4 ++-- .../AbstractTestCases/Redis/RedisExtensionTestCases.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index 2ba6da42..a21f1be2 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -27,9 +27,9 @@ public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade)); + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.25)); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.3)); using (@lock.AcquireReadLock()) { diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index bafbdf82..7c7ea812 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -20,11 +20,11 @@ public abstract class RedisExtensionTestCases public void TearDown() => this._provider.Dispose(); [Test] - [NonParallelizable] // timing-sensitive + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive public async Task TestCanExtendLock() { this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(50), TimeSpan.FromMilliseconds(50))); - var @lock = this._provider.CreateLock("lock"); + var @lock = this._provider.CreateLock(Guid.NewGuid().ToString()); await using var handle = await @lock.AcquireAsync(); From 107e777a399c4145d863b694a215d32231ef2350 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 14 Jan 2021 06:56:32 -0500 Subject: [PATCH 077/399] Description cleanup --- DistributedLock/DistributedLock.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index e5f58eb6..1cd0c7da 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -13,10 +13,7 @@ 2.0.0 2.0.0.0 Michael Adelson - - Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella - package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also - be installed individually. + Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. Copyright © 2017 Michael Adelson MIT From 13e51e45a1fcf633bb660bd28a6d5021e67b3187 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 14 Jan 2021 19:41:07 -0500 Subject: [PATCH 078/399] Initial 2.0 docs --- README.md | 235 +++++++++++----------------- docs/DistributedLock.Azure.md | 1 + docs/DistributedLock.FileSystem.md | 1 + docs/DistributedLock.Postgres.md | 1 + docs/DistributedLock.Redis.md | 1 + docs/DistributedLock.SqlServer.md | 1 + docs/DistributedLock.WaitHandles.md | 1 + docs/Locks.md | 1 + docs/Other topics.md | 10 ++ docs/Reader-writer locks.md | 1 + docs/Semaphores.md | 1 + 11 files changed, 113 insertions(+), 141 deletions(-) create mode 100644 docs/DistributedLock.Azure.md create mode 100644 docs/DistributedLock.FileSystem.md create mode 100644 docs/DistributedLock.Postgres.md create mode 100644 docs/DistributedLock.Redis.md create mode 100644 docs/DistributedLock.SqlServer.md create mode 100644 docs/DistributedLock.WaitHandles.md create mode 100644 docs/Locks.md create mode 100644 docs/Other topics.md create mode 100644 docs/Reader-writer locks.md create mode 100644 docs/Semaphores.md diff --git a/README.md b/README.md index c25cc16f..b876ee99 100644 --- a/README.md +++ b/README.md @@ -1,202 +1,155 @@ # DistributedLock -DistributedLock is a lightweight .NET library that makes it easy to set up and use system-wide or fully-distributed locks. - -DistributedLock is available for download as a [NuGet package](https://www.nuget.org/packages/DistributedLock). [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/) - -[Release notes](#release-notes) - -## Features - -- [System-wide locks](#system-wide-locks) -- [Fully-distributed locks](#fully-distributed-locks) -- [Semaphores](#semaphores) -- [Reader-writer locks](#reader-writer-locks) -- [Safe naming](#naming-locks) -- [Try Semantics](#trylock) -- [Async](#async) -- [Timeouts](#timeouts) -- [Cancellation](#cancellation) -- [Connection management](#connection-management) - -## System-wide locks - -System-wide locks are great for synchronizing between processes or .NET application domains: +DistributedLock is a .NET library that provides robust and easy-to-use distributed mutexes, reader-writer locks, and semaphores based on a variety of underlying technologies. +With DistributedLock, synchronizing access to a region of code across multiple applications/machines is as simple as: ```C# -var myLock = new SystemDistributedLock("SystemLock"); - -using (myLock.Acquire()) +using (await myDistributedLock.AcquireAsync()) { - // this block of code is protected by the lock! + // I hold the lock here } ``` -## Fully-distributed locks - -DistributedLock allows you to easily leverage MSFT SQLServer's application lock functionality to provide synchronization between machines in a distributed environment. To use this functionality, you'll need a SQLServer connection string: +## Implementations -```C# -var connectionString = ConfigurationManager.ConnectionStrings["MyDatabase"].ConnectionString; -var myLock = new SqlDistributedLock("SqlLock", connectionString); +DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. -using (myLock.Acquire()) -{ - // this block of code is protected by the lock! -} -``` +- [DistributedLock.SqlServer](DistributedLock.SqlServer.md): uses Microsoft SQL Server +- [DistributedLock.Postgres](DistributedLock.Postgres.md): uses Postgresql +- [DistributedLock.Redis](DistributedLock.Redis.md): uses Redis +- [DistributedLock.Azure](DistributedLock.Azure.md): uses Azure blobs +- [DistributedLock.FileSystem](DistributedLock.FileSystem.md): uses the file system +- [DistributedLock.WaitHandles](DistributedLock.WaitHandles.md): uses operating system global `WaitHandle`s (Windows only) -As of version 1.1.0, `SqlDistributedLock`s can now be scoped to existing `IDbTransaction` and/or `IDbConnection` objects as an alternative to passing a connection string directly (in which case the lock manages its own connection). +## Synchronization primitives -## Semaphores +- Locks: provide exclusive access to a region of code +- [Reader-writer locks](Reader-writer locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. +- [Semaphores](Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. -DistributedLock contains an implementation of a distributed [semaphore](https://en.wikipedia.org/wiki/Semaphore_(programming)) with an API similar to the framework's non-distributed [SemaphoreSlim](https://msdn.microsoft.com/en-us/library/system.threading.semaphoreslim(v=vs.110).aspx) class. Since the implementation is based on [SQLServer application locks](https://msdn.microsoft.com/en-us/library/ms189823.aspx), this can be used to synchronize across different machines. +While all implementations support locks, the other primitives are only supported by some implementations. See the [implementation-specific documentation pages](docs) for details. -The semaphore acts like a lock that can be acquired by a fixed number of processes/threads simultaneously instead of a single process/thread. This capability is frequently used to "throttle" access to some resource such as a database or email server, generally with the goal of preventing it from becoming overloaded. In such cases, a classic mutex lock is inappropriate because we *do* want to allow concurrent access and simply want to cap the level of concurrency. For example: +## Basic usage -```C# -var semaphore = new SqlDistributedSemaphore("ComputeDatabase", 5, connectionString); -using (semaphore.Acquire()) -{ - // only 5 callers can be inside this block concurrently - UseComputeDatabase(); -} -``` +### Names -## Reader-writer locks +Because distributed locks (and other distributed synchronization primitives) are not isolated to a single process, their identity is based on their name which is provided through the constructor. Different underlying technologies have different restrictions on name format; however, DistributedLock largely allows you to ignore these by escaping/hashing names that would otherwise be invalid. -DistributedLock contains an implementation of a distributed [reader-writer lock](https://en.wikipedia.org/wiki/Readers%E2%80%93writer_lock) with an API similar to the framework's non-distributed [ReaderWriterLockSlim](https://msdn.microsoft.com/en-us/library/system.threading.readerwriterlockslim(v=vs.110).aspx) class. Since the implementation is based on [SQLServer application locks](https://msdn.microsoft.com/en-us/library/ms189823.aspx), this can be used to synchronize across different machines. +### Acquire -The reader-writer lock allows for *multiple readers or one writer.* Furthermore, at most one reader can be in *upgradeable read mode*, which allows for upgrading from read mode to write mode without relinquishing the read lock. Here's an example showing how a reader-writer lock could synchronize access to a distributed cache: +All synchronization primitives support the same basic access pattern. The `Acquire` method returns a "handle" object that represents holding the lock. When the handle is disposed, the lock is released: ```C# -class DistributedCache +var myDistributedLock = new SqlDistributedLock(name, connectionString); // e. g. if we are using SQL Server +using (myDistributedLock.Acquire()) { - private readonly SqlDistributedReaderWriterLock cacheLock = - new SqlDistributedReaderWriterLock("DistributedCache", connectionString); - - public string Get(string key) - { - using (this.cacheLock.AcquireReadLock()) - { - return /* read from cache */ - } - } - - public void Add(string key, string value) - { - using (this.cacheLock.AcquireWriteLock()) - { - /* write to cache */ - } - } - - public void AddOrUpdate(string key, string value) - { - using (var upgradeableHandle = this.cache.AcquireUpgradeableReadLock()) - { - if (/* read from cache */) { return; } - - upgradeableHandle.UpgradeToWriteLock(); - - /* write to cache */ - } - } -} -``` - -## Naming locks - -For all types of locks, the name of the lock defines its identity within its scope. While in general most names will work, the names are ultimately constrained by the underlying technologies used for locking. If you don't want to worry (particularly if when generating names dynamically), you can use the GetSafeLockName method each lock type to convert an arbitrary string into a consistent valid lock name: - -```C# -string baseName = // arbitrary logic -var lockName = SqlDistributedLock.GetSafeLockName(baseName); -var myLock = new SqlDistributedLock(lockName); + // we hold the lock here +} // implicit Dispose() call from using block releases it here ``` -## Other features +### TryAcquire -### TryLock - -All locks support a "try" mechanism so that you can attempt to claim the lock without committing to it: +While `Acquire` will block until the lock is available, there is also a `TryAcquire` variant which returns `null` if the lock could not be acquired (due to being held elsewhere): ```C# -using (var handle = myLock.TryAcquire()) +using (var handle = myDistributedLock.TryAcquire()) { if (handle != null) { - // I have the lock! + // we acquired the lock :-) } else { - // someone else has it! + // someone else has it :-( } } ``` -### Async +### async support + +`async` versions of both of these methods are also supported. These are preferred when you are writing async code since they will not consume a thread while waiting for the lock. If you are using C#8 or higher, you can also dispose of handles asynchronously: -All locks support async acquisition so that you don't need to consume threads waiting for locks to become available: +### Timeouts ```C# -using (await myLock.AcquireAsync()) -{ - // this block of code is protected by the lock! - - // locks can be used to protect async code - await webClient.DownloadStringAsync(...); -} +await using (await myDistributedLock.AcquireAsync()) { ... } ``` -Note that because of this locks do not have thread affinity unlike the Monitor and Mutex .NET synchronization classes and are not re-entrant. +Additionally, all of these methods support an optional `timeout` parameter. `timeout` determines how long `Acquire` will wait before failing with a `TimeoutException` and how long `TryAcquire` will wait before returning null. The default `timeout` for `Acquire` is `Timeout.InfiniteTimeSpan` while for `TryAcquire` the default `timeout` is `TimeSpan.Zero`. -### Timeouts +### Cancellation -All lock methods support specifying timeouts after which point TryAcquire calls will return null and Acquire calls will throw a TimeoutException: +Finally, the methods take an optional `CancellationToken` parameter, which allows for the acquire operation to be interrupted via cancellation. Note that this won't cancel the hold on the lock once the acquire succeeds. + +## Providers + +For applications that use [dependency injection](https://en.wikipedia.org/wiki/Dependency_injection), DistributedLock's provider make it easy to separate out the specification of a lock's (or other primitive's) name from its other settings (such as a database connection string). For example in an ASP.NET Core app you might do: ```C# -// wait up to 5 seconds to acquire the lock -using (var handle = myLock.TryAcquire(TimeSpan.FromSeconds(5))) +// in your Startup.cs: +services.AddSingleton(_ => new PostgresDistributedSynchronizationProvider(myConnectionString)); +services.AddTransient(); + +// in SomeService.cs +public class SomeService { - if (handle != null) + private readonly PostgresDistributedSynchronizationProvider _synchronizationProvider; + + public SomeService(PostgresDistributedSynchronizationProvider synchronizationProvider) { - // I have the lock! + this._synchronizationProvider = synchronizationProvider; } - else + + public void InitializeUserAccount(int id) { - // timed out waiting for someone else to give it up + // use the provider to construct a lock + var @lock = this._synchronizationProvider.CreateLock($"UserAccount{id}"); + using (@lock.Acquire()) + { + // do stuff + } + + // ALTERNATIVELY, for common use-cases extension methods allow this to be done with a single call + using (this._synchronizationProvider.AcquireLock($"UserAccount{id}")) + { + // do stuff + } } } ``` -### Cancellation - -All lock methods support passing a CancellationToken which, if triggered, will break out of the wait: - -``` -// acquire the lock, unless someone cancels us -CancellationToken token = ... -using (myLock.Acquire(cancellationToken: token)) -{ - // this block of code is protected by the lock! -} -``` +## Other topics -### Connection management +- [Interfaces](Other topics.md#interfaces) +- [Detecting handle loss](Other topics.md#detecting-handle-loss) +- [Handle abandonment](Other topics.md#handle-abandonment) +- [Migrating from 1.x to 2.x](Other topics.md#migrating-from-1.x-to-2.x) -When using SQL-based locks, DistributedLock exposes several options for managing the underlying connection/transaction that scopes the lock: -- Explicit: you can pass in the IDbConnection/IDbTransaction instance that provides lock scope. This is useful when you don't have access to a connection string or -when you want the locking to be tied closely to other SQL operations being performed. -- Connection: the lock internally manages a `SqlConnection` instance. The lock is released by calling [sp_releaseapplock](https://msdn.microsoft.com/en-us/library/ms178602.aspx) after which the connection is disposed. This is the default mode. -- Transaction: the lock internally manages a `SqlTransaction` instance. The lock is released by disposing the transaction. -- Connection Multiplexing: the library internally manages a pool of `SqlConnection` instances, each of which may be used to hold multiple locks -simultaneously. This is particularly helpful for high-load scenarios since it can drastically reduce load on the underlying connection pool. -- Azure: similar to the "Connection" strategy, but also automatically issues periodic background queries on the underlying connection to keep it from looking idle to the Azure connection governor. See [#5](https://github.com/madelson/DistributedLock/issues/5) for more details. +## Contributing -Most of the time, you'll want to use the default connection strategy. See more details about the various strategies [here](https://github.com/madelson/DistributedLock/blob/master/DistributedLock/Sql/SqlDistributedLockConnectionStrategy.cs). +Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.0.0 + - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) + - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) + - Added Redis-based locking (#24, DistributedLock.Redis 1.0.0) + - Added Azure blob-based locking (#42, DistributedLock.Azure 1.0.0) + - Added file-based locking (#28, DistributedLock.FileSystem 1.0.0) + - Added provider classes for improved IOC integration (#13) + - Added strong naming to assemblies. Thanks @pedropaulovc for contributing! (#47, BREAKING CHANGE) + - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` #20, BREAKING CHANGE) + - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives (#10) + - Added `HandleLostToken` API for tracking if a lock's underlying connection dies (#6, BREAKING CHANGE) + - Added SourceLink support (#57) + - Removed `GetSafeName` API in favor of safe naming by default (BREAKING CHANGE) + - Renamed "SystemDistributedLock" to "EventWaitHandleDistributedLock" (DistributedLock.WaitHandles 1.0.0) + - Stopped supporting net45 (BREAKING CHANGE) + - Removed `DbConnection` and `DbTransaction` constructors form `SqlDistributedLock`, leaving the constructors that take `IDbConnection`/`IDbTransaction` (#35, BREAKING CHANGE) + - Changed methods returning `Task` to instead return `ValueTask`, making it so that `using (@lock.AcquireAsync()) { ... } without an `await` no longer compiles (#34, BREAKING CHANGE) + - Changed `UpgradeableLockHandle.UpgradeToWriteLock` to return `void` (#33, BREAKING CHANGE) + - Switched to Microsoft.Data.SqlClient by default for all target frameworks (BREAKING CHANGE) + - Changed all locking implementations to be non-reentrant (BREAKING CHANGE) - 1.5.0 - Added cross-platform support via Microsoft.Data.SqlClient ([#25](https://github.com/madelson/DistributedLock/issues/25)). This feature is available for .NET Standard >= 2.0. Thanks to [@alesebi91](https://github.com/alesebi91) for helping with the implementation and testing! - Added C#8 nullable annotations ([#31](https://github.com/madelson/DistributedLock/issues/31)) diff --git a/docs/DistributedLock.Azure.md b/docs/DistributedLock.Azure.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.Azure.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/DistributedLock.FileSystem.md b/docs/DistributedLock.FileSystem.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.FileSystem.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.Postgres.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/DistributedLock.Redis.md b/docs/DistributedLock.Redis.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.Redis.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/DistributedLock.SqlServer.md b/docs/DistributedLock.SqlServer.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.SqlServer.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/DistributedLock.WaitHandles.md b/docs/DistributedLock.WaitHandles.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/DistributedLock.WaitHandles.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/Locks.md b/docs/Locks.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/Locks.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/Other topics.md b/docs/Other topics.md new file mode 100644 index 00000000..4d32b460 --- /dev/null +++ b/docs/Other topics.md @@ -0,0 +1,10 @@ +Coming soon! + +## Interfaces + +## Detecting handle loss + +## Handle abandonment + +## Migrating from 1.x to 2.x + diff --git a/docs/Reader-writer locks.md b/docs/Reader-writer locks.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/Reader-writer locks.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file diff --git a/docs/Semaphores.md b/docs/Semaphores.md new file mode 100644 index 00000000..3014a68f --- /dev/null +++ b/docs/Semaphores.md @@ -0,0 +1 @@ +Coming soon! \ No newline at end of file From 82b860b43692effc798bc66d062463b9e6200171 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 14 Jan 2021 19:45:11 -0500 Subject: [PATCH 079/399] README tweaks --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b876ee99..d42e6119 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,17 @@ using (await myDistributedLock.AcquireAsync()) DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. -- [DistributedLock.SqlServer](DistributedLock.SqlServer.md): uses Microsoft SQL Server +- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)**: uses Microsoft SQL Server - [DistributedLock.Postgres](DistributedLock.Postgres.md): uses Postgresql - [DistributedLock.Redis](DistributedLock.Redis.md): uses Redis - [DistributedLock.Azure](DistributedLock.Azure.md): uses Azure blobs -- [DistributedLock.FileSystem](DistributedLock.FileSystem.md): uses the file system +- [DistributedLock.FileSystem](DistributedLock.FileSystem.md): uses lock files - [DistributedLock.WaitHandles](DistributedLock.WaitHandles.md): uses operating system global `WaitHandle`s (Windows only) ## Synchronization primitives - Locks: provide exclusive access to a region of code -- [Reader-writer locks](Reader-writer locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. +- [Reader-writer locks](docs/Reader-writer+locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. - [Semaphores](Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. While all implementations support locks, the other primitives are only supported by some implementations. See the [implementation-specific documentation pages](docs) for details. @@ -120,10 +120,10 @@ public class SomeService ## Other topics -- [Interfaces](Other topics.md#interfaces) -- [Detecting handle loss](Other topics.md#detecting-handle-loss) -- [Handle abandonment](Other topics.md#handle-abandonment) -- [Migrating from 1.x to 2.x](Other topics.md#migrating-from-1.x-to-2.x) +- [Interfaces](Other+topics.md#interfaces) +- [Detecting handle loss](Other+topics.md#detecting-handle-loss) +- [Handle abandonment](Other+topics.md#handle-abandonment) +- [Migrating from 1.x to 2.x](Other+topics.md#migrating-from-1.x-to-2.x) ## Contributing From 754f4126bd9a1aef573e5768934fc114fbaf909f Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 14 Jan 2021 19:47:12 -0500 Subject: [PATCH 080/399] README tweaks --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d42e6119..bacaeb0a 100644 --- a/README.md +++ b/README.md @@ -15,17 +15,17 @@ using (await myDistributedLock.AcquireAsync()) DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)**: uses Microsoft SQL Server -- [DistributedLock.Postgres](DistributedLock.Postgres.md): uses Postgresql -- [DistributedLock.Redis](DistributedLock.Redis.md): uses Redis -- [DistributedLock.Azure](DistributedLock.Azure.md): uses Azure blobs -- [DistributedLock.FileSystem](DistributedLock.FileSystem.md): uses lock files -- [DistributedLock.WaitHandles](DistributedLock.WaitHandles.md): uses operating system global `WaitHandle`s (Windows only) +- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)**: uses Postgresql +- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)**: uses Redis +- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)**: uses Azure blobs +- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)**: uses lock files +- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)**: uses operating system global `WaitHandle`s (Windows only) ## Synchronization primitives - Locks: provide exclusive access to a region of code - [Reader-writer locks](docs/Reader-writer+locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. -- [Semaphores](Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. +- [Semaphores](docs/Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. While all implementations support locks, the other primitives are only supported by some implementations. See the [implementation-specific documentation pages](docs) for details. @@ -120,10 +120,10 @@ public class SomeService ## Other topics -- [Interfaces](Other+topics.md#interfaces) -- [Detecting handle loss](Other+topics.md#detecting-handle-loss) -- [Handle abandonment](Other+topics.md#handle-abandonment) -- [Migrating from 1.x to 2.x](Other+topics.md#migrating-from-1.x-to-2.x) +- [Interfaces](docs/Other+topics.md#interfaces) +- [Detecting handle loss](docs/Other+topics.md#detecting-handle-loss) +- [Handle abandonment](docs/Other+topics.md#handle-abandonment) +- [Migrating from 1.x to 2.x](docs/Other+topics.md#migrating-from-1x-to-2x) ## Contributing From f6e53d09fc2e6c2a22d9e975c10f07414becc2ca Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 14 Jan 2021 19:49:08 -0500 Subject: [PATCH 081/399] README tweaks --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bacaeb0a..fdc86724 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ using (await myDistributedLock.AcquireAsync()) DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. -- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)**: uses Microsoft SQL Server -- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)**: uses Postgresql -- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)**: uses Redis -- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)**: uses Azure blobs -- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)**: uses lock files -- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)**: uses operating system global `WaitHandle`s (Windows only) +- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server +- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql +- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/): uses Redis +- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/): uses Azure blobs +- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/): uses lock files +- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/): uses operating system global `WaitHandle`s (Windows only) ## Synchronization primitives From 6cc5af9e2fdef053f0761cee7501536f5c55b92c Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 15 Jan 2021 07:41:51 -0500 Subject: [PATCH 082/399] Update DistributedLock.Azure.md --- docs/DistributedLock.Azure.md | 39 ++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.Azure.md b/docs/DistributedLock.Azure.md index 3014a68f..41827317 100644 --- a/docs/DistributedLock.Azure.md +++ b/docs/DistributedLock.Azure.md @@ -1 +1,38 @@ -Coming soon! \ No newline at end of file +# DistributedLock.Azure + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.Azure) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) + +The DistributedLock.Azure package offers distributed locks based on [Azure blob leases](https://docs.microsoft.com/en-us/rest/api/storageservices/lease-blob). For example: + +```C# +var container = new BlobContainerClient(myAzureConnectionString, "my-locking-container-name"); +var @lock = new AzureBlobLeaseDistributedLock(container, "MyLockName"); +await using (var handle = await @lock.TryAcquireAsync()) +{ + if (handle != null) { /* I have the lock */ } +} +``` + +## APIs + +- The `AzureBlobLeaseDistributedLock` class implements the `IDistributedLock` interface. +- The `AzureBlobLeaseDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` interface. + +## Implementation notes + +`AzureBlobLeaseDistributedLock`s can be constructed either from a `BlobContainerClient` and a name, which will cause it to lease a blob in the provided container with a name based on the provided name. If you know exactly which blob you'd like to lease, another constructor lets you pass a `BlobBaseClient` instead. + +Because of how Azure leases work, the acquire operation cannot truly block. If waiting to acquire a lock that is not available, the implementation will periodically sleep and retry until the lease can be taken or the acquire timeout elapses. Because of this, these locks are maximally efficient when using `TryAcquire` semantics with a timeout of zero. + +Blob leases in Azure have built-in expirations. However while an `AzureBlobLeaseDistributedLock` is held it will periodically renew the lease in the background. Therefore, it is generally safe to ignore the problem of lease duration. + +## Options + +In addition to specifying the blob to be leased, several tuning options are provided. You should not need to change these options most of the time. + +- `Duration` changes the blob lease duration requested under the hood +- `RenewalCadence` changes how frequently auto-renewal re-ups the lease duration while holding the lock +- `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lease that is currently held by someone else. A random number in the range will be chosen for each sleep. If you expect contention, lowering these values may increase the responsiveness (how quickly a lock detects that it can now take the lease) but will increase the number of API calls made to Azure. Raising the values will have the reverse effects. + + + From 91499895e2dca4ab09774b3df52fcb9dc650c8c1 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 15 Jan 2021 07:45:55 -0500 Subject: [PATCH 083/399] Remove locks.md --- docs/Locks.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/Locks.md diff --git a/docs/Locks.md b/docs/Locks.md deleted file mode 100644 index 3014a68f..00000000 --- a/docs/Locks.md +++ /dev/null @@ -1 +0,0 @@ -Coming soon! \ No newline at end of file From 40ebb9d7181f7228ae074f0ca723fe9d4408b142 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 20 Jan 2021 07:18:30 -0500 Subject: [PATCH 084/399] Update DistributedLock.FileSystem.md --- docs/DistributedLock.FileSystem.md | 34 +++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.FileSystem.md b/docs/DistributedLock.FileSystem.md index 3014a68f..92f17c94 100644 --- a/docs/DistributedLock.FileSystem.md +++ b/docs/DistributedLock.FileSystem.md @@ -1 +1,33 @@ -Coming soon! \ No newline at end of file +# DistributedLock.FileSystem + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.FileSystem) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) + +The DistributedLock.FileSystem package offers distributed locks based on file handles/locks. For example: + +```C# +var lockFileDirectory = new DirectoryInfo(Environment.CurrentDirectory); // choose where the lock files will live +var @lock = new FileDistributedLock(lockFileDirectory, "MyLockName"); +await using (var handle = await @lock.TryAcquireAsync()) +{ + if (handle != null) { /* I have the lock */ } +} +``` + +## APIs + +- The `FileDistributedLock` class implements the `IDistributedLock` interface. +- The `FileDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` interface. + +## Implementation notes + +Because they are based on files, these locks are used to coordinate between processes on the same machine (as opposed to across machines). In some csaes, it may be possible to coordinate across machines by specifying the path of a networked file. However, this should be tested because the network file system may not truly support locking. + +`FileDistributedLock`s can be constructed either from a base `DirectoryInfo` and a `name`, which will cause it to create a file *based on* `name` in the specified directory. If you know exactly which file you'd like to lock on, you can pass a `FileInfo` instead. + +Because of how exclusive file handles work in .NET, the acquire operation cannot truly block. If waiting to acquire a lock that is not available, the implementation will periodically sleep and retry until the lease can be taken or the acquire timeout elapses. Because of this, these locks are maximally efficient when using `TryAcquire` semantics with a timeout of zero. + +## Options + +File-based locks have no additional configuration options. + + From f4f04bbbce3bed9bf51fe5ef2e9afd0f19ca8a06 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 20 Jan 2021 07:49:53 -0500 Subject: [PATCH 085/399] Update DistributedLock.Postgres.md --- docs/DistributedLock.Postgres.md | 42 +++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md index 3014a68f..295ace79 100644 --- a/docs/DistributedLock.Postgres.md +++ b/docs/DistributedLock.Postgres.md @@ -1 +1,41 @@ -Coming soon! \ No newline at end of file +# DistributedLock.Postgres + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.Postgres) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) + +The DistributedLock.Postgres package offers distributed synchronization primitives based on [PostgreSQL advisory locks](https://www.postgresql.org/docs/9.4/explicit-locking.html#ADVISORY-LOCKS). For example: + +```C# +var @lock = new PostgresDistributedLock(new PostgresAdvisoryLockKey("MyLockName", allowHashing: true), connectionString); +await using (await @lock.AcquireAsync()) +{ + // I have the lock +} +``` + +## APIs + +- The `PostgresDistributedLock` class implements the `IDistributedLock` interface. +- The `PostgresDistributedReaderWriterLock` class implements the `IDistributedReaderWriterLock` interface. +- The `PostgresDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` and `IDistributedReaderWriterLockProvider` interfaces. + +## Implementation notes + +Under the hood, [Postgres advisory locks can be based on either one 64-bit integer value or a pair of 32-bit integer values](https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS). Because of this, rather than taking in a name the lock constructors take a `PostgresAdvisoryLockKey` object which can be constructed in several ways: +- Passing a single `long` value. +- Passing a pair of `int` values. +- Passing a 16-character hex string (e. g. `"00000003ffffffff"`) which will be parsed as a `long`. +- Passing a pair of comma-separated 8-character hex strings (e. g. `"00000003,ffffffff"`) which will be parsed as a pair of `int`s. +- Passing an ASCII string with 0-9 characters, which will be mapped to a `long` based on a custom scheme. +- Passing an arbitrary string with the `allowHashing` option set to `true` which will be hashed to a `long`. Note that hashing will only be used if other methods of interpreting the string fail. + +In addition to specifying the `key`, Postgres-based locks allow you to specify either a `connectionString` or an `IDbConnection` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. + +## Options + +In addition to specifying the `key`, several tuning options are available for `connectionString`-based locks: + +- `KeepaliveCadence` allows you to have the implementation periodically issue a cheap query on a connection holding a lock. This helps in configurations which are set up to aggressively kill idle connections. Defaults to OFF (`Timeout.InfiniteTimeSpan`). +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). + + + From 5a3392a99eb6e98841d5b56f4eae67b351799958 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Thu, 21 Jan 2021 07:51:07 -0500 Subject: [PATCH 086/399] Update DistributedLock.Redis.md --- docs/DistributedLock.Redis.md | 46 ++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.Redis.md b/docs/DistributedLock.Redis.md index 3014a68f..4d019021 100644 --- a/docs/DistributedLock.Redis.md +++ b/docs/DistributedLock.Redis.md @@ -1 +1,45 @@ -Coming soon! \ No newline at end of file +# DistributedLock.Redis + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.Redis) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) + +The DistributedLock.Redis package offers distributed synchronization primitives based on [Redis](https://redis.io/). For example: + +```C# +var connection = await ConnectionMultiplexer.ConnectAsync(connectionString); // uses StackExchange.Redis +var @lock = new RedisDistributedLock("MyLockName", connection.GetDatabase()); +await using (var handle = await @lock.TryAcquireAsync()) +{ + if (handle != null) { /* I have the lock */ } +} +``` + +## APIs + +- The `RedisDistributedLock` class implements the `IDistributedLock` interface. +- The `RedisDistributedReaderWriterLock` class implements the `IDistributedReaderWriterLock` interface +- The `RedisDistributedSemaphore` class implements the `IDistributedSemaphore` interface +- The `RedisDistributedSynchronizationProvider` class implements the `IDistributedLockProvider`, `IDistributedReaderWriterLockProvider`, and `IDistributedSemaphoreProvider` interfaces. + +## Implementation notes + +The `RedisDistributedLock` and `RedisDistributedReaderWriterLock` classes implement the [RedLock algorithm](https://redis.io/topics/distlock). This allows you to increase the robustness of those locks by constructing the lock with a set of databases instead of just a single database. The lock is only considered aquired if it is successfully acquired on more than half of the databases. + +The `RedisDistributedSemaphore` implementation is loosely based on [this algorithm](https://redislabs.com/ebook/part-2-core-concepts/chapter-6-application-components-in-redis/6-3-counting-semaphores/). Note that `RedisDistributedSemaphore` does not support multiple databases, because the RedLock algorithm does not work with semaphores.1 When calling `CreateSemaphore()` on a `RedisDistributedSynchronizationProvider` that has been constructed with multiple databases, the first database in the list will be used. + +Both RedLock and the semaphore algorithm mentioned above claim locks for only a specified period of time. While DistributedLock does this under the hood, it also periodically extends its hold behind the scenes to ensure that the object is not released until the handle returned by `Acquire` is disposed. + +Some Redis synchronization primitives take in a `string name` as their name and others take in a `RedisKey key`. In the former case, one or more Redis keys will be created on the database with `name` as a prefix. In the latter case, the exact key will be used. Make sure your names/keys don't collide with Redis keys you're using for other purposes! + +Because of how Redis locks work, the acquire operation cannot truly block. If waiting to acquire a lock or other primitive that is not available, the implementation will periodically sleep and retry until the lease can be taken or the acquire timeout elapses. Because of this, these classes are maximally efficient when using `TryAcquire` semantics with a timeout of zero. + +## Options + +In addition to specifying the name/key and database(s), some additional tuning options are available. + +- `Expiry` determines how long the lock will be *initially* claimed for (because of auto-extension, locks can be held for longer). Defaults to 30s. +- `ExtensionCadence` determines how frequently the hold on the lock will be renewed to the full `Expiry`. Defaults to 1/3 of `Expiry`. +- `MinValidityTime` determines what fraction of `Expiry` still has to remain when the locking operation completes to consider it a success. This is mostly relevant when acquiring a lock across multiple databases (e. g. if we immediately succeed on database 1 and eventually succeed on database 2 after 30s have elapsed, then our hold on database 1 will have expired). Defaults to 90% of the `Expiry`. +- `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lock that is currently held by someone else. A random number in the range will be chosen for each sleep. If you expect contention, lowering these values may increase the responsiveness (how quickly a lock detects that it can now be taken) but will increase the number of calls made to REdis. Raising the values will have the reverse effects. + + +1 The reason RedLock does not work with semaphores is that entering a semaphore on a majority of databases does not guarantee that the semaphore's invariant is preserved. For example, imagine a two-count semaphore with three databases (1, 2, and 3) and three users (A, B, and C). We could find ourselves in the following situation: on database 1, users A and B have entered. On database 2, users B and C have entered. On database 3, users A and C have entered. Here all users believe they have entered the semaphore because they've succeeded on two out of three databases. From 3568e93f3aa41011df6710d356c980117aed74a0 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 22 Jan 2021 07:28:34 -0500 Subject: [PATCH 087/399] Update DistributedLock.SqlServer.md --- docs/DistributedLock.SqlServer.md | 33 ++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.SqlServer.md b/docs/DistributedLock.SqlServer.md index 3014a68f..32c4a2e2 100644 --- a/docs/DistributedLock.SqlServer.md +++ b/docs/DistributedLock.SqlServer.md @@ -1 +1,32 @@ -Coming soon! \ No newline at end of file +# DistributedLock.SqlServer + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.SqlServer) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) + +The DistributedLock.SqlServer package offers distributed locks based on [Microsoft SQL Server application locks](https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-getapplock-transact-sql?view=sql-server-ver15). For example: + +```C# +var @lock = new SqlDistributedLock("MyLockName", connectionString); +await using (await @lock.AcquireAsync()) +{ + // I have the lock +} +``` + +## APIs + +- The `SqlDistributedLock` class implements the `IDistributedLock` interface. +- The `SqlDistributedReaderWriterLock` class implements the `IDistributedUpgradeableReaderWriterLock` interface. +- The `SqlDistributedSemaphore` class implements the `IDistributedSemaphore` interface. +- The `SqlDistributedSynchronizationProvider` class implements the `IDistributedLockProvider`, `IDistributedUpgradeableReaderWriterLockProvider`, and `IDistributedSemaphoreProvider` interfaces. + +## Implementation notes + +SQL-based locks can be constructed with a connection string, an `IDbConnection`, or an `IDbTransaction`. When a connection is passed, the lock will be scoped to that connection and when a transaction is passed the lock will be scoped to that transaction. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection`/`IDbTransaction` gets used in a way that disrupts the locking process. + +## Options + +When connecting using a `connectionString`, several other tuning options can also be specified. + +- `KeepaliveCadence` configures the frequency at which an innocuous query will be issued on the connection while the lock is being held. The purpose of automatic keepalive is to prevent SQL Azure's aggressive connection governor from killing "idle" lock-holding connections. Defaults to 10 minutes. +- `UseTransaction` scopes the lock to an internally-managed transaction under the hood (otherwise it is connection-scoped). Defaults to FALSE because this mode can lead to long-running transactions which can be disruptive on databases using the full recovery model. +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). From 808c94a259234d0c8e57d0cdf6f70af12d3859be Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 22 Jan 2021 07:43:03 -0500 Subject: [PATCH 088/399] Update DistributedLock.WaitHandles.md --- docs/DistributedLock.WaitHandles.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/DistributedLock.WaitHandles.md b/docs/DistributedLock.WaitHandles.md index 3014a68f..e7d003db 100644 --- a/docs/DistributedLock.WaitHandles.md +++ b/docs/DistributedLock.WaitHandles.md @@ -1 +1,27 @@ -Coming soon! \ No newline at end of file +# DistributedLock.WaitHandles + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.WaitHandles) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) + +The DistributedLock.WaitHandles package offers distributed locks based on [global WaitHandles in Windows](https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-createeventa?redirectedfrom=MSDN). **This library only works on Windows.** For example: + +```C# +var @lock = new EventWaitHandleDistributedLock("MyLockName"); +await using (await @lock.AcquireAsync()) +{ + // I have the lock! +} +``` + +## APIs + +- The `EventWaitHandleDistributedLock` class implements the `IDistributedLock` interface. +- The `WaitHandleDistributedSemaphore` class implements the `IDistributedSemaphore` interface. +- The `WaitHandleDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` and `IDistributedSemaphoreProvider` interfaces. + +## Implementation notes + +Because they are based on global `EventWaitHandle`s/`Semaphore`s, **these classes are used to coordinate between processes on the same machine** (as opposed to across machines). + +## Options + +The optional `abandonmentCheckCadence` argument specifies how frequently the implementation will check to see if the original holder of a lock/semaphore abandoned it without properly releasing it while waiting for it to become available. Defaults to 2s. From eed451b095e1adf08f1ecea3d87170765f16edfd Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:26:46 -0500 Subject: [PATCH 089/399] Update Reader-writer locks.md --- docs/Reader-writer locks.md | 89 ++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/docs/Reader-writer locks.md b/docs/Reader-writer locks.md index 3014a68f..86c11d8e 100644 --- a/docs/Reader-writer locks.md +++ b/docs/Reader-writer locks.md @@ -1 +1,88 @@ -Coming soon! \ No newline at end of file +# Reader-writer locks + +DistributedLock's implementations of [reader-writer locks](https://en.wikipedia.org/wiki/Readers%E2%80%93writer_lock) are similar to the framework's non-distributed [ReaderWriterLockSlim](https://msdn.microsoft.com/en-us/library/system.threading.readerwriterlockslim(v=vs.110).aspx) class. + +## Basics + +A reader-writer lock allows for *EITHER multiple readers OR one writer* to hold the lock at any given time. This is useful for protecting resources that are normally safe for concurrent access but need to sometimes be locked, such as when changes are being made. For example, a distributed reader-writer lock could be used to provide thread-safety in a distributed cache: + +```C# +class DistributedCache +{ + // uses the SQLServer implementation, but others are available as well + private readonly SqlDistributedReaderWriterLock _cacheLock = + new SqlDistributedReaderWriterLock("DistributedCache", connectionString); + + /// + /// If key is present in the cache, returns the associated value. If key is not present, generates a new + /// value with the provided valueFactory, stores that value in the cache, and returns the generated value. + /// + public async Task GetOrCreateAsync(string key, Func valueFactory) + { + // first, take the read lock to avoid blocking the cache in the case of a cache hit + await using (await this._cacheLock.AcquireReadLockAsync()) + { + var cached = await this.GetValueOrDefaultNoLockAsync(key); + if (cached != null) { return cached; } // cache hit + } + + // seems like we'll need to write to the cache; take the write lock + await using (await this._cacheLock.AcquireWriteLockAsync()) + { + // double-check: the value might have been written by another process + // while we were waiting to get the write lock + var cached = await this.GetValueOrDefaultNoLockAsync(key); + if (cached != null) { return cached; } // cache hit + + var generated = valueFactory(key); + await this.SetValueAsync(key, generated); + return generated; + } + } + + private async Task GetValueOrDefaultNoLockAsync(string key) { /* reads from underlying storage */ } + + private async Task SetValueAsync(string key, object value) { /* writes to underlying storage */ } +} +``` + +This approach is more efficient than simply wrapping the entire operation in a regular distributed lock because cache hits don't block each other. + +## Upgradeable reader-writer locks + +Some reader-writer lock implementations further support acquiring an *upgradeable read* lock. When acquired, this lock blocks other writers and upgradeable readers but does not block other readers. Furthermore, an upgradeable read lock can be upgraded to a write lock without having to be released first (with a regular read lock, you must release it before acquiring a write lock. + +It may seem tempting to use an upgradeable read lock instead of both a read lock and a write lock in the cache scenario describe above, but the [problem with this](https://ayende.com/blog/4349/using-readerwriterlockslims-enterupgradeablereadlock) is that it would only allow one caller inside GetOrCreate at any giving time. + +In some cases, though, it is useful to be able to block writers for a time without blocking readers. Consider the following example of a checkout system where we want to protect modification of the shopping cart data model with a lock: + +``` +class ShoppingCartService +{ + public ShoppingCartDetails GetDetails(Guid cartId) + { + using (this.GetCartLock(cartId).AcquireReadLock()) + { + // read from cart data model + } + } + + public void Checkout(Guid cartId) + { + using var handle = this.GetCartLock(cartId).AcquireUpgradeableReadLock(); + + // This makes some API calls to other systems and can be slow. We want an upgradeable + // read lock because we don't want to call Submit() multiple times for the same cart, but we + // don't need to block readers of the cart data model because we're not editing it + var submissionInfo = SubmitOrder(cartId); + + // now it's time to edit the cart data model, so upgrade to a write lock + handle.UpgradeToWriteLock(); + + // write to cart data model + } + + private SqlDistributedReaderWriterLock GetCartLock(Guid cartId) => + new SqlDistributedReaderWriterLock("Cart_" + cartId, connectionString); +} +``` From 34ca6bd311b67dd071b14ff1126b205a844d3721 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:27:03 -0500 Subject: [PATCH 090/399] Update Reader-writer locks.md --- docs/Reader-writer locks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Reader-writer locks.md b/docs/Reader-writer locks.md index 86c11d8e..516fc1b8 100644 --- a/docs/Reader-writer locks.md +++ b/docs/Reader-writer locks.md @@ -56,7 +56,7 @@ It may seem tempting to use an upgradeable read lock instead of both a read lock In some cases, though, it is useful to be able to block writers for a time without blocking readers. Consider the following example of a checkout system where we want to protect modification of the shopping cart data model with a lock: -``` +```C# class ShoppingCartService { public ShoppingCartDetails GetDetails(Guid cartId) From f20c3de50f8a9d10a68eb1b185ce151eca0f98c7 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:30:47 -0500 Subject: [PATCH 091/399] Update Semaphores.md --- docs/Semaphores.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/Semaphores.md b/docs/Semaphores.md index 3014a68f..c31f8923 100644 --- a/docs/Semaphores.md +++ b/docs/Semaphores.md @@ -1 +1,15 @@ -Coming soon! \ No newline at end of file +# Semaphores + +DistributedLock's implementation of distributed semaphore have an API similar to the framework's non-distributed [SemaphoreSlim](https://msdn.microsoft.com/en-us/library/system.threading.semaphoreslim(v=vs.110).aspx) class. + +The semaphore acts like a lock that can be acquired by a fixed number of processes/threads simultaneously instead of a single process/thread. This capability is frequently used to "throttle" access to some resource such as a database or email server, generally with the goal of preventing it from becoming overloaded. In such cases, a distributed mutex lock is inappropriate because we do want to allow concurrent access and simply want to cap the level of concurrency. For example: + +```C# +// uses the Redis implementation; others are available +var semaphore = new RedisDistributedSemaphore("ComputeDatabase", maxCount: 5, database: database); +using (semaphore.Acquire()) +{ + // only 5 callers can be inside this block concurrently + UseComputeDatabase(); +} +``` From 3de1107b327ea884cb4b6cc5c8f6d7e275b2ef1a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:32:28 -0500 Subject: [PATCH 092/399] Update Semaphores.md --- docs/Semaphores.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/Semaphores.md b/docs/Semaphores.md index c31f8923..cfe518a7 100644 --- a/docs/Semaphores.md +++ b/docs/Semaphores.md @@ -13,3 +13,5 @@ using (semaphore.Acquire()) UseComputeDatabase(); } ``` + +Whenever a distributed semaphore is created, you must specify the max count value as well as the name. Specifying the same name with different max count values on different instances of a semaphore has undefined and unpredictable results, so make sure to use the same max count value for each instance of a particular semaphore. From 97e401fe3a537f28c81e046189351c5564ff1044 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:34:02 -0500 Subject: [PATCH 093/399] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fdc86724..ffc67796 100644 --- a/README.md +++ b/README.md @@ -123,14 +123,14 @@ public class SomeService - [Interfaces](docs/Other+topics.md#interfaces) - [Detecting handle loss](docs/Other+topics.md#detecting-handle-loss) - [Handle abandonment](docs/Other+topics.md#handle-abandonment) -- [Migrating from 1.x to 2.x](docs/Other+topics.md#migrating-from-1x-to-2x) +- [Safety of distributed locking](docs/Other+topics.md#safety-of-distributed-locking) ## Contributing Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes -- 2.0.0 +- 2.0.0 (see [Migrating from 1.x to 2.x](docs/Other+topics.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) - Added Redis-based locking (#24, DistributedLock.Redis 1.0.0) From ecd27604a9052428ef688cdc842f6fbdc71649d8 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:35:02 -0500 Subject: [PATCH 094/399] Update Other topics.md --- docs/Other topics.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/Other topics.md b/docs/Other topics.md index 4d32b460..1d702be4 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -1,10 +1,15 @@ -Coming soon! - ## Interfaces + ## Detecting handle loss +Coming soon! ## Handle abandonment +Coming soon! + +## Safety of distributed locking +Coming soon! ## Migrating from 1.x to 2.x +Coming soon! From 4e34c9210d3872df3353078efda47f795cd06b6f Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:36:06 -0500 Subject: [PATCH 095/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffc67796..f18b2d8a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ DistributedLock contains implementations based on various technologies; you can ## Synchronization primitives - Locks: provide exclusive access to a region of code -- [Reader-writer locks](docs/Reader-writer+locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. +- [Reader-writer locks](docs/Reader-writer%20locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. - [Semaphores](docs/Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. While all implementations support locks, the other primitives are only supported by some implementations. See the [implementation-specific documentation pages](docs) for details. From d017299a7352a25b00561ec3c1ac9c806d38a5e6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 10:36:48 -0500 Subject: [PATCH 096/399] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f18b2d8a..9daef072 100644 --- a/README.md +++ b/README.md @@ -120,10 +120,10 @@ public class SomeService ## Other topics -- [Interfaces](docs/Other+topics.md#interfaces) -- [Detecting handle loss](docs/Other+topics.md#detecting-handle-loss) -- [Handle abandonment](docs/Other+topics.md#handle-abandonment) -- [Safety of distributed locking](docs/Other+topics.md#safety-of-distributed-locking) +- [Interfaces](docs/Other%20topics.md#interfaces) +- [Detecting handle loss](docs/Other%20topics.md#detecting-handle-loss) +- [Handle abandonment](docs/Other%20topics.md#handle-abandonment) +- [Safety of distributed locking](docs/Other%20topics.md#safety-of-distributed-locking) ## Contributing From 2171cead07ffd1a2b2a8f29b779c91b294d748e2 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:07:03 -0500 Subject: [PATCH 097/399] Update Other topics.md --- docs/Other topics.md | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/docs/Other topics.md b/docs/Other topics.md index 1d702be4..df461ccf 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -1,15 +1,48 @@ ## Interfaces +The underlying technology behind a particular locking primitive (e. g. SQL Server vs. the file system) affects its behavior and performance. Therefore, in most cases you'll want to use the specific concrete classes (e. g. `SqlDistributedLock`) when writing code with distributed locks. + +However, in some cases you may want to write code that is agnostic to the specific locking technology. For example, swapping out a fully-distributed implementation for a local-system-based or mock implementation during testing might improve test performance and simplify setup. + +For purposes such as this, DistributedLock provides an interface for each of the primitives that can be used in place of the concrete classes. These are: `IDistributedLock`, `IDistributedReaderWriterLock`, `IDistributedUpgradeableReaderWriterLock`, and `IDistributedSemaphore`. + +Similarly, there is a set of interfaces defined for locking providers: `IDistributedLockProvider`, `IDistributedReaderWriterLockProvider`, `IDistributedUpgradeableReaderWriterLockProvider`, and `IDistributedSemaphoreProvider`. Each technology typically has a single provider class which implements all appropriate interfaces. ## Detecting handle loss -Coming soon! + +Sometimes, your code's hold on a lock can be disrupted due to a disruption in the underlying technology. For example, if you are holding a Postgres-based lock and the underlying database connection is killed, your code will no longer be holding the lock. Most such disruptions will result in a failure when the lock handle is disposed, but some may not. + +In most cases, this sort of disruption is rare and not worth worrying about. However, some lock types allow for early detection of such problems through the `HandleLostToken` interface. This is a `CancellationToken` on the returned lock handle which will be canceled if the handle detects that its hold on the lock has been disrupted. **Accessing the HandleLostToken can force a handle to perform additional background work under the hood** (e. g. polling), so don't use this feature unless you think you need it. + +``` +using var handle = myLock.Acquire(); + +if (!handle.HandleLostToken.CanBeCanceled) { Console.WriteLine("Implementation does not support lost handle detection"); } + +handle.HandeLostToken.Register(() => Console.WriteLine("Lock was lost!")); +``` ## Handle abandonment -Coming soon! + +Any code that acquires a distributed lock or other primitive should be sure to dispose of it upon completion of its work to ensure that other parts of the system are not blocked. + +However, in a large and complex system there is always risk that this doesn't happen, either through sloppily written code or a bug that causes an exception to occur in an unexpected place. + +To provide additional protection against the "leaking" of lock handles, DistributedLock's primitives are designed so that a handle being garbage collected without being disposed or a handle-holding process crashing will not cause a lock to be held forever. This helps ensure that systems built on distributed locking are robust to unexpected failures. ## Safety of distributed locking -Coming soon! + +Distributed locking is one of the easiest ways to add robustness to a distributed system without overly-complex design. However, the nature of the approach means that for certain scenarios it may not always be the best fit. + +For example, whenever we are using one technology to protect access to another technology, there is a (likely very small) risk that the locking technology suffers an outage (see section on detecting handle loss), and briefly allows concurrent access to a resource if it comes back online and starts granting new handles while old lost handles are still in use. Timeout-based locking approaches such as Redis locks and Azure leases have an inherent risk that an extended hang on the machine holding the lock could cause the timeout to expire before the lock can be automatically-renewed (a network outage could cause the same issue). + +In some cases, tying together the locking technology with the underlying resource can provide additional safety. For example, when using a SQLServer or Postgres lock to protect a resource on the same database it is possible to use the same `DbConnection` for both the locking operation and the data modification. Combined with database transactions, this guarantees the integrity of the locking. + +In other cases, this sort of unification isn't possible. If any violation of the locking guarantees is unacceptable, you may have to consider more complex approaches such as the techniques discussed in [this article](https://martin.kleppmann.com/2016/02/08/how-to-do-distributed-locking.html). In many cases, you simply won't be able to achieve true safety because of constraints driven by the resources you are trying to protect. + +As mentioned at the start, the distributed locking approaches offered by this library are, in my experience, good enough for a large number of real-life scenarios. Furthermore, they are easy to use correctly and easy to reason about. However, it is worth being aware of any technology's limitations! ## Migrating from 1.x to 2.x -Coming soon! + + From cbb474144771fa761c000aceba5add67feae1fa5 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:30:48 -0500 Subject: [PATCH 098/399] Update Other topics.md --- docs/Other topics.md | 50 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/docs/Other topics.md b/docs/Other topics.md index df461ccf..5edd0235 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -14,7 +14,7 @@ Sometimes, your code's hold on a lock can be disrupted due to a disruption in th In most cases, this sort of disruption is rare and not worth worrying about. However, some lock types allow for early detection of such problems through the `HandleLostToken` interface. This is a `CancellationToken` on the returned lock handle which will be canceled if the handle detects that its hold on the lock has been disrupted. **Accessing the HandleLostToken can force a handle to perform additional background work under the hood** (e. g. polling), so don't use this feature unless you think you need it. -``` +```C# using var handle = myLock.Acquire(); if (!handle.HandleLostToken.CanBeCanceled) { Console.WriteLine("Implementation does not support lost handle detection"); } @@ -44,5 +44,53 @@ As mentioned at the start, the distributed locking approaches offered by this li ## Migrating from 1.x to 2.x +The 2.0 release of DistributedLock is a significant departure from the 1.x series in several ways. While a large percentage of source code written for 1.x should still compile against 2.x, you will almost certainly encounter some issues and this section is intended to help navigate them. + +### Package structure +First off, with the addition of many new locking technologies the package has been broken up into sub-packages which can be installed independently. This allows users to avoid bloating their dependency trees by just installing the providers they actually use. If you've been using SQL Server-based locks, for example, you may want to remove the DistributedLock package and instead install just the DistributedLock.SqlServer package when you upgrade. + +### Safe naming +In 1.x, it was often necessary to call an API like `SqlDistributedLock.GetSafeName()` before constructing a lock instance to ensure that the name you passed in was compatible with the underlying technology. In 2.0, safe naming is enabled by default; instead using the exact name (which is occasionally helpful if you have non-C# code trying to take the same lock) is a constructor option: + +```C# +// 1.x +new SqlDistributedLock(SqlDistributedLock.GetSafeName(name), connectionString); // safe name +new SqlDistributedLock(name, connectionString); // exact name (rare) + +// 2.0 +new SqlDistributedLock(name, connectionString) // safe name +new SqlDistributedLock(name, connectionString, exactName: true) // exact name (rare) +``` + +### SystemDistributedLock renamed +1.x's `SystemDistributedLock` has been renamed to `EventWaitHandleDistributedLock` to emphasize its reliance on that Windows-only technology. Furthermore, 2.0 contains `FileDistributedLock` which offers an alternative system-scoped locking mechanism. + +### SQL Server connection options +1.x offered an [enum-based approach to configuring how the lock connected to the database](https://github.com/madelson/DistributedLock/tree/release-1.5#connection-management). In 2.0, this has been replaced with a more flexible options argument. Note that Azure-focused "keepalive" behavior and connection multiplexing have been enabled by default in 2.0. +### ValueTask return values +The 1.x `AcquireAsync` methods return `Task`. The problem with this API is that it made it easy to write incorrect code that looked correct because `Task` implements `IDisposable`. 2.0 switches to `ValueTask` (which wasn't available when the 1.x APIs were created) to avoid this problem. +```C# +// 1.x +// Forgetting 'await' means that the using block is disposing the Task and not the lock handle. +// We will likely enter the block before the handle is acquired and will never release the handle! +using (myLock.AcquireAsync()) { } + +// 2.0 +// this code will not compile (since ValueTask is not IDisposable) +using (myLock.AcquireAsync()) { } +``` + +If you need a `Task`, you can simply call `.AsTask()` on the returned `ValueTask`. If you are doing anything other than immediately awaiting the task, I recommend reading [Microsoft's documentation on how ValueTasks can be used](https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=net-5.0#remarks). + +### Async disposal +Since the release of 1.x, Microsoft added the `IAsyncDisposable` interface as an async-friendly alternative to `IDisposable`. If you were previously using async locking, you can now switch to async disposing for additional async goodness! + +```C# +// 1.x and 2.0 (acquires asynchronously, releases synchronously) +using (await myLock.AcquireAsync()) { } + +// 2.0 only (acquires and releases asynchronously) +await using (await myLock.AcquireAsync()) { } +``` From d1f8dde29d2dbeccd49c9db9f93d8c54db48c4c6 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 30 Jan 2021 11:32:22 -0500 Subject: [PATCH 099/399] migrating file --- docs/Migrating from 1.x to 2.x.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/Migrating from 1.x to 2.x.md diff --git a/docs/Migrating from 1.x to 2.x.md b/docs/Migrating from 1.x to 2.x.md new file mode 100644 index 00000000..e69de29b From 77271683a78df3bfc4fe23956fa7a8c317f1b43a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:32:52 -0500 Subject: [PATCH 100/399] Update Migrating from 1.x to 2.x.md --- docs/Migrating from 1.x to 2.x.md | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/docs/Migrating from 1.x to 2.x.md b/docs/Migrating from 1.x to 2.x.md index e69de29b..acd1eb5a 100644 --- a/docs/Migrating from 1.x to 2.x.md +++ b/docs/Migrating from 1.x to 2.x.md @@ -0,0 +1,52 @@ +# Migrating from 1.x to 2.x + +The 2.0 release of DistributedLock is a significant departure from the 1.x series in several ways. While a large percentage of source code written for 1.x should still compile against 2.x, you will almost certainly encounter some issues and this section is intended to help navigate them. + +### Package structure +First off, with the addition of many new locking technologies the package has been broken up into sub-packages which can be installed independently. This allows users to avoid bloating their dependency trees by just installing the providers they actually use. If you've been using SQL Server-based locks, for example, you may want to remove the DistributedLock package and instead install just the DistributedLock.SqlServer package when you upgrade. + +### Safe naming +In 1.x, it was often necessary to call an API like `SqlDistributedLock.GetSafeName()` before constructing a lock instance to ensure that the name you passed in was compatible with the underlying technology. In 2.0, safe naming is enabled by default; instead using the exact name (which is occasionally helpful if you have non-C# code trying to take the same lock) is a constructor option: + +```C# +// 1.x +new SqlDistributedLock(SqlDistributedLock.GetSafeName(name), connectionString); // safe name +new SqlDistributedLock(name, connectionString); // exact name (rare) + +// 2.0 +new SqlDistributedLock(name, connectionString) // safe name +new SqlDistributedLock(name, connectionString, exactName: true) // exact name (rare) +``` + +### SystemDistributedLock renamed +1.x's `SystemDistributedLock` has been renamed to `EventWaitHandleDistributedLock` to emphasize its reliance on that Windows-only technology. Furthermore, 2.0 contains `FileDistributedLock` which offers an alternative system-scoped locking mechanism. + +### SQL Server connection options +1.x offered an [enum-based approach to configuring how the lock connected to the database](https://github.com/madelson/DistributedLock/tree/release-1.5#connection-management). In 2.0, this has been replaced with a more flexible options argument. Note that Azure-focused "keepalive" behavior and connection multiplexing have been enabled by default in 2.0. + +### ValueTask return values +The 1.x `AcquireAsync` methods return `Task`. The problem with this API is that it made it easy to write incorrect code that looked correct because `Task` implements `IDisposable`. 2.0 switches to `ValueTask` (which wasn't available when the 1.x APIs were created) to avoid this problem. + +```C# +// 1.x +// Forgetting 'await' means that the using block is disposing the Task and not the lock handle. +// We will likely enter the block before the handle is acquired and will never release the handle! +using (myLock.AcquireAsync()) { } + +// 2.0 +// this code will not compile (since ValueTask is not IDisposable) +using (myLock.AcquireAsync()) { } +``` + +If you need a `Task`, you can simply call `.AsTask()` on the returned `ValueTask`. If you are doing anything other than immediately awaiting the task, I recommend reading [Microsoft's documentation on how ValueTasks can be used](https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=net-5.0#remarks). + +### Async disposal +Since the release of 1.x, Microsoft added the `IAsyncDisposable` interface as an async-friendly alternative to `IDisposable`. If you were previously using async locking, you can now switch to async disposing for additional async goodness! + +```C# +// 1.x and 2.0 (acquires asynchronously, releases synchronously) +using (await myLock.AcquireAsync()) { } + +// 2.0 only (acquires and releases asynchronously) +await using (await myLock.AcquireAsync()) { } +``` From b1c9b6768d7082c625ef9258a827a45b7bf82386 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:33:08 -0500 Subject: [PATCH 101/399] Update Other topics.md --- docs/Other topics.md | 52 -------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/docs/Other topics.md b/docs/Other topics.md index 5edd0235..2608d2f2 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -42,55 +42,3 @@ In other cases, this sort of unification isn't possible. If any violation of the As mentioned at the start, the distributed locking approaches offered by this library are, in my experience, good enough for a large number of real-life scenarios. Furthermore, they are easy to use correctly and easy to reason about. However, it is worth being aware of any technology's limitations! -## Migrating from 1.x to 2.x - -The 2.0 release of DistributedLock is a significant departure from the 1.x series in several ways. While a large percentage of source code written for 1.x should still compile against 2.x, you will almost certainly encounter some issues and this section is intended to help navigate them. - -### Package structure -First off, with the addition of many new locking technologies the package has been broken up into sub-packages which can be installed independently. This allows users to avoid bloating their dependency trees by just installing the providers they actually use. If you've been using SQL Server-based locks, for example, you may want to remove the DistributedLock package and instead install just the DistributedLock.SqlServer package when you upgrade. - -### Safe naming -In 1.x, it was often necessary to call an API like `SqlDistributedLock.GetSafeName()` before constructing a lock instance to ensure that the name you passed in was compatible with the underlying technology. In 2.0, safe naming is enabled by default; instead using the exact name (which is occasionally helpful if you have non-C# code trying to take the same lock) is a constructor option: - -```C# -// 1.x -new SqlDistributedLock(SqlDistributedLock.GetSafeName(name), connectionString); // safe name -new SqlDistributedLock(name, connectionString); // exact name (rare) - -// 2.0 -new SqlDistributedLock(name, connectionString) // safe name -new SqlDistributedLock(name, connectionString, exactName: true) // exact name (rare) -``` - -### SystemDistributedLock renamed -1.x's `SystemDistributedLock` has been renamed to `EventWaitHandleDistributedLock` to emphasize its reliance on that Windows-only technology. Furthermore, 2.0 contains `FileDistributedLock` which offers an alternative system-scoped locking mechanism. - -### SQL Server connection options -1.x offered an [enum-based approach to configuring how the lock connected to the database](https://github.com/madelson/DistributedLock/tree/release-1.5#connection-management). In 2.0, this has been replaced with a more flexible options argument. Note that Azure-focused "keepalive" behavior and connection multiplexing have been enabled by default in 2.0. - -### ValueTask return values -The 1.x `AcquireAsync` methods return `Task`. The problem with this API is that it made it easy to write incorrect code that looked correct because `Task` implements `IDisposable`. 2.0 switches to `ValueTask` (which wasn't available when the 1.x APIs were created) to avoid this problem. - -```C# -// 1.x -// Forgetting 'await' means that the using block is disposing the Task and not the lock handle. -// We will likely enter the block before the handle is acquired and will never release the handle! -using (myLock.AcquireAsync()) { } - -// 2.0 -// this code will not compile (since ValueTask is not IDisposable) -using (myLock.AcquireAsync()) { } -``` - -If you need a `Task`, you can simply call `.AsTask()` on the returned `ValueTask`. If you are doing anything other than immediately awaiting the task, I recommend reading [Microsoft's documentation on how ValueTasks can be used](https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=net-5.0#remarks). - -### Async disposal -Since the release of 1.x, Microsoft added the `IAsyncDisposable` interface as an async-friendly alternative to `IDisposable`. If you were previously using async locking, you can now switch to async disposing for additional async goodness! - -```C# -// 1.x and 2.0 (acquires asynchronously, releases synchronously) -using (await myLock.AcquireAsync()) { } - -// 2.0 only (acquires and releases asynchronously) -await using (await myLock.AcquireAsync()) { } -``` From 8a674407ad9ec228b577beb7f8cc478bd166863a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:33:48 -0500 Subject: [PATCH 102/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9daef072..d888e815 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes -- 2.0.0 (see [Migrating from 1.x to 2.x](docs/Other+topics.md#migrating-from-1x-to-2x)) +- 2.0.0 (see [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) - Added Redis-based locking (#24, DistributedLock.Redis 1.0.0) From 1a7a81ced42da04c2e094f7e8be96cbc630dd3c6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 30 Jan 2021 11:34:31 -0500 Subject: [PATCH 103/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d888e815..47a3d71a 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes -- 2.0.0 (see [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) +- 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) - Added Redis-based locking (#24, DistributedLock.Redis 1.0.0) From de356451cbc1452ada91d03be2b68b8131121a47 Mon Sep 17 00:00:00 2001 From: Sergey Komisarchik Date: Wed, 24 Feb 2021 00:08:22 +0300 Subject: [PATCH 104/399] respect IDatabase key prefix on script evaluation --- .../Primitives/RedisScript.cs | 10 ++++--- .../DistributedLockCoreTestCases.cs | 4 ++- .../RedisSynchronizationCoreTestCases.cs | 27 +++++++++++++++++++ .../Redis/TestingRedisDatabaseProvider.cs | 20 ++++++++++++++ .../TestingRedisSynchronizationStrategy.cs | 9 +++++++ .../Infrastructure/TestingLockProvider.cs | 2 ++ .../TestingSynchronizationStrategy.cs | 1 + .../Tests/CombinatorialTests.cs | 5 ++++ 8 files changed, 73 insertions(+), 5 deletions(-) diff --git a/DistributedLock.Redis/Primitives/RedisScript.cs b/DistributedLock.Redis/Primitives/RedisScript.cs index 0f2916a4..20e98ee6 100644 --- a/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/DistributedLock.Redis/Primitives/RedisScript.cs @@ -20,11 +20,13 @@ public RedisScript(string script, Func parameters) this._parameters = parameters; } - public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => - this._script.Evaluate(database, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluate(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); - public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => - this._script.EvaluateAsync(database, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluateAsync(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); // send the smallest possible script to the server private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 70b5d139..9f9a8e30 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -443,7 +443,7 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) } } - private Command RunLockTaker(TLockProvider engine, params string[] args) + private Command RunLockTaker(TLockProvider engine, string lockType, string lockName) { const string Configuration = #if DEBUG @@ -454,6 +454,8 @@ private Command RunLockTaker(TLockProvider engine, params string[] args) var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker" + exeExtension); + var args = new object[] { lockType, $"{engine.GetLockPrefix()}{lockName}" }; + var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) .RedirectStandardErrorTo(Console.Error); this._cleanupActions.Add(() => diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 4d53ea37..9963b838 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -3,6 +3,8 @@ using Moq; using NUnit.Framework; using StackExchange.Redis; +using StackExchange.Redis.KeyspaceIsolation; + using System; using System.Collections.Generic; using System.Linq; @@ -124,6 +126,27 @@ public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() Assert.IsNotNull(handle); } + [Test] + public void TestAcquireWithLockPrefix() + { + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; + var lock1 = this._provider.CreateLock("N"); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; + var lock2 = this._provider.CreateLock("N"); + var lock3 = this._provider.CreateLock("PN"); + + Assert.NotNull(lock1.TryAcquire()); + Assert.NotNull(lock2.TryAcquire()); + Assert.Null(lock3.TryAcquire()); + + IDatabase CreateDatabase(string? keyPrefix = null) + { + var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); + } + } + private static Mock CreateDatabaseMock() { var mock = new Mock(MockBehavior.Strict); @@ -141,6 +164,10 @@ private static void MockDatabase(Mock mockDatabase, Func return .Returns(() => RedisResult.Create(returns())); mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(() => (bool)RedisResult.Create(returns())); mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 183bd106..7ab9c086 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -1,6 +1,8 @@ using Medallion.Threading.Tests.Redis; using NUnit.Framework; using StackExchange.Redis; +using StackExchange.Redis.KeyspaceIsolation; + using System; using System.Collections.Generic; using System.Diagnostics; @@ -22,17 +24,35 @@ protected TestingRedisDatabaseProvider(int count) { } + protected TestingRedisDatabaseProvider(int count, string keyPrefix) + : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase().WithKeyPrefix(keyPrefix))) + { + } + // publicly settable so that callers can alter the dbs in use public IReadOnlyList Databases { get; set; } public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); } + public interface ITestingRedisWithKeyPrefixDatabaseProvider + { + string KeyPrefix { get; } + } + public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider { public TestingRedisSingleDatabaseProvider() : base(count: 1) { } } + public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider, ITestingRedisWithKeyPrefixDatabaseProvider + { + const string Prefix = "distributed_locks:"; + + public TestingRedisWithKeyPrefixSingleDatabaseProvider() : base(count: 1, keyPrefix: Prefix) { } + public string KeyPrefix => Prefix; + } + public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider { public TestingRedis3DatabaseProvider() : base(count: 3) { } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index 2e346df9..cb9017f7 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -22,6 +22,15 @@ public void SetOptions(Action? op this._options = options; } + public override string? GetLockPrefix() + { + return DatabaseProvider switch + { + ITestingRedisWithKeyPrefixDatabaseProvider p => p.KeyPrefix, + _ => base.GetLockPrefix(), + }; + } + public void Options(RedisDistributedSynchronizationOptionsBuilder options) { if (this._preparedForHandleLost) diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index 6d21c7bf..8b14c1b6 100644 --- a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -19,6 +19,8 @@ public abstract class TestingLockProvider : ITestingNameProvider, IDi public virtual string GetCrossProcessLockType() => this.CreateLock(string.Empty).GetType().Name; public virtual void Dispose() => this.Strategy.Dispose(); + public string? GetLockPrefix() => Strategy.GetLockPrefix(); + /// /// Returns a lock whose name is based on /// diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 8ac80695..81a2b819 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -21,5 +21,6 @@ public virtual void PerformAdditionalCleanupForHandleAbandonment() { } public virtual IDisposable? PrepareForHandleLost() => null; public virtual void PrepareForHighContention() { } public virtual void Dispose() { } + public virtual string? GetLockPrefix() => null; } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index ccfb40d6..3dc45c10 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -60,20 +60,25 @@ namespace Medallion.Threading.Tests.Redis public class Core_ReaderWriterAsMutex_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } public class Core_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } public class Core_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_RedisReaderWriter_RedisWithKeyPrefixSingleDatabase_RedisSynchronizationStrategy_RedisWithKeyPrefixSingleDatabase_RedisSynchronizationStrategy_RedisWithKeyPrefixSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSynchronizationStrategy> { } public class Core_Redis_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Redis_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class Core_Redis_RedisWithKeyPrefixSingleDatabase_RedisSynchronizationStrategy_RedisWithKeyPrefixSingleDatabaseTest : DistributedLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class Core_Semaphore1AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases>, TestingRedisSynchronizationStrategy> { } public class Core_Semaphore5AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedLockCoreTestCases>, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class ReaderWriterCore_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } + public class ReaderWriterCore_RedisReaderWriter_RedisWithKeyPrefixSingleDatabase_RedisSynchronizationStrategy_RedisWithKeyPrefixSingleDatabaseTest : DistributedReaderWriterLockCoreTestCases, TestingRedisSynchronizationStrategy> { } public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_Redis2x1Database_RedisSynchronizationStrategy_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis2x1DatabaseProvider> { } public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedis3DatabaseProvider> { } public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_RedisSingleDatabase_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_ReaderWriterAsMutex_RedisReaderWriter_RedisWithKeyPrefixSingleDatabase_RedisSynchronizationStrategy_RedisWithKeyPrefixSingleDatabase_RedisWithKeyPrefixSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSynchronizationStrategy>, TestingRedisWithKeyPrefixSingleDatabaseProvider> { } public class RedisExtension_Redis_Redis2x1Database_Redis2x1DatabaseTest : RedisExtensionTestCases, TestingRedis2x1DatabaseProvider> { } public class RedisExtension_Redis_Redis3Database_Redis3DatabaseTest : RedisExtensionTestCases, TestingRedis3DatabaseProvider> { } public class RedisExtension_Redis_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases, TestingRedisSingleDatabaseProvider> { } + public class RedisExtension_Redis_RedisWithKeyPrefixSingleDatabase_RedisWithKeyPrefixSingleDatabaseTest : RedisExtensionTestCases, TestingRedisWithKeyPrefixSingleDatabaseProvider> { } public class RedisExtension_Semaphore1AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases>, TestingRedisSingleDatabaseProvider> { } public class RedisExtension_Semaphore5AsMutex_RedisSemaphore_RedisSynchronizationStrategy_RedisSingleDatabase_RedisSingleDatabaseTest : RedisExtensionTestCases>, TestingRedisSingleDatabaseProvider> { } public class RedisSynchronizationCore_ReaderWriterAsMutex_RedisReaderWriter_Redis3Database_RedisSynchronizationStrategy_Redis3DatabaseTest : RedisSynchronizationCoreTestCases, TestingRedisSynchronizationStrategy>> { } From 4d4f51156cbc920ba24b9be773ee18f9ada5f1bd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 24 Feb 2021 07:12:06 -0500 Subject: [PATCH 105/399] Minor cleanup --- .../DistributedLockCoreTestCases.cs | 4 +- .../RedisSynchronizationCoreTestCases.cs | 329 +++++++++--------- .../Redis/TestingRedisDatabaseProvider.cs | 142 ++++---- .../TestingRedisSynchronizationStrategy.cs | 185 +++++----- .../Infrastructure/TestingLockProvider.cs | 2 - .../TestingSynchronizationStrategy.cs | 1 - DistributedLockTaker/Program.cs | 6 + 7 files changed, 327 insertions(+), 342 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 9f9a8e30..70b5d139 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -443,7 +443,7 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) } } - private Command RunLockTaker(TLockProvider engine, string lockType, string lockName) + private Command RunLockTaker(TLockProvider engine, params string[] args) { const string Configuration = #if DEBUG @@ -454,8 +454,6 @@ private Command RunLockTaker(TLockProvider engine, string lockType, string lockN var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker" + exeExtension); - var args = new object[] { lockType, $"{engine.GetLockPrefix()}{lockName}" }; - var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) .RedirectStandardErrorTo(Console.Error); this._cleanupActions.Add(() => diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 9963b838..d2171e98 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -1,177 +1,180 @@ -using Medallion.Threading.Redis; -using Medallion.Threading.Tests.Redis; -using Moq; -using NUnit.Framework; -using StackExchange.Redis; +using Medallion.Threading.Redis; +using Medallion.Threading.Tests.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; using StackExchange.Redis.KeyspaceIsolation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Redis -{ - public abstract class RedisSynchronizationCoreTestCases - // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't - // want to see cases for each possible db provider type - where TLockProvider : TestingLockProvider>, new() - { - private TLockProvider _provider = default!; - - [SetUp] - public void SetUp() => this._provider = new TLockProvider(); - - [TearDown] - public void TearDown() => this._provider.Dispose(); - - [Test] - public void TestMajorityFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); - - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("multi"); - - // we only get the one exception - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); - - // single sync acquire flow is different - this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; - var singleDatabaseLock = this._provider.CreateLock("single"); - Assert.Throws(() => singleDatabaseLock.Acquire()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestMajorityHangingDatabasesCauseAcquireToFail() - { - using var @event = new ManualResetEventSlim(initialState: false); - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[1], () => { @event.Wait(); return true; }); - MockDatabase(databases[2], () => { @event.Wait(); return false; }); - - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); - var @lock = this._provider.CreateLock("lock"); - - Assert.IsNull(await @lock.TryAcquireAsync()); - - @event.Set(); // just to free the waiting threads - } - - [Test] - public void TestMajorityFaultingDatabasesCauseReleaseToThrow() - { - var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("lock"); - using var handle = @lock.Acquire(); - - new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); - var aggregateException = Assert.Throws(() => handle.Dispose()); - Assert.IsInstanceOf(aggregateException.InnerException); - } - - [Test] - public void TestHalfFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - - var @lock = this._provider.CreateLock("lock"); - Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); - } - - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) - { - var database = CreateDatabaseMock(); - MockDatabase(database, () => { Thread.Sleep(50); return true; }); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); - var @lock = this._provider.CreateLock("lock"); - - // single sync acquire has different timeout logic, so we test it separately - Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() - { - using var @event = new ManualResetEventSlim(); - var failDatabase = CreateDatabaseMock(); - MockDatabase(failDatabase, () => { @event.Wait(); return false; }); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; - var @lock = this._provider.CreateLock("lock"); - - var acquireTask = @lock.TryAcquireAsync().AsTask(); - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); - @event.Set(); - Assert.IsNull(await acquireTask); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; - var singleDatabaseLock = this._provider.CreateLock("lock"); - using var handle = await singleDatabaseLock.TryAcquireAsync(); - Assert.IsNotNull(handle); - } - - [Test] +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class RedisSynchronizationCoreTestCases + // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't + // want to see cases for each possible db provider type + where TLockProvider : TestingLockProvider>, new() + { + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + public void TestMajorityFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("multi"); + + // we only get the one exception + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + + // single sync acquire flow is different + this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; + var singleDatabaseLock = this._provider.CreateLock("single"); + Assert.Throws(() => singleDatabaseLock.Acquire()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestMajorityHangingDatabasesCauseAcquireToFail() + { + using var @event = new ManualResetEventSlim(initialState: false); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[1], () => { @event.Wait(); return true; }); + MockDatabase(databases[2], () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); + var @lock = this._provider.CreateLock("lock"); + + Assert.IsNull(await @lock.TryAcquireAsync()); + + @event.Set(); // just to free the waiting threads + } + + [Test] + public void TestMajorityFaultingDatabasesCauseReleaseToThrow() + { + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("lock"); + using var handle = @lock.Acquire(); + + new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); + var aggregateException = Assert.Throws(() => handle.Dispose()); + Assert.IsInstanceOf(aggregateException.InnerException); + } + + [Test] + public void TestHalfFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + + var @lock = this._provider.CreateLock("lock"); + Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) + { + var database = CreateDatabaseMock(); + MockDatabase(database, () => { Thread.Sleep(50); return true; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); + var @lock = this._provider.CreateLock("lock"); + + // single sync acquire has different timeout logic, so we test it separately + Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() + { + using var @event = new ManualResetEventSlim(); + var failDatabase = CreateDatabaseMock(); + MockDatabase(failDatabase, () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; + var @lock = this._provider.CreateLock("lock"); + + var acquireTask = @lock.TryAcquireAsync().AsTask(); + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + @event.Set(); + Assert.IsNull(await acquireTask); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; + var singleDatabaseLock = this._provider.CreateLock("lock"); + using var handle = await singleDatabaseLock.TryAcquireAsync(); + Assert.IsNotNull(handle); + } + + [Test] public void TestAcquireWithLockPrefix() { this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; - var lock1 = this._provider.CreateLock("N"); + var implicitPrefixLock = this._provider.CreateLock("N"); this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; - var lock2 = this._provider.CreateLock("N"); - var lock3 = this._provider.CreateLock("PN"); + var noPrefixLock = this._provider.CreateLock("N"); + var explicitPrefixLock = this._provider.CreateLock("PN"); - Assert.NotNull(lock1.TryAcquire()); - Assert.NotNull(lock2.TryAcquire()); - Assert.Null(lock3.TryAcquire()); + using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); + Assert.IsNotNull(implicitPrefixHandle); + using var noPrefixHandle = noPrefixLock.TryAcquire(); + Assert.IsNotNull(noPrefixHandle); + using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); + Assert.IsNull(explicitPrefixHandle); IDatabase CreateDatabase(string? keyPrefix = null) { var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); } - } - - private static Mock CreateDatabaseMock() - { - var mock = new Mock(MockBehavior.Strict); - MockDatabase(mock, () => true); - return mock; - } - - private static void MockDatabase(Mock mockDatabase, Func returns) - { - mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(returns); - mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(returns)); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => (bool)RedisResult.Create(returns())); - mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); - } - } -} + } + + private static Mock CreateDatabaseMock() + { + var mock = new Mock(MockBehavior.Strict); + MockDatabase(mock, () => true); + return mock; + } + + private static void MockDatabase(Mock mockDatabase, Func returns) + { + mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(returns); + mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(returns)); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => (bool)RedisResult.Create(returns())); + mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 7ab9c086..ab789098 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -1,81 +1,71 @@ -using Medallion.Threading.Tests.Redis; -using NUnit.Framework; -using StackExchange.Redis; +using Medallion.Threading.Tests.Redis; +using NUnit.Framework; +using StackExchange.Redis; using StackExchange.Redis.KeyspaceIsolation; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Redis -{ - public abstract class TestingRedisDatabaseProvider - { - protected TestingRedisDatabaseProvider(IEnumerable databases) - { - this.Databases = databases.ToArray(); - } - - protected TestingRedisDatabaseProvider(int count) - : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) - { - } - - protected TestingRedisDatabaseProvider(int count, string keyPrefix) - : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase().WithKeyPrefix(keyPrefix))) - { - } - - // publicly settable so that callers can alter the dbs in use - public IReadOnlyList Databases { get; set; } - - public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); - } - - public interface ITestingRedisWithKeyPrefixDatabaseProvider +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Redis +{ + public abstract class TestingRedisDatabaseProvider + { + protected TestingRedisDatabaseProvider(IEnumerable databases) + { + this.Databases = databases.ToArray(); + } + + protected TestingRedisDatabaseProvider(int count) + : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) + { + } + + // publicly settable so that callers can alter the dbs in use + public IReadOnlyList Databases { get; set; } + + public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); + } + + public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider + { + public TestingRedisSingleDatabaseProvider() : base(count: 1) { } + } + + public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider { - string KeyPrefix { get; } - } - - public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider - { - public TestingRedisSingleDatabaseProvider() : base(count: 1) { } - } - - public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider, ITestingRedisWithKeyPrefixDatabaseProvider + public TestingRedisWithKeyPrefixSingleDatabaseProvider() + : base(new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase().WithKeyPrefix("distributed_locks:") }) { } + + public override string CrossProcessLockTypeSuffix => "1WithPrefix"; + } + + public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider { - const string Prefix = "distributed_locks:"; + public TestingRedis3DatabaseProvider() : base(count: 3) { } + } + + public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider + { + private static readonly IDatabase DeadDatabase; + + static TestingRedis2x1DatabaseProvider() + { + var server = new RedisServer(allowAdmin: true); + DeadDatabase = server.Multiplexer.GetDatabase(); + using var process = Process.GetProcessById(server.ProcessId); + server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); + Assert.IsTrue(process.WaitForExit(5000)); + } + + public TestingRedis2x1DatabaseProvider() + : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) + { + } - public TestingRedisWithKeyPrefixSingleDatabaseProvider() : base(count: 1, keyPrefix: Prefix) { } - public string KeyPrefix => Prefix; - } - - public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider - { - public TestingRedis3DatabaseProvider() : base(count: 3) { } - } - - public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider - { - private static readonly IDatabase DeadDatabase; - - static TestingRedis2x1DatabaseProvider() - { - var server = new RedisServer(allowAdmin: true); - DeadDatabase = server.Multiplexer.GetDatabase(); - using var process = Process.GetProcessById(server.ProcessId); - server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); - Assert.IsTrue(process.WaitForExit(5000)); - } - - public TestingRedis2x1DatabaseProvider() - : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) - { - } - - public override string CrossProcessLockTypeSuffix => "2x1"; - } -} + public override string CrossProcessLockTypeSuffix => "2x1"; + } +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index cb9017f7..448d446d 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -1,99 +1,90 @@ -using Medallion.Threading.Internal; -using Medallion.Threading.Redis; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; - -namespace Medallion.Threading.Tests.Redis -{ - public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy - where TDatabaseProvider : TestingRedisDatabaseProvider, new() - { - private bool _preparedForHandleLost, _preparedForHandleAbandonment; - private Action? _killHandleAction; - private Action? _options; - - public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); - - public void SetOptions(Action? options) - { - this._options = options; - } - - public override string? GetLockPrefix() +using Medallion.Threading.Internal; +using Medallion.Threading.Redis; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.Redis +{ + public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + where TDatabaseProvider : TestingRedisDatabaseProvider, new() + { + private bool _preparedForHandleLost, _preparedForHandleAbandonment; + private Action? _killHandleAction; + private Action? _options; + + public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); + + public void SetOptions(Action? options) { - return DatabaseProvider switch + this._options = options; + } + + public void Options(RedisDistributedSynchronizationOptionsBuilder options) + { + if (this._preparedForHandleLost) + { + options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); + } + if (this._preparedForHandleAbandonment) + { + options.Expiry(TimeSpan.FromSeconds(.2)) + // the reader writer lock requires that the busy wait sleep time is shorter + // than the expiry, so adjust for that + .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); + } + + this._options?.Invoke(options); + } + + public override IDisposable? PrepareForHandleLost() + { + Invariant.Require(!this._preparedForHandleLost); + this._preparedForHandleLost = true; + return new HandleLostScope(this); + } + + public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; + + public override void PerformAdditionalCleanupForHandleAbandonment() + { + Invariant.Require(this._preparedForHandleAbandonment); + Thread.Sleep(TimeSpan.FromSeconds(.5)); + } + + public void RegisterKillHandleAction(Action action) + { + if (this._preparedForHandleLost) + { + this._killHandleAction += action; + } + } + + private class HandleLostScope : IDisposable + { + private TestingRedisSynchronizationStrategy? _strategy; + + public HandleLostScope(TestingRedisSynchronizationStrategy strategy) + { + this._strategy = strategy; + } + + public void Dispose() { - ITestingRedisWithKeyPrefixDatabaseProvider p => p.KeyPrefix, - _ => base.GetLockPrefix(), - }; - } - - public void Options(RedisDistributedSynchronizationOptionsBuilder options) - { - if (this._preparedForHandleLost) - { - options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); - } - if (this._preparedForHandleAbandonment) - { - options.Expiry(TimeSpan.FromSeconds(.2)) - // the reader writer lock requires that the busy wait sleep time is shorter - // than the expiry, so adjust for that - .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); - } - - this._options?.Invoke(options); - } - - public override IDisposable? PrepareForHandleLost() - { - Invariant.Require(!this._preparedForHandleLost); - this._preparedForHandleLost = true; - return new HandleLostScope(this); - } - - public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; - - public override void PerformAdditionalCleanupForHandleAbandonment() - { - Invariant.Require(this._preparedForHandleAbandonment); - Thread.Sleep(TimeSpan.FromSeconds(.5)); - } - - public void RegisterKillHandleAction(Action action) - { - if (this._preparedForHandleLost) - { - this._killHandleAction += action; - } - } - - private class HandleLostScope : IDisposable - { - private TestingRedisSynchronizationStrategy? _strategy; - - public HandleLostScope(TestingRedisSynchronizationStrategy strategy) - { - this._strategy = strategy; - } - - public void Dispose() - { - var strategy = Interlocked.Exchange(ref this._strategy, null); - if (strategy != null) - { - Invariant.Require(strategy._preparedForHandleLost); - try { strategy._killHandleAction?.Invoke(); } - finally - { - strategy._killHandleAction = null; - strategy._preparedForHandleLost = false; - } - } - } - } - } -} + var strategy = Interlocked.Exchange(ref this._strategy, null); + if (strategy != null) + { + Invariant.Require(strategy._preparedForHandleLost); + try { strategy._killHandleAction?.Invoke(); } + finally + { + strategy._killHandleAction = null; + strategy._preparedForHandleLost = false; + } + } + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index 8b14c1b6..6d21c7bf 100644 --- a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -19,8 +19,6 @@ public abstract class TestingLockProvider : ITestingNameProvider, IDi public virtual string GetCrossProcessLockType() => this.CreateLock(string.Empty).GetType().Name; public virtual void Dispose() => this.Strategy.Dispose(); - public string? GetLockPrefix() => Strategy.GetLockPrefix(); - /// /// Returns a lock whose name is based on /// diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 81a2b819..8ac80695 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -21,6 +21,5 @@ public virtual void PerformAdditionalCleanupForHandleAbandonment() { } public virtual IDisposable? PrepareForHandleLost() => null; public virtual void PrepareForHighContention() { } public virtual void Dispose() { } - public virtual string? GetLockPrefix() => null; } } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 1d826c79..6eac521a 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -76,6 +76,9 @@ public static int Main(string[] args) case nameof(RedisDistributedLock) + "2x1": handle = AcquireRedisLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) break; + case nameof(RedisDistributedLock) + "1WithPrefix": + handle = AcquireRedisLock("distributed_locks:" + name, serverCount: 1); + break; case "Write" + nameof(RedisDistributedReaderWriterLock) + "1": handle = AcquireRedisWriteLock(name, serverCount: 1); break; @@ -85,6 +88,9 @@ public static int Main(string[] args) case "Write" + nameof(RedisDistributedReaderWriterLock) + "2x1": handle = AcquireRedisWriteLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "1WithPrefix": + handle = AcquireRedisWriteLock("distributed_locks:" + name, serverCount: 1); + break; case string _ when type.StartsWith(nameof(RedisDistributedSemaphore)): { var maxCount = type.EndsWith("1AsMutex") ? 1 From 5f69018a168271e9014195be3d26be385efc8f99 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 25 Feb 2021 07:16:13 -0500 Subject: [PATCH 106/399] Prepare 2.0.1 release --- .../DistributedLock.Redis.csproj | 2 +- ...WriterLockConnectionStringStrategyTestCases.cs | 2 +- DistributedLock.Tests/Tests/ApiTest.cs | 15 +++++++++++++++ DistributedLock/DistributedLock.csproj | 2 +- README.md | 3 +++ docs/DistributedLock.Redis.md | 2 ++ 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 16446001..88bc955c 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index a21f1be2..a6fbd390 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -29,7 +29,7 @@ public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.3)); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); using (@lock.AcquireReadLock()) { diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 37234e25..7481ccff 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -130,6 +130,21 @@ public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) } } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestAssemblyVersioning(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + Assert.IsNotNull(assembly.GetName().GetPublicKeyToken(), "Should be signed"); + + // scheme based on https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/ + var version = assembly.GetName().Version; + version!.Minor.ShouldEqual(0); + version.Revision.ShouldEqual(0); + version.Build.ShouldEqual(0); + var informationalVersion = assembly.GetCustomAttribute(); + Assert.That(informationalVersion?.InformationalVersion, Does.StartWith($"{version.Major}.")); + } + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() .Where(IsInPublicApi) #if DEBUG diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 1cd0c7da..2660947c 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.0.0 + 2.0.1 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. diff --git a/README.md b/README.md index 9daef072..8d36645e 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,9 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.0.1 + - Fixed Redis lock behavior when using a database with `WithKeyPrefix` (#66, DistributedLock.Redis 1.0.1). Thanks @skomis-mm +skomis-mm for contributing! - 2.0.0 (see [Migrating from 1.x to 2.x](docs/Other+topics.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) diff --git a/docs/DistributedLock.Redis.md b/docs/DistributedLock.Redis.md index 4d019021..881556c6 100644 --- a/docs/DistributedLock.Redis.md +++ b/docs/DistributedLock.Redis.md @@ -32,6 +32,8 @@ Some Redis synchronization primitives take in a `string name` as their name and Because of how Redis locks work, the acquire operation cannot truly block. If waiting to acquire a lock or other primitive that is not available, the implementation will periodically sleep and retry until the lease can be taken or the acquire timeout elapses. Because of this, these classes are maximally efficient when using `TryAcquire` semantics with a timeout of zero. +As of 1.0.1, Redis-based primitives support the use of `IDatabase.WithKeyPrefix(keyPrefix)` for key space isolation. In such cases all underlying keys will implicitly include the key prefix. Therefore, two locks with the same name targeting the same underlying Redis instance but with different prefixes will not see each other. + ## Options In addition to specifying the name/key and database(s), some additional tuning options are available. From 1be6cf42f8cdf1c62d60ccaa6cfb6ebc960cb564 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 25 Feb 2021 07:17:28 -0500 Subject: [PATCH 107/399] Minor cleanup --- .../AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index d2171e98..06c35076 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -1,5 +1,4 @@ using Medallion.Threading.Redis; -using Medallion.Threading.Tests.Redis; using Moq; using NUnit.Framework; using StackExchange.Redis; From cb8f83846a1fc61374eb869e1326cfc6b86c3100 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 13 Mar 2021 17:40:21 -0500 Subject: [PATCH 108/399] Implement mutex based on ZooKeeper --- DistributedLock.Core/AssemblyAttributes.cs | 1 + .../Internal/Data/DatabaseConnection.cs | 1 - DistributedLock.Redis/TimeoutTask.cs | 2 +- .../DistributedLockCoreTestCases.cs | 2 + .../RedisSynchronizationCoreTestCases.cs | 2 +- .../DistributedLock.Tests.csproj | 2 +- .../Infrastructure/Shared/ZooKeeperPorts.cs | 13 + .../Infrastructure/TestHelper.cs | 30 ++ .../ZooKeeper/TestingZooKeeperProviders.cs | 20 ++ ...TestingZooKeeperSynchronizationStrategy.cs | 55 ++++ .../ZooKeeper/ZooKeeperSetUpFixture.cs | 91 ++++++ .../Tests/CombinatorialTests.cs | 5 + .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 38 +++ .../ZooKeeper/ZooKeeperConnectionInfoTest.cs | 41 +++ .../ZooKeeper/ZooKeeperConnectionTest.cs | 114 ++++++++ .../ZooKeeper/ZooKeeperDistributedLockTest.cs | 231 +++++++++++++++ ...ibutedSynchronizationOptionsBuilderTest.cs | 29 ++ .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 106 +++++++ .../ZooKeeperSequentialPathHelperTest.cs | 218 ++++++++++++++ .../AssemblyAttributes.cs | 6 + .../DistributedLock.ZooKeeper.csproj | 60 ++++ .../ZooKeeperConnection.cs | 265 ++++++++++++++++++ .../ZooKeeperConnectionInfo.cs | 45 +++ ...oKeeperDistributedLock.IDistributedLock.cs | 59 ++++ .../ZooKeeperDistributedLock.cs | 162 +++++++++++ .../ZooKeeperDistributedLockHandle.cs | 36 +++ ...istributedSynchronizationOptionsBuilder.cs | 100 +++++++ DistributedLock.ZooKeeper/ZooKeeperHelper.cs | 177 ++++++++++++ .../ZooKeeperNodeHandle.cs | 119 ++++++++ DistributedLock.ZooKeeper/ZooKeeperPath.cs | 169 +++++++++++ .../ZooKeeperSequentialPathHelper.cs | 147 ++++++++++ DistributedLock.sln | 6 + DistributedLock/DistributedLock.csproj | 1 + ...GenerateIDistributedLockImplementations.cs | 22 +- DistributedLockTaker/Program.cs | 10 +- 35 files changed, 2374 insertions(+), 11 deletions(-) create mode 100644 DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs create mode 100644 DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs create mode 100644 DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs create mode 100644 DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs create mode 100644 DistributedLock.ZooKeeper/AssemblyAttributes.cs create mode 100644 DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj create mode 100644 DistributedLock.ZooKeeper/ZooKeeperConnection.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperHelper.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperPath.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/DistributedLock.Core/AssemblyAttributes.cs index 537fbf06..6cbdd148 100644 --- a/DistributedLock.Core/AssemblyAttributes.cs +++ b/DistributedLock.Core/AssemblyAttributes.cs @@ -12,4 +12,5 @@ [assembly: InternalsVisibleTo("DistributedLock.Azure, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.FileSystem, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Redis, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.ZooKeeper, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 2bfbe254..692eeb88 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -59,7 +59,6 @@ public DatabaseCommand CreateCommand() // note: we could have this return an IAsyncDisposable which would allow you to close the transaction // without closing the connection. However, we don't currently have any use-cases for that public async ValueTask BeginTransactionAsync() -#pragma warning restore CS1998 { Invariant.Require(this._transaction == null); diff --git a/DistributedLock.Redis/TimeoutTask.cs b/DistributedLock.Redis/TimeoutTask.cs index 3e2c071c..a4e9ba08 100644 --- a/DistributedLock.Redis/TimeoutTask.cs +++ b/DistributedLock.Redis/TimeoutTask.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Redis /// Acts as a which is cleaned up when /// the gets disposed /// - internal struct TimeoutTask : IDisposable + internal readonly struct TimeoutTask : IDisposable { private readonly CancellationTokenSource _cleanupTokenSource; private readonly CancellationTokenSource? _linkedTokenSource; diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 70b5d139..bd73b2d3 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -431,6 +431,8 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) command.StandardInput.WriteLine("abandon"); command.StandardInput.Flush(); } + // make sure it actually exits + Assert.IsTrue(command.Task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), "lock taker should exit"); if (this._lockProvider.SupportsCrossProcessAbandonment) { diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 06c35076..3777614d 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -142,7 +142,7 @@ public void TestAcquireWithLockPrefix() using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); Assert.IsNull(explicitPrefixHandle); - IDatabase CreateDatabase(string? keyPrefix = null) + static IDatabase CreateDatabase(string? keyPrefix = null) { var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index f3a979b6..aaef38e6 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 net471;netcoreapp3.1 - 8.0 + Latest enable Medallion.Threading.Tests true diff --git a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs new file mode 100644 index 00000000..b50a3cd6 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests +{ + public static class ZooKeeperPorts + { + public const int DefaultPort = 2181; + + public static readonly string DefaultConnectionString = "127.0.0.1:" + DefaultPort; + } +} diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/DistributedLock.Tests/Infrastructure/TestHelper.cs index 5311bcc5..add18c0c 100644 --- a/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -1,6 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis; using NUnit.Framework; +using System; using System.Threading; using System.Threading.Tasks; @@ -39,5 +40,34 @@ public static async Task WaitAsync(this Task task, TimeoutValue timeout) await task; return true; } + + /// + /// Waits up to for to return true. Checks every + /// . + /// + public static async Task WaitForAsync(Func> predicate, TimeoutValue timeout, TimeoutValue? checkCadence = null) + { + using var cancellationSource = new CancellationTokenSource(); + var waitForPredicateTask = WaitForPredicateAsync(); + + if (!await waitForPredicateTask.WaitAsync(timeout)) + { + cancellationSource.Cancel(); + await waitForPredicateTask; + return false; + } + + return true; + + async Task WaitForPredicateAsync() + { + var cancellationToken = cancellationSource.Token; + while (!cancellationToken.IsCancellationRequested) + { + if (await predicate()) { return; } + await Task.Delay(checkCadence?.TimeSpan ?? TimeSpan.FromMilliseconds(5)); + } + } + } } } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs new file mode 100644 index 00000000..3e3dea2f --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs @@ -0,0 +1,20 @@ +using Medallion.Threading.ZooKeeper; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + public sealed class TestingZooKeeperDistributedLockProvider : TestingLockProvider + { + public override IDistributedLock CreateLockWithExactName(string name) + { + var @lock = new ZooKeeperDistributedLock(name.TrimStart(ZooKeeperPath.Separator), ZooKeeperPorts.DefaultConnectionString); + @lock.Path.ToString().ShouldEqual(name); // sanity check + this.Strategy.TrackPath(@lock.Path.ToString()); + return @lock; + } + + public override string GetSafeName(string name) => new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); + } +} diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs new file mode 100644 index 00000000..4a75fa28 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs @@ -0,0 +1,55 @@ +using Medallion.Threading.ZooKeeper; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + public sealed class TestingZooKeeperSynchronizationStrategy : TestingSynchronizationStrategy + { + private List? _trackedPaths; + + public void TrackPath(string path) => this._trackedPaths?.Add(path); + + public override IDisposable? PrepareForHandleLost() + { + if (this._trackedPaths != null) { throw new InvalidOperationException("Already in handle lost mode"); } + + this._trackedPaths = new List(); + return new HandleLostScope(this); + } + + private class HandleLostScope : IDisposable + { + private readonly TestingZooKeeperSynchronizationStrategy _strategy; + + public HandleLostScope(TestingZooKeeperSynchronizationStrategy strategy) + { + this._strategy = strategy; + } + + public void Dispose() + { + var trackedPaths = Interlocked.Exchange(ref this._strategy._trackedPaths, null); + if (trackedPaths == null) { return; } // already disposed + + using var connection = ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ) + .Result; + + // delete all children of the nodes + foreach (var trackedPath in trackedPaths) + { + var childrenResult = connection.ZooKeeper.getChildrenAsync(trackedPath).Result; + foreach (var child in childrenResult.Children) + { + connection.ZooKeeper.deleteAsync(trackedPath + ZooKeeperPath.Separator + child).Wait(); + } + } + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs new file mode 100644 index 00000000..f75f81d2 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -0,0 +1,91 @@ +using Medallion.Shell; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Sockets; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [SetUpFixture] + public class ZooKeeperSetUpFixture + { + private Command? _zooKeeperCommand; + + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (IsZooKeeperRunning()) + { + Console.WriteLine("ZooKeeper already running"); + } + else + { + // based on Windows install as per https://medium.com/@shaaslam/installing-apache-zookeeper-on-windows-45eda303e835 + + const string ZooKeeperHomeEnvironmentVariable = "ZOOKEEPER_HOME"; + var zooKeeperHome = Environment.GetEnvironmentVariable(ZooKeeperHomeEnvironmentVariable); + if (zooKeeperHome == null) { throw new InvalidOperationException($"Environment variable '{ZooKeeperHomeEnvironmentVariable}' is not set"); } + + var zooKeeperPath = Path.Combine(zooKeeperHome, "bin", "zkServer.cmd"); + + var command = Command.Run(zooKeeperPath, options: o => o.StartInfo(i => i.RedirectStandardInput = false)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error); + Console.WriteLine($"Launched ZooKeeper ({zooKeeperPath}; PID={command.ProcessId})"); + this._zooKeeperCommand = command; + } + } + + private static bool IsZooKeeperRunning() + { + // based loosely on https://stackoverflow.com/questions/29106546/how-to-check-if-zookeeper-is-running-or-up-from-command-prompt + + try + { + using var tcpClient = new TcpClient("localhost", ZooKeeperPorts.DefaultPort); + using var tcpStream = tcpClient.GetStream(); + var message = Encoding.UTF8.GetBytes("ruok"); + tcpStream.Write(message, 0, message.Length); + + tcpStream.ReadTimeout = 500; // ms + var readBuffer = new byte[1024]; + var bytesRead = tcpStream.Read(readBuffer, 0, readBuffer.Length); + var response = Encoding.UTF8.GetString(readBuffer, 0, bytesRead).Trim(); + if (response == "imok" || response == "ruok is not executed because it is not in the whitelist.") + { + return true; + } + + throw new InvalidOperationException($"Received unexpected response '{response}' from application running at port {ZooKeeperPorts.DefaultPort}"); + } + catch (SocketException) { } + catch (IOException) { } + + return false; + } + + [OneTimeTearDown] + public void OneTimeTearDown() + { + if (this._zooKeeperCommand != null) + { + if (this._zooKeeperCommand.Task.IsCompleted) + { + throw new InvalidOperationException($"ZooKeeper exited unexpectedly with error code {this._zooKeeperCommand.Result.ExitCode}"); + } + + if (this._zooKeeperCommand.TrySignalAsync(CommandSignal.ControlC).Result + && this._zooKeeperCommand.Task.Wait(TimeSpan.FromSeconds(2))) + { + return; // graceful shutdown + } + + Console.WriteLine("ZooKeeper graceful shutdown failed: killing"); + this._zooKeeperCommand.Kill(); + this._zooKeeperCommand.Wait(); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 3dc45c10..bef626d3 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -208,4 +208,9 @@ namespace Medallion.Threading.Tests.WaitHandles [Category("CIWindows")] public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } [Category("CIWindows")] public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } [Category("CIWindows")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandleSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } +} + +namespace Medallion.Threading.Tests.ZooKeeper +{ + public class Core_ZooKeeper_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs new file mode 100644 index 00000000..7aaba656 --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -0,0 +1,38 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [Category("CI")] + public class ZooKeeperApiTest + { + [Test] + public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() + { + Assert.IsEmpty( + GetPublicTypes().SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance)) + .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))) + ); + } + + [Test] + public void TestNamePropertyIsImplementedExplicitlyInFavorOfPath() + { + Assert.IsEmpty(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null)); + foreach (var lockType in GetPublicTypes().Where(t => !typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t) && t.GetInterfaces().Any(i => i.Name.StartsWith("IDistributed")))) + { + var pathProperty = lockType.GetProperty("Path"); + Assert.IsNotNull(pathProperty, $"{lockType} missing Path"); + pathProperty!.PropertyType.ShouldEqual(typeof(ZooKeeperPath)); + } + } + + private static IEnumerable GetPublicTypes() => typeof(ZooKeeperDistributedLock).Assembly.GetTypes() + .Where(t => t.IsPublic || t.IsNestedPublic); + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs new file mode 100644 index 00000000..ad9be77b --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs @@ -0,0 +1,41 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [Category("CI")] + public class ZooKeeperConnectionInfoTest + { + [Test] + public void TestEquality() + { + var connectionA = new ZooKeeperConnectionInfo( + "cs", + TimeSpan.FromSeconds(1), + TimeSpan.FromSeconds(2), + new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) + ); + var connectionB = new ZooKeeperConnectionInfo( + "cs", + TimeSpan.FromSeconds(1), + TimeSpan.FromSeconds(2), + new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) + ); + var connectionC = connectionA with { + AuthInfo = new EquatableReadOnlyList(new[] + { + new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })), + new ZooKeeperAuthInfo("s2", new EquatableReadOnlyList(new byte[] { 11 })), + }) + }; + + Assert.IsTrue(connectionA == connectionB); + connectionA.GetHashCode().ShouldEqual(connectionB.GetHashCode()); + Assert.IsFalse(connectionA == connectionC); + Assert.AreNotEqual(connectionA.GetHashCode(), connectionC.GetHashCode()); + } + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs new file mode 100644 index 00000000..a5b520c2 --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -0,0 +1,114 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Linq; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + using org.apache.zookeeper; + + public class ZooKeeperConnectionTest + { + [Test] + public async Task TestSharesConnections() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + + Assert.AreNotSame(connection1, connection2); + Assert.AreSame(connection1.ZooKeeper, connection2.ZooKeeper); + + connection1.Dispose(); + connection2.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); + } + + [Test] + public async Task TestDoesNotShareDifferentConnections() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(30)), CancellationToken.None); + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(20)), CancellationToken.None); + + Assert.AreNotSame(connection1, connection2); + Assert.AreNotSame(connection1.ZooKeeper, connection2.ZooKeeper); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestConnectionIsClosedAndNotSharedAfterMaxAgeElapses() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); + + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + var zooKeeper1 = connection1.ZooKeeper; + + connection1.Dispose(); + Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3))); + + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + Assert.AreNotSame(zooKeeper1, connection2.ZooKeeper); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestConnectionCanBeHeldOpenAfterMaxAgeButDoesNotShareAndClosesAfterwards() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); + + using var connection = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + Assert.IsTrue(await TestHelper.WaitForAsync( + async () => + { + using var testConnectionInfo = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + return testConnectionInfo.ZooKeeper != connection.ZooKeeper; + }, + TimeSpan.FromSeconds(3) + )); + + connection.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); + var zooKeeper = connection.ZooKeeper; + connection.Dispose(); + Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper.getState() != ZooKeeper.States.CONNECTED).AsValueTask(), TimeSpan.FromSeconds(1))); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public void TestConnectTimeout() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + Assert.ThrowsAsync(() => pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.Zero), CancellationToken.None)); + } + + [Test] + public void TestThreadSafety() + { + var connectionInfos = Enumerable.Range(1, 3) + .Select(i => GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(10 * i))) + .ToArray(); + var tasks = Enumerable.Range(0, 100) + .Select(i => Task.Run(async () => + { + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(connectionInfos[i % connectionInfos.Length], CancellationToken.None); + await connection.ZooKeeper.existsAsync("/zookeeper"); + await Task.Delay(1); + await connection.ZooKeeper.existsAsync($"/{Guid.NewGuid()}"); + })) + .ToArray(); + Assert.DoesNotThrow(() => Task.WaitAll(tasks)); + } + + private static ZooKeeperConnectionInfo GetConnectionInfo(TimeoutValue? connectTimeout = null) => + new ZooKeeperConnectionInfo( + ZooKeeperPorts.DefaultConnectionString, + ConnectTimeout: connectTimeout ?? TimeSpan.FromSeconds(30), + SessionTimeout: TimeSpan.FromSeconds(30), + new EquatableReadOnlyList(Array.Empty()) + ); + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs new file mode 100644 index 00000000..68c03d04 --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs @@ -0,0 +1,231 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using org.apache.zookeeper; +using org.apache.zookeeper.data; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + // todo many of these can be in an abstract test instead + public class ZooKeeperDistributedLockTest + { + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new ZooKeeperDistributedLock(null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock("name", null!)); + Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/name"), null!)); + Assert.Throws(() => new ZooKeeperDistributedLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "name", default(string)!)); + } + + [Test] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } + + [Test] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); + } + + [Test] + public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() + { + var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + + // pre-clean up just in case + try { await connection.ZooKeeper.deleteAsync(path.ToString()); } + catch (KeeperException.NoNodeException) { } + + var @lock = new ZooKeeperDistributedLock(path, ZooKeeperPorts.DefaultConnectionString); + + Assert.That( + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, + Does.Contain("does not exist") + ); + + await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperHelper.PublicAcl }, CreateMode.PERSISTENT); + try + { + await using (var handle = await @lock.TryAcquireAsync()) + { + Assert.IsNotNull(handle); + } + + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); + } + finally + { + await connection.ZooKeeper.deleteAsync(path.ToString()); + } + } + + [TestCase("/")] + [TestCase(".")] + [TestCase("..")] + [TestCase("zookeeper")] + [TestCase("abc\0")] + public void TestGetSafeName(string name) => + Assert.DoesNotThrowAsync(async () => await (await new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).AcquireAsync()).DisposeAsync()); + + [Test] + public void TestGetSafeNameWithControlCharacters() => this.TestGetSafeName("\u001f\u009F\uf8ff\ufff1"); + + [Test] + public async Task TestCustomAclAndAuth() + { + const string Username = "username"; + const string Password = "secretPassword"; + + var lockName = TestHelper.UniqueName; + var @lock = new ZooKeeperDistributedLock( + lockName, + ZooKeeperPorts.DefaultConnectionString, + options: o => o.AddAccessControl("digest", GenerateDigestAclId(Username, Password), 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")) + ); + + var unauthenticatedLock = new ZooKeeperDistributedLock(lockName, ZooKeeperPorts.DefaultConnectionString); + + await using (await @lock.AcquireAsync()) + { + Assert.ThrowsAsync(() => unauthenticatedLock.TryAcquireAsync().AsTask()); + } + + Assert.DoesNotThrowAsync(async () => await (await unauthenticatedLock.AcquireAsync()).DisposeAsync()); + + // Based on + // https://github.com/apache/zookeeper/blob/d8561f620fa8611e9a6819d9879b0f18e5a404a9/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java + static string GenerateDigestAclId(string username, string password) + { + using var sha = SHA1.Create(); + var digest = sha.ComputeHash(Encoding.UTF8.GetBytes($"{username}:{password}")); + return $"{username}:{Convert.ToBase64String(digest)}"; + } + } + + [Test] + public async Task TestInvalidAclDoesNotCorruptStore() + { + const string Username = "username"; + const string Password = "xyz"; + + var lockName = TestHelper.UniqueName; + var invalidAclLock = new ZooKeeperDistributedLock( + lockName, + ZooKeeperPorts.DefaultConnectionString, + // ACL is the right format but the wrong password (this can easily happen if you get the encoding wrong) + options: o => o.AddAccessControl("digest", $"{Username}:1eYGPn6j9+P9osACW8ob4HhZT+s=", 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")) + ); + + // pre-cleanup to make sure we will actually create the path + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + try { await connection.ZooKeeper.deleteAsync(invalidAclLock.Path.ToString()); } + catch (KeeperException.NoNodeException) { } + + Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); + + Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Path.ToString())); + + var validLock = new ZooKeeperDistributedLock(lockName, ZooKeeperPorts.DefaultConnectionString); + Assert.DoesNotThrowAsync(async () => await (await validLock.AcquireAsync()).DisposeAsync()); + } + + [Test] + public async Task TestDeepDirectoryCreation() + { + var directory = new ZooKeeperPath($"/{TestHelper.UniqueName}/foo/bar/baz"); + + // pre-cleanup to make sure we will actually create the directory + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + for (var toDelete = directory; toDelete != ZooKeeperPath.Root; toDelete = toDelete.GetDirectory()!.Value) + { + try { await connection.ZooKeeper.deleteAsync(toDelete.ToString()); } + catch (KeeperException.NoNodeException) { } + } + + var @lock = new ZooKeeperDistributedLock(directory, "qux", ZooKeeperPorts.DefaultConnectionString); + + await using (await @lock.AcquireAsync()) + { + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); + } + + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); + } + + [Test] + public async Task TestThrowsIfPathDeletedWhileWaiting() + { + var @lock = new ZooKeeperDistributedLock(TestHelper.UniqueName, ZooKeeperPorts.DefaultConnectionString); + + // hold the lock + await using var handle = await @lock.AcquireAsync(); + + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + var initialChildren = await connection.ZooKeeper.getChildrenAsync(@lock.Path.ToString()); + + // start waiting + var blockedAcquireTask = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // once the wait has started... + var newChild = await WaitForNewChildAsync(); + // ... start another waiter... + var blockedAcquireTask2 = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // ... and delete the first waiter's node + await connection.ZooKeeper.deleteAsync(newChild); + + // release the lock + await handle.DisposeAsync(); + + // the first waiter should throw + Assert.ThrowsAsync(() => blockedAcquireTask); + + // the second waiter should complete + Assert.DoesNotThrowAsync(async () => await (await blockedAcquireTask2).DisposeAsync()); + + async Task WaitForNewChildAsync() + { + var start = DateTime.UtcNow; + while (true) + { + var children = await connection.ZooKeeper.getChildrenAsync(@lock.Path.ToString()); + var newChild = children.Children.Except(initialChildren.Children).SingleOrDefault(); + if (newChild != null) { return $"{@lock.Path}/{newChild}"; } + + if (DateTime.UtcNow - start >= TimeSpan.FromSeconds(10)) { Assert.Fail("Timed out"); } + + await Task.Delay(5); + } + } + } + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs new file mode 100644 index 00000000..e190805c --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs @@ -0,0 +1,29 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [Category("CI")] + public class ZooKeeperDistributedSynchronizationOptionsBuilderTest + { + [Test] + public void TestValidatesArguments() + { + Assert.Throws(Create(b => b.ConnectTimeout(TimeSpan.FromSeconds(-2)))); + Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.FromSeconds(-2)))); + Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.Zero))); + Assert.Throws(Create(b => b.SessionTimeout(Timeout.InfiniteTimeSpan))); + Assert.Throws(Create(b => b.AddAuthInfo(null!, Array.Empty()))); + Assert.Throws(Create(b => b.AddAuthInfo("scheme", null!))); + Assert.Throws(Create(b => b.AddAccessControl(null!, "id", 0x1f))); + Assert.Throws(Create(b => b.AddAccessControl("scheme", null!, 0x1f))); + + static TestDelegate Create(Action action) => + () => ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(action); + } + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs new file mode 100644 index 00000000..954ac26c --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -0,0 +1,106 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [Category("CI")] + public class ZooKeeperPathTest + { + [Test] + public void TestRejectsNull() => Assert.Throws(() => new ZooKeeperPath(null!)); + + [TestCase("")] + [TestCase("a")] + [TestCase("/a/")] + [TestCase("/x\0b")] + [TestCase("/.")] + [TestCase("/b/./a")] + [TestCase("/x/..")] + [TestCase("/../r")] + public void TestRejectsInvalidPaths(string path) => Assert.Throws(() => new ZooKeeperPath(path)); + + [Test] + public void TestRejectsPathsWithControlCharacters() + { + // these can't be test cases because the control characters confuse the test explorer + this.TestRejectsInvalidPaths("/\u0000a"); + this.TestRejectsInvalidPaths("/a/\u007f"); + this.TestRejectsInvalidPaths("/a\uf8ff/b"); + this.TestRejectsInvalidPaths("/a\uffff"); + } + + [TestCase("/a.js")] + [TestCase("/...m")] + [TestCase("/...")] + [TestCase("/..foo")] + [TestCase("/a..")] + [TestCase("/.x")] + public void TestAllowsDotInNonRelativePath(string path) => Assert.DoesNotThrow(() => new ZooKeeperPath(path)); + + [TestCase("/", "abc", ExpectedResult = "/abc")] + [TestCase("/xyz/foo", "bar", ExpectedResult = "/xyz/foo/bar")] + [TestCase("/", "...", ExpectedResult = "/...")] + [TestCase("/", "", ExpectedResult = "/EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg_SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==")] + [TestCase("/", "/", ExpectedResult = "/_XIbwNE7SSUJciq0_Jytyos4P84h5HzFJfq8lf6cmKUh_qv1_0n6w3WNV1VCeLz+vdnEQFc2SB9JI1VD96hUnTw==")] + [TestCase("/", "a/", ExpectedResult = "/a__H_H9kmjf3WHGaL30_9h_RNn+GipsxwkovtbOR9nXFUa9lT++YHfmM7FomA2RoilE23u5yCsImr8ImvgukZ3lQ==")] + [TestCase("/bar", "\0", ExpectedResult = "/bar/_uCRNAomB1pOve0Vq+O+kytY9KC4Z_xSULCRuUNk1HSJwSoAqccNYC2Nw3kzrKTwySoQjNCVX1OXDhDjw42kQ7g==")] + [TestCase("/a.a", ".", ExpectedResult = "/a.a/._C2EkHXwXvLsbrucJTRS3xFHv7Mf_y9klmKDxPTE8yevCoH5h8Ae69Y+_lP+ahpW91crnzgO78elOk2E6APJfIQ==")] + [TestCase("/b..b/a", "..", ExpectedResult = "/b..b/a/.._Rh_NqllQfVidZsBWJatUTHt1u_RuBCeYLhNba59jtMe0u1rD7QNtp2QKxdN3Ohz1E1VnJ_yfFMevOUWeSrtxxw==")] + [TestCase("/a/b", "/..", ExpectedResult = "/a/b/_..p0p_PzMVsjkHpwCrL63ktSqk0bLNJX9_X+7BtDMfHWr5usgqZ3n5VVI3FSGJ0YPNrps_Pf7f9yxeCzz+AiD0sw==")] + [TestCase("/", "zookeeper", ExpectedResult = "/zookeeper_yX0zkYBzsEZ1VDADNUx54LUSt9VL9M9lOPoez38tnk4FrBtllVz+ksFllir7N2yla_wy22pIOnbpcfRkcVXBag==")] + [TestCase("/", "zooKeeper", ExpectedResult = "/zooKeeper")] + [TestCase("/a", "zookeeper", ExpectedResult = "/a/zookeeper")] + public string TestCreateChildNodeWithSafeName(string path, string name) + { + var result = new ZooKeeperPath(path).CreateChildNodeWithSafeName(name); + Assert.DoesNotThrow(() => new ZooKeeperPath(result.ToString()), "should pass path validation"); + return result.ToString(); + } + + [Test] + public void TestCreateChildNodeWithSafeNameHandlesControlCharacters() => + this.TestCreateChildNodeWithSafeName("/", "\u0000\u007f\uf8ff\uffff").ShouldEqual("/____7A++E8vPxbYKJmhCX1bUTCwjqJqW1POHfCeBk62R9hqB0Fd_uTUBIpv9mssG7K68FHZ_7wJ70UNRKsVH8CrngA=="); + + [Test] + public void TestEquality() + { + var paths = new[] { null, "/", "/a", "/A" }.Select(p => p == null ? default : new ZooKeeperPath(p)).ToArray(); + for (var i = 0; i < paths.Length; ++i) + { + for (var j = 0; j < paths.Length; ++j) + { + if (i == j) + { + Assert.IsTrue(paths[i] == paths[j]); + Assert.IsFalse(paths[i] != paths[j]); + Assert.IsTrue(paths[i].Equals(paths[j])); + Assert.IsTrue(Equals(paths[i], paths[j])); + } + else + { + Assert.IsFalse(paths[i] == paths[j]); + Assert.IsTrue(paths[i] != paths[j]); + Assert.IsFalse(paths[i].Equals(paths[j])); + Assert.IsFalse(Equals(paths[i], paths[j])); + Assert.AreNotEqual(paths[i].GetHashCode(), paths[j].GetHashCode()); + } + } + } + } + + [Test] + public void TestExposesMinimalApi() + { + var publicMembers = typeof(ZooKeeperPath).GetMembers() + .Where(m => m.DeclaringType == typeof(ZooKeeperPath)); + CollectionAssert.AreEquivalent( + new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" }, + publicMembers.Select(m => m.Name) + ); + } + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs new file mode 100644 index 00000000..1c9e6a42 --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs @@ -0,0 +1,218 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + [Category("CI")] + public class ZooKeeperSequentialPathHelperTest + { + [TestCase("/", "a", ExpectedResult = null)] + [TestCase("/ba0000000002", "a", ExpectedResult = null)] + [TestCase("/ba0000000002", "ba", ExpectedResult = 2)] + [TestCase("/ba000000002", "ba", ExpectedResult = null)] + [TestCase("/ba00000000112", "ba", ExpectedResult = null)] + [TestCase("/ba-000000002", "ba", ExpectedResult = -2)] + [TestCase("/ba0000000002", "/ba", ExpectedResult = null)] + [TestCase("/c/d/ba0000000402", "ba", ExpectedResult = 402)] + [TestCase("lock-2147483647", "lock-", ExpectedResult = int.MaxValue)] + [TestCase("read--000000001", "read-", ExpectedResult = -1)] + [TestCase("write--2147483648", "write-", ExpectedResult = int.MinValue)] + [TestCase("x 000000002", "x", ExpectedResult = null)] + [TestCase("x000000002 ", "x", ExpectedResult = null)] + public int? TestGetSequenceNumberOrDefault(string pathOrName, string prefix) => + ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(pathOrName, prefix); + + [Test] + public Task TestFilterAndSortLowPositiveNumbers() => TestFilterAndSortHelper( + new[] { 5, 3, 1 }, + expectedSequenceNumbers: new[] { 1, 3, 5 } + ); + + [Test] + public Task TestFilterAndSortMediumNegativeNumbers() => TestFilterAndSortHelper( + new[] { -1000000000, -1000000050, -1000000500 }, + expectedSequenceNumbers: new[] { -1000000500, -1000000050, -1000000000 } + ); + + [Test] + public Task TestFilterAndSortHighPositiveAndLowNegativeNumbers() => TestFilterAndSortHelper( + new[] { int.MaxValue, int.MaxValue - 1, int.MaxValue - 100, int.MinValue, int.MinValue + 9, int.MinValue + 90 }, + expectedSequenceNumbers: new[] { int.MaxValue - 100, int.MaxValue - 1, int.MaxValue, int.MinValue, int.MinValue + 9, int.MinValue + 90 } + ); + + [Test] + public Task TestFilterAndSortHighNegativeAndLowPositiveNumbers() => TestFilterAndSortHelper( + new[] { 1, 15, 6, -1, -3 }, + expectedSequenceNumbers: new[] { -3, -1, 1, 6, 15 } + ); + + [Test] + public Task TestFilterAndSortLowAndHighPositiveNumbersLowsOlder() => TestFilterAndSortHelper( + new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, + expectedSequenceNumbers: new[] { 0, 2, 4, int.MaxValue - 5, int.MaxValue - 3, int.MaxValue }, + creationTimes: new Dictionary + { + [0] = 1, + [2] = 1, + [4] = 2, + [int.MaxValue - 5] = 3, + [int.MaxValue - 3] = 4, + [int.MaxValue] = 5, + } + ); + + [Test] + public Task TestFilterAndSortLowAndHighPositiveNumbersHighsOlder() => TestFilterAndSortHelper( + new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, + expectedSequenceNumbers: new[] { int.MaxValue - 5, int.MaxValue - 3, int.MaxValue, 0, 2, 4 }, + creationTimes: new Dictionary + { + [0] = 3, + [2] = 4, + [4] = 5, + [int.MaxValue - 5] = 1, + [int.MaxValue - 3] = 1, + [int.MaxValue] = 2, + } + ); + + [Test] + public Task TestFilterAndSortLowAndHighNegativeNumbersLowsOlder() => TestFilterAndSortHelper( + new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + expectedSequenceNumbers: new[] { int.MinValue, int.MinValue + 10, int.MinValue + 100, -302, -301, -300 }, + creationTimes: new Dictionary + { + [-302] = 300, + [-301] = 300, + [-300] = 300, + [int.MinValue] = 100, + [int.MinValue + 10] = 100, + [int.MinValue + 100] = 100, + } + ); + + [Test] + public Task TestFilterAndSortLowAndHighNegativeNumbersHighsOlder() => TestFilterAndSortHelper( + new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + expectedSequenceNumbers: new[] { -302, -301, -300, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + creationTimes: new Dictionary + { + [-302] = 30, + [-301] = 30, + [-300] = 30, + [int.MinValue] = 100, + [int.MinValue + 10] = 100, + [int.MinValue + 100] = 100, + } + ); + + [Test] + public Task TestFilterAndSortHighNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( + new[] { int.MaxValue, -1000 }, + expectedSequenceNumbers: new[] { int.MaxValue, -1000 }, + creationTimes: new Dictionary + { + [int.MaxValue] = 1, + [-1000] = 2000, + } + ); + + [Test] + public Task TestFilterAndSortHighNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( + new[] { int.MaxValue, -1000 }, + expectedSequenceNumbers: new[] { -1000, int.MaxValue }, + creationTimes: new Dictionary + { + [int.MaxValue] = long.MaxValue, + [-1000] = long.MaxValue - 1, + } + ); + + [Test] + public Task TestFilterAndSortLowNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( + new[] { int.MinValue, 2_000_000 }, + expectedSequenceNumbers: new[] { 2_000_000, int.MinValue }, + creationTimes: new Dictionary + { + [int.MinValue] = 10, + [2_000_000] = 1, + } + ); + + [Test] + public Task TestFilterAndSortLowNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( + new[] { int.MinValue, 2_000_000 }, + expectedSequenceNumbers: new[] { int.MinValue, 2_000_000 }, + creationTimes: new Dictionary + { + [int.MinValue] = 1, + [2_000_000] = 10, + } + ); + + [Test] + public Task TestFilterAndSortEmpty() => TestFilterAndSortHelper(Array.Empty(), expectedSequenceNumbers: Array.Empty()); + + [Test] + public Task TestFilterAndSortEmptyAfterChecking() => TestFilterAndSortHelper( + Enumerable.Range(1, 100).Concat(new[] { int.MaxValue }).ToArray(), + expectedSequenceNumbers: Array.Empty(), + creationTimes: new Dictionary { [-1] = 1 } + ); + + [Test] + public Task TestFilterAndSortFilteredAfterChecking() => TestFilterAndSortHelper( + new[] { 1, 2, 3, int.MaxValue - 10, int.MaxValue }, + expectedSequenceNumbers: new[] { int.MaxValue - 10, 2 }, + creationTimes: new Dictionary + { + [int.MaxValue - 10] = long.MinValue, + [2] = long.MaxValue + } + ); + + private static async Task TestFilterAndSortHelper( + IReadOnlyList sequenceNumbers, + IReadOnlyList expectedSequenceNumbers, + Dictionary? creationTimes = null) + { + var random = new Random(12345); + var paths = sequenceNumbers.Select(n => MakeName(random.Next(2) == 0 ? "a" : "b", n)) + .Concat(new[] { MakeName("c", 0), MakeName("d", 1), "a", "b" }) + .OrderBy(_ => random.Next()) + .ToArray(); + var parentNode = $"/parent{random.Next()}"; + + var result = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( + parentNode, + paths, + n => Task.FromResult( + (creationTimes ?? throw new AssertionException("Shouldn't check creation time")).TryGetValue(GetSequenceNumber(n), out var creationTime) + ? creationTime + : default(long?) + ), + prefix: "a", + alternatePrefix: "b" + ); + + CollectionAssert.AreEqual(expectedSequenceNumbers, result.Select(t => t.SequenceNumber)); + foreach (var info in result) + { + info.Path.ShouldEqual($"{parentNode}/{MakeName(info.Prefix, info.SequenceNumber)}"); + } + + int GetSequenceNumber(string name) => ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "a") + ?? ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "b") + ?? throw new AssertionException($"Can't get sequence number for '{name}'"); + } + + private static string MakeName(string prefix, int sequenceNumber) => $"{prefix}{sequenceNumber:0000000000}"; + + private static Task CannotGetNodeCreationTime(string node) => throw new AssertionException("Should not be called"); + } +} diff --git a/DistributedLock.ZooKeeper/AssemblyAttributes.cs b/DistributedLock.ZooKeeper/AssemblyAttributes.cs new file mode 100644 index 00000000..398d8ac7 --- /dev/null +++ b/DistributedLock.ZooKeeper/AssemblyAttributes.cs @@ -0,0 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; + +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj new file mode 100644 index 00000000..db14c847 --- /dev/null +++ b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -0,0 +1,60 @@ + + + + netstandard2.0;netstandard2.1;net461 + Medallion.Threading.ZooKeeper + True + 4 + Latest + enable + + + + 1.0.0 + 1.0.0.0 + Michael Adelson + Provides a distributed locking implementation based on Apache ZooKeeper + Copyright © 2020 Michael Adelson + MIT + distributed lock async zookeeper + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + embedded + + + + False + 1591 + TRACE;DEBUG + + + + + + + all + + + all + + + + + + + + + + \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs new file mode 100644 index 00000000..a2377ba0 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs @@ -0,0 +1,265 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.ZooKeeper +{ + using Medallion.Threading.Internal; + using org.apache.zookeeper; + using System.Collections; + using System.Linq; + using System.Threading; + using System.Threading.Tasks; + + /// + /// We don't want to use one session () per lock because "The creation and closing of sessions are + /// costly in ZooKeeper because they need quorum confirmations, they become the bottleneck of a ZooKeeper ensemble when it needs to handle + /// thousands of client connections" (https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html). + /// + /// However, ZooKeeper sessions do "leak" watches over time (see https://issues.apache.org/jira/browse/ZOOKEEPER-442). + /// + /// This class attempts to balance those two concerns by managing a pool of cached sessions that live for a while but not forever. + /// + internal class ZooKeeperConnection : IDisposable + { + /// + /// Hopefully, 10m prevents leaks from ever getting too bad while granting efficiencies by allowing us to re-use + /// sessions under load. + /// + public static readonly Pool DefaultPool = new Pool(maxAge: TimeSpan.FromMinutes(10)); + + private readonly InternalConnection _internalConnection; + private Action? _releaseToPool; + + private ZooKeeperConnection(InternalConnection internalConnection, Action releaseToPool) + { + this._internalConnection = internalConnection; + this._releaseToPool = releaseToPool; + } + + public ZooKeeper ZooKeeper => this._internalConnection.ZooKeeper; + + public CancellationToken ConnectionLostToken => this._internalConnection.ConnectionLostToken; + + public void Dispose() => Interlocked.Exchange(ref this._releaseToPool, null)?.Invoke(); + + public sealed class Pool + { + private readonly Dictionary Connections = new Dictionary(); + private readonly TimeoutValue _maxAge; + + public Pool(TimeoutValue maxAge) + { + Invariant.Require(!maxAge.IsInfinite); + this._maxAge = maxAge.TimeSpan; + } + + private object PoolLock => Connections.As().SyncRoot; + + public Task ConnectAsync(ZooKeeperConnectionInfo connectionInfo, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + lock (this.PoolLock) + { + // if we have an entry in the pool, use that + if (this.Connections.TryGetValue(connectionInfo, out var entry)) + { + ++entry.UserCount; + return ToResultAsync(entry); + } + + // create a new connection + var newConnectionTask = this.InternalConnectAsync(connectionInfo); + var newEntry = new ConnectionEntry(newConnectionTask) + { + // 2 because we have both the current request and the timeout task we're about to create + UserCount = 2 + }; + this.Connections.Add(connectionInfo, newEntry); + newConnectionTask.ContinueWith(OnConnectionTaskCompleted); + return ToResultAsync(newEntry); + + void OnConnectionTaskCompleted(Task internalConnectionTask) + { + // if we never connected, just release our hold on the task + if (internalConnectionTask.Status != TaskStatus.RanToCompletion) + { + this.ReleaseEntry(connectionInfo, newEntry, remove: true); + } + // Otherwise, wait until either max age has elapsed or the connection is lost to release our hold. This + // ensures both that the connection won't be removed from the pool prematurely as well as that it will be + // eventually removed even if it stops being used + else + { + Task.Delay(this._maxAge.TimeSpan, internalConnectionTask.Result.ConnectionLostToken) + .ContinueWith(_ => this.ReleaseEntry(connectionInfo, newEntry, remove: true)); + } + } + } + + async Task ToResultAsync(ConnectionEntry entry) + { + try + { + var internalConnection = await entry.ConnectionTask.ConfigureAwait(false); + return new ZooKeeperConnection(internalConnection, releaseToPool: () => this.ReleaseEntry(connectionInfo, entry, remove: false)); + } + catch + { + // if we fail to construct a connection, still release our hold on the entry to allow cleanup + this.ReleaseEntry(connectionInfo, entry, remove: false); + throw; + } + } + } + + private async Task InternalConnectAsync(ZooKeeperConnectionInfo connectionInfo) + { + var watcher = new ConnectionWatcher(connectionInfo.SessionTimeout); + var zooKeeper = new ZooKeeper( + connectstring: connectionInfo.ConnectionString, + sessionTimeout: connectionInfo.SessionTimeout.InMilliseconds, + watcher: watcher + ); + + using var timeoutSource = new CancellationTokenSource(connectionInfo.ConnectTimeout.TimeSpan); + using var timeoutRegistration = timeoutSource.Token.Register( + () => watcher.TaskCompletionSource.TrySetException(new TimeoutException($"Timed out connecting to ZooKeeper after {connectionInfo.ConnectTimeout.InMilliseconds}ms")) + ); + + foreach (var authInfo in connectionInfo.AuthInfo) + { + zooKeeper.addAuthInfo(authInfo.Scheme, authInfo.Auth.ToArray()); + } + + try + { + await watcher.TaskCompletionSource.Task.ConfigureAwait(false); + return new InternalConnection(zooKeeper, watcher); + } + catch + { + // on failure, clean up the instance we created + try { await zooKeeper.closeAsync().ConfigureAwait(false); } + finally { watcher.Dispose(); } + throw; + } + } + + private void ReleaseEntry(ZooKeeperConnectionInfo connectionInfo, ConnectionEntry entry, bool remove) + { + bool shouldDispose; + lock (this.PoolLock) + { + if (remove) + { + this.Connections.As>>() + .Remove(new KeyValuePair(connectionInfo, entry)); + } + + shouldDispose = --entry.UserCount == 0; + // this guarantee is upheld by the fact that we include the timeout watcher task as a "user" + Invariant.Require( + !shouldDispose || !(this.Connections.TryGetValue(connectionInfo, out var registeredEntry) && registeredEntry == entry), + "If we're disposing then the entry must be removed from the pool" + ); + } + + if (shouldDispose) + { + // kick off connection disposal in the background to + // avoid blocking/throwing and to handle the case where the task hasn't yet completed + entry.ConnectionTask.ContinueWith( + t => { var ignored = t.Result.DisposeAsync(); }, + TaskContinuationOptions.OnlyOnRanToCompletion + ); + } + } + + private class ConnectionEntry + { + public ConnectionEntry(Task connectionTask) + { + this.ConnectionTask = connectionTask; + } + + public Task ConnectionTask { get; } + // protected by the pool's lock + public int UserCount { get; set; } + } + } + + private class InternalConnection : IAsyncDisposable + { + private readonly ConnectionWatcher _watcher; + + public InternalConnection(ZooKeeper zooKeeper, ConnectionWatcher watcher) + { + this.ZooKeeper = zooKeeper; + this._watcher = watcher; + } + + public ZooKeeper ZooKeeper { get; } + + public CancellationToken ConnectionLostToken => this._watcher.ConnectionLost; + + public async ValueTask DisposeAsync() + { + try { await this.ZooKeeper.closeAsync().ConfigureAwait(false); } + finally { this._watcher.Dispose(); } + } + } + + private class ConnectionWatcher : Watcher, IDisposable + { + private readonly CancellationTokenSource _connectionLostSource = new CancellationTokenSource(); + private readonly TimeoutValue _sessionTimeout; + private int _isWaitingForReconnect; + + public ConnectionWatcher(TimeoutValue sessionTimeout) + { + this._sessionTimeout = sessionTimeout; + } + + public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); + public CancellationToken ConnectionLost => this._connectionLostSource.Token; + + public override Task process(WatchedEvent @event) + { + if (@event.getState() == Event.KeeperState.SyncConnected) + { + if (!this.TaskCompletionSource.TrySetResult(default)) + { + // if we're reconnecting, clear any scheduled cancellation + this._connectionLostSource.CancelAfter(Timeout.Infinite); + Volatile.Write(ref this._isWaitingForReconnect, 0); + } + } + else + { + if (!this.TaskCompletionSource.TrySetException(new InvalidOperationException($"Failed to connect to ZooKeeper. State: {@event.getState()}"))) + { + // if we see the expired event (which might not come if we never reconnect), just fire connection lost + if (@event.getState() == Event.KeeperState.Expired) + { + this._connectionLostSource.Cancel(); + } + // Otherwise, zookeeper will be attempting reconnection. Give it up to the session timeout to + // do so before we fire. See https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html + else if (Interlocked.Exchange(ref this._isWaitingForReconnect, 1) == 0) + { + // Only do this if we changed from !reconnecting to reconnecting; otherwise if we get multiple + // failure events we'll keep re-upping the timer + this._connectionLostSource.CancelAfter(this._sessionTimeout.TimeSpan); + } + } + } + + return Task.CompletedTask; + } + + public void Dispose() => this._connectionLostSource.Dispose(); + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs new file mode 100644 index 00000000..ba18c09a --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs @@ -0,0 +1,45 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Medallion.Threading.ZooKeeper +{ + internal sealed record ZooKeeperAuthInfo(string Scheme, EquatableReadOnlyList Auth); + + internal sealed record ZooKeeperConnectionInfo(string ConnectionString, TimeoutValue ConnectTimeout, TimeoutValue SessionTimeout, EquatableReadOnlyList AuthInfo); + + internal readonly struct EquatableReadOnlyList : IReadOnlyList, IEquatable> + { + private readonly T[] _array; + + public EquatableReadOnlyList(IEnumerable items) + { + this._array = items.ToArray(); + } + + public T this[int index] => this._array[index]; + + public int Count => this._array.Length; + + public bool Equals(EquatableReadOnlyList other) => this._array.SequenceEqual(other._array); + + public override bool Equals(object obj) => obj is EquatableReadOnlyList that && this.Equals(that); + + public override int GetHashCode() + { + var hash = 0; + foreach (var item in this._array) + { + hash = (hash, item).GetHashCode(); + } + return hash; + } + + public IEnumerator GetEnumerator() => this._array.As>().GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator(); + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..fd2d4f88 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs @@ -0,0 +1,59 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.ZooKeeper +{ + public partial class ZooKeeperDistributedLock + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + ZooKeeperDistributedLockHandle? IInternalDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + ZooKeeperDistributedLockHandle IInternalDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs new file mode 100644 index 00000000..58ddb33d --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs @@ -0,0 +1,162 @@ +using Medallion.Threading.Internal; +using org.apache.zookeeper.data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + /// + /// An implementation of based on ZooKeeper. Uses the lock recipe described in + /// https://zookeeper.apache.org/doc/r3.1.2/recipes.html + /// + public sealed partial class ZooKeeperDistributedLock : IInternalDistributedLock + { + private const string NodePrefix = "lock-"; + + private readonly bool _assumeNodePathExists; + private readonly ZooKeeperConnectionInfo _connectionInfo; + private readonly IReadOnlyList _acl; + + // todo revisit this API; should we make assumption of existance optional? + public ZooKeeperDistributedLock(ZooKeeperPath existingNodePath, string connectionString, Action? options = null) + : this(existingNodePath, assumeNodePathExists: true, connectionString, options) + { + if (existingNodePath == default) { throw new ArgumentNullException(nameof(existingNodePath)); } + if (existingNodePath == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(existingNodePath)); } + } + + public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, connectionString, options) + { + } + + public ZooKeeperDistributedLock(ZooKeeperPath directoryNodePath, string name, string connectionString, Action? options = null) + : this( + (directoryNodePath == default ? throw new ArgumentNullException(nameof(directoryNodePath)) : directoryNodePath).CreateChildNodeWithSafeName(name), + assumeNodePathExists: false, + connectionString, + options) + { + } + + private ZooKeeperDistributedLock(ZooKeeperPath nodePath, bool assumeNodePathExists, string connectionString, Action? optionsBuilder) + { + this.Path = nodePath; + this._assumeNodePathExists = assumeNodePathExists; + var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); + this._connectionInfo = new ZooKeeperConnectionInfo( + connectionString ?? throw new ArgumentNullException(nameof(connectionString)), + ConnectTimeout: options.ConnectTimeout, + SessionTimeout: options.SessionTimeout, + AuthInfo: options.AuthInfo + ); + this._acl = options.Acl; + } + + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path { get; } + + /// + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. + /// + string IDistributedLock.Name => this.Path.ToString(); + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + var task = this.InternalTryAcquireHelperAsync(timeout, cancellationToken); + return SyncViaAsync.IsSynchronous ? task.GetAwaiter().GetResult().AsValueTask() : task.AsValueTask(); + } + + private async Task InternalTryAcquireHelperAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); + ZooKeeperDistributedLockHandle? result = null; + try + { + result = await this.InternalTryAcquireAsync(connection, timeout, cancellationToken).ConfigureAwait(false); + return result; + } + finally + { + if (result == null) { connection.Dispose(); } + } + } + + private async Task InternalTryAcquireAsync(ZooKeeperConnection connection, TimeoutValue timeout, CancellationToken cancellationToken) + { + // (1) Call create( ) with a pathname of "_locknode_/lock-" and the sequence and ephemeral flags set. + var ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, NodePrefix, this._acl, ensureDirectoryExists: !this._assumeNodePathExists).ConfigureAwait(false); + CancellationTokenSource? timeoutSource = null; + var acquired = false; + var ephemeralNodeLost = false; + try + { + while (true) + { + // (2) Call getChildren( ) on the lock node without setting the watch flag (this is important to avoid the herd effect). + var children = await connection.ZooKeeper.getChildrenAsync(this.Path.ToString()).ConfigureAwait(false); + + // (3) If the pathname created in step 1 has the lowest sequence number suffix, the client has the lock and the client exits the protocol. + var childrenAndSequenceNumbers = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( + parentNode: this.Path.ToString(), + childrenNames: children.Children, + getNodeCreationTimeAsync: connection.GetNodeCreationTimeAsync, + prefix: NodePrefix + ).ConfigureAwait(false); + var ephemeralNodeIndex = Array.FindIndex(childrenAndSequenceNumbers, t => t.Path == ephemeralNodePath); + if (ephemeralNodeIndex == 0) + { + acquired = true; + return new ZooKeeperDistributedLockHandle(new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumeNodePathExists)); + } + // Sanity check; this could happen if someone else deletes it out from under us. We must check + // this first because it covers the empty collection case + if (ephemeralNodeIndex < 0) + { + ephemeralNodeLost = true; + throw new InvalidOperationException($"Node '{ephemeralNodePath}' was created, but no longer exists"); + } + if (timeout.IsZero) { return null; } // don't proceed further if we're not willing to wait + + // (4) The client calls exists( ) with the watch flag set on the path in the lock directory with the next lowest sequence number. + // (5) If exists( ) returns false, go to step 2. Otherwise, wait for a notification for the pathname from the previous step before going to step 2. + var nextLowestChildNode = childrenAndSequenceNumbers[ephemeralNodeIndex - 1].Path; + if (!timeout.IsInfinite) { timeoutSource ??= new CancellationTokenSource(timeout.TimeSpan); } + if ((await connection.WaitForNotExistsOrChanged(nextLowestChildNode, cancellationToken, timeoutSource?.Token ?? CancellationToken.None).ConfigureAwait(false)) == false) + { + return null; // timed out + } + } + } + finally + { + timeoutSource?.Dispose(); + + // if we failed to acquire, clean up + if (!acquired) + { + if (!ephemeralNodeLost) + { + await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); + } + if (!this._assumeNodePathExists) + { + // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because + // someone else is holding the lock. However, we could have encountered a race condition where the other holder + // released right after we failed to acquire and our ephemeral node prevented them from deleting. Therefore, we + // fire and forget this deletion to cover that case without slowing us down + _ = connection.ZooKeeper.deleteAsync(this.Path.ToString()); + } + } + } + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs new file mode 100644 index 00000000..33f5dd5d --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs @@ -0,0 +1,36 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + public sealed class ZooKeeperDistributedLockHandle : IDistributedSynchronizationHandle + { + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; + + internal ZooKeeperDistributedLockHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } + + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs new file mode 100644 index 00000000..0d522fb7 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs @@ -0,0 +1,100 @@ +using Medallion.Threading.Internal; +using org.apache.zookeeper.data; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.ZooKeeper +{ + public sealed class ZooKeeperDistributedSynchronizationOptionsBuilder + { + private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperHelper.PublicAcl }; + + /// + /// According to https://bowenli86.github.io/2016/09/15/distributed%20system/zookeeper/ZooKeeper-Sessions-and-Session-Management/, + /// timeout can be a minimum of 2x the tick time and a maximum of 20x the tick time. The default tick time is 2s, so this default + /// is set to be high enough to require relatively few heartbeats but also low enough to support either a 2s or 1s tick time by default. + /// + private TimeoutValue _sessionTimeout = TimeSpan.FromSeconds(20); + + /// + /// Default value (arbitrarily) matches the default connection timeout for SQL Server + /// + private TimeoutValue _connectTimeout = TimeSpan.FromSeconds(15); + + private readonly List _authInfo = new List(); + private readonly List _acl = new List(); + + private ZooKeeperDistributedSynchronizationOptionsBuilder() + { + } + + /// + /// Configures the for connections to ZooKeeper. Because the underlying ZooKeeper client periodically renews + /// the session, this value generally will not impact behavior. Lower values mean that locks will be released more quickly following a crash + /// of the lock-holding process, but also increase the risk that transient connection issues will result in a dropped lock. + /// + /// Defaults to 20s. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder SessionTimeout(TimeSpan sessionTimeout) + { + var sessionTimeoutValue = new TimeoutValue(sessionTimeout, nameof(sessionTimeout)); + if (sessionTimeoutValue.IsZero) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must be positive"); } + if (sessionTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must not be infinite"); } + + this._sessionTimeout = sessionTimeoutValue; + return this; + } + + /// + /// Configures how long to wait to establish a connection to ZooKeeper before failing with a . + /// + /// Defaults to 15s. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder ConnectTimeout(TimeSpan connectTimeout) + { + this._connectTimeout = new TimeoutValue(connectTimeout, nameof(connectTimeout)); + return this; + } + + /// + /// Specifies authentication info to be added to the Zookeeper connection with . Each call + /// to this method adds another entry to the list of auth info. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more + /// information on ZooKeeper auth. + /// + /// By default, no auth info is added. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder AddAuthInfo(string scheme, IReadOnlyList auth) + { + this._authInfo.Add(new ZooKeeperAuthInfo( + scheme ?? throw new ArgumentNullException(nameof(scheme)), + new EquatableReadOnlyList(auth ?? throw new ArgumentNullException(nameof(auth))) + )); + return this; + } + + /// + /// Configures the access control list (ACL) for any created ZooKeeper nodes. Each call to this method adds another entry to the access control + /// list. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more information on ZooKeeper ACLs. + /// + /// If no ACL entries are specified, the ACL used will be a singleton list that grants all permissions to (world, anyone). + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder AddAccessControl(string scheme, string id, int permissionFlags) + { + this._acl.Add(new ACL(permissionFlags, new Id(scheme ?? throw new ArgumentNullException(nameof(scheme)), id ?? throw new ArgumentNullException(nameof(id))))); + return this; + } + + internal static (TimeoutValue SessionTimeout, TimeoutValue ConnectTimeout, EquatableReadOnlyList AuthInfo, IReadOnlyList Acl) GetOptions(Action? options) + { + var builder = new ZooKeeperDistributedSynchronizationOptionsBuilder(); + options?.Invoke(builder); + return ( + SessionTimeout: builder._sessionTimeout, + ConnectTimeout: builder._connectTimeout, + AuthInfo: new EquatableReadOnlyList(builder._authInfo), + Acl: builder._acl.Count != 0 ? builder._acl.ToArray() : DefaultAcl + ); + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs new file mode 100644 index 00000000..fd800615 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs @@ -0,0 +1,177 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + using org.apache.zookeeper; + using org.apache.zookeeper.data; + using System.Linq; + using System.Threading; + + internal static class ZooKeeperHelper + { + /// + /// See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html under "Builtin ACL Schemes" + /// + public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); + + /// + /// Returns true when does not exist. + /// Returns null when we receive a watch event indicating that has changed. + /// Returns false if the fires. + /// + public static async Task WaitForNotExistsOrChanged( + this ZooKeeperConnection connection, + string path, + CancellationToken cancellationToken, + CancellationToken timeoutToken) + { + cancellationToken.ThrowIfCancellationRequested(); + + using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); + using var cancellationTokenRegistration = cancellationToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetCanceled(), + state: watcher + ); + using var timeoutRegistration = timeoutToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), + state: watcher + ); + // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification + using var connectionLostRegistration = connection.ConnectionLostToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), + state: watcher + ); + + var exists = await connection.ZooKeeper.existsAsync(path, watcher).ConfigureAwait(false); + return exists == null ? true : await watcher.TaskCompletionSource.Task.ConfigureAwait(false); + } + + public static async Task CreateEphemeralSequentialNode( + this ZooKeeperConnection connection, + ZooKeeperPath directory, + string namePrefix, + IEnumerable aclEnumerable, + bool ensureDirectoryExists) + { + // If we are in charge of ensuring the directory, this algorithm loops until either we EnsureDirectory fails or we hit an error other than the directory + // not existing. This supports concurrent node creation and directory creation as well as node creation and directory deletion. + + var acl = aclEnumerable.ToList(); + while (true) + { + var createdDirectories = ensureDirectoryExists + ? await EnsureDirectoryAndGetCreatedPathsAsync().ConfigureAwait(false) + : Array.Empty(); + + try + { + return await connection.ZooKeeper.createAsync($"{directory}{ZooKeeperPath.Separator}{namePrefix}", data: Array.Empty(), acl, CreateMode.EPHEMERAL_SEQUENTIAL).ConfigureAwait(false); + } + catch (KeeperException.NoNodeException ex) + { + // If we're not ensuring the directory, rethrow a more helpful error message. Otherwise, + // swallow the error and go around the loop again + if (!ensureDirectoryExists) + { + throw new InvalidOperationException($"Node '{directory}' does not exist", ex); + } + } + catch + { + // on an unhandled error, clean up any directories we created + await TryCleanUpCreatedDirectoriesAsync(createdDirectories).ConfigureAwait(false); + + throw; + } + } + + async Task> EnsureDirectoryAndGetCreatedPathsAsync() + { + // This algorithm loops until either the directory exists or our creation attempt fails with something other + // than NoNodeException or NodeExistsException. This supports concurrent directory creation as well as concurrent + // creation and deletion via optimistic concurrency + + var toCreate = new Stack(); + toCreate.Push(directory); + List? created = null; + do + { + var directoryToCreate = toCreate.Peek(); + if (directoryToCreate == ZooKeeperPath.Root) + { + throw new InvalidOperationException($"Received {typeof(KeeperException.NoNodeException)} when creating child node of directory '{ZooKeeperPath.Root}'"); + } + + try + { + await connection.ZooKeeper.createAsync(directoryToCreate.ToString(), data: Array.Empty(), acl, CreateMode.PERSISTENT).ConfigureAwait(false); + toCreate.Pop(); + (created ??= new List()).Add(directoryToCreate); + } + catch (KeeperException.NodeExistsException) // someone else created it + { + toCreate.Pop(); + } + catch (KeeperException.NoNodeException) // parent needs to be created + { + toCreate.Push(directoryToCreate.GetDirectory()!.Value); + } + catch + { + // on an unhandled failure, attempt to clean up our work + if (created != null) { await TryCleanUpCreatedDirectoriesAsync(created).ConfigureAwait(false); } + + throw; + } + } + while (toCreate.Count != 0); + + return created ?? (IReadOnlyList)Array.Empty(); + } + + async Task TryCleanUpCreatedDirectoriesAsync(IReadOnlyList createdDirectories) + { + try + { + // delete in reverse order of creation + for (var i = createdDirectories.Count - 1; i >= 0; --i) + { + await connection.ZooKeeper.deleteAsync(createdDirectories[i].ToString()).ConfigureAwait(false); + } + } + catch + { + // swallow errors, since there's a good chance this cleanup fails the same way that the creation did + } + } + } + + private sealed class TaskWatcher : Watcher, IDisposable + { + private volatile Action>? _watchedEventHandler; + + public TaskWatcher(Action> watchedEventHandler) + { + this._watchedEventHandler = watchedEventHandler; + } + + public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); + + public void Dispose() => this._watchedEventHandler = null; + + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) + { + this._watchedEventHandler?.Invoke(@event, this.TaskCompletionSource); + } + + return Task.CompletedTask; + } + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs new file mode 100644 index 00000000..ec5ac1b9 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs @@ -0,0 +1,119 @@ +using Medallion.Threading.Internal; +using org.apache.zookeeper; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + /// + /// implementation where holding the primitive + /// is based on the existence of an ephemeral zookeeper node + /// + internal sealed class ZooKeeperNodeHandle : IDistributedSynchronizationHandle + { + private readonly ZooKeeperConnection _connection; + private readonly ZooKeeperPath _nodePath; + private readonly bool _shouldDeleteParent; + private readonly Lazy _handleLostState; + + private volatile bool _disposed; + + public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool shouldDeleteParent) + { + this._connection = connection; + this._nodePath = new ZooKeeperPath(nodePath); + this._shouldDeleteParent = shouldDeleteParent; + + this._handleLostState = new Lazy(() => + { + var handleLostSource = CancellationTokenSource.CreateLinkedTokenSource(this._connection.ConnectionLostToken); + var handleLostToken = handleLostSource.Token; // grab this now before the source is disposed + var disposalSource = new CancellationTokenSource(); + var disposalSourceToken = disposalSource.Token; + var monitoringTask = Task.Run(async () => + { + try + { + while (true) + { + var result = await this._connection.WaitForNotExistsOrChanged( + this._nodePath.ToString(), + cancellationToken: CancellationToken.None, // ConnectionLostToken already accounted for by method + timeoutToken: disposalSource.Token + ).ConfigureAwait(false); + switch (result) + { + case false: // disposalSource triggered + return; + case true: // node no longer exists + handleLostSource.Cancel(); + return; + default: // something changed + break; // continue looping + } + } + } + finally + { + handleLostSource.Dispose(); + } + }); + return new HandleLostState(handleLostToken, disposalSource, monitoringTask); + }); + } + + public CancellationToken HandleLostToken => this._disposed ? throw this.ObjectDisposed() : this._handleLostState.Value.Token; + + public void Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() + { + var disposalTask = this.InternalDisposeAsync(); + if (!SyncViaAsync.IsSynchronous) { return disposalTask.AsValueTask(); } + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + disposalTask.GetAwaiter().GetResult(); + return default; + } + + private async Task InternalDisposeAsync() + { + if (this._disposed) { return; } + this._disposed = true; + + try + { + // clean up monitoring + if (this._handleLostState.IsValueCreated) + { + this._handleLostState.Value.DisposalSource.Cancel(); + this._handleLostState.Value.DisposalSource.Dispose(); + await this._handleLostState.Value.MonitoringTask.ConfigureAwait(false); + } + } + finally + { + try + { + // clean up the node + await this._connection.ZooKeeper.deleteAsync(this._nodePath.ToString()).ConfigureAwait(false); + + if (this._shouldDeleteParent) + { + try { await this._connection.ZooKeeper.deleteAsync(this._nodePath.GetDirectory()!.Value.ToString()).ConfigureAwait(false); } + catch (KeeperException.NotEmptyException) { } // can't delete nodes which have other children + catch (KeeperException.NoNodeException) { } // can't delete nodes which don't exist (race condition) + } + } + finally + { + this._connection.Dispose(); + } + } + } + + private record HandleLostState(CancellationToken Token, CancellationTokenSource DisposalSource, Task MonitoringTask); + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperPath.cs b/DistributedLock.ZooKeeper/ZooKeeperPath.cs new file mode 100644 index 00000000..12e25d0c --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperPath.cs @@ -0,0 +1,169 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Security.Cryptography; +using System.Text; + +namespace Medallion.Threading.ZooKeeper +{ + /// + /// Represents a path to a ZooKeeper node. The constructor validates that the input is a valid path. + /// Call to get the path value. + /// + public readonly struct ZooKeeperPath : IEquatable + { + internal const char Separator = '/'; + + internal static ZooKeeperPath Root { get; } = new ZooKeeperPath("/"); + + private readonly string _path; + + /// + /// Constructs a new based on the given string. + /// + public ZooKeeperPath(string path) : this(path, checkPath: true) { } + + private ZooKeeperPath(string path, bool checkPath, string? paramName = null) + { + if (path == null) { throw new ArgumentNullException(paramName ?? nameof(path)); } + if (checkPath && ValidatePath(path) is { } error) + { + throw new FormatException($"{paramName ?? nameof(path)} {error.Reason}{(error.Index.HasValue ? $" (index {error.Index})" : string.Empty)}"); + } + this._path = path; + } + + internal ZooKeeperPath? GetDirectory() + { + if (this == Root) { return null; } + var lastSeparatorIndex = this._path.LastIndexOf(Separator); + return lastSeparatorIndex == 0 ? Root : new ZooKeeperPath(this._path.Substring(0, lastSeparatorIndex), checkPath: false); + } + + /// + /// Returns the path value as a string + /// + public override string ToString() => this._path; + + /// + /// Implements equality based on the path string + /// + public override bool Equals(object obj) => obj is ZooKeeperPath that && this.Equals(that); + + /// + /// Implements equality based on the path string + /// + public bool Equals(ZooKeeperPath that) => this._path == that._path; + + /// + /// Implements hashing based on the path string + /// + public override int GetHashCode() => this._path?.GetHashCode() ?? 0; + + /// + /// Implements equality based on the path string + /// + public static bool operator ==(ZooKeeperPath @this, ZooKeeperPath that) => @this.Equals(that); + + /// + /// Implements inequality based on the path string + /// + public static bool operator !=(ZooKeeperPath @this, ZooKeeperPath that) => !(@this == that); + + internal ZooKeeperPath CreateChildNodeWithSafeName(string name) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + var isRoot = this == Root; + var safeName = DistributedLockHelpers.ToSafeName( + name, + maxNameLength: int.MaxValue, // no max + convertToValidName: ConvertToValidNodeName + ) + // If ToSafeName adds a hash, it uses Base64 encoding which can include the separator character. We replace + // with '_' which is not in Base64 so that the output name remains safe without weakening the hash + .Replace(Separator, '_'); + return new ZooKeeperPath((this == Root ? this._path : (this._path + Separator)) + safeName, checkPath: false); + + string ConvertToValidNodeName(string name) + { + // in order to be a valid node name: + + // must not be empty (special-case this because our generic conversion method will map empty to itself) + if (name.Length == 0) { return "EMPTY"; } + + // must not be ., .., or (this this is root), the reserved path "zookeeper" + // (see https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#ch_zkDataModel) + switch (name) + { + case ".": + case "..": + case "zookeeper" when isRoot: + return name + "_"; + default: + break; // keep going + } + + if (name.IndexOf(Separator) < 0 // must not contain the path separator + && !ValidatePath(Separator + name).HasValue) // "/name" must be a valid path + { + return name; + } + + var converted = name.ToCharArray(); + for (var i = 0; i < name.Length; ++i) + { + switch (name[i]) + { + // note: we don't have to replace '.' because it is only invalid if '.' or '..' is a full path + // segment. Since we'll be appending on a hash, that doesn't matter + case Separator: // separator cannot appear in names, only in paths + case '\0': + case char @char when IsNonNullInvalidPathChar(@char): + converted[i] = '_'; // replace with placeholder + break; + } + } + + return new string(converted); + } + } + + private static (string Reason, int? Index)? ValidatePath(string path) + { + // logic based on https://github.com/apache/zookeeper/blob/master/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathUtils.java#L43 + // (cited in https://stackoverflow.com/questions/55463167/node-name-limitations-in-zookeeper) + + if (path.Length == 0) { return ("may not be empty", null); } + if (path[0] != Separator) { return ("must start with the '/' character", null); } + if (path.Length == 1) { return null; } + if (path[path.Length - 1] == Separator) { return ("must not end with the '/' character", path.Length - 1); } + + for (var i = 1; i < path.Length; ++i) + { + // keep in sync with ConvertToValidNodeName() + + switch (path[i]) + { + case '\0': + return ("may not contain the null character", i); + case Separator when path[i - 1] == Separator: + return ("may not contain empty segments", i); + case '.' when path[i - (path[i - 1] == '.' ? 2 : 1)] == Separator && ((i + 1 == path.Length) || path[i + 1] == Separator): + return ("may not be a relative path", i); + case char @char when IsNonNullInvalidPathChar(@char): + return ("invalid character", i); + } + } + + return null; + } + + private static bool IsNonNullInvalidPathChar(char @char) => + @char > '\u0000' && @char <= '\u001f' + || @char >= '\u007f' && @char <= '\u009F' + || @char >= '\ud800' && @char <= '\uf8ff' + || @char >= '\ufff0' && @char <= '\uffff'; + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs new file mode 100644 index 00000000..a2b7a21a --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs @@ -0,0 +1,147 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + internal static class ZooKeeperSequentialPathHelper + { + /// + /// Given a set of child node names (), filters them to include only sequential nodes + /// with the prefix or . + /// + /// Then, sorts the nodes from oldest to newest. In most, cases, this sort can be done purely using the sequence number. However, because sequence + /// numbers roll over at , more complex logic is needed to get a correct sort in certain scenarios. + /// + public static async ValueTask<(string Path, int SequenceNumber, string Prefix)[]> FilterAndSortAsync( + string parentNode, + IEnumerable childrenNames, + Func> getNodeCreationTimeAsync, + string prefix, + string? alternatePrefix = null) + { + var ephemeralChildrenWithPrefix = GetEphemeralChildrenWithPrefix(); + + if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } + + // first, sort by the unsigned value + ephemeralChildrenWithPrefix.Sort((a, b) => a.UnsignedSequenceNumber.CompareTo(b.UnsignedSequenceNumber)); + + // next, measure the gaps between each pair of sequential values to see if the break point is obvious + + // This is > 90% of the uint space; there can only be one gap of this size and if there is such a gap + // then we can safely assume that the gap identifies the end of the sequence + const uint LargeGapSize = 4_000_000_000u; + + var maxGap = 0u; + var maxGapEndIndex = -1; + for (var i = 0; i < ephemeralChildrenWithPrefix.Count; ++i) + { + var gapEndIndex = (i + 1) % ephemeralChildrenWithPrefix.Count; + var gap = unchecked(ephemeralChildrenWithPrefix[gapEndIndex].UnsignedSequenceNumber - ephemeralChildrenWithPrefix[i].UnsignedSequenceNumber); + if (gap > maxGap) + { + maxGap = gap; + maxGapEndIndex = gapEndIndex; + } + } + if (maxGap >= LargeGapSize) + { + return ReorderByLowestIndex(maxGapEndIndex); + } + + // finally, fall back to determining the start point via creation time + var creationTimeTasksByChildPath = ephemeralChildrenWithPrefix.ToDictionary(t => t.Path, t => getNodeCreationTimeAsync(t.Path)); + await Task.WhenAll(creationTimeTasksByChildPath.Values).ConfigureAwait(false); + + ephemeralChildrenWithPrefix.RemoveAll(t => creationTimeTasksByChildPath[t.Path].Result == null); // remove all nodes with no creation time (they no longer exist) + if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } + + var oldestChild = ephemeralChildrenWithPrefix.Select((t, index) => (creationTime: creationTimeTasksByChildPath[t.Path].Result!.Value, index)) + .OrderBy(t => t.creationTime) + .ThenBy(t => t.index) + .First(); + return ReorderByLowestIndex(oldestChild.index); + + List<(string Path, uint UnsignedSequenceNumber, string Prefix)> GetEphemeralChildrenWithPrefix() + { + var result = new List<(string Path, uint UnsignedSequenceNumber, string Prefix)>(); + foreach (var childName in childrenNames) + { + int? childSequenceNumber; + string? childPrefix; + if (GetSequenceNumberOrDefault(childName, prefix) is { } prefixSequenceNumber) + { + childSequenceNumber = prefixSequenceNumber; + childPrefix = prefix; + } + else if (alternatePrefix != null + && GetSequenceNumberOrDefault(childName, alternatePrefix) is { } alternatePrefixSequenceNumber) + { + childSequenceNumber = alternatePrefixSequenceNumber; + childPrefix = alternatePrefix; + } + else + { + childSequenceNumber = null; + childPrefix = null; + } + + if (childPrefix != null) + { + result.Add(($"{parentNode.TrimEnd(ZooKeeperPath.Separator)}/{childName}", unchecked((uint)childSequenceNumber!.Value), childPrefix)); + } + } + + return result; + } + + (string Path, int SequenceNumber, string Prefix)[] ReorderByLowestIndex(int lowestIndex) + { + var result = new (string Path, int SequenceNumber, string Prefix)[ephemeralChildrenWithPrefix.Count]; + for (var i = 0; i < result.Length; ++i) + { + var element = ephemeralChildrenWithPrefix[(i + lowestIndex) % result.Length]; + result[i] = (element.Path, unchecked((int)element.UnsignedSequenceNumber), element.Prefix); + } + return result; + } + } + + /// + /// If is of the form [.../]prefix{sequence number}, returns the sequence + /// number. Otherwise, returns null. + /// + internal static int? GetSequenceNumberOrDefault(string pathOrName, string prefix) + { + Invariant.Require(prefix.Length > 0); + + // when processing child path names, this should be -1; that means we'll expect the prefix at the start + var prefixStartIndex = pathOrName.LastIndexOf(ZooKeeperPath.Separator) + 1; + if (pathOrName.IndexOf(prefix, startIndex: prefixStartIndex) != prefixStartIndex) + { + return null; + } + + // FROM https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming + // "The counter has a format of %010d -- that is 10 digits with 0 (zero) padding (the counter is formatted in this way to simplify sorting), + // i.e. "0000000001". See Queue Recipe for an example use of this feature. Note: the counter used to store the next sequence number + // is a signed int (4bytes) maintained by the parent node, the counter will overflow when incremented beyond 2147483647 (resulting in a name "-2147483648")." + var counterSuffix = pathOrName.Substring(prefixStartIndex + prefix.Length); + return ( + (counterSuffix.Length == 10 && counterSuffix[0] != '+') // 10-char number; don't allow leading + + || (counterSuffix.Length == 11 && counterSuffix[0] == '-') // 11-char number MUST be - and then 10 digits + ) + && int.TryParse(counterSuffix, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var sequenceNumber) + ? sequenceNumber + : default(int?); + } + + public static async Task GetNodeCreationTimeAsync(this ZooKeeperConnection connection, string path) => + (await connection.ZooKeeper.existsAsync(path).ConfigureAwait(false))?.getCtime(); + } +} diff --git a/DistributedLock.sln b/DistributedLock.sln index 76250022..0b66e25a 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D14FE348 FixDistributedLockCoreDependencyVersion.targets = FixDistributedLockCoreDependencyVersion.targets EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.ZooKeeper", "DistributedLock.ZooKeeper\DistributedLock.ZooKeeper.csproj", "{710F287B-02FB-4F89-9BEC-BAA97250037F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -81,6 +83,10 @@ Global {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Debug|Any CPU.Build.0 = Debug|Any CPU {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Release|Any CPU.ActiveCfg = Release|Any CPU {8ADAA171-8373-432E-8D2B-3DA73E35EB76}.Release|Any CPU.Build.0 = Release|Any CPU + {710F287B-02FB-4F89-9BEC-BAA97250037F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {710F287B-02FB-4F89-9BEC-BAA97250037F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {710F287B-02FB-4F89-9BEC-BAA97250037F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {710F287B-02FB-4F89-9BEC-BAA97250037F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 2660947c..cf8891ce 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -48,6 +48,7 @@ + diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 8b688204..597003c7 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -15,7 +15,7 @@ public class GenerateIDistributedLockImplementations public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore")] string name) { var files = CodeGenHelpers.EnumerateSolutionFiles() - .Where(f => f.IndexOf($"Distributed{name}.Core", StringComparison.OrdinalIgnoreCase) < 0) + .Where(f => !f.Contains($"Distributed{name}.Core", StringComparison.OrdinalIgnoreCase)) .Where(f => f.EndsWith($"Distributed{name}.cs", StringComparison.OrdinalIgnoreCase) && Path.GetFileName(f)[0] != 'I'); var errors = new List(); @@ -36,12 +36,20 @@ public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore") var lockType = Path.GetFileNameWithoutExtension(file); var handleType = lockType + "Handle"; + // zookeeper is inherently asynchronous (watch-based), so any synchronous APIs it has are just sync-over-async + var includeSynchronousApis = !file.Contains("ZooKeeper", StringComparison.OrdinalIgnoreCase); var explicitImplementations = new StringBuilder(); var @interface = $"IDistributed{name}"; foreach (var method in new[] { "TryAcquire", "Acquire", "TryAcquireAsync", "AcquireAsync" }) { - AppendExplicitInterfaceMethod(explicitImplementations, @interface, method, "IDistributedSynchronizationHandle"); + AppendExplicitInterfaceMethod( + explicitImplementations, + @interface, + method, + "IDistributedSynchronizationHandle", + @as: includeSynchronousApis ? null : $"IInternalDistributed{name}<{handleType}>" + ); } var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; @@ -58,10 +66,10 @@ public partial class {lockType} // AUTO-GENERATED {explicitImplementations} - public {handleType}? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + {IfSyncApis("public ")}{handleType}? {(includeSynchronousApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}TryAcquire(TimeSpan timeout{IfSyncApis(" = default")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - public {handleType} Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + {IfSyncApis("public ")}{handleType} {(includeSynchronousApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}Acquire(TimeSpan? timeout{IfSyncApis(" = null")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => DistributedLockHelpers.Acquire(this, timeout, cancellationToken); public ValueTask<{handleType}?> TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => @@ -79,6 +87,8 @@ public partial class {lockType} File.WriteAllText(outputPath, code); errors.Add($"updated {file}"); } + + string IfSyncApis(string value) => includeSynchronousApis ? value : string.Empty; } Assert.IsEmpty(errors); @@ -182,7 +192,7 @@ public partial class {lockType} Assert.IsEmpty(errors); } - private static void AppendExplicitInterfaceMethod(StringBuilder code, string @interface, string method, string returnType) + private static void AppendExplicitInterfaceMethod(StringBuilder code, string @interface, string method, string returnType, string? @as = null) { var isAsync = method.EndsWith("Async"); var isTry = method.StartsWith("Try"); @@ -192,7 +202,7 @@ private static void AppendExplicitInterfaceMethod(StringBuilder code, string @in .Append(isAsync ? $"ValueTask<{returnTypeToUse}>" : returnTypeToUse) .AppendLine($" {@interface}.{method}(TimeSpan{(isTry ? string.Empty : "?")} timeout, CancellationToken cancellationToken) =>") .Append(' ', 12) - .Append($"this.{method}(timeout, cancellationToken)") + .Append($"this{(@as != null ? $".As<{@as}>()" : "")}.{method}(timeout, cancellationToken)") .Append(isAsync ? $".Convert(To<{returnTypeToUse}>.ValueTask)" : string.Empty) .AppendLine(";"); } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 6eac521a..f8bfa3b9 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -13,6 +13,7 @@ using Medallion.Threading; using System.Drawing.Text; using System.Collections.Generic; +using Medallion.Threading.ZooKeeper; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -106,6 +107,9 @@ public static int Main(string[] args) ).Acquire(); break; } + case nameof(ZooKeeperDistributedLock): + handle = new ZooKeeperDistributedLock(name.TrimStart('/'), ZooKeeperPorts.DefaultConnectionString, ZooKeeperOptions).AcquireAsync().Result; + break; default: Console.Error.WriteLine($"type: {type}"); return 123; @@ -133,6 +137,10 @@ private static IEnumerable GetRedisDatabases(int serverCount) => Redi private static void RedisOptions(RedisDistributedSynchronizationOptionsBuilder options) => options.Expiry(TimeSpan.FromSeconds(.5)) // short expiry for abandonment testing - .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); + .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); + + private static void ZooKeeperOptions(ZooKeeperDistributedSynchronizationOptionsBuilder options) => + // use a very short session timeout to support abandonment + options.SessionTimeout(TimeSpan.FromSeconds(.1)); } } From f409b3163dfe11a586fba49705be44a817e3188c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 22 Mar 2021 07:24:06 -0400 Subject: [PATCH 109/399] Add ZooKeeper reader-writer lock --- .../Internal/Data/ConnectionMonitor.cs | 3 +- DistributedLock.Core/Internal/LeaseMonitor.cs | 3 +- DistributedLock.Core/Internal/SyncViaAsync.cs | 22 ++ .../RedLock/RedLockAcquire.cs | 4 +- .../ZooKeeperSynchronizationCoreTestCases.cs | 206 ++++++++++++++++++ .../ZooKeeper/TestingZooKeeperProviders.cs | 17 +- ...TestingZooKeeperSynchronizationStrategy.cs | 4 + DistributedLock.Tests/Tests/ApiTest.cs | 17 ++ .../Tests/CombinatorialTests.cs | 4 + .../ZooKeeper/ZooKeeperDistributedLockTest.cs | 191 +--------------- ...ooKeeperDistributedReaderWriterLockTest.cs | 39 ++++ .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 8 +- ...oKeeperDistributedLock.IDistributedLock.cs | 4 +- .../ZooKeeperDistributedLock.cs | 147 +++---------- ...WriterLock.IDistributedReaderWriterLock.cs | 106 +++++++++ .../ZooKeeperDistributedReaderWriterLock.cs | 98 +++++++++ ...KeeperDistributedReaderWriterLockHandle.cs | 36 +++ DistributedLock.ZooKeeper/ZooKeeperHelper.cs | 31 ++- .../ZooKeeperNodeHandle.cs | 12 +- DistributedLock.ZooKeeper/ZooKeeperPath.cs | 2 +- .../ZooKeeperSynchronizationHelper.cs | 180 +++++++++++++++ DistributedLockCodeGen/CodeGenHelpers.cs | 5 + ...GenerateIDistributedLockImplementations.cs | 22 +- DistributedLockTaker/Program.cs | 3 + 24 files changed, 819 insertions(+), 345 deletions(-) create mode 100644 DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 67418930..42af4205 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -260,8 +260,7 @@ private async ValueTask StopOrDisposeAsync(bool isDispose) if (task != null) { - if (SyncViaAsync.IsSynchronous) { task.GetAwaiter().GetResult(); } - else { await task.ConfigureAwait(false); } + await task.AwaitSyncOverAsync().ConfigureAwait(false); } } diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index f0d09057..eb8c25e3 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -46,8 +46,7 @@ public async ValueTask DisposeAsync() this._disposalSource.Cancel(); } - if (SyncViaAsync.IsSynchronous) { this._monitoringTask.GetAwaiter().GetResult(); } - else { await this._monitoringTask.ConfigureAwait(false); } + await this._monitoringTask.AwaitSyncOverAsync().ConfigureAwait(false); } finally { diff --git a/DistributedLock.Core/Internal/SyncViaAsync.cs b/DistributedLock.Core/Internal/SyncViaAsync.cs index 3bcbeede..6d29c820 100644 --- a/DistributedLock.Core/Internal/SyncViaAsync.cs +++ b/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -102,5 +102,27 @@ public static ValueTask Delay(TimeoutValue timeout, CancellationToken cancellati public static void DisposeSyncViaAsync(this TDisposable disposable) where TDisposable : IAsyncDisposable, IDisposable => Run(@this => @this.DisposeAsync(), disposable); + + /// + /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, + /// returns the as a . + /// + public static ValueTask AwaitSyncOverAsync(this Task task) => + IsSynchronous ? task.GetAwaiter().GetResult().AsValueTask() : task.AsValueTask(); + + /// + /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, + /// returns the as a . + /// + public static ValueTask AwaitSyncOverAsync(this Task task) + { + if (IsSynchronous) + { + task.GetAwaiter().GetResult(); + return default; + } + + return task.AsValueTask(); + } } } diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index 0bd2c8b9..217bfb06 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -57,9 +57,7 @@ public RedLockAcquire( var succeeded = false; try { - succeeded = isSynchronous - ? waitForAcquireTask.GetAwaiter().GetResult() - : await waitForAcquireTask.ConfigureAwait(false); + succeeded = await waitForAcquireTask.AwaitSyncOverAsync().ConfigureAwait(false); } finally { diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs new file mode 100644 index 00000000..11c2d7b8 --- /dev/null +++ b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -0,0 +1,206 @@ +using Medallion.Threading.Tests.ZooKeeper; +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using org.apache.zookeeper; +using org.apache.zookeeper.data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + public abstract class ZooKeeperSynchronizationCoreTestCases + where TLockProvider : TestingLockProvider, new() + { + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() + { + var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + + // pre-clean up just in case + try { await connection.ZooKeeper.deleteAsync(path.ToString()); } + catch (KeeperException.NoNodeException) { } + + this._provider.Strategy.AssumeNodeExists = true; + var @lock = this._provider.CreateLockWithExactName(path.ToString()); + + Assert.That( + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, + Does.Contain("does not exist") + ); + + await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperHelper.PublicAcl }, CreateMode.PERSISTENT); + try + { + await using (var handle = await @lock.TryAcquireAsync()) + { + Assert.IsNotNull(handle); + } + + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); + } + finally + { + await connection.ZooKeeper.deleteAsync(path.ToString()); + } + } + + [TestCase("/")] + [TestCase(".")] + [TestCase("..")] + [TestCase("zookeeper")] + [TestCase("abc\0")] + public void TestGetSafeName(string name) => + Assert.DoesNotThrowAsync(async () => await (await this._provider.CreateLockWithExactName(this._provider.GetSafeName(name)).AcquireAsync()).DisposeAsync()); + + [Test] + public void TestGetSafeNameWithControlCharacters() => this.TestGetSafeName("\u001f\u009F\uf8ff\ufff1"); + + [Test] + public async Task TestCustomAclAndAuth() + { + const string Username = "username"; + const string Password = "secretPassword"; + + var unauthenticatedLock = this._provider.CreateLock(string.Empty); + + this._provider.Strategy.Options = o => o.AddAccessControl("digest", GenerateDigestAclId(Username, Password), 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); + var @lock = this._provider.CreateLock(string.Empty); + + await using (await @lock.AcquireAsync()) + { + Assert.ThrowsAsync(() => unauthenticatedLock.TryAcquireAsync().AsTask()); + } + + Assert.DoesNotThrowAsync(async () => await (await unauthenticatedLock.AcquireAsync()).DisposeAsync()); + + // Based on + // https://github.com/apache/zookeeper/blob/d8561f620fa8611e9a6819d9879b0f18e5a404a9/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java + static string GenerateDigestAclId(string username, string password) + { + using var sha = SHA1.Create(); + var digest = sha.ComputeHash(Encoding.UTF8.GetBytes($"{username}:{password}")); + return $"{username}:{Convert.ToBase64String(digest)}"; + } + } + + [Test] + public async Task TestInvalidAclDoesNotCorruptStore() + { + const string Username = "username"; + const string Password = "xyz"; + + // ACL is the right format but the wrong password (this can easily happen if you get the encoding wrong) + this._provider.Strategy.Options = o => o.AddAccessControl("digest", $"{Username}:1eYGPn6j9+P9osACW8ob4HhZT+s=", 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); + var invalidAclLock = this._provider.CreateLock(string.Empty); + + // pre-cleanup to make sure we will actually create the path + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + try { await connection.ZooKeeper.deleteAsync(invalidAclLock.Name); } + catch (KeeperException.NoNodeException) { } + + Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); + + Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Name)); + + this._provider.Strategy.Options = null; + var validLock = this._provider.CreateLock(string.Empty); + Assert.DoesNotThrowAsync(async () => await (await validLock.AcquireAsync()).DisposeAsync()); + } + + [Test] + public async Task TestDeepDirectoryCreation() + { + var directory = new ZooKeeperPath($"/{TestHelper.UniqueName}/foo/bar/baz"); + + // pre-cleanup to make sure we will actually create the directory + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + for (var toDelete = directory; toDelete != ZooKeeperPath.Root; toDelete = toDelete.GetDirectory()!.Value) + { + try { await connection.ZooKeeper.deleteAsync(toDelete.ToString()); } + catch (KeeperException.NoNodeException) { } + } + + var @lock = this._provider.CreateLockWithExactName(directory.GetChildNodePathWithSafeName("qux").ToString()); + + await using (await @lock.AcquireAsync()) + { + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); + } + + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); + } + + [Test] + public async Task TestThrowsIfPathDeletedWhileWaiting() + { + var @lock = this._provider.CreateLock(string.Empty); + + // hold the lock + await using var handle = await @lock.AcquireAsync(); + + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + var initialChildren = await connection.ZooKeeper.getChildrenAsync(@lock.Name); + + // start waiting + var blockedAcquireTask = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // once the wait has started... + var newChild = await WaitForNewChildAsync(); + // ... start another waiter... + var blockedAcquireTask2 = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // ... and delete the first waiter's node + await connection.ZooKeeper.deleteAsync(newChild); + + // release the lock + await handle.DisposeAsync(); + + // the first waiter should throw + Assert.ThrowsAsync(() => blockedAcquireTask); + + // the second waiter should complete + Assert.DoesNotThrowAsync(async () => await (await blockedAcquireTask2).DisposeAsync()); + + async Task WaitForNewChildAsync() + { + var start = DateTime.UtcNow; + while (true) + { + var children = await connection.ZooKeeper.getChildrenAsync(@lock.Name); + var newChild = children.Children.Except(initialChildren.Children).SingleOrDefault(); + if (newChild != null) { return $"{@lock.Name}/{newChild}"; } + + if (DateTime.UtcNow - start >= TimeSpan.FromSeconds(10)) { Assert.Fail("Timed out"); } + + await Task.Delay(5); + } + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs index 3e3dea2f..2ecab147 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs @@ -9,9 +9,20 @@ public sealed class TestingZooKeeperDistributedLockProvider : TestingLockProvide { public override IDistributedLock CreateLockWithExactName(string name) { - var @lock = new ZooKeeperDistributedLock(name.TrimStart(ZooKeeperPath.Separator), ZooKeeperPorts.DefaultConnectionString); - @lock.Path.ToString().ShouldEqual(name); // sanity check - this.Strategy.TrackPath(@lock.Path.ToString()); + var @lock = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); + return @lock; + } + + public override string GetSafeName(string name) => new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); + } + + public sealed class TestingZooKeeperDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider + { + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) + { + var @lock = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); return @lock; } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs index 4a75fa28..4cf56770 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs @@ -10,6 +10,10 @@ public sealed class TestingZooKeeperSynchronizationStrategy : TestingSynchroniza { private List? _trackedPaths; + public bool AssumeNodeExists { get; set; } + + public Action? Options { get; set; } + public void TrackPath(string path) => this._trackedPaths?.Add(path); public override IDisposable? PrepareForHandleLost() diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 7481ccff..9488c8a2 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -73,6 +73,23 @@ public void TestProviderApisAreAvailable(AssemblyName assemblyName) } } + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicHandleTypesDoNotHaveVisibleConstructors(AssemblyName assemblyName) + { + var publicHandleTypes = GetPublicTypes(Assembly.Load(assemblyName)) + .Where(t => typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t)) + .ToArray(); + Assert.IsNotEmpty(publicHandleTypes); // sanity check + + foreach (var publicHandleType in publicHandleTypes) + { + Assert.IsEmpty( + publicHandleType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) + .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly) + ); + } + } + [TestCaseSource(nameof(DistributedLockAssemblies))] public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) { diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index bef626d3..49fb227a 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -212,5 +212,9 @@ namespace Medallion.Threading.Tests.WaitHandles namespace Medallion.Threading.Tests.ZooKeeper { + public class Core_ReaderWriterAsMutex_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategy_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingZooKeeperSynchronizationStrategy> { } public class Core_ZooKeeper_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases { } + public class ReaderWriterCore_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategyTest : DistributedReaderWriterLockCoreTestCases { } + public class ZooKeeperSynchronizationCore_ReaderWriterAsMutex_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategyTest : ZooKeeperSynchronizationCoreTestCases> { } + public class ZooKeeperSynchronizationCore_ZooKeeperTest : ZooKeeperSynchronizationCoreTestCases { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs index 68c03d04..6e7dc522 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs @@ -16,7 +16,7 @@ namespace Medallion.Threading.Tests.ZooKeeper // todo many of these can be in an abstract test instead public class ZooKeeperDistributedLockTest { - [Test] + [Test, Category("CI")] public void TestValidatesConstructorArguments() { Assert.Throws(() => new ZooKeeperDistributedLock(null!, ZooKeeperPorts.DefaultConnectionString)); @@ -29,203 +29,18 @@ public void TestValidatesConstructorArguments() Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "name", default(string)!)); } - [Test] + [Test, Category("CI")] public void TestNameReturnsPathString() { var @lock = new ZooKeeperDistributedLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); @lock.As().Name.ShouldEqual(@lock.Path.ToString()); } - [Test] + [Test, Category("CI")] public void TestProperlyCombinesDirectoryAndName() { new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); Assert.That(new ZooKeeperDistributedLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); } - - [Test] - public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() - { - var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - - // pre-clean up just in case - try { await connection.ZooKeeper.deleteAsync(path.ToString()); } - catch (KeeperException.NoNodeException) { } - - var @lock = new ZooKeeperDistributedLock(path, ZooKeeperPorts.DefaultConnectionString); - - Assert.That( - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, - Does.Contain("does not exist") - ); - - await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperHelper.PublicAcl }, CreateMode.PERSISTENT); - try - { - await using (var handle = await @lock.TryAcquireAsync()) - { - Assert.IsNotNull(handle); - } - - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); - } - finally - { - await connection.ZooKeeper.deleteAsync(path.ToString()); - } - } - - [TestCase("/")] - [TestCase(".")] - [TestCase("..")] - [TestCase("zookeeper")] - [TestCase("abc\0")] - public void TestGetSafeName(string name) => - Assert.DoesNotThrowAsync(async () => await (await new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).AcquireAsync()).DisposeAsync()); - - [Test] - public void TestGetSafeNameWithControlCharacters() => this.TestGetSafeName("\u001f\u009F\uf8ff\ufff1"); - - [Test] - public async Task TestCustomAclAndAuth() - { - const string Username = "username"; - const string Password = "secretPassword"; - - var lockName = TestHelper.UniqueName; - var @lock = new ZooKeeperDistributedLock( - lockName, - ZooKeeperPorts.DefaultConnectionString, - options: o => o.AddAccessControl("digest", GenerateDigestAclId(Username, Password), 0x1f) - .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")) - ); - - var unauthenticatedLock = new ZooKeeperDistributedLock(lockName, ZooKeeperPorts.DefaultConnectionString); - - await using (await @lock.AcquireAsync()) - { - Assert.ThrowsAsync(() => unauthenticatedLock.TryAcquireAsync().AsTask()); - } - - Assert.DoesNotThrowAsync(async () => await (await unauthenticatedLock.AcquireAsync()).DisposeAsync()); - - // Based on - // https://github.com/apache/zookeeper/blob/d8561f620fa8611e9a6819d9879b0f18e5a404a9/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java - static string GenerateDigestAclId(string username, string password) - { - using var sha = SHA1.Create(); - var digest = sha.ComputeHash(Encoding.UTF8.GetBytes($"{username}:{password}")); - return $"{username}:{Convert.ToBase64String(digest)}"; - } - } - - [Test] - public async Task TestInvalidAclDoesNotCorruptStore() - { - const string Username = "username"; - const string Password = "xyz"; - - var lockName = TestHelper.UniqueName; - var invalidAclLock = new ZooKeeperDistributedLock( - lockName, - ZooKeeperPorts.DefaultConnectionString, - // ACL is the right format but the wrong password (this can easily happen if you get the encoding wrong) - options: o => o.AddAccessControl("digest", $"{Username}:1eYGPn6j9+P9osACW8ob4HhZT+s=", 0x1f) - .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")) - ); - - // pre-cleanup to make sure we will actually create the path - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - try { await connection.ZooKeeper.deleteAsync(invalidAclLock.Path.ToString()); } - catch (KeeperException.NoNodeException) { } - - Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); - - Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Path.ToString())); - - var validLock = new ZooKeeperDistributedLock(lockName, ZooKeeperPorts.DefaultConnectionString); - Assert.DoesNotThrowAsync(async () => await (await validLock.AcquireAsync()).DisposeAsync()); - } - - [Test] - public async Task TestDeepDirectoryCreation() - { - var directory = new ZooKeeperPath($"/{TestHelper.UniqueName}/foo/bar/baz"); - - // pre-cleanup to make sure we will actually create the directory - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - for (var toDelete = directory; toDelete != ZooKeeperPath.Root; toDelete = toDelete.GetDirectory()!.Value) - { - try { await connection.ZooKeeper.deleteAsync(toDelete.ToString()); } - catch (KeeperException.NoNodeException) { } - } - - var @lock = new ZooKeeperDistributedLock(directory, "qux", ZooKeeperPorts.DefaultConnectionString); - - await using (await @lock.AcquireAsync()) - { - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); - } - - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); - } - - [Test] - public async Task TestThrowsIfPathDeletedWhileWaiting() - { - var @lock = new ZooKeeperDistributedLock(TestHelper.UniqueName, ZooKeeperPorts.DefaultConnectionString); - - // hold the lock - await using var handle = await @lock.AcquireAsync(); - - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - var initialChildren = await connection.ZooKeeper.getChildrenAsync(@lock.Path.ToString()); - - // start waiting - var blockedAcquireTask = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); - // once the wait has started... - var newChild = await WaitForNewChildAsync(); - // ... start another waiter... - var blockedAcquireTask2 = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); - // ... and delete the first waiter's node - await connection.ZooKeeper.deleteAsync(newChild); - - // release the lock - await handle.DisposeAsync(); - - // the first waiter should throw - Assert.ThrowsAsync(() => blockedAcquireTask); - - // the second waiter should complete - Assert.DoesNotThrowAsync(async () => await (await blockedAcquireTask2).DisposeAsync()); - - async Task WaitForNewChildAsync() - { - var start = DateTime.UtcNow; - while (true) - { - var children = await connection.ZooKeeper.getChildrenAsync(@lock.Path.ToString()); - var newChild = children.Children.Except(initialChildren.Children).SingleOrDefault(); - if (newChild != null) { return $"{@lock.Path}/{newChild}"; } - - if (DateTime.UtcNow - start >= TimeSpan.FromSeconds(10)) { Assert.Fail("Timed out"); } - - await Task.Delay(5); - } - } - } } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs new file mode 100644 index 00000000..85a2ce1b --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs @@ -0,0 +1,39 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + public class ZooKeeperDistributedReaderWriterLockTest + { + [Test, Category("CI")] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock("name", null!)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/name"), null!)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "name", default(string)!)); + } + + [Test, Category("CI")] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedReaderWriterLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } + + [Test, Category("CI")] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); + } + } +} diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index 954ac26c..7e1f0632 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -54,16 +54,16 @@ public void TestRejectsPathsWithControlCharacters() [TestCase("/", "zookeeper", ExpectedResult = "/zookeeper_yX0zkYBzsEZ1VDADNUx54LUSt9VL9M9lOPoez38tnk4FrBtllVz+ksFllir7N2yla_wy22pIOnbpcfRkcVXBag==")] [TestCase("/", "zooKeeper", ExpectedResult = "/zooKeeper")] [TestCase("/a", "zookeeper", ExpectedResult = "/a/zookeeper")] - public string TestCreateChildNodeWithSafeName(string path, string name) + public string TestGetChildNodePathWithSafeName(string path, string name) { - var result = new ZooKeeperPath(path).CreateChildNodeWithSafeName(name); + var result = new ZooKeeperPath(path).GetChildNodePathWithSafeName(name); Assert.DoesNotThrow(() => new ZooKeeperPath(result.ToString()), "should pass path validation"); return result.ToString(); } [Test] - public void TestCreateChildNodeWithSafeNameHandlesControlCharacters() => - this.TestCreateChildNodeWithSafeName("/", "\u0000\u007f\uf8ff\uffff").ShouldEqual("/____7A++E8vPxbYKJmhCX1bUTCwjqJqW1POHfCeBk62R9hqB0Fd_uTUBIpv9mssG7K68FHZ_7wJ70UNRKsVH8CrngA=="); + public void TestGetChildNodePathWithSafeNameHandlesControlCharacters() => + this.TestGetChildNodePathWithSafeName("/", "\u0000\u007f\uf8ff\uffff").ShouldEqual("/____7A++E8vPxbYKJmhCX1bUTCwjqJqW1POHfCeBk62R9hqB0Fd_uTUBIpv9mssG7K68FHZ_7wJ70UNRKsVH8CrngA=="); [Test] public void TestEquality() diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs index fd2d4f88..fd3ae2d8 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs @@ -14,9 +14,9 @@ public partial class ZooKeeperDistributedLock IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this.As>().Acquire(timeout, cancellationToken); ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.As>().TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.As>().AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); ZooKeeperDistributedLockHandle? IInternalDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs index 58ddb33d..a90f6803 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs @@ -1,5 +1,4 @@ using Medallion.Threading.Internal; -using org.apache.zookeeper.data; using System; using System.Collections.Generic; using System.Linq; @@ -15,18 +14,17 @@ namespace Medallion.Threading.ZooKeeper /// public sealed partial class ZooKeeperDistributedLock : IInternalDistributedLock { - private const string NodePrefix = "lock-"; + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; - private readonly bool _assumeNodePathExists; - private readonly ZooKeeperConnectionInfo _connectionInfo; - private readonly IReadOnlyList _acl; - - // todo revisit this API; should we make assumption of existance optional? - public ZooKeeperDistributedLock(ZooKeeperPath existingNodePath, string connectionString, Action? options = null) - : this(existingNodePath, assumeNodePathExists: true, connectionString, options) + public ZooKeeperDistributedLock( + ZooKeeperPath path, + string connectionString, + bool assumeNodeExists = false, + Action? options = null) + : this(path, assumeNodeExists: assumeNodeExists, connectionString, options) { - if (existingNodePath == default) { throw new ArgumentNullException(nameof(existingNodePath)); } - if (existingNodePath == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(existingNodePath)); } + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } } public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) @@ -34,33 +32,22 @@ public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) + public ZooKeeperDistributedLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) : this( - (directoryNodePath == default ? throw new ArgumentNullException(nameof(directoryNodePath)) : directoryNodePath).CreateChildNodeWithSafeName(name), - assumeNodePathExists: false, + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + assumeNodeExists: false, connectionString, options) { } - private ZooKeeperDistributedLock(ZooKeeperPath nodePath, bool assumeNodePathExists, string connectionString, Action? optionsBuilder) - { - this.Path = nodePath; - this._assumeNodePathExists = assumeNodePathExists; - var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); - this._connectionInfo = new ZooKeeperConnectionInfo( - connectionString ?? throw new ArgumentNullException(nameof(connectionString)), - ConnectTimeout: options.ConnectTimeout, - SessionTimeout: options.SessionTimeout, - AuthInfo: options.AuthInfo - ); - this._acl = options.Acl; - } + private ZooKeeperDistributedLock(ZooKeeperPath nodePath, bool assumeNodeExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder); /// /// The zookeeper node path /// - public ZooKeeperPath Path { get; } + public ZooKeeperPath Path => this._synchronizationHelper.Path; /// /// Implements . Implemented explicitly to avoid confusion with the fact @@ -68,95 +55,27 @@ private ZooKeeperDistributedLock(ZooKeeperPath nodePath, bool assumeNodePathExis /// string IDistributedLock.Name => this.Path.ToString(); - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - var task = this.InternalTryAcquireHelperAsync(timeout, cancellationToken); - return SyncViaAsync.IsSynchronous ? task.GetAwaiter().GetResult().AsValueTask() : task.AsValueTask(); - } - - private async Task InternalTryAcquireHelperAsync(TimeoutValue timeout, CancellationToken cancellationToken) + async ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { - var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); - ZooKeeperDistributedLockHandle? result = null; - try - { - result = await this.InternalTryAcquireAsync(connection, timeout, cancellationToken).ConfigureAwait(false); - return result; - } - finally - { - if (result == null) { connection.Dispose(); } - } - } - - private async Task InternalTryAcquireAsync(ZooKeeperConnection connection, TimeoutValue timeout, CancellationToken cancellationToken) - { - // (1) Call create( ) with a pathname of "_locknode_/lock-" and the sequence and ephemeral flags set. - var ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, NodePrefix, this._acl, ensureDirectoryExists: !this._assumeNodePathExists).ConfigureAwait(false); - CancellationTokenSource? timeoutSource = null; - var acquired = false; - var ephemeralNodeLost = false; - try - { - while (true) - { - // (2) Call getChildren( ) on the lock node without setting the watch flag (this is important to avoid the herd effect). - var children = await connection.ZooKeeper.getChildrenAsync(this.Path.ToString()).ConfigureAwait(false); - - // (3) If the pathname created in step 1 has the lowest sequence number suffix, the client has the lock and the client exits the protocol. - var childrenAndSequenceNumbers = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( - parentNode: this.Path.ToString(), - childrenNames: children.Children, - getNodeCreationTimeAsync: connection.GetNodeCreationTimeAsync, - prefix: NodePrefix - ).ConfigureAwait(false); - var ephemeralNodeIndex = Array.FindIndex(childrenAndSequenceNumbers, t => t.Path == ephemeralNodePath); - if (ephemeralNodeIndex == 0) + var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( + hasAcquired: state => state.SortedChildren[0].Path == state.EphemeralNodePath, + waitAsync: async (zooKeeper, state, watcher) => { - acquired = true; - return new ZooKeeperDistributedLockHandle(new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumeNodePathExists)); - } - // Sanity check; this could happen if someone else deletes it out from under us. We must check - // this first because it covers the empty collection case - if (ephemeralNodeIndex < 0) - { - ephemeralNodeLost = true; - throw new InvalidOperationException($"Node '{ephemeralNodePath}' was created, but no longer exists"); - } - if (timeout.IsZero) { return null; } // don't proceed further if we're not willing to wait + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; + // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; + }, + timeout, + cancellationToken, + nodePrefix: "lock-" + ) + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + .AwaitSyncOverAsync() + .ConfigureAwait(false); - // (4) The client calls exists( ) with the watch flag set on the path in the lock directory with the next lowest sequence number. - // (5) If exists( ) returns false, go to step 2. Otherwise, wait for a notification for the pathname from the previous step before going to step 2. - var nextLowestChildNode = childrenAndSequenceNumbers[ephemeralNodeIndex - 1].Path; - if (!timeout.IsInfinite) { timeoutSource ??= new CancellationTokenSource(timeout.TimeSpan); } - if ((await connection.WaitForNotExistsOrChanged(nextLowestChildNode, cancellationToken, timeoutSource?.Token ?? CancellationToken.None).ConfigureAwait(false)) == false) - { - return null; // timed out - } - } - } - finally - { - timeoutSource?.Dispose(); - - // if we failed to acquire, clean up - if (!acquired) - { - if (!ephemeralNodeLost) - { - await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); - } - if (!this._assumeNodePathExists) - { - // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because - // someone else is holding the lock. However, we could have encountered a race condition where the other holder - // released right after we failed to acquire and our ephemeral node prevented them from deleting. Therefore, we - // fire and forget this deletion to cover that case without slowing us down - _ = connection.ZooKeeper.deleteAsync(this.Path.ToString()); - } - } - } + return nodeHandle != null ? new ZooKeeperDistributedLockHandle(nodeHandle) : null; } } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs new file mode 100644 index 00000000..539bfc74 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -0,0 +1,106 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.ZooKeeper +{ + public partial class ZooKeeperDistributedReaderWriterLock + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + + ZooKeeperDistributedReaderWriterLockHandle? IInternalDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: false); + + ZooKeeperDistributedReaderWriterLockHandle IInternalDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: false); + + /// + /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: false); + + /// + /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: false); + + ZooKeeperDistributedReaderWriterLockHandle? IInternalDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: true); + + ZooKeeperDistributedReaderWriterLockHandle IInternalDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: true); + + /// + /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireWriteLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: true); + + /// + /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (await myLock.AcquireWriteLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); + + } +} \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs new file mode 100644 index 00000000..5893a8fb --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -0,0 +1,98 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + using org.apache.zookeeper; + + /// + /// A distributed reader-writer lock based on the ZooKeeper shared lock recipe (https://zookeeper.apache.org/doc/current/recipes.html). + /// + public sealed partial class ZooKeeperDistributedReaderWriterLock : IInternalDistributedReaderWriterLock + { + private const string ReadNodePrefix = "read-", + WriteNodePrefix = "write-"; + + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + + public ZooKeeperDistributedReaderWriterLock( + ZooKeeperPath path, + string connectionString, + bool assumeNodeExists = false, + Action? options = null) + : this(path, assumeNodeExists: assumeNodeExists, connectionString, options) + { + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } + } + + public ZooKeeperDistributedReaderWriterLock(string name, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, connectionString, options) + { + } + + public ZooKeeperDistributedReaderWriterLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) + : this( + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + assumeNodeExists: false, + connectionString, + options) + { + } + + private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assumeNodeExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder); + + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path => this._synchronizationHelper.Path; + + /// + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. + /// + string IDistributedReaderWriterLock.Name => this.Path.ToString(); + + async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken, bool isWrite) + { + var nodeHandleTask = isWrite + ? this._synchronizationHelper.TryAcquireAsync(HasAcquiredWriteLock, WaitForWriteLockAcquiredOrChange, timeout, cancellationToken, WriteNodePrefix, alternateNodePrefix: ReadNodePrefix) + : this._synchronizationHelper.TryAcquireAsync(HasAcquiredReadLock, WaitForReadLockAcquiredOrChange, timeout, cancellationToken, ReadNodePrefix, alternateNodePrefix: WriteNodePrefix); + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + var nodeHandle = await nodeHandleTask.AwaitSyncOverAsync().ConfigureAwait(false); + + return nodeHandle != null ? new ZooKeeperDistributedReaderWriterLockHandle(nodeHandle) : null; + } + + private static bool HasAcquiredReadLock(ZooKeeperSynchronizationHelper.State state) => + // We have the read lock if there are no writers ahead of us + state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath).All(t => t.Prefix != WriteNodePrefix); + + private static async Task WaitForReadLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) + { + var nextLowestWriteNode = state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath) + .Last(t => t.Prefix == WriteNodePrefix); + // If the next lowest write node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestWriteNode.Path, watcher).ConfigureAwait(false) == null; + } + + private static bool HasAcquiredWriteLock(ZooKeeperSynchronizationHelper.State state) => + state.SortedChildren[0].Path == state.EphemeralNodePath; + + private async Task WaitForWriteLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) + { + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; + // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs new file mode 100644 index 00000000..5512be6d --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs @@ -0,0 +1,36 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + public sealed class ZooKeeperDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle + { + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; + + internal ZooKeeperDistributedReaderWriterLockHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } + + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs index fd800615..adaa4e2d 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs @@ -17,24 +17,18 @@ internal static class ZooKeeperHelper /// public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); + // todo revisit whether it is worth having this method /// /// Returns true when does not exist. /// Returns null when we receive a watch event indicating that has changed. /// Returns false if the fires. /// - public static async Task WaitForNotExistsOrChanged( + public static async Task WaitForNotExistsOrChangedAsync( this ZooKeeperConnection connection, string path, - CancellationToken cancellationToken, CancellationToken timeoutToken) { - cancellationToken.ThrowIfCancellationRequested(); - using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); - using var cancellationTokenRegistration = cancellationToken.Register( - state => ((TaskWatcher)state).TaskCompletionSource.TrySetCanceled(), - state: watcher - ); using var timeoutRegistration = timeoutToken.Register( state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), state: watcher @@ -149,6 +143,27 @@ async Task TryCleanUpCreatedDirectoriesAsync(IReadOnlyList create } } + private sealed class WaitCompletionSourceWatcher : Watcher + { + private readonly TaskCompletionSource _waitCompletionSource; + + public WaitCompletionSourceWatcher(TaskCompletionSource waitCompletionSource) + { + this._waitCompletionSource = waitCompletionSource; + } + + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) + { + this._waitCompletionSource.TrySetResult(true); + } + + return Task.CompletedTask; + } + } + private sealed class TaskWatcher : Watcher, IDisposable { private volatile Action>? _watchedEventHandler; diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs index ec5ac1b9..0436b3dd 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs @@ -39,9 +39,8 @@ public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool { while (true) { - var result = await this._connection.WaitForNotExistsOrChanged( + var result = await this._connection.WaitForNotExistsOrChangedAsync( this._nodePath.ToString(), - cancellationToken: CancellationToken.None, // ConnectionLostToken already accounted for by method timeoutToken: disposalSource.Token ).ConfigureAwait(false); switch (result) @@ -69,14 +68,9 @@ public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool public void Dispose() => this.DisposeSyncViaAsync(); - public ValueTask DisposeAsync() - { - var disposalTask = this.InternalDisposeAsync(); - if (!SyncViaAsync.IsSynchronous) { return disposalTask.AsValueTask(); } + public ValueTask DisposeAsync() => // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - disposalTask.GetAwaiter().GetResult(); - return default; - } + this.InternalDisposeAsync().AwaitSyncOverAsync(); private async Task InternalDisposeAsync() { diff --git a/DistributedLock.ZooKeeper/ZooKeeperPath.cs b/DistributedLock.ZooKeeper/ZooKeeperPath.cs index 12e25d0c..e758048b 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperPath.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperPath.cs @@ -71,7 +71,7 @@ private ZooKeeperPath(string path, bool checkPath, string? paramName = null) /// public static bool operator !=(ZooKeeperPath @this, ZooKeeperPath that) => !(@this == that); - internal ZooKeeperPath CreateChildNodeWithSafeName(string name) + internal ZooKeeperPath GetChildNodePathWithSafeName(string name) { if (name == null) { throw new ArgumentNullException(nameof(name)); } diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs new file mode 100644 index 00000000..9f8a7e43 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs @@ -0,0 +1,180 @@ +using Medallion.Threading.Internal; +using org.apache.zookeeper.data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + using org.apache.zookeeper; + + /// + /// Provides a common structure for ZooKeeper synchronization algorithms. The structure is: + /// * Create a sequential ephemeral node + /// * Loop + /// * Compare our node's sequence number to its siblings to see if we've acquired + /// * If we haven't acquired, wait for a watcher to tell us that something has changed + /// + internal class ZooKeeperSynchronizationHelper + { + private readonly ZooKeeperConnectionInfo _connectionInfo; + private readonly IReadOnlyList _acl; + private readonly bool _assumeNodeExists; + + public ZooKeeperSynchronizationHelper( + ZooKeeperPath nodePath, + bool assumeNodeExists, + string connectionString, + Action? optionsBuilder) + { + this.Path = nodePath; + this._assumeNodeExists = assumeNodeExists; + var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); + this._connectionInfo = new ZooKeeperConnectionInfo( + connectionString ?? throw new ArgumentNullException(nameof(connectionString)), + ConnectTimeout: options.ConnectTimeout, + SessionTimeout: options.SessionTimeout, + AuthInfo: options.AuthInfo + ); + this._acl = options.Acl; + } + + public ZooKeeperPath Path { get; } + + public async Task TryAcquireAsync( + Func hasAcquired, + Func> waitAsync, + TimeoutValue timeout, + CancellationToken cancellationToken, + string nodePrefix, + string? alternateNodePrefix = null) + { + var acquired = false; + var ephemeralNodeLost = false; + ZooKeeperConnection? connection = null; + string? ephemeralNodePath = null; + var timeoutSource = new CancellationTokenSource(timeout.TimeSpan); + + try + { + connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); + + // create a path that represents both our hold on the synch object and our place in line waiting for it + ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, nodePrefix, this._acl, ensureDirectoryExists: !this._assumeNodeExists).ConfigureAwait(false); + + while (true) + { + // get the children of the node, filter them by prefix, and sort them by age; we'll use this to determine our place in the list + var children = await connection.ZooKeeper.getChildrenAsync(this.Path.ToString()).ConfigureAwait(false); + var sortedChildren = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( + parentNode: this.Path.ToString(), + childrenNames: children.Children, + getNodeCreationTimeAsync: connection.GetNodeCreationTimeAsync, + prefix: nodePrefix, + alternatePrefix: alternateNodePrefix + ).ConfigureAwait(false); + + // Sanity check; this could happen if someone else deletes it out from under us. We must check + // this first because it covers the empty collection case + if (!sortedChildren.Any(t => t.Path == ephemeralNodePath)) + { + ephemeralNodeLost = true; + throw new InvalidOperationException($"Node '{ephemeralNodePath}' was created, but no longer exists"); + } + + // see if we've acquired + var state = new State(ephemeralNodePath, sortedChildren); + if (hasAcquired(state)) + { + acquired = true; + return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumeNodeExists); + } + + // wait for something to change + var waitCompletionSource = new TaskCompletionSource(); + using var timeoutRegistration = timeoutSource.Token.Register(state => ((TaskCompletionSource)state).TrySetResult(false), waitCompletionSource); + using var cancellationRegistration = cancellationToken.Register(state => ((TaskCompletionSource)state).TrySetCanceled(), waitCompletionSource); + // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification + using var connectionLostRegistration = connection.ConnectionLostToken.Register( + state => ((TaskCompletionSource)state).TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), + state: waitCompletionSource + ); + if (!waitCompletionSource.Task.IsCompleted + && await waitAsync(connection.ZooKeeper, state, new WaitCompletionSourceWatcher(waitCompletionSource)).ConfigureAwait(false)) + { + waitCompletionSource.TrySetResult(true); + } + + if (!await waitCompletionSource.Task.ConfigureAwait(false)) + { + return null; // wait timed out + } + } + } + finally + { + timeoutSource.Dispose(); + + // if we failed to acquire, clean up the connection/node path + if (!acquired) + { + await this.CleanUpOnFailureAsync(connection, ephemeralNodePath, ephemeralNodeLost).ConfigureAwait(false); + } + } + } + + private async Task CleanUpOnFailureAsync(ZooKeeperConnection? connection, string? ephemeralNodePath, bool ephemeralNodeLost) + { + if (connection == null) { return; } + + try + { + if (ephemeralNodePath != null) + { + if (!ephemeralNodeLost) + { + await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); + } + if (!this._assumeNodeExists) + { + // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because + // someone else is holding the lock. However, we could have encountered a race condition where the other holder + // released right after we failed to acquire and our ephemeral node prevented them from deleting. Therefore, we + // fire and forget this deletion to cover that case without slowing us down + _ = connection.ZooKeeper.deleteAsync(this.Path.ToString()); + } + } + } + finally + { + connection.Dispose(); + } + } + + private sealed class WaitCompletionSourceWatcher : Watcher + { + private readonly TaskCompletionSource _waitCompletionSource; + + public WaitCompletionSourceWatcher(TaskCompletionSource waitCompletionSource) + { + this._waitCompletionSource = waitCompletionSource; + } + + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) + { + this._waitCompletionSource.TrySetResult(true); + } + + return Task.CompletedTask; + } + } + + public record State(string EphemeralNodePath, (string Path, int SequenceNumber, string Prefix)[] SortedChildren); + } +} diff --git a/DistributedLockCodeGen/CodeGenHelpers.cs b/DistributedLockCodeGen/CodeGenHelpers.cs index 9d7811bb..4176eb61 100644 --- a/DistributedLockCodeGen/CodeGenHelpers.cs +++ b/DistributedLockCodeGen/CodeGenHelpers.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -29,5 +30,9 @@ public static bool HasPublicType(string code, out (string typeName, bool isInter info = default; return false; } + + public static bool SupportsSyncApis(string path) => + // zookeeper is inherently asynchronous (watch-based), so any synchronous APIs it has are just sync-over-async + !path.Contains("ZooKeeper", StringComparison.OrdinalIgnoreCase); } } diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 597003c7..1b868375 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -36,8 +36,7 @@ public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore") var lockType = Path.GetFileNameWithoutExtension(file); var handleType = lockType + "Handle"; - // zookeeper is inherently asynchronous (watch-based), so any synchronous APIs it has are just sync-over-async - var includeSynchronousApis = !file.Contains("ZooKeeper", StringComparison.OrdinalIgnoreCase); + var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); var explicitImplementations = new StringBuilder(); var @interface = $"IDistributed{name}"; @@ -48,7 +47,7 @@ public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore") @interface, method, "IDistributedSynchronizationHandle", - @as: includeSynchronousApis ? null : $"IInternalDistributed{name}<{handleType}>" + @as: supportsSyncApis || method.EndsWith("Async") ? null : $"IInternalDistributed{name}<{handleType}>" ); } @@ -66,10 +65,10 @@ public partial class {lockType} // AUTO-GENERATED {explicitImplementations} - {IfSyncApis("public ")}{handleType}? {(includeSynchronousApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}TryAcquire(TimeSpan timeout{IfSyncApis(" = default")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => + {IfSyncApis("public ")}{handleType}? {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}TryAcquire(TimeSpan timeout{IfSyncApis(" = default")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - {IfSyncApis("public ")}{handleType} {(includeSynchronousApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}Acquire(TimeSpan? timeout{IfSyncApis(" = null")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => + {IfSyncApis("public ")}{handleType} {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}Acquire(TimeSpan? timeout{IfSyncApis(" = null")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => DistributedLockHelpers.Acquire(this, timeout, cancellationToken); public ValueTask<{handleType}?> TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => @@ -88,7 +87,7 @@ public partial class {lockType} errors.Add($"updated {file}"); } - string IfSyncApis(string value) => includeSynchronousApis ? value : string.Empty; + string IfSyncApis(string value) => supportsSyncApis ? value : string.Empty; } Assert.IsEmpty(errors); @@ -127,6 +126,7 @@ public void GenerateForIDistributedReaderWriterLock() } var lockType = Path.GetFileNameWithoutExtension(file); + var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); var explicitImplementations = new StringBuilder(); var publicMethods = new StringBuilder(); @@ -142,16 +142,18 @@ public void GenerateForIDistributedReaderWriterLock() explicitImplementations, $"IDistributed{upgradeableText}ReaderWriterLock", methodName, - $"IDistributed{(methodLockType == LockType.Upgrade ? "LockUpgradeable" : "Synchronization")}Handle" + $"IDistributed{(methodLockType == LockType.Upgrade ? "LockUpgradeable" : "Synchronization")}Handle", + @as: supportsSyncApis || isAsync ? null : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>" ); var simplifiedMethodName = methodLockType == LockType.Upgrade ? methodName : methodName.Replace("ReadLock", "").Replace("WriteLock", ""); publicMethods.AppendLine() - .Append(' ', 8).Append("public ") + .Append(' ', 8).Append(IfPublic("public ")) .Append(isAsync ? "ValueTask<" : "").Append(handleType).Append(isTry ? "?" : "").Append(isAsync ? ">" : "").Append(' ') + .Append(supportsSyncApis || isAsync ? "" : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>.") .Append(methodName) - .Append("(").Append("TimeSpan").Append(isTry ? "" : "?").AppendLine($" timeout = {(isTry ? "default" : "null")}, CancellationToken cancellationToken = default) =>") + .Append("(").Append("TimeSpan").Append(isTry ? "" : "?").AppendLine($" timeout{IfPublic($" = {(isTry ? "default" : "null")}")}, CancellationToken cancellationToken{IfPublic(" = default")}) =>") .Append(' ', 12) .Append( isTry && isAsync @@ -161,6 +163,8 @@ public void GenerateForIDistributedReaderWriterLock() ) .Append(methodLockType == LockType.Read ? ", isWrite: false" : methodLockType == LockType.Write ? ", isWrite: true" : "") .AppendLine(");"); + + string? IfPublic(string content) => supportsSyncApis || isAsync ? content : null; } var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index f8bfa3b9..f0628aa1 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -110,6 +110,9 @@ public static int Main(string[] args) case nameof(ZooKeeperDistributedLock): handle = new ZooKeeperDistributedLock(name.TrimStart('/'), ZooKeeperPorts.DefaultConnectionString, ZooKeeperOptions).AcquireAsync().Result; break; + case "Write" + nameof(ZooKeeperDistributedReaderWriterLock): + handle = new ZooKeeperDistributedReaderWriterLock(name.TrimStart('/'), ZooKeeperPorts.DefaultConnectionString, ZooKeeperOptions).AcquireWriteLockAsync().Result; + break; default: Console.Error.WriteLine($"type: {type}"); return 123; From 83a6d64343dc8425fef95d82110fca74fc37e447 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 24 Mar 2021 07:11:22 -0400 Subject: [PATCH 110/399] Add ZooKeeperDistributedSemaphore --- .../ZooKeeperSynchronizationCoreTestCases.cs | 15 +++ .../TestingSemaphoreAsMutexProvider.cs | 2 +- .../ZooKeeper/TestingZooKeeperProviders.cs | 14 ++- ...TestingZooKeeperSynchronizationStrategy.cs | 12 +- .../Tests/CombinatorialTests.cs | 5 + .../ZooKeeper/ZooKeeperDistributedLockTest.cs | 1 - .../ZooKeeperDistributedSemaphoreTest.cs | 43 ++++++++ .../ZooKeeperDistributedReaderWriterLock.cs | 2 +- ...tributedSemaphore.IDistributedSemaphore.cs | 59 ++++++++++ .../ZooKeeperDistributedSemaphore.cs | 103 ++++++++++++++++++ .../ZooKeeperDistributedSemaphoreHandle.cs | 36 ++++++ DistributedLock.ZooKeeper/ZooKeeperHelper.cs | 2 +- .../ZooKeeperSynchronizationHelper.cs | 12 +- DistributedLockTaker/Program.cs | 17 ++- 14 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 11c2d7b8..1d27b013 100644 --- a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -27,6 +27,10 @@ public abstract class ZooKeeperSynchronizationCoreTestCases [Test] public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() { + // This doesn't work because creating the lock attempts to acquire which will then fail initially. We could work around this by testing + // for a different set of conditions in the multi-ticket case, but the extra coverage doesn't seem valuable (we still have coverage of single-ticket) + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } + var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), @@ -75,6 +79,10 @@ public void TestGetSafeName(string name) => [Test] public async Task TestCustomAclAndAuth() { + // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) + // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } + const string Username = "username"; const string Password = "secretPassword"; @@ -104,6 +112,10 @@ static string GenerateDigestAclId(string username, string password) [Test] public async Task TestInvalidAclDoesNotCorruptStore() { + // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) + // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } + const string Username = "username"; const string Password = "xyz"; @@ -202,5 +214,8 @@ async Task WaitForNewChildAsync() } } } + + private static bool IsMultiTicketSemaphoreProvider => + typeof(TLockProvider) == typeof(TestingSemaphore5AsMutexProvider); } } diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index b4511eab..d55f434b 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -68,7 +68,7 @@ public SemaphoreAsMutex(IDistributedSemaphore semaphore) this._semaphore = semaphore; } - string IDistributedLock.Name => throw new NotImplementedException(); + string IDistributedLock.Name => this._semaphore.Name; IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => this._semaphore.Acquire(timeout, cancellationToken); diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs index 2ecab147..51dd1247 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs @@ -26,6 +26,18 @@ public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName return @lock; } - public override string GetSafeName(string name) => new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); + public override string GetSafeName(string name) => new ZooKeeperDistributedReaderWriterLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); + } + + public sealed class TestingZooKeeperDistributedSemaphoreProvider : TestingSemaphoreProvider + { + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) + { + var semaphore = new ZooKeeperDistributedSemaphore(new ZooKeeperPath(name), maxCount, ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); + return semaphore; + } + + public override string GetSafeName(string name) => new ZooKeeperDistributedSemaphore(name, maxCount: 1, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); } } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs index 4cf56770..6c6eb7de 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs @@ -1,6 +1,7 @@ using Medallion.Threading.ZooKeeper; using System; using System.Collections.Generic; +using System.Linq; using System.Text; using System.Threading; @@ -44,14 +45,15 @@ public void Dispose() ) .Result; - // delete all children of the nodes + // delete the newest child of the node (other children may be extra semaphore ticket holders) foreach (var trackedPath in trackedPaths) { var childrenResult = connection.ZooKeeper.getChildrenAsync(trackedPath).Result; - foreach (var child in childrenResult.Children) - { - connection.ZooKeeper.deleteAsync(trackedPath + ZooKeeperPath.Separator + child).Wait(); - } + var toDelete = childrenResult.Children.Select(ch => $"{trackedPath.TrimEnd(ZooKeeperPath.Separator)}{ZooKeeperPath.Separator}{ch}") + .Select(p => (Path: p, CreationTime: connection.ZooKeeper.existsAsync(p).Result?.getCtime() ?? -1)) + .OrderByDescending(t => t.CreationTime) + .First(); + connection.ZooKeeper.deleteAsync(toDelete.Path).Wait(); } } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 49fb227a..016ec4f9 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -213,8 +213,13 @@ namespace Medallion.Threading.Tests.WaitHandles namespace Medallion.Threading.Tests.ZooKeeper { public class Core_ReaderWriterAsMutex_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategy_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingZooKeeperSynchronizationStrategy> { } + public class Core_Semaphore1AsMutex_ZooKeeperSemaphore_ZooKeeperSynchronizationStrategy_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingZooKeeperSynchronizationStrategy> { } + public class Core_Semaphore5AsMutex_ZooKeeperSemaphore_ZooKeeperSynchronizationStrategy_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingZooKeeperSynchronizationStrategy> { } public class Core_ZooKeeper_ZooKeeperSynchronizationStrategyTest : DistributedLockCoreTestCases { } public class ReaderWriterCore_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategyTest : DistributedReaderWriterLockCoreTestCases { } + public class SemaphoreCore_ZooKeeperSemaphore_ZooKeeperSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } public class ZooKeeperSynchronizationCore_ReaderWriterAsMutex_ZooKeeperReaderWriter_ZooKeeperSynchronizationStrategyTest : ZooKeeperSynchronizationCoreTestCases> { } + public class ZooKeeperSynchronizationCore_Semaphore1AsMutex_ZooKeeperSemaphore_ZooKeeperSynchronizationStrategyTest : ZooKeeperSynchronizationCoreTestCases> { } + public class ZooKeeperSynchronizationCore_Semaphore5AsMutex_ZooKeeperSemaphore_ZooKeeperSynchronizationStrategyTest : ZooKeeperSynchronizationCoreTestCases> { } public class ZooKeeperSynchronizationCore_ZooKeeperTest : ZooKeeperSynchronizationCoreTestCases { } } \ No newline at end of file diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs index 6e7dc522..d5d14198 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs @@ -13,7 +13,6 @@ namespace Medallion.Threading.Tests.ZooKeeper { - // todo many of these can be in an abstract test instead public class ZooKeeperDistributedLockTest { [Test, Category("CI")] diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs new file mode 100644 index 00000000..538f6c2e --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs @@ -0,0 +1,43 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.ZooKeeper +{ + // todo test somewhere that different primitives don't conflict + + public class ZooKeeperDistributedSemaphoreTest + { + [Test, Category("CI")] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new ZooKeeperDistributedSemaphore(null!, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", -1, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 0, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 2, null!)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/name"), 2, null!)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(ZooKeeperPath.Root, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), "name", 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), null!, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "name", 2, default(string)!)); + } + + [Test, Category("CI")] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedSemaphore("some/crazy/name", 2, ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } + + [Test, Category("CI")] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "a", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/a/b"), "c/d", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs index 5893a8fb..8614f1ca 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -54,7 +54,7 @@ private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assume public ZooKeeperPath Path => this._synchronizationHelper.Path; /// - /// Implements . Implemented explicitly to avoid confusion with the fact + /// Implements . Implemented explicitly to avoid confusion with the fact /// that this will include the leading "/" and base directory alongside the passed-in name. /// string IDistributedReaderWriterLock.Name => this.Path.ToString(); diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs new file mode 100644 index 00000000..a8a50fb2 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs @@ -0,0 +1,59 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.ZooKeeper +{ + public partial class ZooKeeperDistributedSemaphore + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + ZooKeeperDistributedSemaphoreHandle? IInternalDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + ZooKeeperDistributedSemaphoreHandle IInternalDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs new file mode 100644 index 00000000..ea69217d --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs @@ -0,0 +1,103 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + /// + /// An implementation of based on ZooKeeper. Uses an approach similar to . + /// + public sealed partial class ZooKeeperDistributedSemaphore : IInternalDistributedSemaphore + { + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + + public ZooKeeperDistributedSemaphore( + ZooKeeperPath path, + int maxCount, + string connectionString, + bool assumeNodeExists = false, + Action? options = null) + : this(path, maxCount, assumeNodeExists: assumeNodeExists, connectionString, options) + { + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } + } + + public ZooKeeperDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, maxCount, connectionString, options) + { + } + + public ZooKeeperDistributedSemaphore(ZooKeeperPath directoryPath, string name, int maxCount, string connectionString, Action? options = null) + : this( + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + maxCount, + assumeNodeExists: false, + connectionString, + options) + { + } + + private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool assumeNodeExists, string connectionString, Action? optionsBuilder) + { + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + this.MaxCount = maxCount; + // setAcquiredMarker is needed because we use data changes as part of our wait procedure below + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder, setAcquiredMarker: true); + } + + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path => this._synchronizationHelper.Path; + + /// + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. + /// + string IDistributedSemaphore.Name => this.Path.ToString(); + + public int MaxCount { get; } + + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( + hasAcquired: state => Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath) < this.MaxCount, + waitAsync: async (zooKeeper, state, watcher) => + { + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + Invariant.Require(ephemeralNodeIndex >= this.MaxCount); + + // if we're the next node in line for a ticket, wait for any changes in the collection of children + if (ephemeralNodeIndex == this.MaxCount) + { + var childNames = new HashSet((await zooKeeper.getChildrenAsync(this.Path.ToString(), watcher).ConfigureAwait(false)).Children); + // If any of the children in front of us are missing, then the wait is done. Otherwise, + // let the watcher notify us when there is any change to the set of children + return state.SortedChildren.Take(ephemeralNodeIndex) + .Any(t => !childNames.Contains(t.Path.Substring(t.Path.LastIndexOf(ZooKeeperPath.Separator) + 1))); + } + + // Otherwise, we just watch for the node ahead of us in line to have its data changed to the acquired marker. While we could + // watch all children in this case as well, that approach is less efficient because it will generate a herd effect where each + // new waiter or released waiter wakes up everyone else. + var nextLowestChildData = await zooKeeper.getDataAsync(state.SortedChildren[ephemeralNodeIndex - 1].Path, watcher).ConfigureAwait(false); + // If it's already acquired, then the wait is done. Otherwise, the watcher will notify us on any data change or on deletion of that node + return nextLowestChildData.Data.SequenceEqual(ZooKeeperSynchronizationHelper.AcquiredMarker); + }, + timeout, + cancellationToken, + nodePrefix: "semaphore-" + ) + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + .AwaitSyncOverAsync() + .ConfigureAwait(false); + + return nodeHandle != null ? new ZooKeeperDistributedSemaphoreHandle(nodeHandle) : null; + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs new file mode 100644 index 00000000..c6b5b2b1 --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs @@ -0,0 +1,36 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.ZooKeeper +{ + public sealed class ZooKeeperDistributedSemaphoreHandle : IDistributedSynchronizationHandle + { + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; + + internal ZooKeeperDistributedSemaphoreHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } + + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs index adaa4e2d..5c29b394 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperHelper.cs @@ -17,7 +17,7 @@ internal static class ZooKeeperHelper /// public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); - // todo revisit whether it is worth having this method + // todo move this method and rename this class to focus on creating nodes /// /// Returns true when does not exist. /// Returns null when we receive a watch event indicating that has changed. diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs index 9f8a7e43..193aee92 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs @@ -20,15 +20,18 @@ namespace Medallion.Threading.ZooKeeper /// internal class ZooKeeperSynchronizationHelper { + public static readonly IReadOnlyList AcquiredMarker = Encoding.UTF8.GetBytes("ACQUIRED"); + private readonly ZooKeeperConnectionInfo _connectionInfo; private readonly IReadOnlyList _acl; - private readonly bool _assumeNodeExists; + private readonly bool _assumeNodeExists, _setAcquiredMarker; public ZooKeeperSynchronizationHelper( ZooKeeperPath nodePath, bool assumeNodeExists, string connectionString, - Action? optionsBuilder) + Action? optionsBuilder, + bool setAcquiredMarker = false) { this.Path = nodePath; this._assumeNodeExists = assumeNodeExists; @@ -40,6 +43,7 @@ public ZooKeeperSynchronizationHelper( AuthInfo: options.AuthInfo ); this._acl = options.Acl; + this._setAcquiredMarker = setAcquiredMarker; } public ZooKeeperPath Path { get; } @@ -89,6 +93,10 @@ public ZooKeeperSynchronizationHelper( var state = new State(ephemeralNodePath, sortedChildren); if (hasAcquired(state)) { + if (this._setAcquiredMarker) + { + await connection.ZooKeeper.setDataAsync(ephemeralNodePath, AcquiredMarker.ToArray()).ConfigureAwait(false); + } acquired = true; return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumeNodeExists); } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index f0628aa1..81bdc5b1 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -108,11 +108,24 @@ public static int Main(string[] args) break; } case nameof(ZooKeeperDistributedLock): - handle = new ZooKeeperDistributedLock(name.TrimStart('/'), ZooKeeperPorts.DefaultConnectionString, ZooKeeperOptions).AcquireAsync().Result; + handle = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireAsync().Result; break; case "Write" + nameof(ZooKeeperDistributedReaderWriterLock): - handle = new ZooKeeperDistributedReaderWriterLock(name.TrimStart('/'), ZooKeeperPorts.DefaultConnectionString, ZooKeeperOptions).AcquireWriteLockAsync().Result; + handle = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireWriteLockAsync().Result; break; + case string _ when type.StartsWith(nameof(ZooKeeperDistributedSemaphore)): + { + var maxCount = type.EndsWith("1AsMutex") ? 1 + : type.EndsWith("5AsMutex") ? 5 + : throw new ArgumentException(type); + handle = new ZooKeeperDistributedSemaphore( + new ZooKeeperPath(name), + maxCount, + ZooKeeperPorts.DefaultConnectionString, + options: ZooKeeperOptions + ).AcquireAsync().Result; + break; + } default: Console.Error.WriteLine($"type: {type}"); return 123; From 7a8b945566030fb82d1c1a2ad1d6f1526e4aadbf Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 24 Mar 2021 07:41:00 -0400 Subject: [PATCH 111/399] Add ZooKeeperDistributedSynchronizationProvider --- .../ZooKeeperDistributedSemaphoreTest.cs | 2 - ...rDistributedSynchronizationProviderTest.cs | 83 +++++++++++++++++++ ...eeperDistributedSynchronizationProvider.cs | 52 ++++++++++++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs index 538f6c2e..0381c760 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs @@ -7,8 +7,6 @@ namespace Medallion.Threading.Tests.ZooKeeper { - // todo test somewhere that different primitives don't conflict - public class ZooKeeperDistributedSemaphoreTest { [Test, Category("CI")] diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..89c584e8 --- /dev/null +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs @@ -0,0 +1,83 @@ +using Medallion.Threading.ZooKeeper; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Tests.ZooKeeper +{ + public class ZooKeeperDistributedSynchronizationProviderTest + { + [Test, Category("CI")] + public void TestArgumentValidation() + { + Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(default, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(null!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); + + var lockName = TestHelper.UniqueName + "Lock"; + await using (await provider.AcquireLockAsync(lockName)) + { + await using var handle = await provider.TryAcquireLockAsync(lockName); + Assert.IsNull(handle); + } + + var readerWriterLockName = TestHelper.UniqueName + "ReaderWriterLock"; + await using (await provider.AcquireReadLockAsync(readerWriterLockName)) + { + await using var handle = await provider.TryAcquireWriteLockAsync(readerWriterLockName); + Assert.IsNull(handle); + } + + var semaphoreName = TestHelper.UniqueName + "Semaphore"; + await using (await provider.AcquireSemaphoreAsync(semaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); + Assert.IsNotNull(handle); + + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); + Assert.IsNull(failedHandle); + } + } + + [Test] + public async Task TestDifferentPrimitivesDoNotCollide() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); + + var name = TestHelper.UniqueName; + var @lock = provider.CreateLock(name); + var readerWriterLock = provider.CreateReaderWriterLock(name); + var semaphore = provider.CreateSemaphore(name, maxCount: 1); + + @lock.Path.ShouldEqual(readerWriterLock.Path); + @lock.Path.ShouldEqual(semaphore.Path); + + await using var lockHandle = await @lock.TryAcquireAsync(); + Assert.IsNotNull(lockHandle); + await using var readLockHandle = await readerWriterLock.TryAcquireReadLockAsync(); + Assert.IsNotNull(readLockHandle); + await using var semaphoreHandle = await semaphore.TryAcquireAsync(); + Assert.IsNotNull(semaphoreHandle); + + await readLockHandle!.DisposeAsync(); + await using var writeLockHandle = await readerWriterLock.TryAcquireWriteLockAsync(); + Assert.IsNotNull(writeLockHandle); + } + + [Test, Category("CI")] + public void TestIncorporatesDirectoryNameIfProvided() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(new ZooKeeperPath("/foo"), ZooKeeperPorts.DefaultConnectionString); + provider.CreateLock("bar").Path.ToString().ShouldEqual("/foo/bar"); + provider.CreateReaderWriterLock("baz").Path.ToString().ShouldEqual("/foo/baz"); + provider.CreateSemaphore("qux", 1).Path.ToString().ShouldEqual("/foo/qux"); + } + } +} diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..2a5f3c9e --- /dev/null +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.ZooKeeper +{ + /// + /// Implements for , + /// for , + /// and for . + /// + public sealed class ZooKeeperDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider + { + private readonly ZooKeeperPath _directoryPath; + private readonly string _connectionString; + private readonly Action? _options; + + public ZooKeeperDistributedSynchronizationProvider(string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, connectionString, options) { } + + public ZooKeeperDistributedSynchronizationProvider(ZooKeeperPath directoryPath, string connectionString, Action? options = null) + { + this._directoryPath = directoryPath != default ? directoryPath : throw new ArgumentNullException(nameof(directoryPath)); + this._connectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString)); + this._options = options; + } + + /// + /// Creates a using the given . + /// + public ZooKeeperDistributedLock CreateLock(string name) => + new ZooKeeperDistributedLock(this._directoryPath, name, this._connectionString, this._options); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Creates a using the given . + /// + public ZooKeeperDistributedReaderWriterLock CreateReaderWriterLock(string name) => + new ZooKeeperDistributedReaderWriterLock(this._directoryPath, name, this._connectionString, this._options); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(name); + + /// + /// Creates a using the given and . + /// + public ZooKeeperDistributedSemaphore CreateSemaphore(string name, int maxCount) => + new ZooKeeperDistributedSemaphore(this._directoryPath, name, maxCount, this._connectionString, this._options); + + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); + } +} From 7cb4100e88d1c213fa140c5e4d22624aea943c8d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 25 Mar 2021 07:14:26 -0400 Subject: [PATCH 112/399] Cleanup --- .../Data/MultiplexedConnectionLock.cs | 4 +- .../ZooKeeperSynchronizationCoreTestCases.cs | 2 +- .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 4 +- ...istributedSynchronizationOptionsBuilder.cs | 2 +- ...eeperHelper.cs => ZooKeeperNodeCreator.cs} | 77 +------------------ .../ZooKeeperNodeHandle.cs | 53 ++++++++++++- 6 files changed, 61 insertions(+), 81 deletions(-) rename DistributedLock.ZooKeeper/{ZooKeeperHelper.cs => ZooKeeperNodeCreator.cs} (60%) diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 991c42b9..859f54c0 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -33,8 +33,8 @@ public async ValueTask TryAcquireAsync( bool opportunistic) where TLockCookie : class { - using var mutextHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); - if (mutextHandle == null) + using var mutexHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); + if (mutexHandle == null) { // mutex wasn't free, so just give up Invariant.Require(opportunistic); diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 1d27b013..9ddae13f 100644 --- a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -49,7 +49,7 @@ public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() Does.Contain("does not exist") ); - await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperHelper.PublicAcl }, CreateMode.PERSISTENT); + await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperNodeCreator.PublicAcl }, CreateMode.PERSISTENT); try { await using (var handle = await @lock.TryAcquireAsync()) diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs index 7aaba656..823d5cad 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -24,11 +24,13 @@ public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() public void TestNamePropertyIsImplementedExplicitlyInFavorOfPath() { Assert.IsEmpty(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null)); - foreach (var lockType in GetPublicTypes().Where(t => !typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t) && t.GetInterfaces().Any(i => i.Name.StartsWith("IDistributed")))) + foreach (var lockType in GetPublicTypes() + .Where(t => t.GetInterfaces().Any(i => i.GetProperty("Name") != null))) { var pathProperty = lockType.GetProperty("Path"); Assert.IsNotNull(pathProperty, $"{lockType} missing Path"); pathProperty!.PropertyType.ShouldEqual(typeof(ZooKeeperPath)); + Assert.IsNull(lockType.GetProperty("Name")); } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs index 0d522fb7..d17edf60 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.ZooKeeper { public sealed class ZooKeeperDistributedSynchronizationOptionsBuilder { - private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperHelper.PublicAcl }; + private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperNodeCreator.PublicAcl }; /// /// According to https://bowenli86.github.io/2016/09/15/distributed%20system/zookeeper/ZooKeeper-Sessions-and-Session-Management/, diff --git a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs similarity index 60% rename from DistributedLock.ZooKeeper/ZooKeeperHelper.cs rename to DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs index 5c29b394..6c707bc1 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs @@ -8,41 +8,14 @@ namespace Medallion.Threading.ZooKeeper using org.apache.zookeeper; using org.apache.zookeeper.data; using System.Linq; - using System.Threading; - - internal static class ZooKeeperHelper + + internal static class ZooKeeperNodeCreator { /// /// See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html under "Builtin ACL Schemes" /// public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); - // todo move this method and rename this class to focus on creating nodes - /// - /// Returns true when does not exist. - /// Returns null when we receive a watch event indicating that has changed. - /// Returns false if the fires. - /// - public static async Task WaitForNotExistsOrChangedAsync( - this ZooKeeperConnection connection, - string path, - CancellationToken timeoutToken) - { - using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); - using var timeoutRegistration = timeoutToken.Register( - state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), - state: watcher - ); - // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification - using var connectionLostRegistration = connection.ConnectionLostToken.Register( - state => ((TaskWatcher)state).TaskCompletionSource.TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), - state: watcher - ); - - var exists = await connection.ZooKeeper.existsAsync(path, watcher).ConfigureAwait(false); - return exists == null ? true : await watcher.TaskCompletionSource.Task.ConfigureAwait(false); - } - public static async Task CreateEphemeralSequentialNode( this ZooKeeperConnection connection, ZooKeeperPath directory, @@ -142,51 +115,5 @@ async Task TryCleanUpCreatedDirectoriesAsync(IReadOnlyList create } } } - - private sealed class WaitCompletionSourceWatcher : Watcher - { - private readonly TaskCompletionSource _waitCompletionSource; - - public WaitCompletionSourceWatcher(TaskCompletionSource waitCompletionSource) - { - this._waitCompletionSource = waitCompletionSource; - } - - public override Task process(WatchedEvent @event) - { - // only care about connected state events; the ConnectionLostToken takes care of the other states for us - if (@event.getState() == Event.KeeperState.SyncConnected) - { - this._waitCompletionSource.TrySetResult(true); - } - - return Task.CompletedTask; - } - } - - private sealed class TaskWatcher : Watcher, IDisposable - { - private volatile Action>? _watchedEventHandler; - - public TaskWatcher(Action> watchedEventHandler) - { - this._watchedEventHandler = watchedEventHandler; - } - - public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); - - public void Dispose() => this._watchedEventHandler = null; - - public override Task process(WatchedEvent @event) - { - // only care about connected state events; the ConnectionLostToken takes care of the other states for us - if (@event.getState() == Event.KeeperState.SyncConnected) - { - this._watchedEventHandler?.Invoke(@event, this.TaskCompletionSource); - } - - return Task.CompletedTask; - } - } } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs index 0436b3dd..caaff911 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs @@ -39,7 +39,8 @@ public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool { while (true) { - var result = await this._connection.WaitForNotExistsOrChangedAsync( + var result = await WaitForNotExistsOrChangedAsync( + this._connection, this._nodePath.ToString(), timeoutToken: disposalSource.Token ).ConfigureAwait(false); @@ -108,6 +109,56 @@ private async Task InternalDisposeAsync() } } + /// + /// Returns true when does not exist. + /// Returns null when we receive a watch event indicating that has changed. + /// Returns false if the fires. + /// + public static async Task WaitForNotExistsOrChangedAsync( + ZooKeeperConnection connection, + string path, + CancellationToken timeoutToken) + { + using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); + using var timeoutRegistration = timeoutToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), + state: watcher + ); + // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification + using var connectionLostRegistration = connection.ConnectionLostToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), + state: watcher + ); + + var exists = await connection.ZooKeeper.existsAsync(path, watcher).ConfigureAwait(false); + return exists == null ? true : await watcher.TaskCompletionSource.Task.ConfigureAwait(false); + } + + private sealed class TaskWatcher : Watcher, IDisposable + { + private volatile Action>? _watchedEventHandler; + + public TaskWatcher(Action> watchedEventHandler) + { + this._watchedEventHandler = watchedEventHandler; + } + + public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); + + public void Dispose() => this._watchedEventHandler = null; + + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) + { + this._watchedEventHandler?.Invoke(@event, this.TaskCompletionSource); + } + + return Task.CompletedTask; + } + } + private record HandleLostState(CancellationToken Token, CancellationTokenSource DisposalSource, Task MonitoringTask); } } From e2aef47190a88d84a5a506f6b56b778cba5cff1d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 25 Mar 2021 08:40:19 -0400 Subject: [PATCH 113/399] Add remaining doc comments --- .../ZooKeeperDistributedLock.cs | 28 ++++++++++++++--- .../ZooKeeperDistributedLockHandle.cs | 9 ++++++ .../ZooKeeperDistributedReaderWriterLock.cs | 28 ++++++++++++++--- ...KeeperDistributedReaderWriterLockHandle.cs | 9 ++++++ .../ZooKeeperDistributedSemaphore.cs | 31 ++++++++++++++++--- .../ZooKeeperDistributedSemaphoreHandle.cs | 9 ++++++ ...istributedSynchronizationOptionsBuilder.cs | 3 ++ ...eeperDistributedSynchronizationProvider.cs | 8 +++++ .../ZooKeeperSynchronizationHelper.cs | 16 +++++----- 9 files changed, 118 insertions(+), 23 deletions(-) diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs index a90f6803..63f4b2da 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs @@ -16,33 +16,51 @@ public sealed partial class ZooKeeperDistributedLock : IInternalDistributedLock< { private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + /// + /// Constructs a new lock based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). + /// public ZooKeeperDistributedLock( ZooKeeperPath path, string connectionString, - bool assumeNodeExists = false, + bool assumePathExists = false, Action? options = null) - : this(path, assumeNodeExists: assumeNodeExists, connectionString, options) + : this(path, assumePathExists: assumePathExists, connectionString, options) { if (path == default) { throw new ArgumentNullException(nameof(path)); } if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } } + /// + /// Constructs a new lock based on the provided , , and . + /// + /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) : this(ZooKeeperPath.Root, name, connectionString, options) { } + /// + /// Constructs a new lock based on the provided , , , and . + /// + /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) : this( (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), - assumeNodeExists: false, + assumePathExists: false, connectionString, options) { } - private ZooKeeperDistributedLock(ZooKeeperPath nodePath, bool assumeNodeExists, string connectionString, Action? optionsBuilder) => - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder); + private ZooKeeperDistributedLock(ZooKeeperPath path, bool assumePathExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(path, assumePathExists, connectionString, optionsBuilder); /// /// The zookeeper node path diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs index 33f5dd5d..2d67b7c9 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs @@ -7,6 +7,9 @@ namespace Medallion.Threading.ZooKeeper { + /// + /// Implements + /// public sealed class ZooKeeperDistributedLockHandle : IDistributedSynchronizationHandle { private ZooKeeperNodeHandle? _innerHandle; @@ -22,11 +25,17 @@ internal ZooKeeperDistributedLockHandle(ZooKeeperNodeHandle innerHandle) this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); } + /// + /// Implements + /// public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; // explicit because this is sync-over-async void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + /// + /// Releases the lock + /// public ValueTask DisposeAsync() { Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs index 8614f1ca..aaa6bbbc 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -20,33 +20,51 @@ public sealed partial class ZooKeeperDistributedReaderWriterLock : IInternalDist private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + /// + /// Constructs a new lock based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). + /// public ZooKeeperDistributedReaderWriterLock( ZooKeeperPath path, string connectionString, - bool assumeNodeExists = false, + bool assumePathExists = false, Action? options = null) - : this(path, assumeNodeExists: assumeNodeExists, connectionString, options) + : this(path, assumePathExists: assumePathExists, connectionString, options) { if (path == default) { throw new ArgumentNullException(nameof(path)); } if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } } + /// + /// Constructs a new lock based on the provided , , and . + /// + /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedReaderWriterLock(string name, string connectionString, Action? options = null) : this(ZooKeeperPath.Root, name, connectionString, options) { } + /// + /// Constructs a new lock based on the provided , , , and . + /// + /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedReaderWriterLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) : this( (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), - assumeNodeExists: false, + assumePathExists: false, connectionString, options) { } - private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assumeNodeExists, string connectionString, Action? optionsBuilder) => - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder); + private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assumePathExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder); /// /// The zookeeper node path diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs index 5512be6d..a803b601 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs @@ -7,6 +7,9 @@ namespace Medallion.Threading.ZooKeeper { + /// + /// Implements + /// public sealed class ZooKeeperDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { private ZooKeeperNodeHandle? _innerHandle; @@ -22,11 +25,17 @@ internal ZooKeeperDistributedReaderWriterLockHandle(ZooKeeperNodeHandle innerHan this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); } + /// + /// Implements + /// public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; // explicit because this is sync-over-async void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + /// + /// Releases the lock + /// public ValueTask DisposeAsync() { Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs index ea69217d..ce9eb249 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs @@ -15,39 +15,57 @@ public sealed partial class ZooKeeperDistributedSemaphore : IInternalDistributed { private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + /// + /// Constructs a new semaphore based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). + /// public ZooKeeperDistributedSemaphore( ZooKeeperPath path, int maxCount, string connectionString, - bool assumeNodeExists = false, + bool assumePathExists = false, Action? options = null) - : this(path, maxCount, assumeNodeExists: assumeNodeExists, connectionString, options) + : this(path, maxCount, assumePathExists: assumePathExists, connectionString, options) { if (path == default) { throw new ArgumentNullException(nameof(path)); } if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } } + /// + /// Constructs a new semaphore based on the provided , , and . + /// + /// The semaphore's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) : this(ZooKeeperPath.Root, name, maxCount, connectionString, options) { } + /// + /// Constructs a new semaphore based on the provided , , , and . + /// + /// The semaphore's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// public ZooKeeperDistributedSemaphore(ZooKeeperPath directoryPath, string name, int maxCount, string connectionString, Action? options = null) : this( (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), maxCount, - assumeNodeExists: false, + assumePathExists: false, connectionString, options) { } - private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool assumeNodeExists, string connectionString, Action? optionsBuilder) + private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool assumePathExists, string connectionString, Action? optionsBuilder) { if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } this.MaxCount = maxCount; // setAcquiredMarker is needed because we use data changes as part of our wait procedure below - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumeNodeExists, connectionString, optionsBuilder, setAcquiredMarker: true); + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder, setAcquiredMarker: true); } /// @@ -61,6 +79,9 @@ private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool /// string IDistributedSemaphore.Name => this.Path.ToString(); + /// + /// Implements + /// public int MaxCount { get; } async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs index c6b5b2b1..48d6b149 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs @@ -7,6 +7,9 @@ namespace Medallion.Threading.ZooKeeper { + /// + /// Implements + /// public sealed class ZooKeeperDistributedSemaphoreHandle : IDistributedSynchronizationHandle { private ZooKeeperNodeHandle? _innerHandle; @@ -22,11 +25,17 @@ internal ZooKeeperDistributedSemaphoreHandle(ZooKeeperNodeHandle innerHandle) this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); } + /// + /// Implements + /// public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; // explicit because this is sync-over-async void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + /// + /// Releases the semaphore + /// public ValueTask DisposeAsync() { Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs index d17edf60..580ddf0a 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs @@ -6,6 +6,9 @@ namespace Medallion.Threading.ZooKeeper { + /// + /// Options for configuring ZooKeeper-based synchronization primitives + /// public sealed class ZooKeeperDistributedSynchronizationOptionsBuilder { private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperNodeCreator.PublicAcl }; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs index 2a5f3c9e..7e6b510e 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs @@ -15,9 +15,17 @@ public sealed class ZooKeeperDistributedSynchronizationProvider : IDistributedLo private readonly string _connectionString; private readonly Action? _options; + /// + /// Constructs a provider which uses and . Lock and semaphore nodes will be created + /// in the root directory '/'. + /// public ZooKeeperDistributedSynchronizationProvider(string connectionString, Action? options = null) : this(ZooKeeperPath.Root, connectionString, options) { } + /// + /// Constructs a provider which uses and . Lock and semaphore nodes will be created + /// in . + /// public ZooKeeperDistributedSynchronizationProvider(ZooKeeperPath directoryPath, string connectionString, Action? options = null) { this._directoryPath = directoryPath != default ? directoryPath : throw new ArgumentNullException(nameof(directoryPath)); diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs index 193aee92..7044bc18 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs @@ -24,17 +24,17 @@ internal class ZooKeeperSynchronizationHelper private readonly ZooKeeperConnectionInfo _connectionInfo; private readonly IReadOnlyList _acl; - private readonly bool _assumeNodeExists, _setAcquiredMarker; + private readonly bool _assumePathExists, _setAcquiredMarker; public ZooKeeperSynchronizationHelper( - ZooKeeperPath nodePath, - bool assumeNodeExists, + ZooKeeperPath path, + bool assumePathExists, string connectionString, Action? optionsBuilder, bool setAcquiredMarker = false) { - this.Path = nodePath; - this._assumeNodeExists = assumeNodeExists; + this.Path = path; + this._assumePathExists = assumePathExists; var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); this._connectionInfo = new ZooKeeperConnectionInfo( connectionString ?? throw new ArgumentNullException(nameof(connectionString)), @@ -67,7 +67,7 @@ public ZooKeeperSynchronizationHelper( connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); // create a path that represents both our hold on the synch object and our place in line waiting for it - ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, nodePrefix, this._acl, ensureDirectoryExists: !this._assumeNodeExists).ConfigureAwait(false); + ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, nodePrefix, this._acl, ensureDirectoryExists: !this._assumePathExists).ConfigureAwait(false); while (true) { @@ -98,7 +98,7 @@ public ZooKeeperSynchronizationHelper( await connection.ZooKeeper.setDataAsync(ephemeralNodePath, AcquiredMarker.ToArray()).ConfigureAwait(false); } acquired = true; - return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumeNodeExists); + return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumePathExists); } // wait for something to change @@ -146,7 +146,7 @@ private async Task CleanUpOnFailureAsync(ZooKeeperConnection? connection, string { await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); } - if (!this._assumeNodeExists) + if (!this._assumePathExists) { // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because // someone else is holding the lock. However, we could have encountered a race condition where the other holder From dddf22cb4614832d93e5715853275ccda2e7c441 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 26 Mar 2021 06:33:46 -0400 Subject: [PATCH 114/399] Update docs --- README.md | 3 +++ docs/DistributedLock.ZooKeeper.md | 34 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 docs/DistributedLock.ZooKeeper.md diff --git a/README.md b/README.md index 53778db3..53ace79e 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ DistributedLock contains implementations based on various technologies; you can - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql - **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/): uses Redis - **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/): uses Azure blobs +- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/): uses Apache ZooKeeper - **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/): uses lock files - **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/): uses operating system global `WaitHandle`s (Windows only) @@ -130,6 +131,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.1.0 + - Added ZooKeeper-based implementation ([#41](https://github.com/madelson/DistributedLock/issues/41), DistributedLock.ZooKeeper 1.0.0). - 2.0.1 - Fixed Redis lock behavior when using a database with `WithKeyPrefix` (#66, DistributedLock.Redis 1.0.1). Thanks @skomis-mm for contributing! - 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) diff --git a/docs/DistributedLock.ZooKeeper.md b/docs/DistributedLock.ZooKeeper.md new file mode 100644 index 00000000..63690c5b --- /dev/null +++ b/docs/DistributedLock.ZooKeeper.md @@ -0,0 +1,34 @@ +# DistributedLock.ZooKeeper + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.ZooKeeper) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) + +The DistributedLock.ZooKeeper package offers distributed locks based on [Apache ZooKeeper](https://zookeeper.apache.org/). For example: + +```C# +var @lock = new ZooKeeperDistributedLock("MyLockName", connectionString); +await using (await @lock.AcquireAsync()) +{ + // I have the lock +} +``` + +## APIs + +- The `ZooKeeperDistributedLock` class implements the `IDistributedLock` interface. +- The `ZooKeeperDistributedReaderWriterLock` class implements the `IDistributedReaderWriterLock` interface. +- The `ZooKeeperDistributedSemaphore` class implements the `IDistributedSemaphore` interface. +- The `ZooKeeperDistributedSynchronizationProvider` class implements the `IDistributedLockProvider`, `IDistributedReaderWriterLockProvider`, and `IDistributedSemaphoreProvider` interfaces. + +## Implementation notes + +ZooKeeper-based locks leverage ZooKeeper's recommended [recipes](https://zookeeper.apache.org/doc/r3.1.2/recipes.html) for distributed synchronization. + +By leveraging ZooKeeper watches under the hood, these recipes allow for very efficient event-driven waits when acquiring. + +## Options + +- `SessionTimeout` configures the underlying session timeout value for ZooKeeper connections. Because the underlying ZooKeeper client periodically renews the session, this value generally will not impact behavior. Lower values mean that locks will be released more quickly following a crash of the lock-holding process, but also increase the risk that transient connection issues will result in a dropped lock. Defaults to 20s. +- `ConnectTimeout` configures how long to wait when establishing a connection to ZooKeeper. Defaults to 15s. +- `AddAuthInfo` allows you to specify additional auth information to be added to the ZooKeeper session. This option can be specified multiple times to add multiple auth schemes. +- `AddAccessControl` configures the ZooKeeper ACL for nodes created by the lock. This option can be specified multiple times to add multiple ACL entries. If left unspecified, the ACL used is (world, anyone). + From 63142412518dd4ea20ebfecb24e0a2f88f57073c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 26 Mar 2021 06:50:31 -0400 Subject: [PATCH 115/399] Cleanup --- .../Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs | 6 +++++- .../Tests/FileSystem/FileDistributedLockTest.cs | 10 +++++----- DistributedLock.Tests/Tests/TestSetupTest.cs | 8 ++++++++ .../ZooKeeperDistributedSynchronizationProviderTest.cs | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs index f75f81d2..916a7df5 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -16,7 +16,11 @@ public class ZooKeeperSetUpFixture [OneTimeSetUp] public void OneTimeSetUp() { - if (IsZooKeeperRunning()) + if (Environment.GetEnvironmentVariable("APPVEYOR") != null) + { + Console.WriteLine("Running on AppVeyor; will not attempt to launch ZooKeeper"); + } + else if (IsZooKeeperRunning()) { Console.WriteLine("ZooKeeper already running"); } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 5123f22e..dd70c595 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -315,7 +315,6 @@ public string TestSafeNameCompatibility(string name) // meant to be consistent length across platforms var consistentDirectory = Path.Combine(LockFileDirectory, new string('b', 100)).Substring(0, 100); var @lock = new FileDistributedLock(new DirectoryInfo(consistentDirectory), name); - Console.WriteLine(@lock.Name); Assert.That(@lock.Name, Does.StartWith(consistentDirectory + Path.DirectorySeparatorChar)); return @lock.Name.Substring(consistentDirectory.Length + 1); } @@ -346,10 +345,11 @@ public void TestBase32Hashing() } } - for (var i = 0; i < charCounts.Length; ++i) - { - Console.WriteLine($"{(char.IsLetterOrDigit((char)i) ? ((char)i).ToString() : i.ToString())}: {charCounts[i]}"); - } + // for debugging + //for (var i = 0; i < charCounts.Length; ++i) + //{ + // Console.WriteLine($"{(char.IsLetterOrDigit((char)i) ? ((char)i).ToString() : i.ToString())}: {charCounts[i]}"); + //} var expectedCount = (Iterations * FileNameValidationHelper.HashLengthInChars) / 32; for (var @char = default(char); @char < charCounts.Length; ++@char) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index ddc7f639..47e06a3b 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -61,6 +61,14 @@ public void VerifyAllTestsAreCreated() static string? NormalizeWhitespace(string? code) => code?.Trim().Replace("\r\n", "\n"); } + [Test] + public void TestTestNamespaces() + { + // these can be auto-added by VS but they can mess up our SetUpFixtures + var badNamespaceSegments = new[] { "Tests.Tests", "AbstractTestCases", "Infrastructure" }; + Assert.IsEmpty(this.GetType().Assembly.GetTypes().Where(t => t.Namespace != null && badNamespaceSegments.Any(s => t.Namespace.Contains(s)))); + } + private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) { static string GetTestClassName(Type type) diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs index 89c584e8..72a54070 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper { public class ZooKeeperDistributedSynchronizationProviderTest { From 940e84363d6e9abb35beed661dc39bbfa4c231d0 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 18 Apr 2021 17:34:29 -0400 Subject: [PATCH 116/399] Fix typo in DistributedLock.FileSystem.md --- docs/DistributedLock.FileSystem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.FileSystem.md b/docs/DistributedLock.FileSystem.md index 92f17c94..15bce1f5 100644 --- a/docs/DistributedLock.FileSystem.md +++ b/docs/DistributedLock.FileSystem.md @@ -20,7 +20,7 @@ await using (var handle = await @lock.TryAcquireAsync()) ## Implementation notes -Because they are based on files, these locks are used to coordinate between processes on the same machine (as opposed to across machines). In some csaes, it may be possible to coordinate across machines by specifying the path of a networked file. However, this should be tested because the network file system may not truly support locking. +Because they are based on files, these locks are used to coordinate between processes on the same machine (as opposed to across machines). In some cases, it may be possible to coordinate across machines by specifying the path of a networked file. However, this should be tested because the network file system may not truly support locking. `FileDistributedLock`s can be constructed either from a base `DirectoryInfo` and a `name`, which will cause it to create a file *based on* `name` in the specified directory. If you know exactly which file you'd like to lock on, you can pass a `FileInfo` instead. From 19c0e6418c11553a73c86d9f6680f56304a78a16 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 10:27:16 -0400 Subject: [PATCH 117/399] Rename private method in MultiplexedConnectionLockPool for clarity --- .../Internal/Data/MultiplexedConnectionLockPool.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index a8fc6281..0e9c58a8 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -51,7 +51,7 @@ public MultiplexedConnectionLockPool(Func connection { // opportunistic phase: see if we can use a connection that is already holding a lock // to acquire the current lock - var existingLock = await this.GetOrCreateLockAsync(connectionString).ConfigureAwait(false); + var existingLock = await this.GetExistingLockOrDefaultAsync(connectionString).ConfigureAwait(false); if (existingLock != null) { var canSafelyDisposeExistingLock = false; @@ -101,7 +101,7 @@ public MultiplexedConnectionLockPool(Func connection @lock.TryAcquireAsync(name, timeout, strategy, keepaliveCadence, cancellationToken, opportunistic); } - private async ValueTask GetOrCreateLockAsync(string connectionString) + private async ValueTask GetExistingLockOrDefaultAsync(string connectionString) { using var _ = await this._lock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); From 99afbe42558a3bc13748e6f74098165405fdfc4a Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 13:25:39 -0400 Subject: [PATCH 118/399] Fix #85 and fix #61. Make all SqlServer tests use the default keepalive behavior by default. --- .../Internal/Data/ConnectionMonitor.cs | 25 ++++++++++++--- .../DistributedLock.Postgres.csproj | 2 +- .../Data/ConnectionStringStrategyTestCases.cs | 25 +++++++++++++++ .../Infrastructure/Data/ConnectionOptions.cs | 4 +-- .../Postgres/TestingPostgresProviders.cs | 7 +++-- .../SqlServer/TestingSqlServerProviders.cs | 7 +++-- .../Tests/Postgres/PostgresBehaviorTest.cs | 31 +++---------------- 7 files changed, 62 insertions(+), 39 deletions(-) diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 67418930..e1a754cd 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -248,8 +248,12 @@ private async ValueTask StopOrDisposeAsync(bool isDispose) this.CloseOrCancelMonitoringHandleRegistrationsNoLock(isCancel: false); task = this._monitoringWorkerTask; - this._monitorStateChangedTokenSource?.Cancel(); + // Note: synchronous cancel here should be safe because we've already set + // the state to disposed above which the monitoring loop will check if it + // takes over the Cancel() thread. + this._monitorStateChangedTokenSource?.Cancel(); + // unsubscribe from state change tracking if (this._stateChangedHandler != null && this._weakConnection.TryGetTarget(out var connection)) @@ -304,7 +308,7 @@ private bool StartMonitorWorkerIfNeededNoLock() // skip if there's nothing to do if (this._keepaliveCadence.IsInfinite && !this.HasRegisteredMonitoringHandlesNoLock) { return false; } - + this._monitorStateChangedTokenSource = new CancellationTokenSource(); // Set up the task as a continuation on the previous task to avoid concurrency in the case where the previous // one is spinning down. If we change states in rapid succession we could end up with multiple tasks queued up @@ -318,9 +322,20 @@ private bool StartMonitorWorkerIfNeededNoLock() private void FireStateChangedNoLock() { - this._monitorStateChangedTokenSource!.Cancel(); - this._monitorStateChangedTokenSource.Dispose(); + var monitorStateChangedTokenSource = this._monitorStateChangedTokenSource!; this._monitorStateChangedTokenSource = new CancellationTokenSource(); + // Canceling asynchronously is important because the Cancel() thread can end up + // running continuations inside the monitoring loop (e. g. see + // https://github.com/madelson/DistributedLock/issues/85). Now that we set the new + // token source before canceling the old one we should avoid that particular issue, but + // it is still safer and easier to reason about not to have that happen. This also ensures + // that FireStateChangedNoLock() always returns quickly, even if the monitoring loop + // were to do some synchronous work on the continuation thread. + Task.Run(() => + { + try { monitorStateChangedTokenSource.Cancel(); } + finally { monitorStateChangedTokenSource.Dispose(); } + }); } private async Task MonitorWorkerLoop() @@ -357,7 +372,7 @@ private async Task DoMonitoringAsync(CancellationToken cancellationToken) using var _ = await this._connectionLock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); // 1-min increments is kind of an arbitrary choice. We want to avoid this being too short since each time - // we "come up to breathe" that's a waste of resource. We also want to avoid this being too long since + // we "come up to breathe" that's a waste of resources. We also want to avoid this being too long since // in case people have some kind of monitoring set up for hanging queries await connection.SleepAsync( sleepTime: TimeSpan.FromMinutes(1), diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 1ac6b661..7c4565a0 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -41,7 +41,7 @@ - + diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 84b42607..0e943542 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -3,6 +3,7 @@ using System; using System.Diagnostics; using System.Threading; +using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data { @@ -95,5 +96,29 @@ public void TestKeepaliveDoesNotCreateRaceCondition() } }); } + + // replicates issue from https://github.com/madelson/DistributedLock/issues/85 + [Test] + public async Task TestAccessingHandleLostTokenWhileKeepaliveActiveDoesNotBlock() + { + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMinutes(5); + + var @lock = this._lockProvider.CreateLock(string.Empty); + var handle = await @lock.TryAcquireAsync(); + if (handle != null) + { + var accessHandleLostTokenTask = Task.Run(() => + { + if (handle.HandleLostToken.CanBeCanceled) + { + handle.HandleLostToken.Register(() => { }); + } + }); + Assert.IsTrue(await accessHandleLostTokenTask.WaitAsync(TimeSpan.FromSeconds(5))); + + // do this only on success; on failure we're likely deadlocked and dispose will hang + await handle.DisposeAsync(); + } + } } } diff --git a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs index 7044ebe4..811680e4 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs @@ -20,13 +20,13 @@ public sealed class TestingDbConnectionOptions public DbTransaction? Transaction { get; set; } public T Create( - Func fromConnectionString, + Func fromConnectionString, Func fromConnection, Func fromTransaction) { if (this.ConnectionString != null) { - return fromConnectionString(this.ConnectionString, (this.ConnectionStringUseMultiplexing, this.ConnectionStringUseTransaction, this.ConnectionStringKeepaliveCadence ?? Timeout.InfiniteTimeSpan)); + return fromConnectionString(this.ConnectionString, (this.ConnectionStringUseMultiplexing, this.ConnectionStringUseTransaction, this.ConnectionStringKeepaliveCadence)); } if (this.Connection != null) diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index 3dfd6b78..121c4861 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -23,8 +23,11 @@ public override IDistributedLock CreateLockWithExactName(string name) => public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); - internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan keepaliveCadence) options) => - o => o.UseMultiplexing(options.useMultiplexing).KeepaliveCadence(options.keepaliveCadence); + internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => + { + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; } public sealed class TestingPostgresDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs index f0848237..e4151b46 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs @@ -19,8 +19,11 @@ public override IDistributedLock CreateLockWithExactName(string name) => public override string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); - internal static Action ToSqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan keepaliveCadence) options) => - o => o.UseMultiplexing(options.useMultiplexing).UseTransaction(options.useTransaction).KeepaliveCadence(options.keepaliveCadence); + internal static Action ToSqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => + { + o.UseMultiplexing(options.useMultiplexing).UseTransaction(options.useTransaction); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; } public sealed class TestingSqlDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index cb46af58..34ce2866 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -89,7 +89,8 @@ async Task RunTransactionWithAbortAsync(bool useSavePoint) if (useTimeout) { command.CommandText = "SET LOCAL statement_timeout = 100; " + command.CommandText; } else { cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(.5)); } - Assert.ThrowsAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token)); + var exception = Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token)); + Assert.IsInstanceOf(useTimeout ? typeof(PostgresException) : typeof(OperationCanceledException), exception); if (useSavePoint) { @@ -143,31 +144,7 @@ public async Task TestDoesNotDetectConnectionBreakViaState() Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); } - // replicates https://github.com/npgsql/npgsql/issues/2912 - [Test] - public async Task TestPrepareThrowsNullReferenceExceptionOnTerminatedConnection() - { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); - await connection.OpenAsync(); - - using var getPidCommand = connection.CreateCommand(); - getPidCommand.CommandText = "SELECT pg_backend_pid()"; - var pid = (int)(await getPidCommand.ExecuteScalarAsync()); - - // kill the connection from the back end - using var killingConnection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); - await killingConnection.OpenAsync(); - using var killCommand = killingConnection.CreateCommand(); - killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; - await killCommand.ExecuteNonQueryAsync(); - - await Task.Delay(10); - - Assert.ThrowsAsync(() => getPidCommand.PrepareAsync()); - } - - // See https://github.com/npgsql/npgsql/issues/3442. Until that's resolved, connection monitoring - // is broken in 5.x + // Effective test for https://github.com/npgsql/npgsql/issues/3442, which broke monitoring [Test] public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() { @@ -193,7 +170,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() Assert.ThrowsAsync(() => getPidCommand.ExecuteScalarAsync()); Assert.AreNotEqual(ConnectionState.Open, connection.State); - Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); // assertion passes in 4.1.4, fails in 5.0.1.1 + Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); } } } From 1d4a526847f31665045a3e59b01bcce6bd4bf0cf Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 15:26:38 -0400 Subject: [PATCH 119/399] Ensure that broken connection does not pollute the multiplexed connection pool. Fix #83 --- .../Internal/Data/DatabaseConnection.cs | 16 ++++---- .../Data/MultiplexedConnectionLock.cs | 39 +++++++++++++++---- .../Data/MultiplexedConnectionLockPool.cs | 1 + ...MultiplexingConnectionStrategyTestCases.cs | 27 +++++++++++++ .../Postgres/TestingPostgresDb.cs | 2 +- 5 files changed, 69 insertions(+), 16 deletions(-) diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 2bfbe254..00a320c4 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -112,14 +112,14 @@ private async ValueTask DisposeOrCloseAsync(bool isDispose) finally { #if NETSTANDARD2_1 - if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) - { - await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); - } - else - { - SyncDisposeConnection(); - } + if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) + { + await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); + } + else + { + SyncDisposeConnection(); + } #elif NETSTANDARD2_0 || NET461 SyncDisposeConnection(); #else diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 991c42b9..153fd7c4 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -18,12 +18,20 @@ internal sealed class MultiplexedConnectionLock : IAsyncDisposable private readonly AsyncLock _mutex = AsyncLock.Create(); private readonly Dictionary _heldLocksToKeepaliveCadences = new Dictionary(); private readonly DatabaseConnection _connection; + /// + /// Tracks whether we've successfully opened the connection. We track this explicity instead of just looking at + /// because we want to make sure we close() explicitly for every + /// open() and also we want to make sure we do not try to re-open a broken connection. + /// + private bool _connectionOpened; public MultiplexedConnectionLock(DatabaseConnection connection) { this._connection = connection; } + private bool IsConnectionBrokenNoLock => this._connectionOpened && !this._connection.CanExecuteQueries; + public async ValueTask TryAcquireAsync( string name, TimeoutValue timeout, @@ -33,8 +41,8 @@ public async ValueTask TryAcquireAsync( bool opportunistic) where TLockCookie : class { - using var mutextHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); - if (mutextHandle == null) + using var mutexHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); + if (mutexHandle == null) { // mutex wasn't free, so just give up Invariant.Require(opportunistic); @@ -43,6 +51,10 @@ public async ValueTask TryAcquireAsync( return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); } + // This is technically redundant with the similar catch block below, but avoids needing to have + // to attempt a query on a connection that we know is broken. + if (opportunistic && this.IsConnectionBrokenNoLock) { return this.GetAlreadyBrokenResultNoLock(); } + try { if (this._heldLocksToKeepaliveCadences.ContainsKey(name)) @@ -53,9 +65,10 @@ public async ValueTask TryAcquireAsync( return this.GetFailureResultNoLock(isAlreadyHeld: true, opportunistic, timeout); } - if (!this._connection.CanExecuteQueries) + if (!this._connectionOpened) { await this._connection.OpenAsync(cancellationToken).ConfigureAwait(false); + this._connectionOpened = true; } var lockCookie = await strategy.TryAcquireAsync(this._connection, name, opportunistic ? TimeSpan.Zero : timeout, cancellationToken).ConfigureAwait(false); @@ -71,6 +84,11 @@ public async ValueTask TryAcquireAsync( // shortened the timeout return this.GetFailureResultNoLock(isAlreadyHeld: false, opportunistic, timeout); } + // never punish for the connection being broken already (see https://github.com/madelson/DistributedLock/issues/83) + catch when (opportunistic && this.IsConnectionBrokenNoLock) + { + return this.GetAlreadyBrokenResultNoLock(); + } finally { await this.CloseConnectionIfNeededNoLockAsync().ConfigureAwait(false); @@ -90,6 +108,11 @@ public async ValueTask GetIsInUseAsync() return mutexHandle == null || this._heldLocksToKeepaliveCadences.Count != 0; } + private Result GetAlreadyBrokenResultNoLock() => + // Retry on any already-broken connection to avoid "leaking" the killing or death of connections. We want there to be no observable + // results (other than perf) of multiplexing vs. not. + new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); + private Result GetFailureResultNoLock(bool isAlreadyHeld, bool opportunistic, TimeoutValue timeout) { // only opportunistic acquisitions trigger retries @@ -151,11 +174,13 @@ private async ValueTask ReleaseAsync(IDbSynchronizationStrategy connection try { result = await TryAcquireAsync(@lock, opportunistic: false).ConfigureAwait(false); + Invariant.Require(result!.Value.Retry == MultiplexedConnectionLockRetry.NoRetry, "Acquire on fresh lock should not recommend a retry"); } finally { diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index 924f3da5..1c7aeae0 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; +using System.Data.Common; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Threading; @@ -122,5 +123,31 @@ async Task Test() string MakeLockName(int i) => $"{nameof(TestHighConcurrencyWithSmallPool)}_{i}"; } + + [Test] + public async Task TestBrokenConnectionDoesNotCorruptPool() + { + // This makes sure that for the Semaphore5 lock initial 4 tickets are taken with the default + // application name and therefore won't be killed + this._lockProvider.CreateLock("1"); + this._lockProvider.CreateLock("2"); + var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + + var lock1 = this._lockProvider.CreateLock("1"); + await using var handle1 = await lock1.AcquireAsync(); + + // kill the session + await this._lockProvider.Strategy.Db.KillSessionsAsync(applicationName); + + var lock2 = this._lockProvider.CreateLock("2"); + Assert.DoesNotThrowAsync(async () => await (await lock2.AcquireAsync()).DisposeAsync()); + + await using var handle2 = await lock2.AcquireAsync(); + Assert.DoesNotThrow(() => lock2.TryAcquire()?.Dispose()); + + Assert.Catch(() => handle1.Dispose()); + + Assert.DoesNotThrowAsync(async () => await (await lock1.AcquireAsync()).DisposeAsync()); + } } } diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 74d90019..c4d221b3 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -43,7 +43,7 @@ public int CountActiveSessions(string applicationName) using var command = connection.CreateCommand(); command.CommandText = "SELECT COUNT(*)::int FROM pg_stat_activity WHERE application_name = @applicationName"; command.Parameters.AddWithValue("applicationName", applicationName); - return (int)command.ExecuteScalar(); + return (int)command.ExecuteScalar()!; } public IsolationLevel GetIsolationLevel(DbConnection connection) From f581dd2c74cca7ded847d769cc6d3628653f1fd5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 15:34:19 -0400 Subject: [PATCH 120/399] 2.0.2 version bumps --- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 2 +- DistributedLock/DistributedLock.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 54a90171..e5c76502 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 7c4565a0..c16ea55e 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 2ce82baa..5eac9c35 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 2660947c..644e26ad 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.0.1 + 2.0.2 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 3925748babc0abf5498c8a739bcfd9e8616c32ce Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 16:31:26 -0400 Subject: [PATCH 121/399] Update release notes for 2.0.2 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 53778db3..6ba35b18 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,10 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.0.2 + - Fixed bug where `HandleLostToken` would hang when accessed on a SqlServer or Postgres lock handle that used keepalive ([#85](https://github.com/madelson/DistributedLock/issues/85), DistributedLock.Core 1.0.1) + - Fixed bug where broken database connections could result in future lock attempts failing when using SqlServer or Postgres locks with multiplexing ([#83](https://github.com/madelson/DistributedLock/issues/83), DistributedLock.Core 1.0.1) + - Updated Npgsql dependency to 5.x to take advantage of various bugfixes ([#61](https://github.com/madelson/DistributedLock/issues/61), DistributedLock.Postgres 1.0.1) - 2.0.1 - Fixed Redis lock behavior when using a database with `WithKeyPrefix` (#66, DistributedLock.Redis 1.0.1). Thanks @skomis-mm for contributing! - 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) From a60febb71821e557f305a3d91aeb5ecc58bbc3f6 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 24 Apr 2021 16:33:06 -0400 Subject: [PATCH 122/399] Minor readme fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ba35b18..9a264159 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ DistributedLock is a .NET library that provides robust and easy-to-use distribut With DistributedLock, synchronizing access to a region of code across multiple applications/machines is as simple as: ```C# -using (await myDistributedLock.AcquireAsync()) +await using (await myDistributedLock.AcquireAsync()) { // I hold the lock here } From b98802ad254d2d5280566510b9b4e91af6a83a18 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 28 Apr 2021 07:46:18 -0400 Subject: [PATCH 123/399] Add clarifying comments --- DistributedLock.Postgres/PostgresAdvisoryLock.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 2b97387b..2e6a2b05 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -122,7 +122,10 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post var commandText = new StringBuilder(); + // We set the statement_timeout to 0 (inf) because we want everything to be driven by the lock_timeout. commandText.AppendLine("SET LOCAL statement_timeout = 0;"); + // We set the lock timeout to our timeout, with the exception that if our timeout is zero we set it to inf because + // we'll be using the pg_try_advisory_lock function which doesn't block in that case. commandText.AppendLine($"SET LOCAL lock_timeout = {(timeout.IsZero || timeout.IsInfinite ? 0 : timeout.InMilliseconds)};"); if (connection.IsExernallyOwned) From 360db4a8d2b8d7818fc02934363f78c160e6470a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Thu, 6 May 2021 07:16:07 -0400 Subject: [PATCH 124/399] Clarify versioning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a264159..fbdc9dca 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ await using (await myDistributedLock.AcquireAsync()) ## Implementations -DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. +DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql From dacb827ec3bbd9335c8807de556f682af6c1bf58 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 15 May 2021 08:43:52 -0400 Subject: [PATCH 125/399] attempt to make appveyor run tests on ubuntu --- appveyor.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b9361417..7434dc19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,10 +7,8 @@ image: build_script: - dotnet build DistributedLock.sln -c Release -# only test categories that don't depend on external things -test: - categories: - - CI +test_script: + - dotnet test DistributedLock.sln -c Release --no-build --filter TestCategory=CI for: - @@ -18,7 +16,5 @@ for: only: - image: "Visual Studio 2019" - test: - categories: - - CI - - CIWindows \ No newline at end of file + test_script: + - dotnet test DistributedLock.sln -c Release --no-build --filter "TestCategory=CI|TestCategory=CIWindows" \ No newline at end of file From d6b4a3cdf3d4763d91bf9ec5899dbfd439249aed Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 15 May 2021 09:00:17 -0400 Subject: [PATCH 126/399] more appveyor linux fixes --- .../Infrastructure/Redis/RedisServer.cs | 15 +++++++++------ appveyor.yml | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 550fdbba..03fdd30f 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -15,11 +15,14 @@ internal class RedisServer // redis default is 6379, so go one above that private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; - private static readonly string WslPath = Directory.GetDirectories(@"C:\Windows\WinSxS") - .Select(d => Path.Combine(d, "wsl.exe")) - .Where(File.Exists) - .OrderByDescending(File.GetCreationTimeUtc) - .First(); + // it's important for this to be lazy because it doesn't work when running on Linux + private static readonly Lazy WslPath = new Lazy( + () => Directory.GetDirectories(@"C:\Windows\WinSxS") + .Select(d => Path.Combine(d, "wsl.exe")) + .Where(File.Exists) + .OrderByDescending(File.GetCreationTimeUtc) + .First() + ); private static readonly Dictionary ActiveServersByPort = new Dictionary(); private static readonly RedisServer[] DefaultServers = new RedisServer[RedisPorts.DefaultPorts.Count]; @@ -34,7 +37,7 @@ private RedisServer(int? port, bool allowAdmin) { this.Port = port ?? Enumerable.Range(MinDynamicPort, count: MaxDynamicPort - MinDynamicPort + 1) .First(p => !ActiveServersByPort.ContainsKey(p)); - this._command = Command.Run(WslPath, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) + this._command = Command.Run(WslPath.Value, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) .RedirectTo(Console.Out) .RedirectStandardErrorTo(Console.Error); ActiveServersByPort.Add(this.Port, this); diff --git a/appveyor.yml b/appveyor.yml index 7434dc19..b3cbaac9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ build_script: - dotnet build DistributedLock.sln -c Release test_script: - - dotnet test DistributedLock.sln -c Release --no-build --filter TestCategory=CI + - dotnet test DistributedLock.sln -c Release -f netcoreapp3.1 --no-build --filter TestCategory=CI for: - From 7eef93ed050b10346d9c76fcbef07d3b059fe85c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 18 Jun 2021 09:43:18 -0400 Subject: [PATCH 127/399] Patch bump for Core --- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index e5c76502..2523c9a4 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages From a81df60470700ab24ee3bff9401e5bc4412f0648 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 18 Jun 2021 09:45:20 -0400 Subject: [PATCH 128/399] Version bump for DistributedLock --- DistributedLock/DistributedLock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index f0d135bd..4d6229c7 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.0.2 + 2.1.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 052fc8c43efb6a2371d725bb10d86143936900f3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 18 Jun 2021 09:48:21 -0400 Subject: [PATCH 129/399] Release notes cleanup --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 238029e7..c6a60959 100644 --- a/README.md +++ b/README.md @@ -138,25 +138,25 @@ Contributions are welcome! If you are interested in contributing towards a new o - Fixed bug where broken database connections could result in future lock attempts failing when using SqlServer or Postgres locks with multiplexing ([#83](https://github.com/madelson/DistributedLock/issues/83), DistributedLock.Core 1.0.1) - Updated Npgsql dependency to 5.x to take advantage of various bugfixes ([#61](https://github.com/madelson/DistributedLock/issues/61), DistributedLock.Postgres 1.0.1) - 2.0.1 - - Fixed Redis lock behavior when using a database with `WithKeyPrefix` (#66, DistributedLock.Redis 1.0.1). Thanks @skomis-mm for contributing! + - Fixed Redis lock behavior when using a database with `WithKeyPrefix` ([#66](https://github.com/madelson/DistributedLock/issues/66), DistributedLock.Redis 1.0.1). Thanks @skomis-mm for contributing! - 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - - Added Postgresql-based locking (#56, DistributedLock.Postgres 1.0.0) - - Added Redis-based locking (#24, DistributedLock.Redis 1.0.0) - - Added Azure blob-based locking (#42, DistributedLock.Azure 1.0.0) - - Added file-based locking (#28, DistributedLock.FileSystem 1.0.0) - - Added provider classes for improved IOC integration (#13) - - Added strong naming to assemblies. Thanks @pedropaulovc for contributing! (#47, BREAKING CHANGE) - - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` #20, BREAKING CHANGE) - - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives (#10) - - Added `HandleLostToken` API for tracking if a lock's underlying connection dies (#6, BREAKING CHANGE) - - Added SourceLink support (#57) + - Added Postgresql-based locking ([#56](https://github.com/madelson/DistributedLock/issues/56), DistributedLock.Postgres 1.0.0) + - Added Redis-based locking ([#24](https://github.com/madelson/DistributedLock/issues/24), DistributedLock.Redis 1.0.0) + - Added Azure blob-based locking ([#42](https://github.com/madelson/DistributedLock/issues/42), DistributedLock.Azure 1.0.0) + - Added file-based locking ([#28](https://github.com/madelson/DistributedLock/issues/28), DistributedLock.FileSystem 1.0.0) + - Added provider classes for improved IOC integration ([#13](https://github.com/madelson/DistributedLock/issues/13)) + - Added strong naming to assemblies. Thanks @pedropaulovc for contributing! ([#47](https://github.com/madelson/DistributedLock/issues/47), BREAKING CHANGE) + - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` [#20](https://github.com/madelson/DistributedLock/issues/20), BREAKING CHANGE) + - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives ([#10](https://github.com/madelson/DistributedLock/issues/10)) + - Added `HandleLostToken` API for tracking if a lock's underlying connection dies ([#6](https://github.com/madelson/DistributedLock/issues/6), BREAKING CHANGE) + - Added SourceLink support ([#57](https://github.com/madelson/DistributedLock/issues/57)) - Removed `GetSafeName` API in favor of safe naming by default (BREAKING CHANGE) - Renamed "SystemDistributedLock" to "EventWaitHandleDistributedLock" (DistributedLock.WaitHandles 1.0.0) - Stopped supporting net45 (BREAKING CHANGE) - - Removed `DbConnection` and `DbTransaction` constructors form `SqlDistributedLock`, leaving the constructors that take `IDbConnection`/`IDbTransaction` (#35, BREAKING CHANGE) + - Removed `DbConnection` and `DbTransaction` constructors form `SqlDistributedLock`, leaving the constructors that take `IDbConnection`/`IDbTransaction` ([#35](https://github.com/madelson/DistributedLock/issues/35), BREAKING CHANGE) - Changed methods returning `Task` to instead return `ValueTask`, making it so that `using (@lock.AcquireAsync()) { ... } without an `await` no longer compiles (#34, BREAKING CHANGE) - - Changed `UpgradeableLockHandle.UpgradeToWriteLock` to return `void` (#33, BREAKING CHANGE) + - Changed `UpgradeableLockHandle.UpgradeToWriteLock` to return `void` ([#33](https://github.com/madelson/DistributedLock/issues/33), BREAKING CHANGE) - Switched to Microsoft.Data.SqlClient by default for all target frameworks (BREAKING CHANGE) - Changed all locking implementations to be non-reentrant (BREAKING CHANGE) - 1.5.0 From 6666195468078af637c0e1cc83b210de55c088a9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 18 Jun 2021 09:50:47 -0400 Subject: [PATCH 130/399] Link contributors in release notes. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c6a60959..32f3c35c 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ Contributions are welcome! If you are interested in contributing towards a new o - Fixed bug where broken database connections could result in future lock attempts failing when using SqlServer or Postgres locks with multiplexing ([#83](https://github.com/madelson/DistributedLock/issues/83), DistributedLock.Core 1.0.1) - Updated Npgsql dependency to 5.x to take advantage of various bugfixes ([#61](https://github.com/madelson/DistributedLock/issues/61), DistributedLock.Postgres 1.0.1) - 2.0.1 - - Fixed Redis lock behavior when using a database with `WithKeyPrefix` ([#66](https://github.com/madelson/DistributedLock/issues/66), DistributedLock.Redis 1.0.1). Thanks @skomis-mm for contributing! + - Fixed Redis lock behavior when using a database with `WithKeyPrefix` ([#66](https://github.com/madelson/DistributedLock/issues/66), DistributedLock.Redis 1.0.1). Thanks [@skomis-mm](https://github.com/skomis-mm) for contributing! - 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - Added Postgresql-based locking ([#56](https://github.com/madelson/DistributedLock/issues/56), DistributedLock.Postgres 1.0.0) @@ -146,7 +146,7 @@ Contributions are welcome! If you are interested in contributing towards a new o - Added Azure blob-based locking ([#42](https://github.com/madelson/DistributedLock/issues/42), DistributedLock.Azure 1.0.0) - Added file-based locking ([#28](https://github.com/madelson/DistributedLock/issues/28), DistributedLock.FileSystem 1.0.0) - Added provider classes for improved IOC integration ([#13](https://github.com/madelson/DistributedLock/issues/13)) - - Added strong naming to assemblies. Thanks @pedropaulovc for contributing! ([#47](https://github.com/madelson/DistributedLock/issues/47), BREAKING CHANGE) + - Added strong naming to assemblies. Thanks [@pedropaulovc](https://github.com/pedropaulovc) for contributing! ([#47](https://github.com/madelson/DistributedLock/issues/47), BREAKING CHANGE) - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` [#20](https://github.com/madelson/DistributedLock/issues/20), BREAKING CHANGE) - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives ([#10](https://github.com/madelson/DistributedLock/issues/10)) - Added `HandleLostToken` API for tracking if a lock's underlying connection dies ([#6](https://github.com/madelson/DistributedLock/issues/6), BREAKING CHANGE) From a7dece4f5cb64bc1a7866f61b5f2179d602847e0 Mon Sep 17 00:00:00 2001 From: Michael Wiedinmyer Date: Wed, 23 Jun 2021 19:20:52 -0400 Subject: [PATCH 131/399] Fix capitalization --- docs/DistributedLock.Redis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.Redis.md b/docs/DistributedLock.Redis.md index 881556c6..07805157 100644 --- a/docs/DistributedLock.Redis.md +++ b/docs/DistributedLock.Redis.md @@ -41,7 +41,7 @@ In addition to specifying the name/key and database(s), some additional tuning o - `Expiry` determines how long the lock will be *initially* claimed for (because of auto-extension, locks can be held for longer). Defaults to 30s. - `ExtensionCadence` determines how frequently the hold on the lock will be renewed to the full `Expiry`. Defaults to 1/3 of `Expiry`. - `MinValidityTime` determines what fraction of `Expiry` still has to remain when the locking operation completes to consider it a success. This is mostly relevant when acquiring a lock across multiple databases (e. g. if we immediately succeed on database 1 and eventually succeed on database 2 after 30s have elapsed, then our hold on database 1 will have expired). Defaults to 90% of the `Expiry`. -- `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lock that is currently held by someone else. A random number in the range will be chosen for each sleep. If you expect contention, lowering these values may increase the responsiveness (how quickly a lock detects that it can now be taken) but will increase the number of calls made to REdis. Raising the values will have the reverse effects. +- `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lock that is currently held by someone else. A random number in the range will be chosen for each sleep. If you expect contention, lowering these values may increase the responsiveness (how quickly a lock detects that it can now be taken) but will increase the number of calls made to Redis. Raising the values will have the reverse effects. 1 The reason RedLock does not work with semaphores is that entering a semaphore on a majority of databases does not guarantee that the semaphore's invariant is preserved. For example, imagine a two-count semaphore with three databases (1, 2, and 3) and three users (A, B, and C). We could find ourselves in the following situation: on database 1, users A and B have entered. On database 2, users B and C have entered. On database 3, users A and C have entered. Here all users believe they have entered the semaphore because they've succeeded on two out of three databases. From 5cb90f710ba7af77d34066ebb97109f9289053be Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 9 Jul 2021 07:13:33 -0400 Subject: [PATCH 132/399] MySql project setup --- DistributedLock.Core/AssemblyAttributes.cs | 1 + DistributedLock.MySql/AssemblyAttributes.cs | 3 ++ .../DistributedLock.MySql.csproj | 54 +++++++++++++++++++ DistributedLock.sln | 8 ++- DistributedLock/DistributedLock.csproj | 1 + 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 DistributedLock.MySql/AssemblyAttributes.cs create mode 100644 DistributedLock.MySql/DistributedLock.MySql.csproj diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/DistributedLock.Core/AssemblyAttributes.cs index 6cbdd148..9a42671f 100644 --- a/DistributedLock.Core/AssemblyAttributes.cs +++ b/DistributedLock.Core/AssemblyAttributes.cs @@ -13,4 +13,5 @@ [assembly: InternalsVisibleTo("DistributedLock.FileSystem, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Redis, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.ZooKeeper, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.MySql, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif diff --git a/DistributedLock.MySql/AssemblyAttributes.cs b/DistributedLock.MySql/AssemblyAttributes.cs new file mode 100644 index 00000000..a9e3a34f --- /dev/null +++ b/DistributedLock.MySql/AssemblyAttributes.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj new file mode 100644 index 00000000..60eda120 --- /dev/null +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -0,0 +1,54 @@ + + + + netstandard2.0;netstandard2.1;net461 + Medallion.Threading.MySql + True + 4 + Latest + enable + + + + 1.0.0 + 1.0.0.0 + Michael Adelson + Provides a distributed lock implementation based on MySql + Copyright © 2020 Michael Adelson + MIT + distributed lock async mutex sql mysql + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + embedded + + + + False + 1591 + TRACE;DEBUG + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DistributedLock.sln b/DistributedLock.sln index 0b66e25a..565ccbd5 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -31,7 +31,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D14FE348 FixDistributedLockCoreDependencyVersion.targets = FixDistributedLockCoreDependencyVersion.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.ZooKeeper", "DistributedLock.ZooKeeper\DistributedLock.ZooKeeper.csproj", "{710F287B-02FB-4F89-9BEC-BAA97250037F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.ZooKeeper", "DistributedLock.ZooKeeper\DistributedLock.ZooKeeper.csproj", "{710F287B-02FB-4F89-9BEC-BAA97250037F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.MySql", "DistributedLock.MySql\DistributedLock.MySql.csproj", "{6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -87,6 +89,10 @@ Global {710F287B-02FB-4F89-9BEC-BAA97250037F}.Debug|Any CPU.Build.0 = Debug|Any CPU {710F287B-02FB-4F89-9BEC-BAA97250037F}.Release|Any CPU.ActiveCfg = Release|Any CPU {710F287B-02FB-4F89-9BEC-BAA97250037F}.Release|Any CPU.Build.0 = Release|Any CPU + {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 4d6229c7..65cb3b98 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -49,6 +49,7 @@ + From 27d687905540eb6cb89d747cfb4fbbb00cfa322f Mon Sep 17 00:00:00 2001 From: Frederik Andersen Date: Fri, 20 Aug 2021 14:55:08 +0200 Subject: [PATCH 133/399] Change example to use interface --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 32f3c35c..b06fc3d6 100644 --- a/README.md +++ b/README.md @@ -88,15 +88,15 @@ For applications that use [dependency injection](https://en.wikipedia.org/wiki/D ```C# // in your Startup.cs: -services.AddSingleton(_ => new PostgresDistributedSynchronizationProvider(myConnectionString)); +services.AddSingleton(_ => new PostgresDistributedSynchronizationProvider(myConnectionString)); services.AddTransient(); // in SomeService.cs public class SomeService { - private readonly PostgresDistributedSynchronizationProvider _synchronizationProvider; + private readonly IDistributedLockProvider _synchronizationProvider; - public SomeService(PostgresDistributedSynchronizationProvider synchronizationProvider) + public SomeService(IDistributedLockProvider synchronizationProvider) { this._synchronizationProvider = synchronizationProvider; } From 4c0b7ffcc8ad7e069bbbf6e1042260e22abcb0af Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 24 Aug 2021 20:19:40 -0400 Subject: [PATCH 134/399] Implement MySql distributed lock (fix #95) --- .../Internal/Data/DatabaseConnection.cs | 2 +- ...onnectionOrTransactionDbDistributedLock.cs | 37 ++-- .../DistributedLock.MySql.csproj | 5 +- .../MySqlConnectionOptionsBuilder.cs | 76 ++++++++ .../MySqlDatabaseConnection.cs | 49 +++++ .../MySqlDistributedLock.IDistributedLock.cs | 85 ++++++++ DistributedLock.MySql/MySqlDistributedLock.cs | 183 ++++++++++++++++++ .../MySqlDistributedLockHandle.cs | 37 ++++ ...MySqlDistributedSynchronizationProvider.cs | 53 +++++ .../MySqlMultiplexedConnectionLockPool.cs | 12 ++ DistributedLock.MySql/MySqlUserLock.cs | 83 ++++++++ .../PostgresMultiplexedConnectionLockPool.cs | 3 +- .../SqlDatabaseConnection.cs | 6 +- .../SqlMultiplexedConnectionLockPool.cs | 3 +- ...onnectionOrTransactionStrategyTestCases.cs | 13 +- .../ExternalTransactionStrategyTestCases.cs | 25 ++- .../Data/OwnedTransactionStrategyTestCases.cs | 10 +- .../DistributedLockCoreTestCases.cs | 4 +- .../Infrastructure/Data/ITestingDb.cs | 20 +- .../Infrastructure/MySql/TestingMySqlDb.cs | 107 ++++++++++ .../MySql/TestingMySqlProviders.cs | 31 +++ .../Postgres/TestingPostgresDb.cs | 2 +- .../Shared/MariaDbCredentials.cs | 45 +++++ .../Infrastructure/Shared/MySqlCredentials.cs | 39 ++++ .../SqlServer/TestingSqlServerDb.cs | 4 +- .../Tests/CombinatorialTests.cs | 34 ++++ .../MySqlConnectionOptionsBuilderTest.cs | 28 +++ .../Tests/MySql/MySqlDistributedLockTest.cs | 77 ++++++++ .../Postgres/PostgresDistributedLockTest.cs | 8 + ...PostgresDistributedReaderWriterLockTest.cs | 21 ++ DistributedLockTaker/Program.cs | 7 + 31 files changed, 1062 insertions(+), 47 deletions(-) create mode 100644 DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs create mode 100644 DistributedLock.MySql/MySqlDatabaseConnection.cs create mode 100644 DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs create mode 100644 DistributedLock.MySql/MySqlDistributedLock.cs create mode 100644 DistributedLock.MySql/MySqlDistributedLockHandle.cs create mode 100644 DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs create mode 100644 DistributedLock.MySql/MySqlUserLock.cs create mode 100644 DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs create mode 100644 DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs create mode 100644 DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs create mode 100644 DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs create mode 100644 DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs create mode 100644 DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs create mode 100644 DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 7471531b..a7a85f61 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -60,7 +60,7 @@ public DatabaseCommand CreateCommand() // without closing the connection. However, we don't currently have any use-cases for that public async ValueTask BeginTransactionAsync() { - Invariant.Require(this._transaction == null); + Invariant.Require(!this.HasTransaction); using var _ = await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index e0c38190..78e2f0a3 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -18,11 +18,14 @@ sealed class DedicatedConnectionOrTransactionDbDistributedLock : IDbDistributedL { private readonly string _name; private readonly Func _connectionFactory; - private readonly bool _scopeToOwnedTransaction; + private readonly bool _transactionScopedIfPossible; private readonly TimeoutValue _keepaliveCadence; + /// + /// Constructs an instance using the given EXTERNALLY OWNED . + /// public DedicatedConnectionOrTransactionDbDistributedLock(string name, Func externalConnectionFactory) - : this(name, externalConnectionFactory, useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan) + : this(name, externalConnectionFactory, useTransaction: true, keepaliveCadence: Timeout.InfiniteTimeSpan) { } @@ -34,7 +37,7 @@ public DedicatedConnectionOrTransactionDbDistributedLock( { this._name = name; this._connectionFactory = connectionFactory; - this._scopeToOwnedTransaction = useTransaction; + this._transactionScopedIfPossible = useTransaction; this._keepaliveCadence = keepaliveCadence; } @@ -50,39 +53,34 @@ public DedicatedConnectionOrTransactionDbDistributedLock( try { DatabaseConnection connection; - bool transactionScoped; if (contextHandle != null) { connection = GetContextHandleConnection(contextHandle); - transactionScoped = false; } else { connectionResource = connection = this._connectionFactory(); if (connection.IsExernallyOwned) { - Invariant.Require(!this._scopeToOwnedTransaction); if (!connection.CanExecuteQueries) { throw new InvalidOperationException("The connection and/or transaction are disposed or closed"); } - transactionScoped = false; } else { await connection.OpenAsync(cancellationToken).ConfigureAwait(false); - if (this._scopeToOwnedTransaction) + if (this._transactionScopedIfPossible) // for an internally-owned connection, we must create the transaction { await connection.BeginTransactionAsync().ConfigureAwait(false); } - transactionScoped = this._scopeToOwnedTransaction; } } var lockCookie = await strategy.TryAcquireAsync(connection, this._name, timeout, cancellationToken).ConfigureAwait(false); if (lockCookie != null) { - result = new Handle(connection, strategy, this._name, lockCookie, transactionScoped, connectionResource); + result = new Handle(connection, strategy, this._name, lockCookie, transactionScoped: this._transactionScopedIfPossible && connection.HasTransaction, connectionResource); if (!this._keepaliveCadence.IsInfinite) { connection.SetKeepaliveCadence(this._keepaliveCadence); @@ -148,7 +146,7 @@ private sealed class InnerHandle : IAsyncDisposable private readonly IDbSynchronizationStrategy _strategy; private readonly string _name; private readonly TLockCookie _lockCookie; - private readonly bool _scopedToOwnedTransaction; + private readonly bool _transactionScoped; private readonly IAsyncDisposable? _connectionResource; private object? _connectionMonitoringHandleOrDisposedSentinel; @@ -157,14 +155,14 @@ public InnerHandle( IDbSynchronizationStrategy strategy, string name, TLockCookie lockCookie, - bool scopedToOwnTransaction, + bool transactionScoped, IAsyncDisposable? connectionResource) { this.Connection = connection; this._strategy = strategy; this._name = name; this._lockCookie = lockCookie; - this._scopedToOwnedTransaction = scopedToOwnTransaction; + this._transactionScoped = transactionScoped; this._connectionResource = connectionResource; } @@ -215,13 +213,12 @@ public async ValueTask DisposeAsync() try { - // If we're not scoped to a transaction, explicit release is required regardless of whether - // we are about to dispose the connection due to connection pooling. For a pooled connection, - // simply calling Dispose() will not release the lock: it just returns the connection to the pool. - if (!(this._scopedToOwnedTransaction - // For external transaction-scoped locks, we're not about to dispose the transaction but if the transaction is - // dead (e. g. completed or rolled back) then we know the lock has been released. - || (this.Connection.IsExernallyOwned && this.Connection.HasTransaction && !this.Connection.CanExecuteQueries))) + // For transaction-scoped locks, we can sometimes skip the explicit release step. This comes up when either + // (a) We own the connection and therefore the transaction. In this case we're about to dispose the transaction and release that way + // (b) The transaction is dead (e. g. completed or rolled back) in which case the lock has already been released + var canSkipExplicitRelease = + this._transactionScoped && (!this.Connection.IsExernallyOwned || !this.Connection.CanExecuteQueries); + if (!canSkipExplicitRelease) { await this._strategy.ReleaseAsync(this.Connection, this._name, this._lockCookie).ConfigureAwait(false); } diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj index 60eda120..bc66182f 100644 --- a/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -14,7 +14,7 @@ 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on MySql - Copyright © 2020 Michael Adelson + Copyright © 2021 Michael Adelson MIT distributed lock async mutex sql mysql https://github.com/madelson/DistributedLock @@ -41,7 +41,8 @@ - + + diff --git a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs new file mode 100644 index 00000000..38c11a66 --- /dev/null +++ b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs @@ -0,0 +1,76 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.MySql +{ + /// + /// Specifies options for connecting to and locking against a MySQL database + /// + public sealed class MySqlConnectionOptionsBuilder + { + private TimeoutValue? _keepaliveCadence; + private bool? _useMultiplexing; + + internal MySqlConnectionOptionsBuilder() { } + + /// + /// MySQL's wait_timeout system variable determines how long the server will allow a connection to be idle before killing it. + /// For more information, see https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout. + /// + /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. + /// + /// Because MySQL's default for this setting is 8 hours, the default is 3.5 hours. + /// + /// Setting a value of disables keepalive. + /// + public MySqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) + { + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } + + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public MySqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } + + internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + MySqlConnectionOptionsBuilder? options; + if (optionsBuilder != null) + { + options = new MySqlConnectionOptionsBuilder(); + optionsBuilder(options); + } + else + { + options = null; + } + + var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromHours(3.5); + var useMultiplexing = options?._useMultiplexing ?? true; + + return (keepaliveCadence, useMultiplexing); + } + } +} diff --git a/DistributedLock.MySql/MySqlDatabaseConnection.cs b/DistributedLock.MySql/MySqlDatabaseConnection.cs new file mode 100644 index 00000000..6de275b4 --- /dev/null +++ b/DistributedLock.MySql/MySqlDatabaseConnection.cs @@ -0,0 +1,49 @@ +using Medallion.Threading.Internal.Data; +using MySqlConnector; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.MySql +{ + internal class MySqlDatabaseConnection : DatabaseConnection + { + public MySqlDatabaseConnection(IDbConnection connection) + : base(connection, isExternallyOwned: true) + { + } + + public MySqlDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) + { + } + + public MySqlDatabaseConnection(string connectionString) + : base(new MySqlConnection(connectionString), isExternallyOwned: false) + { + } + + // Seems like this only helps when executing a statement multiple times on the + // same connection (unclear since there's limited documentation) + public override bool ShouldPrepareCommands => false; + + public override bool IsCommandCancellationException(Exception exception) + { + // see https://mysqlconnector.net/overview/command-cancellation/ + return exception is MySqlException ex && ex.ErrorCode == MySqlErrorCode.QueryInterrupted; + } + + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + using var sleepCommand = this.CreateCommand(); + sleepCommand.SetCommandText("SELECT SLEEP(@durationSeconds)"); + sleepCommand.AddParameter("durationSeconds", sleepTime.TotalSeconds); + sleepCommand.SetTimeout(sleepTime); + + await executor(sleepCommand, cancellationToken).ConfigureAwait(false); + } + } +} diff --git a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..c9973013 --- /dev/null +++ b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.MySql +{ + public partial class MySqlDistributedLock + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public MySqlDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public MySqlDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.MySql/MySqlDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.cs new file mode 100644 index 00000000..57e600e8 --- /dev/null +++ b/DistributedLock.MySql/MySqlDistributedLock.cs @@ -0,0 +1,183 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Data; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.MySql +{ + /// + /// Implements a distributed lock for MySQL or MariaDB based on the GET_LOCK family of functions + /// + public sealed partial class MySqlDistributedLock : IInternalDistributedLock + { + /// + /// From https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html + /// + internal const int MaxNameLength = 64; + + private readonly IDbDistributedLock _internalLock; + + /// + /// Constructs a lock with the given that connects using the provided and + /// . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public MySqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) + { + } + + /// + /// Constructs a lock with the given that connects using the provided . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public MySqlDistributedLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connection)) + { + } + + /// + /// Constructs a lock with the given that connects using the connection from the provided . + /// + /// NOTE that the lock will not be scoped to the and must still be explicitly released before the transaction ends. + /// However, this constructor allows the lock to PARTICIPATE in an ongoing transaction on a connection. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public MySqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, transaction)) + { + } + + private MySqlDistributedLock(string name, bool exactName, Func internalLockFactory) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + if (exactName) + { + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + if (name.Length == 0) { throw new FormatException($"{nameof(name)}: must not be empty"); } + if (name.ToLowerInvariant() != name) { throw new FormatException($"{nameof(name)}: must not container uppercase letters"); } + this.Name = name; + } + else + { + this.Name = GetSafeName(name); + } + + this._internalLock = internalLockFactory(this.Name); + } + + /// + /// Implements + /// + public string Name { get; } + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, new MySqlUserLock(), cancellationToken, contextHandle: null).Wrap(h => new MySqlDistributedLockHandle(h)); + + private static string GetSafeName(string name) => + ToSafeName( + name, + MaxNameLength, + convertToValidName: s => + { + if (s.Length == 0) { return "__empty__"; } + return s.ToLowerInvariant(); + }, + hash: ComputeHash + ); + + private static string ToSafeName(string name, int maxNameLength, Func convertToValidName, Func hash) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + var validBaseLockName = convertToValidName(name); + if (validBaseLockName == name && validBaseLockName.Length <= maxNameLength) + { + return name; + } + + var nameHash = hash(Encoding.UTF8.GetBytes(name)); + + if (nameHash.Length >= maxNameLength) + { + return nameHash.Substring(0, length: maxNameLength); + } + + var prefix = validBaseLockName.Substring(0, Math.Min(validBaseLockName.Length, maxNameLength - nameHash.Length)); + return prefix + nameHash; + } + + private static string ComputeHash(byte[] bytes) + { + using var sha = SHA512.Create(); + var hashBytes = sha.ComputeHash(bytes); + + // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char + // name to include a good portion of the original provided name, which is good for debugging. See + // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big + const int Base32CharBits = 5; + const int HashLengthInChars = 160 / Base32CharBits; + + // we use Base32 because it is case-insensitive (like MySQL) and a bit more compact than Base16 + // RFC 4648 from https://en.wikipedia.org/wiki/Base32 + const string Base32Alphabet = "abcdefghijklmnopqrstuvwxyz234567"; + + var chars = new char[HashLengthInChars]; + var byteIndex = 0; + var bitBuffer = 0; + var bitsRemaining = 0; + for (var charIndex = 0; charIndex < chars.Length; ++charIndex) + { + if (bitsRemaining < Base32CharBits) + { + bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; + bitsRemaining += 8; + } + chars[charIndex] = Base32Alphabet[bitBuffer & 31]; + bitBuffer >>= Base32CharBits; + bitsRemaining -= Base32CharBits; + } + + return new string(chars); + } + + private static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + var (keepaliveCadence, useMultiplexing) = MySqlConnectionOptionsBuilder.GetOptions(options); + + if (useMultiplexing) + { + return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, MySqlMultiplexedConnectionLockPool.Instance, keepaliveCadence); + } + + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + } + + static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connection)); + } + + static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + // Note: we pass useTransaction:false here because MYSQL locks are always session-scoped; we only support locking against a transaction + // so that your lock can participate in the connection. + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); + } + } +} diff --git a/DistributedLock.MySql/MySqlDistributedLockHandle.cs b/DistributedLock.MySql/MySqlDistributedLockHandle.cs new file mode 100644 index 00000000..646f4a9b --- /dev/null +++ b/DistributedLock.MySql/MySqlDistributedLockHandle.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.MySql +{ + /// + /// Implements + /// + public sealed class MySqlDistributedLockHandle : IDistributedSynchronizationHandle + { + private IDistributedSynchronizationHandle? _innerHandle; + + internal MySqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } +} diff --git a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..00b3388f --- /dev/null +++ b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Medallion.Threading.MySql +{ + /// + /// Implements for + /// + public sealed class MySqlDistributedSynchronizationProvider : IDistributedLockProvider + { + private readonly Func _lockFactory; + + /// + /// Constructs a provider that connects with and . + /// + public MySqlDistributedSynchronizationProvider(string connectionString, Action? options = null) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connectionString, options, exactName); + } + + /// + /// Constructs a provider that connects with . + /// + public MySqlDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connection, exactName); + } + + /// + /// Constructs a provider that connects with . + /// + public MySqlDistributedSynchronizationProvider(IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, transaction, exactName); + } + + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// + public MySqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + } +} diff --git a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs new file mode 100644 index 00000000..4ba0303a --- /dev/null +++ b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs @@ -0,0 +1,12 @@ +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.MySql +{ + internal static class MySqlMultiplexedConnectionLockPool + { + public static readonly MultiplexedConnectionLockPool Instance = new(s => new MySqlDatabaseConnection(s)); + } +} diff --git a/DistributedLock.MySql/MySqlUserLock.cs b/DistributedLock.MySql/MySqlUserLock.cs new file mode 100644 index 00000000..0e4aa551 --- /dev/null +++ b/DistributedLock.MySql/MySqlUserLock.cs @@ -0,0 +1,83 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using MySqlConnector; +using System; +using System.Collections.Generic; +using System.Data.Common; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.MySql +{ + /// + /// Implements using user-level locking functions. See + /// https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html + /// + internal class MySqlUserLock : IDbSynchronizationStrategy + { + // matches SqlApplicationLock + private const int AlreadyHeldReturnCode = 103; + // see behavior documented at https://mariadb.com/kb/en/get_lock/ for when GET_LOCK returns NULL + private const int GetLockErrorReturnCode = 104; + + private static readonly object Cookie = new(); + + public bool IsUpgradeable => false; + + public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) + { + using var command = connection.CreateCommand(); + command.SetCommandText("DO RELEASE_LOCK(@name)"); + command.AddParameter("name", resourceName); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + } + + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + { + try + { + using var command = connection.CreateCommand(); + command.SetCommandText($"SELECT CASE WHEN IS_USED_LOCK(@name) = CONNECTION_ID() THEN {AlreadyHeldReturnCode} ELSE IFNULL(GET_LOCK(@name, @timeoutSeconds), {GetLockErrorReturnCode}) END"); + command.AddParameter("name", resourceName); + // Note: -1 works for MySQL but not for MariaDB (https://stackoverflow.com/questions/49792089/set-infinite-timeout-get-lock-in-mariadb/49809919) + command.AddParameter("timeoutSeconds", timeout.IsInfinite ? 0xFFFFFFFF : timeout.InSeconds); + + // Convert required because the value comes back as int on MariaDB and long on MySQL + var acquireCommandResult = Convert.ToInt64(await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false)); + switch (acquireCommandResult) + { + case 0: // timeout + return null; + case 1: // success + return Cookie; + case AlreadyHeldReturnCode: + if (timeout.IsZero) { return null; } + if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; + case GetLockErrorReturnCode: + cancellationToken.ThrowIfCancellationRequested(); // this error can also indicate cancellation in MariaDB + throw new InvalidOperationException("An error occurred such as running out of memory on the thread or a mysqladmin kill when trying to acquire the lock"); + default: + throw new InvalidOperationException($"Unexpected return code {acquireCommandResult}"); + } + } + catch (MySqlException ex) + // from https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_user_lock_deadlock + when ((ex.Number == 3058 && ex.SqlState == "HY000") + // from https://mariadb.com/kb/en/mariadb-error-codes/ + || (ex.Number == 1213 && ex.SqlState == "40001")) + { + throw new DeadlockException($"The request for the distributed lock failed with deadlock exit code {ex.Number}", ex); + } + catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) + { + // If the command is canceled, I believe there's a slim chance that acquisition just completed before the cancellation went through. + // In that case, I'm pretty sure it won't be rolled back. Therefore, to be safe we issue a release + await this.ReleaseAsync(connection, resourceName, Cookie).ConfigureAwait(false); + throw; + } + } + } +} diff --git a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs index d012fc28..a2d0c631 100644 --- a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs +++ b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs @@ -8,7 +8,6 @@ namespace Medallion.Threading.Postgres { internal static class PostgresMultiplexedConnectionLockPool { - public static readonly MultiplexedConnectionLockPool Instance = - new MultiplexedConnectionLockPool(s => new PostgresDatabaseConnection(s)); + public static readonly MultiplexedConnectionLockPool Instance = new(s => new PostgresDatabaseConnection(s)); } } diff --git a/DistributedLock.SqlServer/SqlDatabaseConnection.cs b/DistributedLock.SqlServer/SqlDatabaseConnection.cs index 6357d2c3..1bcad50c 100644 --- a/DistributedLock.SqlServer/SqlDatabaseConnection.cs +++ b/DistributedLock.SqlServer/SqlDatabaseConnection.cs @@ -58,16 +58,16 @@ public override bool IsCommandCancellationException(Exception exception) return exception is InvalidOperationException; } - public override Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) { Invariant.Require(sleepTime >= TimeSpan.Zero && sleepTime < TimeSpan.FromDays(1)); - var command = this.CreateCommand(); + using var command = this.CreateCommand(); command.SetCommandText(@"WAITFOR DELAY @delay"); command.AddParameter("delay", sleepTime.ToString(@"hh\:mm\:ss\.fff"), DbType.AnsiStringFixedLength); command.SetTimeout(sleepTime); - return executor(command, cancellationToken).AsTask(); + await executor(command, cancellationToken).ConfigureAwait(false); } } } diff --git a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs index 75e59f9a..ce5602bb 100644 --- a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs +++ b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs @@ -8,7 +8,6 @@ namespace Medallion.Threading.SqlServer { internal static class SqlMultiplexedConnectionLockPool { - public static readonly MultiplexedConnectionLockPool Instance = - new MultiplexedConnectionLockPool(s => new SqlDatabaseConnection(s)); + public static readonly MultiplexedConnectionLockPool Instance = new(s => new SqlDatabaseConnection(s)); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index ff91cd4b..b7f9ebf3 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -48,11 +48,16 @@ Task RunDeadlock(bool isFirst) Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, this.GetType().Name); - var deadlockVictim = tasks.Single(t => t.IsFaulted); - Assert.IsInstanceOf(deadlockVictim.Exception!.GetBaseException()); // backwards compat check - Assert.IsInstanceOf(deadlockVictim.Exception.GetBaseException()); + // MariaDB fails both tasks due to deadlock instead of just picking a single victim + Assert.GreaterOrEqual(tasks.Count(t => t.IsFaulted), 1); + Assert.LessOrEqual(tasks.Count(t => t.Status == TaskStatus.RanToCompletion), 1); + Assert.IsEmpty(tasks.Where(t => t.IsCanceled)); - tasks.Count(t => t.Status == TaskStatus.RanToCompletion).ShouldEqual(1); + foreach (var deadlockVictim in tasks.Where(t => t.IsFaulted)) + { + Assert.IsInstanceOf(deadlockVictim.Exception!.GetBaseException()); // backwards compat check + Assert.IsInstanceOf(deadlockVictim.Exception.GetBaseException()); + } } [Test] diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index 59fa0268..70edd6f8 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -113,18 +113,31 @@ private void TestLockOnCompletedTransactionHelper(Action complete complete(this._lockProvider.Strategy.AmbientTransaction!); - Assert.DoesNotThrow(handle.Dispose); + var transactionSupport = this._lockProvider.Strategy.Db.TransactionSupport; + if (transactionSupport == TransactionSupport.ExplicitParticipation) + { + // this will throw because the lock will still be trying to use the transaction and we've ended it + Assert.Throws(handle.Dispose); + } + else + { + Assert.DoesNotThrow(handle.Dispose); + } - // now lock can be re-acquired - Assert.IsFalse(nonAmbientTransactionLock.IsHeld()); + nonAmbientTransactionLock.IsHeld() + // explicit participation will fail to release above, so it is still held + .ShouldEqual(transactionSupport == TransactionSupport.ExplicitParticipation ? true : false); - if (this._lockProvider.Strategy.Db.SupportsTransactionScopedSynchronization) + if (transactionSupport == TransactionSupport.ImplicitParticipation) { - Assert.Catch(() => ambientTransactionLock.Acquire()); + // If we use transactions implicitly then we can keep using our lock without issue + // because we're just using the underlyign connection which is still good. + Assert.DoesNotThrow(() => ambientTransactionLock.Acquire().Dispose()); } else { - Assert.DoesNotThrow(() => ambientTransactionLock.Acquire().Dispose()); + // Otherwise we'll fail to use a transaction that has been ended + Assert.Catch(() => ambientTransactionLock.Acquire()); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs index d9221394..d8bed0de 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs @@ -33,6 +33,14 @@ public abstract class OwnedTransactionStrategyTestCases [Test] public void TestIsolationLevelLeakage() { + // Needed because MySQL has RepeatableRead while SqlServer and Postgres have ReadCommitted + IsolationLevel defaultIsolationLevel; + using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) + { + connection.Open(); + defaultIsolationLevel = this._lockProvider.Strategy.Db.GetIsolationLevel(connection); + } + // Pre-generate the lock we will use. This is necessary for our Semaphore5 strategy, where the first lock created // takes 4 of the 5 tickets (and thus may need more connections than a single-connection pool can support). For other // lock types this does nothing since creating a lock might open a connection but otherwise won't run any commands @@ -55,7 +63,7 @@ void AssertHasDefaultIsolationLevel() { using var connection = this._lockProvider.Strategy.Db.CreateConnection(); connection.Open(); - this._lockProvider.Strategy.Db.GetIsolationLevel(connection).ShouldEqual(IsolationLevel.ReadCommitted); + this._lockProvider.Strategy.Db.GetIsolationLevel(connection).ShouldEqual(defaultIsolationLevel); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index bd73b2d3..4b2ab692 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -252,8 +252,8 @@ public async Task TestLockNamesAreCaseSensitive() else { // otherwise, check that the names still contain the suffixes we added - Assert.That(lowerName, Does.Contain(lowerBaseName)); - Assert.That(upperName, Does.Contain(upperBaseName)); + Assert.IsTrue(lowerName.IndexOf(lowerBaseName, StringComparison.OrdinalIgnoreCase) >= 0); + Assert.IsTrue(upperName.IndexOf(upperBaseName, StringComparison.OrdinalIgnoreCase) >= 0); } } diff --git a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs index e02621b8..9703ab0c 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs @@ -19,7 +19,7 @@ public interface ITestingDb int MaxApplicationNameLength { get; } - bool SupportsTransactionScopedSynchronization { get; } + TransactionSupport TransactionSupport { get; } DbConnection CreateConnection(); @@ -30,6 +30,24 @@ public interface ITestingDb IsolationLevel GetIsolationLevel(DbConnection connection); } + public enum TransactionSupport + { + /// + /// The lifetime of the lock is tied to the transaction + /// + TransactionScoped, + + /// + /// Connection-scoped lifetime, but locking requests will automatically participate in a transaction if the connection has one + /// + ImplicitParticipation, + + /// + /// Connection-scoped lifetime, but locking requests will participate in a transaction if one is explicitly provided + /// + ExplicitParticipation, + } + /// /// Interface for the "primary" ADO.NET client for a particular DB backend. For now /// this is just used to designate Microsoft.Data.SqlClient vs. System.Data.SqlClient diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs new file mode 100644 index 00000000..5fd6c5e9 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -0,0 +1,107 @@ +using Medallion.Threading.Tests.Data; +using MySqlConnector; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.MySql +{ + public class TestingMySqlDb : ITestingPrimaryClientDb + { + private readonly string _defaultConnectionString; + private readonly MySqlConnectionStringBuilder _connectionStringBuilder; + + public TestingMySqlDb() : + this(MySqlCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) + { + } + + protected TestingMySqlDb(string defaultConnectionString) + { + this._defaultConnectionString = defaultConnectionString; + this._connectionStringBuilder = new MySqlConnectionStringBuilder(this._defaultConnectionString); + } + + public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + + public int MaxPoolSize + { + get => (int)this._connectionStringBuilder.MaximumPoolSize; + set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; + } + + public int MaxApplicationNameLength => 65390; // based on empirical testing + + public TransactionSupport TransactionSupport => TransactionSupport.ExplicitParticipation; + + protected virtual string IsolationLevelVariableName => "transaction_isolation"; + + public void ClearPool(DbConnection connection) => MySqlConnection.ClearPool((MySqlConnection)connection); + + public int CountActiveSessions(string applicationName) + { + using var connection = new MySqlConnection(this._defaultConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT COUNT(*) FROM performance_schema.session_connect_attrs WHERE ATTR_NAME = 'program_name' AND ATTR_VALUE = @applicationName"; + command.Parameters.AddWithValue(nameof(applicationName), applicationName); + return (int)(long)command.ExecuteScalar()!; + } + + public DbConnection CreateConnection() => new MySqlConnection(this.ConnectionStringBuilder.ConnectionString); + + public IsolationLevel GetIsolationLevel(DbConnection connection) + { + using var command = connection.CreateCommand(); + command.CommandText = "SELECT @@" + this.IsolationLevelVariableName; + var rawIsolationLevel = (string)command.ExecuteScalar()!; + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), rawIsolationLevel.Replace("-", string.Empty), ignoreCase: true); + } + + public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + { + var minTimeSeconds = idleSince.HasValue + ? (int?)(DateTimeOffset.UtcNow - idleSince.Value).TotalSeconds + : null; + + using var connection = new MySqlConnection(this._defaultConnectionString); + await connection.OpenAsync(); + using var idleSessionsCommand = connection.CreateCommand(); + idleSessionsCommand.CommandText = @" + SELECT a.PROCESSLIST_ID + FROM performance_schema.session_connect_attrs a + JOIN information_schema.processlist p + ON p.ID = a.PROCESSLIST_ID + WHERE a.ATTR_NAME = 'program_name' + AND a.ATTR_VALUE = @applicationName + AND (@minTimeSeconds IS NULL OR p.TIME > @minTimeSeconds)"; + idleSessionsCommand.Parameters.AddWithValue(nameof(applicationName), applicationName); + idleSessionsCommand.Parameters.AddWithValue(nameof(minTimeSeconds), minTimeSeconds); + + var idsToKill = new List(); + await using (var reader = await idleSessionsCommand.ExecuteReaderAsync()) + { + while (await reader.ReadAsync()) { idsToKill.Add(reader.GetInt32(0)); } + } + + foreach (var idToKill in idsToKill) + { + using var killCommand = connection.CreateCommand(); + killCommand.CommandText = $"KILL {idToKill}"; + await killCommand.ExecuteNonQueryAsync(); + } + } + } + + public sealed class TestingMariaDbDb : TestingMySqlDb + { + public TestingMariaDbDb() : base(MariaDbCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) { } + + protected override string IsolationLevelVariableName => "tx_isolation"; + } +} diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs new file mode 100644 index 00000000..6aa82b16 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs @@ -0,0 +1,31 @@ +using Medallion.Threading.MySql; +using Medallion.Threading.Tests.Data; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.MySql +{ + public sealed class TestingMySqlDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + where TDb : TestingMySqlDb, new() + { + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => new MySqlDistributedLock(name, connectionString, options: ToMySqlOptions(options)), + connection => new MySqlDistributedLock(name, connection, exactName: true), + transaction => new MySqlDistributedLock(name, transaction, exactName: true) + ); + + public override string GetSafeName(string name) => new MySqlDistributedLock(name, new TDb().ConnectionStringBuilder.ConnectionString).Name; + + public override string GetCrossProcessLockType() => (typeof(TDb) == typeof(TestingMariaDbDb) ? "MariaDB" : string.Empty) + base.GetCrossProcessLockType(); + + internal static Action ToMySqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => + { + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; + } +} diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index c4d221b3..f1823e92 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -30,7 +30,7 @@ public sealed class TestingPostgresDb : ITestingPrimaryClientDb /// abort semantics and largely unnecessary for our purposes since, unlike SQLServer, a connection-scoped Postgres lock can still /// participate in an ongoing transaction. /// - public bool SupportsTransactionScopedSynchronization => false; + public TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; public void ClearPool(DbConnection connection) => NpgsqlConnection.ClearPool((NpgsqlConnection)connection); diff --git a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs new file mode 100644 index 00000000..28061afd --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs @@ -0,0 +1,45 @@ +using MySqlConnector; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +namespace Medallion.Threading.Tests +{ + internal static class MariaDbCredentials + { + // MARIADB SETUP NOTE + // + // In order to enable application name tracking, we mus enable the performance schema. Add the following to + // C:\Program Files\MariaDB 10.6\data\my.ini in the [mysqld] section + // + // ;from https://mariadb.com/kb/en/performance-schema-overview/#activating-the-performance-schema + // performance_schema=ON + + private static (string username, string password) GetCredentials(string baseDirectory) + { + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mariadb.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find MariaDB credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); + } + + public static string GetConnectionString(string baseDirectory) + { + var (username, password) = GetCredentials(baseDirectory); + + return new MySqlConnectionStringBuilder + { + Port = 3307, + Server = "localhost", + Database = "mysql", + UserID = username, + Password = password, + PersistSecurityInfo = true, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaximumPoolSize = 500, + }.ConnectionString; + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs new file mode 100644 index 00000000..57365582 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs @@ -0,0 +1,39 @@ +using MySqlConnector; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests +{ + internal static class MySqlCredentials + { + private static (string username, string password) GetCredentials(string baseDirectory) + { + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mysql.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find mysql credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); + } + + public static string GetConnectionString(string baseDirectory) + { + var (username, password) = GetCredentials(baseDirectory); + + return new MySqlConnectionStringBuilder + { + Port = 3306, + Server = "localhost", + Database = "mysql", + UserID = username, + Password = password, + PersistSecurityInfo = true, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaximumPoolSize = 500, + }.ConnectionString; + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index a2dca553..ed57d0a4 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -25,7 +25,7 @@ public sealed class TestingSqlServerDb : ITestingSqlServerDb, ITestingPrimaryCli // https://stackoverflow.com/questions/5808332/sql-server-maximum-character-length-of-object-names/41502228 public int MaxApplicationNameLength => 128; - public bool SupportsTransactionScopedSynchronization => true; + public TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; public void ClearPool(DbConnection connection) => Microsoft.Data.SqlClient.SqlConnection.ClearPool((Microsoft.Data.SqlClient.SqlConnection)connection); @@ -110,7 +110,7 @@ public sealed class TestingSystemDataSqlServerDb : ITestingSqlServerDb public int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; - public bool SupportsTransactionScopedSynchronization => true; + public TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; public void ClearPool(DbConnection connection) => System.Data.SqlClient.SqlConnection.ClearPool((System.Data.SqlClient.SqlConnection)connection); diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 016ec4f9..1c322518 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -16,6 +16,40 @@ namespace Medallion.Threading.Tests.FileSystem [Category("CI")] public class Core_File_FileSynchronizationStrategyTest : DistributedLockCoreTestCases { } } +namespace Medallion.Threading.Tests.MySql +{ + public class ConnectionStringStrategy_MySql_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDb_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ConnectionStringStrategyTestCases, TestingMariaDbDb>, TestingConnectionMultiplexingSynchronizationStrategy, TestingMariaDbDb> { } + public class ConnectionStringStrategy_MySql_ConnectionMultiplexingSynchronizationStrategy_MySqlDb_MySqlDb_ConnectionMultiplexingSynchronizationStrategy_MySqlDb_MySqlDbTest : ConnectionStringStrategyTestCases, TestingMySqlDb>, TestingConnectionMultiplexingSynchronizationStrategy, TestingMySqlDb> { } + public class ConnectionStringStrategy_MySql_OwnedConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_OwnedConnectionSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ConnectionStringStrategyTestCases, TestingMariaDbDb>, TestingOwnedConnectionSynchronizationStrategy, TestingMariaDbDb> { } + public class ConnectionStringStrategy_MySql_OwnedConnectionSynchronizationStrategy_MySqlDb_MySqlDb_OwnedConnectionSynchronizationStrategy_MySqlDb_MySqlDbTest : ConnectionStringStrategyTestCases, TestingMySqlDb>, TestingOwnedConnectionSynchronizationStrategy, TestingMySqlDb> { } + public class ConnectionStringStrategy_MySql_OwnedTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_OwnedTransactionSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ConnectionStringStrategyTestCases, TestingMariaDbDb>, TestingOwnedTransactionSynchronizationStrategy, TestingMariaDbDb> { } + public class ConnectionStringStrategy_MySql_OwnedTransactionSynchronizationStrategy_MySqlDb_MySqlDb_OwnedTransactionSynchronizationStrategy_MySqlDb_MySqlDbTest : ConnectionStringStrategyTestCases, TestingMySqlDb>, TestingOwnedTransactionSynchronizationStrategy, TestingMySqlDb> { } + public class Core_MySql_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDb_ConnectionMultiplexingSynchronizationStrategy_MariaDbDbTest : DistributedLockCoreTestCases, TestingMariaDbDb>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class Core_MySql_ConnectionMultiplexingSynchronizationStrategy_MySqlDb_MySqlDb_ConnectionMultiplexingSynchronizationStrategy_MySqlDbTest : DistributedLockCoreTestCases, TestingMySqlDb>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class Core_MySql_ExternalConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_ExternalConnectionSynchronizationStrategy_MariaDbDbTest : DistributedLockCoreTestCases, TestingMariaDbDb>, TestingExternalConnectionSynchronizationStrategy> { } + public class Core_MySql_ExternalConnectionSynchronizationStrategy_MySqlDb_MySqlDb_ExternalConnectionSynchronizationStrategy_MySqlDbTest : DistributedLockCoreTestCases, TestingMySqlDb>, TestingExternalConnectionSynchronizationStrategy> { } + public class Core_MySql_ExternalTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_ExternalTransactionSynchronizationStrategy_MariaDbDbTest : DistributedLockCoreTestCases, TestingMariaDbDb>, TestingExternalTransactionSynchronizationStrategy> { } + public class Core_MySql_ExternalTransactionSynchronizationStrategy_MySqlDb_MySqlDb_ExternalTransactionSynchronizationStrategy_MySqlDbTest : DistributedLockCoreTestCases, TestingMySqlDb>, TestingExternalTransactionSynchronizationStrategy> { } + public class Core_MySql_OwnedConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_OwnedConnectionSynchronizationStrategy_MariaDbDbTest : DistributedLockCoreTestCases, TestingMariaDbDb>, TestingOwnedConnectionSynchronizationStrategy> { } + public class Core_MySql_OwnedConnectionSynchronizationStrategy_MySqlDb_MySqlDb_OwnedConnectionSynchronizationStrategy_MySqlDbTest : DistributedLockCoreTestCases, TestingMySqlDb>, TestingOwnedConnectionSynchronizationStrategy> { } + public class Core_MySql_OwnedTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_OwnedTransactionSynchronizationStrategy_MariaDbDbTest : DistributedLockCoreTestCases, TestingMariaDbDb>, TestingOwnedTransactionSynchronizationStrategy> { } + public class Core_MySql_OwnedTransactionSynchronizationStrategy_MySqlDb_MySqlDb_OwnedTransactionSynchronizationStrategy_MySqlDbTest : DistributedLockCoreTestCases, TestingMySqlDb>, TestingOwnedTransactionSynchronizationStrategy> { } + public class ExternalConnectionOrTransactionStrategy_MySql_ExternalConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_ExternalConnectionSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingMariaDbDb>, TestingExternalConnectionSynchronizationStrategy, TestingMariaDbDb> { } + public class ExternalConnectionOrTransactionStrategy_MySql_ExternalConnectionSynchronizationStrategy_MySqlDb_MySqlDb_ExternalConnectionSynchronizationStrategy_MySqlDb_MySqlDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingMySqlDb>, TestingExternalConnectionSynchronizationStrategy, TestingMySqlDb> { } + public class ExternalConnectionOrTransactionStrategy_MySql_ExternalTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_ExternalTransactionSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingMariaDbDb>, TestingExternalTransactionSynchronizationStrategy, TestingMariaDbDb> { } + public class ExternalConnectionOrTransactionStrategy_MySql_ExternalTransactionSynchronizationStrategy_MySqlDb_MySqlDb_ExternalTransactionSynchronizationStrategy_MySqlDb_MySqlDbTest : ExternalConnectionOrTransactionStrategyTestCases, TestingMySqlDb>, TestingExternalTransactionSynchronizationStrategy, TestingMySqlDb> { } + public class ExternalConnectionStrategy_MySql_ExternalConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_MariaDbDbTest : ExternalConnectionStrategyTestCases, TestingMariaDbDb>, TestingMariaDbDb> { } + public class ExternalConnectionStrategy_MySql_ExternalConnectionSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : ExternalConnectionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } + public class ExternalTransactionStrategy_MySql_ExternalTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_MariaDbDbTest : ExternalTransactionStrategyTestCases, TestingMariaDbDb>, TestingMariaDbDb> { } + public class ExternalTransactionStrategy_MySql_ExternalTransactionSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : ExternalTransactionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } + public class MultiplexingConnectionStrategy_MySql_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDb_MariaDbDbTest : MultiplexingConnectionStrategyTestCases, TestingMariaDbDb>, TestingMariaDbDb> { } + public class MultiplexingConnectionStrategy_MySql_ConnectionMultiplexingSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : MultiplexingConnectionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } + public class OwnedConnectionStrategy_MySql_OwnedConnectionSynchronizationStrategy_MariaDbDb_MariaDbDb_MariaDbDbTest : OwnedConnectionStrategyTestCases, TestingMariaDbDb>, TestingMariaDbDb> { } + public class OwnedConnectionStrategy_MySql_OwnedConnectionSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : OwnedConnectionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } + public class OwnedTransactionStrategy_MySql_OwnedTransactionSynchronizationStrategy_MariaDbDb_MariaDbDb_MariaDbDbTest : OwnedTransactionStrategyTestCases, TestingMariaDbDb>, TestingMariaDbDb> { } + public class OwnedTransactionStrategy_MySql_OwnedTransactionSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : OwnedTransactionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } +} + namespace Medallion.Threading.Tests.Postgres { public class ConnectionStringStrategy_Postgres_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } diff --git a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs new file mode 100644 index 00000000..c543bb62 --- /dev/null +++ b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs @@ -0,0 +1,28 @@ +using Medallion.Threading.MySql; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.MySql +{ + public class MySqlConnectionOptionsBuilderTest + { + [Test] + public void TestValidatesArguments() + { + var builder = new MySqlConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + } + + [Test] + public void TestDefaults() + { + var options = MySqlConnectionOptionsBuilder.GetOptions(null); + options.keepaliveCadence.ShouldEqual(TimeSpan.FromHours(3.5)); + Assert.IsTrue(options.useMultiplexing); + options.ShouldEqual(MySqlConnectionOptionsBuilder.GetOptions(o => { })); + } + } +} diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs new file mode 100644 index 00000000..e8207b1e --- /dev/null +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -0,0 +1,77 @@ +using Medallion.Threading.MySql; +using Medallion.Threading.Tests.Data; +using MySqlConnector; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.MySql +{ + public class MySqlDistributedLockTest + { + private static readonly string ConnectionString = new TestingMySqlDb().ConnectionStringBuilder.ConnectionString; + + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString)); + Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString, exactName: true)); + Assert.Catch(() => new MySqlDistributedLock("a", default(string)!)); + Assert.Catch(() => new MySqlDistributedLock("a", default(IDbTransaction)!)); + Assert.Catch(() => new MySqlDistributedLock("a", default(IDbConnection)!)); + Assert.Catch(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength + 1), ConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength), ConnectionString, exactName: true)); + } + + [Test] + public void TestGetSafeLockNameCompat() + { + GetSafeName(string.Empty).ShouldEqual("__empty__p6ad62yppho33ytkibum5wbqhqvbcsxa"); + GetSafeName("abc").ShouldEqual("abc"); + GetSafeName("ABC").ShouldEqual("abczj4qr6tvn4a3kmgq4bukhowqyfrlxsb3"); + GetSafeName("\\").ShouldEqual("\\"); + GetSafeName(new string('a', MySqlDistributedLock.MaxNameLength)).ShouldEqual(new string('a', MySqlDistributedLock.MaxNameLength)); + GetSafeName(new string('\\', MySqlDistributedLock.MaxNameLength)).ShouldEqual(@"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"); + GetSafeName(new string('x', MySqlDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgkd2zq6c6ey6mhs45clqg7vij6ycgo43"); + + static string GetSafeName(string name) => new MySqlDistributedLock(name, ConnectionString).Name; + } + + /// + /// This test justifies why we have constructors for MySQL locks that take in a . + /// Otherwise, you can't have a lock use the same connection as a transaction you're working on. Compare to + /// + /// + [TestCase(typeof(TestingMySqlDb))] + [TestCase(typeof(TestingMariaDbDb))] + public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type testingDbType) + { + var db = (ITestingDb)Activator.CreateInstance(testingDbType)!; + + using var connection = new MySqlConnection(db.ConnectionStringBuilder.ConnectionString); + await connection.OpenAsync(); + + using var createTableCommand = connection.CreateCommand(); + createTableCommand.CommandText = "CREATE TEMPORARY TABLE world.temp (id INT)"; + await createTableCommand.ExecuteNonQueryAsync(); + + using var transaction = connection.BeginTransaction(); + + using var commandInTransaction = connection.CreateCommand(); + commandInTransaction.Transaction = transaction; + commandInTransaction.CommandText = @"INSERT INTO world.temp (id) VALUES (1), (2)"; + await commandInTransaction.ExecuteNonQueryAsync(); + + using var commandOutsideTransaction = connection.CreateCommand(); + commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); + Assert.That(exception.Message, Does.Contain("The transaction associated with this command is not the connection's active transaction")); + + commandInTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(2); + } + } +} diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index cb915692..3ec6a0c7 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; +using System.Data; using System.Data.Common; using System.Linq; using System.Text; @@ -13,6 +14,13 @@ namespace Medallion.Threading.Tests.Postgres { public class PostgresDistributedLockTest { + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new PostgresDistributedLock(new(0), default(string)!)); + Assert.Throws(() => new PostgresDistributedLock(new(0), default(IDbConnection)!)); + } + [Test] public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() { diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs new file mode 100644 index 00000000..821f4662 --- /dev/null +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs @@ -0,0 +1,21 @@ +using Medallion.Threading.Postgres; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Postgres +{ + public class PostgresDistributedReaderWriterLockTest + { + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(string)!)); + Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(IDbConnection)!)); + } + } +} diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index 81bdc5b1..e59af60b 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -14,6 +14,7 @@ using System.Drawing.Text; using System.Collections.Generic; using Medallion.Threading.ZooKeeper; +using Medallion.Threading.MySql; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -49,6 +50,12 @@ public static int Main(string[] args) case "Write" + nameof(PostgresDistributedReaderWriterLock): handle = new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name), PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); break; + case nameof(MySqlDistributedLock): + handle = new MySqlDistributedLock(name, MySqlCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; + case "MariaDB" + nameof(MySqlDistributedLock): + handle = new MySqlDistributedLock(name, MariaDbCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; case nameof(EventWaitHandleDistributedLock): handle = new EventWaitHandleDistributedLock(name).Acquire(); break; From a41378497292148f58601d71bd72b9d4640e593b Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 24 Aug 2021 20:53:04 -0400 Subject: [PATCH 135/399] Bump distributedlock.core version --- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 2523c9a4..258f24cf 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages From d8b68d6fea118df8946da201f423191c5f0808a9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 25 Aug 2021 06:47:06 -0400 Subject: [PATCH 136/399] Minor cleanup --- .../Data/DedicatedConnectionOrTransactionDbDistributedLock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 78e2f0a3..5c235a38 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -141,7 +141,7 @@ public ValueTask DisposeAsync() private sealed class InnerHandle : IAsyncDisposable { - private static readonly object DisposedSentinel = new object(); + private static readonly object DisposedSentinel = new(); private readonly IDbSynchronizationStrategy _strategy; private readonly string _name; From fe2959638405c17dc4295fb670964815295bedeb Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 25 Aug 2021 07:04:11 -0400 Subject: [PATCH 137/399] Update docs for MySQL --- README.md | 3 +++ docs/DistributedLock.MySql.md | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 docs/DistributedLock.MySql.md diff --git a/README.md b/README.md index 32f3c35c..a8aac546 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ DistributedLock contains implementations based on various technologies; you can - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql +- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/): uses MySQL or MariaDB - **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/): uses Redis - **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/): uses Azure blobs - **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/): uses Apache ZooKeeper @@ -131,6 +132,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.2.0 + - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0) - 2.1.0 - Added ZooKeeper-based implementation ([#41](https://github.com/madelson/DistributedLock/issues/41), DistributedLock.ZooKeeper 1.0.0) - 2.0.2 diff --git a/docs/DistributedLock.MySql.md b/docs/DistributedLock.MySql.md new file mode 100644 index 00000000..1dbcd14d --- /dev/null +++ b/docs/DistributedLock.MySql.md @@ -0,0 +1,36 @@ +# DistributedLock.MySql + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.MySql) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) + +The DistributedLock.MySql package offers distributed synchronization primitives based on [MySQL/MariaDB user locks](https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html). For example: + +```C# +var @lock = new MySqlDistributedLock("mylockname"), connectionString); +await using (await @lock.AcquireAsync()) +{ + // I have the lock +} +``` + +## APIs + +- The `MySqlDistributedLock` class implements the `IDistributedLock` interface. +- The `MySqlDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` and `IDistributedReaderWriterLockProvider` interfaces. + +## Implementation notes + +MySQL-based locks have been tested against and work with both the [MySQL](https://www.mysql.com/) and [MariaDB](https://mariadb.org/). + +MySQL-based locks locks can be constructed with a `connectionString`, an `IDbConnection` or an `IDbTransaction` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. Using an `IDbTransaction` is generally equivalent to using an `IDbConnection` (the lock is still connection-scoped), but it allows the lock to participate in an ongoing transaction. + +Natively, MySQL's locking functions are case-insensitive with respect to the lock name. Since the DistributedLock library as a whole uses case-sensitive names, lock names containing uppercase characters will be transformed/hashed under the hood (as will empty names or names that are too long). If your program needs to coordinate with other code that is using `GET_LOCK` directly, be sure to express the name in lower case and to pass `exactName: true` when constructing the lock instance (in `exactName` mode, an invalid name will throw an exception rather than silently being transformed into a valid one). + +## Options + +In addition to specifying the `name`, several tuning options are available for `connectionString`-based locks: + +- `KeepaliveCadence` allows you to have the implementation periodically issue a cheap query on a connection holding a lock. This helps in configurations which are set up to aggressively kill idle connections. Defaults to OFF (`Timeout.InfiniteTimeSpan`). +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). + + + From eab0ae755f3cfb760fdb4e851a705363cb10bda8 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 2 Oct 2021 09:46:03 -0400 Subject: [PATCH 138/399] Bump DistributedLock version --- DistributedLock/DistributedLock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 65cb3b98..c7c31000 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.1.0 + 2.2.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From fe507d8dafd37b9ab3ac5f2d5b919b6b9d723bf5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 2 Oct 2021 10:25:24 -0400 Subject: [PATCH 139/399] Comment typo fix --- .../Infrastructure/Shared/MariaDbCredentials.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs index 28061afd..70ce51a6 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs @@ -10,7 +10,7 @@ internal static class MariaDbCredentials { // MARIADB SETUP NOTE // - // In order to enable application name tracking, we mus enable the performance schema. Add the following to + // In order to enable application name tracking, we must enable the performance schema. Add the following to // C:\Program Files\MariaDB 10.6\data\my.ini in the [mysqld] section // // ;from https://mariadb.com/kb/en/performance-schema-overview/#activating-the-performance-schema From ae60a27a36d8a505b4912f3bd5a02c1ff76b6809 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 2 Oct 2021 10:27:56 -0400 Subject: [PATCH 140/399] Improve TestParallelism error message on AppVeyor --- .../AbstractTestCases/DistributedLockCoreTestCases.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 4b2ab692..dfba0e85 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -182,7 +182,7 @@ public void TestParallelism() // increment going in if (Interlocked.Increment(ref counter) == 2) { - Assert.Fail("Concurrent lock acquisitions"); + Assert.Fail($"Concurrent lock acquisitions ({this.GetType()}"); } // hang out for a bit to ensure concurrency From 213139345680da0b877c87a1622809a7de7205a8 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 2 Oct 2021 10:57:45 -0400 Subject: [PATCH 141/399] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e110606a..b06c86cc 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ DistributedLock contains implementations based on various technologies; you can - **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/): uses lock files - **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/): uses operating system global `WaitHandle`s (Windows only) +The [DistributedLock.Core](https://www.nuget.org/packages/DistributedLock.Core) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Core.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Core/) package contains common code and abstractions and is referenced by all implementations. + ## Synchronization primitives - Locks: provide exclusive access to a region of code From ccc1e1e712d708bf5d02fb8e5eddf18e69c76027 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:29:36 -0400 Subject: [PATCH 142/399] fix typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b06c86cc..782ff0ea 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Finally, the methods take an optional `CancellationToken` parameter, which allow ## Providers -For applications that use [dependency injection](https://en.wikipedia.org/wiki/Dependency_injection), DistributedLock's provider make it easy to separate out the specification of a lock's (or other primitive's) name from its other settings (such as a database connection string). For example in an ASP.NET Core app you might do: +For applications that use [dependency injection](https://en.wikipedia.org/wiki/Dependency_injection), DistributedLock's providers make it easy to separate out the specification of a lock's (or other primitive's) name from its other settings (such as a database connection string). For example in an ASP.NET Core app you might do: ```C# // in your Startup.cs: From efa0aab4c610be129dffed9ff3cd8271e407e8c0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 3 Nov 2021 07:13:57 -0400 Subject: [PATCH 143/399] Add infrastructure for testing against a local Oracle containerized instance --- .../DistributedLock.Tests.csproj | 1 + .../Oracle/OracleSetUpFixture.cs | 99 +++++++++++++++++++ .../Shared/OracleCredentials.cs | 37 +++++++ .../Tests/Oracle/OracleDistributedLockTest.cs | 22 +++++ 4 files changed, 159 insertions(+) create mode 100644 DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs create mode 100644 DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index aaef38e6..1a38a605 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -20,6 +20,7 @@ + diff --git a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs new file mode 100644 index 00000000..472aedf9 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs @@ -0,0 +1,99 @@ +using Medallion.Shell; +using NUnit.Framework; +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Oracle +{ + /// + /// Starts and stops the oracle docker container if needed. For best performance, run "docker start oracle-distributed-lock" before running the + /// tests so that the container will just keep running. + /// + /// Note: for this setup we're assuming that the Oracle DB has been set up to run in Docker. + /// + /// Setup steps: + /// (1) Install Docker if needed + /// (2) Clone https://github.com/oracle/docker-images + /// (3) Follow instructions here: https://github.com/oracle/docker-images/tree/main/OracleDatabase/SingleInstance#oracle-database-container-images + /// for running the buildContainerImage shell script. I ran "./buildContainerImage.sh -v 18.4.0 -x" because as of 2021-11-01 that was the version that + /// came pre-baked with the repo + /// (4) Create the container with "docker run --name oracle-distributed-lock -p 1521:1521 oracle/database:18.4.0-xe", then stop it (e. g. from the docker desktop gui) + /// + /// NOTE: After reading https://blog.simonpeterdebbarma.com/2020-04-memory-and-wsl/ I also added a %USERPROFILE%/.wslconfig containing the following: + /// [wsl2] + /// memory=1GB + /// + [SetUpFixture] + public class OracleSetUpFixture + { + private const string ContainerName = "oracle-distributed-lock"; + + private static readonly Shell.Shell Shell = new(o => o.ThrowOnError(true)); + + private bool _startedContainer; + + [OneTimeSetUp] + public async Task OneTimeSetUpAsync() + { + // first, check if container has started + var containerLs = await Shell.Run("docker", new[] { "container", "ls" }).Task; + if (!containerLs.StandardOutput.Contains(ContainerName)) + { + Console.WriteLine($"docker container ls:"); + Console.WriteLine(containerLs); + + Console.WriteLine("STARTING CONTAINER"); + + var stopwatch = Stopwatch.StartNew(); + await Shell.Run("docker", new[] { "start", ContainerName }).Task; + this._startedContainer = true; + + Console.WriteLine($"CONTAINER STARTED ({stopwatch.Elapsed.TotalSeconds}s)"); + } + + var timeout = Task.Delay(TimeSpan.FromMinutes(5)); + while (true) + { + var tryConnectTask = TryConnectAsync(); + var completed = await Task.WhenAny(timeout, tryConnectTask); + if (completed == timeout) { throw new TimeoutException("Timed out trying to connect to Oracle"); } + if (await tryConnectTask) { return; } + } + + async Task TryConnectAsync() + { + await using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + try + { + await connection.OpenAsync(); + return true; + } + catch (OracleException ex) + when ( + ex.Number == 12541 // TNS: No listener + || ex.Number == 12514 // TNS:listener does not currently know of service requested in connect descriptor + || ex.Number == 12528 // TNS: listener: all appropriate instances are blocking new connections + ) + { + return false; + } + } + } + + [OneTimeTearDown] + public async Task OneTimeTearDown() + { + if (this._startedContainer) + { + Console.WriteLine("STOPPING CONTAINER"); + var stopwatch = Stopwatch.StartNew(); + await Shell.Run("docker", new[] { "stop", ContainerName }).Task; + Console.WriteLine($"CONTAINER STOPPED ({stopwatch.Elapsed.TotalSeconds}s)"); + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs new file mode 100644 index 00000000..76cdaec8 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -0,0 +1,37 @@ +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests +{ + internal static class OracleCredentials + { + private static string GetPassword(string baseDirectory) + { + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "oracle.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find mysql credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 1) { throw new FormatException($"{file} must contain exactly 1 line of text"); } + return lines[0]; + } + + public static string GetConnectionString(string baseDirectory) + { + var password = GetPassword(baseDirectory); + + return new OracleConnectionStringBuilder + { + DataSource = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=XE)))", + UserID = "SYSTEM", + Password = password, + PersistSecurityInfo = true, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaxPoolSize = 500, + }.ConnectionString; + } + } +} diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs new file mode 100644 index 00000000..4d75df0f --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs @@ -0,0 +1,22 @@ +using NUnit.Framework; +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleDistributedLockTest + { + [Test] + public async Task Test() + { + var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + await connection.OpenAsync(); + var command = connection.CreateCommand(); + command.CommandText = "SELECT 10 FROM DUAL"; + (await command.ExecuteScalarAsync()).ShouldEqual(10); + } + } +} From 9eccea910bb600a0f771522aa796690bbd0f5790 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 3 Nov 2021 07:34:53 -0400 Subject: [PATCH 144/399] Add Oracle project --- DistributedLock.Oracle/AssemblyAttributes.cs | 3 + .../DistributedLock.Oracle.csproj | 55 +++++++++++++++++++ .../DistributedLock.Tests.csproj | 1 - .../Oracle/OracleSetUpFixture.cs | 3 +- DistributedLock.sln | 8 ++- DistributedLock/DistributedLock.csproj | 3 +- 6 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 DistributedLock.Oracle/AssemblyAttributes.cs create mode 100644 DistributedLock.Oracle/DistributedLock.Oracle.csproj diff --git a/DistributedLock.Oracle/AssemblyAttributes.cs b/DistributedLock.Oracle/AssemblyAttributes.cs new file mode 100644 index 00000000..a9e3a34f --- /dev/null +++ b/DistributedLock.Oracle/AssemblyAttributes.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj new file mode 100644 index 00000000..a531a9f6 --- /dev/null +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -0,0 +1,55 @@ + + + + netstandard2.1;net462 + Medallion.Threading.Oracle + True + 4 + Latest + enable + + + + 1.0.0 + 1.0.0.0 + Michael Adelson + Provides a distributed lock implementation based on Oracle Database + Copyright © 2021 Michael Adelson + MIT + distributed lock async mutex sql oracle + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + embedded + + + + False + 1591 + TRACE;DEBUG + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index 1a38a605..aaef38e6 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -20,7 +20,6 @@ - diff --git a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs index 472aedf9..95b791f1 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs @@ -64,7 +64,7 @@ public async Task OneTimeSetUpAsync() if (await tryConnectTask) { return; } } - async Task TryConnectAsync() + static async Task TryConnectAsync() { await using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); try @@ -77,6 +77,7 @@ async Task TryConnectAsync() ex.Number == 12541 // TNS: No listener || ex.Number == 12514 // TNS:listener does not currently know of service requested in connect descriptor || ex.Number == 12528 // TNS: listener: all appropriate instances are blocking new connections + || ex.Number == 01033 // ORACLE initialization or shutdown in progress ) { return false; diff --git a/DistributedLock.sln b/DistributedLock.sln index 565ccbd5..699cbe67 100644 --- a/DistributedLock.sln +++ b/DistributedLock.sln @@ -33,7 +33,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D14FE348 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.ZooKeeper", "DistributedLock.ZooKeeper\DistributedLock.ZooKeeper.csproj", "{710F287B-02FB-4F89-9BEC-BAA97250037F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.MySql", "DistributedLock.MySql\DistributedLock.MySql.csproj", "{6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.MySql", "DistributedLock.MySql\DistributedLock.MySql.csproj", "{6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.Oracle", "DistributedLock.Oracle\DistributedLock.Oracle.csproj", "{1CAB9A1D-0C02-459C-A90E-47819832BD58}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -93,6 +95,10 @@ Global {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}.Release|Any CPU.Build.0 = Release|Any CPU + {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index c7c31000..e55aba76 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net461;net462 Medallion.Threading True 4 @@ -50,6 +50,7 @@ + From c9a347ad4633db9d389b81b7046bffd2ee41c249 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 12 Nov 2021 20:40:32 -0500 Subject: [PATCH 145/399] Fix #106 and #109 --- .../DistributedLock.FileSystem.csproj | 4 +- .../FileDistributedLock.cs | 67 ++++++++-- .../FileSystem/FileDistributedLockTest.cs | 117 ++++++++++++++++++ .../FileDistributedLockWindowsTest.cs | 37 ++++++ README.md | 2 + 5 files changed, 218 insertions(+), 9 deletions(-) create mode 100644 DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 6d6db76d..f7abc787 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -10,8 +10,8 @@ - 1.0.0 - 1.0.0.0 + 1.0.1 + 1.0.1.0 Michael Adelson Provides a distributed lock implementation based on file locks Copyright © 2020 Michael Adelson diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index 80b00f0d..fa90243f 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -13,6 +13,13 @@ namespace Medallion.Threading.FileSystem /// public sealed partial class FileDistributedLock : IInternalDistributedLock { + /// + /// Since can be thrown EITHER transiently or for permissions issues, we retry up to this many times + /// before we assume that the issue is non-transient. Empirically I've found 50 to work fine so I doubled it just to be safe (if there IS a problem + /// there's little risk to trying more times because we'll eventually be failing hard). + /// + private const int MaxUnauthorizedAccessExceptionRetries = 100; + // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks // to be used in cases where contention is rare @@ -64,15 +71,13 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) private FileDistributedLockHandle? TryAcquire(CancellationToken cancellationToken) { + var retryCount = 0; + while (true) { cancellationToken.ThrowIfCancellationRequested(); - try { System.IO.Directory.CreateDirectory(this.Directory); } - catch (Exception ex) - { - throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); - } + this.EnsureDirectoryExists(); FileStream lockFileStream; try @@ -88,9 +93,36 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) // this should almost never happen because we just created the directory but in a race condition it could. Just retry continue; } - catch (UnauthorizedAccessException) when (System.IO.Directory.Exists(this.Name)) + catch (UnauthorizedAccessException) { - throw new InvalidOperationException($"Failed to create lock file '{this.Name}' because it is already the name of a directory"); + // This can happen in few cases: + + // The path is already directory, so we'll never be able to open a handle of it as a file + if (System.IO.Directory.Exists(this.Name)) + { + throw new InvalidOperationException($"Failed to create lock file '{this.Name}' because it is already the name of a directory"); + } + + // The file exists and is read-only + FileAttributes attributes; + try { attributes = File.GetAttributes(this.Name); } + catch { attributes = FileAttributes.Normal; } // e. g. could fail with FileNotFoundException + if (attributes.HasFlag(FileAttributes.ReadOnly)) + { + // We could support this by eschewing DeleteOnClose once we detect that a file is read-only, + // but absent interest or a use-case we'll just throw for now + throw new NotSupportedException($"Locking on read-only file '{this.Name}' is not supported"); + } + + // Frustratingly, this error can be thrown transiently due to concurrent creation/deletion. Initially assume + // that it is transient and just retry + if (++retryCount <= MaxUnauthorizedAccessExceptionRetries) + { + continue; + } + + // If we get here, we've exhausted our retries: assume that it is a legitimate permissions issue + throw; } // this should never happen because we validate. However if it does (e. g. due to some system configuration change?), throw so that // this doesn't end up in the IOException block (PathTooLongException is IOException) @@ -104,5 +136,26 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) return new FileDistributedLockHandle(lockFileStream); } } + + private void EnsureDirectoryExists() + { + var retryCount = 0; + + while (true) + { + try + { + System.IO.Directory.CreateDirectory(this.Directory); + return; + } + // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. + // If we encounter it, assume it is transient unless it persists. + catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } + catch (Exception ex) + { + throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); + } + } + } } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index dd70c595..c653ad7b 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -7,6 +7,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace Medallion.Threading.Tests.FileSystem @@ -365,6 +366,122 @@ public void TestBase32Hashing() } } + /// + /// Reproduces https://github.com/madelson/DistributedLock/issues/109 + /// + /// Basically, there is a small window where concurrent file creation/deletion throws + /// despite there being no access permission errors. + /// See also https://github.com/dotnet/runtime/issues/61395. + /// + /// This test shows that we are not vulnerable to this. + /// + [Test] + public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnFileCreation() + { + Directory.CreateDirectory(LockFileDirectory); + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + + const int TaskCount = 20; + + using var barrier = new Barrier(TaskCount); + + var tasks = Enumerable.Range(0, TaskCount) + .Select(_ => Task.Factory.StartNew(() => + { + barrier.SignalAndWait(); + + for (var i = 0; i < 500; ++i) + { + @lock.TryAcquire()?.Dispose(); + } + }, TaskCreationOptions.LongRunning)) + .ToArray(); + + Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); + } + + /// + /// Reproduces https://github.com/madelson/DistributedLock/issues/106 + /// + /// Basically, there is a small window where concurrent creation/deletion of directories + /// throws even though there are no access permission errors. + /// + /// This test confirms that we recover from such errors. + /// + [Test] + public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnDirectoryCreation() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + + const int TaskCount = 20; + + using var barrier = new Barrier(TaskCount); + using var cancelationTokenSource = new CancellationTokenSource(); + + var tasks = Enumerable.Range(0, TaskCount) + .Select(task => Task.Factory.StartNew(() => + { + for (var i = 0; i < 1000; ++i) + { + // line up all the threads + try { barrier.SignalAndWait(cancelationTokenSource.Token); } + catch when (cancelationTokenSource.Token.IsCancellationRequested) { return; } + + // have one thread clear the directory + if (task == 0 && Directory.Exists(LockFileDirectory)) { Directory.Delete(LockFileDirectory, recursive: true); } + + // line up all the threads + if (!barrier.SignalAndWait(TimeSpan.FromSeconds(3))) { throw new TimeoutException("should never get here"); } + + // have half the threads just create and delete the directory, catching any errors + if (task % 2 == 0) + { + try + { + Directory.CreateDirectory(LockFileDirectory); + Directory.Delete(LockFileDirectory); + } + catch { } + } + // the other half will attempt to acquire the lock + else + { + try { @lock.TryAcquire()?.Dispose(); } + catch + { + cancelationTokenSource.Cancel(); // exception found: exit + throw; + } + } + } + }, TaskCreationOptions.LongRunning)) + .ToArray(); + + Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); + } + + /// + /// Documents a limitation we've imposed for now to keep the code simpler + /// + [Test] + public void TestLockingReadOnlyFileIsNotSupported() + { + Directory.CreateDirectory(LockFileDirectory); + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + File.Create(@lock.Name).Dispose(); + + try + { + File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); + + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + } + finally + { + File.SetAttributes(@lock.Name, FileAttributes.Normal); + } + } + private static void AssertCanUseName(string name, DirectoryInfo? directory = null) { var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs new file mode 100644 index 00000000..758de51f --- /dev/null +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.FileSystem; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +namespace Medallion.Threading.Tests.FileSystem +{ + [Category("CIWindows")] + public class FileDistributedLockWindowsTest + { + /// + /// Example of where always ignoring during file creation + /// would be problematic. + /// + [Test] + public void TestThrowsUnauthorizedAccessExceptionInCaseOfFilePermissionViolation() + { + var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows"), Guid.NewGuid().ToString()); + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + } + + /// + /// Example of where always ignoring during directory creation + /// would be problematic. + /// + [Test] + public void TestThrowsUnauthorizedAccessExceptionInCaseOfDirectoryPermissionViolation() + { + var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows\MedallionDistributedLock"), Guid.NewGuid().ToString()); + var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + Assert.IsInstanceOf(exception.InnerException); + Assert.IsFalse(Directory.Exists(Path.GetDirectoryName(@lock.Name))); + } + } +} diff --git a/README.md b/README.md index 782ff0ea..d6cfc9b0 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.3.0 + - Made file-based locking more robust to transient `UnauthorizedAccessException`s ([#106](https://github.com/madelson/DistributedLock/issues/106) & [#109](https://github.com/madelson/DistributedLock/issues/109), DistributedLock.FileSystem 1.0.1) - 2.2.0 - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0) - 2.1.0 From ddbdab21d23efa6753dcb56415704537918b7862 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 15 Nov 2021 20:10:46 -0500 Subject: [PATCH 146/399] Minor cleanup --- DistributedLock.MySql/MySqlDistributedLock.cs | 4 +- .../OracleConnectionOptionsBuilder.cs | 74 ++++++++++++ .../OracleDatabaseConnection.cs | 44 +++++++ DistributedLock.Oracle/OracleDbmsLock.cs | 88 ++++++++++++++ .../OracleDistributedLock.IDistributedLock.cs | 85 ++++++++++++++ .../OracleDistributedLock.cs | 109 ++++++++++++++++++ .../OracleDistributedLockHandle.cs | 37 ++++++ .../OracleMultiplexedConnectionLockPool.cs | 12 ++ 8 files changed, 451 insertions(+), 2 deletions(-) create mode 100644 DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs create mode 100644 DistributedLock.Oracle/OracleDatabaseConnection.cs create mode 100644 DistributedLock.Oracle/OracleDbmsLock.cs create mode 100644 DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs create mode 100644 DistributedLock.Oracle/OracleDistributedLock.cs create mode 100644 DistributedLock.Oracle/OracleDistributedLockHandle.cs create mode 100644 DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs diff --git a/DistributedLock.MySql/MySqlDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.cs index 57e600e8..1c829a76 100644 --- a/DistributedLock.MySql/MySqlDistributedLock.cs +++ b/DistributedLock.MySql/MySqlDistributedLock.cs @@ -164,14 +164,14 @@ private static IDbDistributedLock CreateInternalLock(string name, string connect return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); } - static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + private static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) { if (connection == null) { throw new ArgumentNullException(nameof(connection)); } return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connection)); } - static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) + private static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) { if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } diff --git a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs new file mode 100644 index 00000000..2c720636 --- /dev/null +++ b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs @@ -0,0 +1,74 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Oracle +{ + /// + /// Specifies options for connecting to and locking against a MySQL database + /// + public sealed class OracleConnectionOptionsBuilder + { + private TimeoutValue? _keepaliveCadence; + private bool? _useMultiplexing; + + internal OracleConnectionOptionsBuilder() { } + + /// + /// Oracle does not kill idle connections by default, so by default keepalive is disabled (set to ). + /// + /// However, if you are using the IDLE_TIME setting in Oracle or if your network is dropping connections that are idle holding locks for + /// a long time, you can set a value for keepalive to prevent this from happening. + /// + /// See https://stackoverflow.com/questions/1966247/idle-timeout-parameter-in-oracle. + /// + public OracleConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) + { + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } + + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public OracleConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } + + internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + OracleConnectionOptionsBuilder? options; + if (optionsBuilder != null) + { + options = new OracleConnectionOptionsBuilder(); + optionsBuilder(options); + } + else + { + options = null; + } + + var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; + var useMultiplexing = options?._useMultiplexing ?? true; + + return (keepaliveCadence, useMultiplexing); + } + } +} diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/DistributedLock.Oracle/OracleDatabaseConnection.cs new file mode 100644 index 00000000..c8b75806 --- /dev/null +++ b/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -0,0 +1,44 @@ +using Medallion.Threading.Internal.Data; +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + internal class OracleDatabaseConnection : DatabaseConnection + { + public OracleDatabaseConnection(IDbConnection connection) + : base(connection, isExternallyOwned: true) + { + } + + public OracleDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) + { + } + + public OracleDatabaseConnection(string connectionString) + : base(new OracleConnection(connectionString), isExternallyOwned: false) + { + } + + // from https://docs.oracle.com/html/E10927_01/OracleCommandClass.htm "this method is a no-op" wrt "Prepare()" + public override bool ShouldPrepareCommands => false; + + public override bool IsCommandCancellationException(Exception exception) => + exception is OracleException oracleException + // based on https://docs.oracle.com/cd/E85694_01/ODPNT/CommandCancel.htm + && (oracleException.Number == 01013 || oracleException.Number == 00936 || oracleException.Number == 00604); + + public override Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + // We should be able to use SYS.DBMS_SESSION.SLEEP, but this is broken because cancellation doesn't seem to work. + // See https://github.com/oracle/dotnet-db-samples/issues/211 + throw new NotSupportedException(); + } + } +} diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs new file mode 100644 index 00000000..998b648c --- /dev/null +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -0,0 +1,88 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + /// + /// Implements using Oracle's DBMS_LOCK package + /// + internal class OracleDbmsLock : IDbSynchronizationStrategy + { + // https://docs.oracle.com/cd/B19306_01/appdev.102/b14258/d_lock.htm#i1002309 + private const int MaxWaitSeconds = 32767; + private const int MaxTimeoutSeconds = MaxWaitSeconds - 1; + + private static readonly object Cookie = new(); + + public bool IsUpgradeable => false; // TODO revisit + + public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) + { + using var command = connection.CreateCommand(); + command.SetCommandText(@" + DECLARE + lockHandle VARCHAR2(128); + BEGIN + SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); + :returnValue = SYS.DBMS_LOCK.RELEASE(lockHandle); + END;" + ); + command.AddParameter("lockName", resourceName); + var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + + var returnValue = (int)returnValueParameter.Value; + if (returnValue != 0) + { + // we don't enumerate the error codes here because release shouldn't ever fail unless the user really messes things up + throw new InvalidOperationException($"SYS.DBMS_LOCK.RELEASE returned error code {returnValue}"); + } + } + + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + { + using var command = connection.CreateCommand(); + // TODO revisit mode, release_on_commit + command.SetCommandText(@" + DECLARE + lockHandle VARCHAR2(128); + BEGIN + SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); + :returnValue = SYS.DBMS_LOCK.REQUEST(lockHandle, SYS.DBMS_LOCK.X_MODE, :timeout, FALSE); + END;" + ); + command.AddParameter("lockName", resourceName); + command.AddParameter( + "timeout", + timeout.IsInfinite ? MaxWaitSeconds + // we could support longer timeouts via looping lock requests, but this doesn't feel particularly valuable and isn't a true longer wait + // since by looping you fall out of the wait queue + : timeout.TimeSpan.TotalSeconds > MaxTimeoutSeconds ? throw new ArgumentOutOfRangeException($"Requested non-infinite timeout value '{timeout}' is longer than Oracle's allowed max of '{TimeSpan.FromSeconds(MaxTimeoutSeconds)}'") + : timeout.TimeSpan.TotalSeconds + ); + var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); + await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); + + var returnValue = (int)returnValueParameter.Value; + return returnValue switch + { + 0 => Cookie, // success + 1 => null, // timeout + 2 => throw new DeadlockException(GetErrorMessage("deadlock")), + 3 => throw new InvalidOperationException(GetErrorMessage("parameter error")), + 4 => throw new InvalidOperationException(GetErrorMessage("attempted to acquire a lock that is already held by this connection")), + 5 => throw new InvalidOperationException(GetErrorMessage("illegal lock handle")), + _ => throw new InvalidOperationException(GetErrorMessage("unknown error code")), + }; + + string GetErrorMessage(string description) => + $"SYS.DBMS_LOCK.REQUEST returned error code {returnValue} ({description})"; + } + } +} diff --git a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..a1a3e2bd --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs @@ -0,0 +1,85 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Oracle +{ + public partial class OracleDistributedLock + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public OracleDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public OracleDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs new file mode 100644 index 00000000..ce2f9965 --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -0,0 +1,109 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + public sealed partial class OracleDistributedLock : IInternalDistributedLock + { + private readonly IDbDistributedLock _internalLock; + + /// + /// Constructs a lock with the given that connects using the provided and + /// . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) + { + } + + /// + /// Constructs a lock with the given that connects using the provided . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connection)) + { + } + + /// + /// Constructs a lock with the given that connects using the connection from the provided . + /// + /// NOTE that the lock will not be scoped to the and must still be explicitly released before the transaction ends. + /// However, this constructor allows the lock to PARTICIPATE in an ongoing transaction on a connection. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedLock(string name, IDbTransaction transaction, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, transaction)) + { + } + + private OracleDistributedLock(string name, bool exactName, Func internalLockFactory) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + //if (exactName) + //{ + // if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + // if (name.Length == 0) { throw new FormatException($"{nameof(name)}: must not be empty"); } + // if (name.ToLowerInvariant() != name) { throw new FormatException($"{nameof(name)}: must not container uppercase letters"); } + // this.Name = name; + //} + //else + //{ + // this.Name = GetSafeName(name); + //} + + // TODO exactName? + + this.Name = name; + this._internalLock = internalLockFactory(this.Name); + } + + /// + /// Implements + /// + public string Name { get; } + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, new OracleDbmsLock(), cancellationToken, contextHandle: null).Wrap(h => new OracleDistributedLockHandle(h)); + + private static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + var (keepaliveCadence, useMultiplexing) = OracleConnectionOptionsBuilder.GetOptions(options); + + if (useMultiplexing) + { + return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, OracleMultiplexedConnectionLockPool.Instance, keepaliveCadence); + } + + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + } + + private static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connection)); + } + + static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + throw new NotImplementedException("need to figure out transaction-scoped locks"); + //return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); + } + } +} diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/DistributedLock.Oracle/OracleDistributedLockHandle.cs new file mode 100644 index 00000000..0e38be8f --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedLockHandle.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.Internal; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + /// + /// Implements + /// + public sealed class OracleDistributedLockHandle : IDistributedSynchronizationHandle + { + private IDistributedSynchronizationHandle? _innerHandle; + + internal OracleDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } + + /// + /// TODO reference issue + /// + public CancellationToken HandleLostToken => CancellationToken.None; + + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } +} diff --git a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs new file mode 100644 index 00000000..2e9f6ffd --- /dev/null +++ b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs @@ -0,0 +1,12 @@ +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Oracle +{ + internal static class OracleMultiplexedConnectionLockPool + { + public static readonly MultiplexedConnectionLockPool Instance = new(s => new OracleDatabaseConnection(s)); + } +} From 490d63b126298567bbc4faf6ac9ff5d910dc81aa Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 15 Nov 2021 20:14:34 -0500 Subject: [PATCH 147/399] Basic OracleDistributedLock setup --- DistributedLock.Oracle/OracleDbmsLock.cs | 8 +- .../OracleDistributedLock.cs | 27 +++---- .../Oracle/OracleSetUpFixture.cs | 1 + .../Infrastructure/Oracle/TestingOracleDb.cs | 79 +++++++++++++++++++ .../Oracle/TestingOracleProviders.cs | 29 +++++++ .../Tests/CombinatorialTests.cs | 19 +++++ DistributedLockTaker/Program.cs | 4 + 7 files changed, 149 insertions(+), 18 deletions(-) create mode 100644 DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs create mode 100644 DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index 998b648c..72498002 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -30,9 +30,10 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour lockHandle VARCHAR2(128); BEGIN SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); - :returnValue = SYS.DBMS_LOCK.RELEASE(lockHandle); + :returnValue := SYS.DBMS_LOCK.RELEASE(lockHandle); END;" ); + // note: parameters bind by position by default! command.AddParameter("lockName", resourceName); var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); @@ -54,10 +55,12 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour lockHandle VARCHAR2(128); BEGIN SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); - :returnValue = SYS.DBMS_LOCK.REQUEST(lockHandle, SYS.DBMS_LOCK.X_MODE, :timeout, FALSE); + :returnValue := SYS.DBMS_LOCK.REQUEST(lockhandle => lockHandle, lockmode => SYS.DBMS_LOCK.X_MODE, timeout => :timeout, release_on_commit => FALSE); END;" ); + // note: parameters bind by position by default! command.AddParameter("lockName", resourceName); + var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); command.AddParameter( "timeout", timeout.IsInfinite ? MaxWaitSeconds @@ -66,7 +69,6 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour : timeout.TimeSpan.TotalSeconds > MaxTimeoutSeconds ? throw new ArgumentOutOfRangeException($"Requested non-infinite timeout value '{timeout}' is longer than Oracle's allowed max of '{TimeSpan.FromSeconds(MaxTimeoutSeconds)}'") : timeout.TimeSpan.TotalSeconds ); - var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); var returnValue = (int)returnValueParameter.Value; diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index ce2f9965..91f6467a 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -11,6 +11,8 @@ namespace Medallion.Threading.Oracle { public sealed partial class OracleDistributedLock : IInternalDistributedLock { + private const int MaxNameLength = 128; + private readonly IDbDistributedLock _internalLock; /// @@ -51,21 +53,16 @@ private OracleDistributedLock(string name, bool exactName, Func MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - // if (name.Length == 0) { throw new FormatException($"{nameof(name)}: must not be empty"); } - // if (name.ToLowerInvariant() != name) { throw new FormatException($"{nameof(name)}: must not container uppercase letters"); } - // this.Name = name; - //} - //else - //{ - // this.Name = GetSafeName(name); - //} - - // TODO exactName? - - this.Name = name; + if (exactName) + { + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + this.Name = name; + } + else + { + this.Name = DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); + } + this._internalLock = internalLockFactory(this.Name); } diff --git a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs index 95b791f1..12c0c569 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs @@ -78,6 +78,7 @@ static async Task TryConnectAsync() || ex.Number == 12514 // TNS:listener does not currently know of service requested in connect descriptor || ex.Number == 12528 // TNS: listener: all appropriate instances are blocking new connections || ex.Number == 01033 // ORACLE initialization or shutdown in progress + || ex.Message.Contains("Connection request timeout") ) { return false; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs new file mode 100644 index 00000000..b005bb06 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -0,0 +1,79 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Tests.Data; +using NUnit.Framework; +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Oracle +{ + public sealed class TestingOracleDb : ITestingPrimaryClientDb + { + internal static readonly string ConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); + + private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(ConnectionString); + + public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } + + // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 + public int MaxApplicationNameLength => 64; + + public TransactionSupport TransactionSupport => throw new NotImplementedException(); + + public void ClearPool(DbConnection connection) => OracleConnection.ClearPool((OracleConnection)connection); + + public int CountActiveSessions(string applicationName) + { + Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); + + using var connection = new OracleConnection(ConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT COUNT(*) FROM v$session WHERE status = 'ACTIVE' AND client_info = :applicationName"; + command.Parameters.Add("applicationName", applicationName); + return (int)(decimal)command.ExecuteScalar()!; + } + + public DbConnection CreateConnection() => new OracleConnection(this.ConnectionStringBuilder.ConnectionString); + + public IsolationLevel GetIsolationLevel(DbConnection connection) + { + throw new NotImplementedException(); + } + + public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + { + using var connection = new OracleConnection(ConnectionString); + await connection.OpenAsync(); + + using var getIdleSessionsCommand = connection.CreateCommand(); + var idleTimeSeconds = idleSince.HasValue ? (DateTimeOffset.Now - idleSince.Value).TotalSeconds : default(double?); + getIdleSessionsCommand.CommandText = $@" + SELECT sid, serial# + FROM v$sesion + WHERE status = 'INACTIVE' + AND client_info = :applicationName + {(idleTimeSeconds.HasValue ? $"AND last_call_et >= {idleTimeSeconds}" : string.Empty)}"; + getIdleSessionsCommand.Parameters.Add("applicationName", applicationName); + using var reader = await getIdleSessionsCommand.ExecuteReaderAsync(); + var sessionsToKill = new List<(int Sid, int SerialNumber)>(); + while (await reader.ReadAsync()) + { + sessionsToKill.Add((Sid: (int)reader.GetDecimal(0), SerialNumber: (int)reader.GetDecimal(1))); + } + + foreach (var (sid, serialNumber) in sessionsToKill) + { + using var killCommand = connection.CreateCommand(); + killCommand.CommandText = $"ALTER SYSTEM KILL SESSION '{sid},{serialNumber}'"; + await killCommand.ExecuteNonQueryAsync(); + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs new file mode 100644 index 00000000..b692858c --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -0,0 +1,29 @@ +using Medallion.Threading.Oracle; +using Medallion.Threading.Tests.Data; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Medallion.Threading.Tests.Oracle +{ + public sealed class TestingOracleDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + { + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + // todo pass in app name here + (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), + connection => new OracleDistributedLock(name, connection), + transaction => new OracleDistributedLock(name, transaction) + ); + + public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.ConnectionString).Name; + + internal static Action ToOracleOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => + { + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; + } +} diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 1c322518..6258c98c 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -50,6 +50,25 @@ public class OwnedTransactionStrategy_MySql_OwnedTransactionSynchronizationStrat public class OwnedTransactionStrategy_MySql_OwnedTransactionSynchronizationStrategy_MySqlDb_MySqlDb_MySqlDbTest : OwnedTransactionStrategyTestCases, TestingMySqlDb>, TestingMySqlDb> { } } +namespace Medallion.Threading.Tests.Oracle +{ + public class ConnectionStringStrategy_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingOracleDb> { } + public class ConnectionStringStrategy_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy, TestingOracleDb> { } + public class ConnectionStringStrategy_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy, TestingOracleDb> { } + public class Core_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class Core_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy> { } + public class Core_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } + public class Core_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy> { } + public class Core_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } + public class ExternalConnectionOrTransactionStrategy_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalConnectionSynchronizationStrategy, TestingOracleDb> { } + public class ExternalConnectionOrTransactionStrategy_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalTransactionSynchronizationStrategy, TestingOracleDb> { } + public class ExternalConnectionStrategy_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionStrategyTestCases>, TestingOracleDb> { } + public class ExternalTransactionStrategy_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalTransactionStrategyTestCases>, TestingOracleDb> { } + public class MultiplexingConnectionStrategy_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : MultiplexingConnectionStrategyTestCases>, TestingOracleDb> { } + public class OwnedConnectionStrategy_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedConnectionStrategyTestCases>, TestingOracleDb> { } + public class OwnedTransactionStrategy_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedTransactionStrategyTestCases>, TestingOracleDb> { } +} + namespace Medallion.Threading.Tests.Postgres { public class ConnectionStringStrategy_Postgres_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index e59af60b..b2f8e6a0 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -15,6 +15,7 @@ using System.Collections.Generic; using Medallion.Threading.ZooKeeper; using Medallion.Threading.MySql; +using Medallion.Threading.Oracle; #if NET471 using System.Data.SqlClient; #elif NETCOREAPP3_1 @@ -56,6 +57,9 @@ public static int Main(string[] args) case "MariaDB" + nameof(MySqlDistributedLock): handle = new MySqlDistributedLock(name, MariaDbCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); break; + case nameof(OracleDistributedLock): + handle = new OracleDistributedLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; case nameof(EventWaitHandleDistributedLock): handle = new EventWaitHandleDistributedLock(name).Acquire(); break; From 18f4348077848f5cc9157880dc51e9a14a09066d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 11 Dec 2021 17:35:40 -0500 Subject: [PATCH 148/399] Oracle: set up application name, get additional tests to pass --- .../OracleDatabaseConnection.cs | 21 +++++++++++ .../OracleDistributedLock.cs | 4 ++- .../Infrastructure/Data/ITestingDb.cs | 4 ++- .../Data/TestingDbSynchronizationStrategy.cs | 8 ++--- .../Infrastructure/MySql/TestingMySqlDb.cs | 4 ++- .../Oracle/OracleSetUpFixture.cs | 35 ++++++++++--------- .../Infrastructure/Oracle/TestingOracleDb.cs | 8 ++++- .../Postgres/TestingPostgresDb.cs | 6 ++++ .../SqlServer/TestingSqlServerDb.cs | 4 +++ 9 files changed, 69 insertions(+), 25 deletions(-) diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/DistributedLock.Oracle/OracleDatabaseConnection.cs index c8b75806..d4d1ddfd 100644 --- a/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -11,6 +11,8 @@ namespace Medallion.Threading.Oracle { internal class OracleDatabaseConnection : DatabaseConnection { + public const string ApplicationNameIndicatorPrefix = "__DistributedLock.ApplicationName="; + public OracleDatabaseConnection(IDbConnection connection) : base(connection, isExternallyOwned: true) { @@ -40,5 +42,24 @@ public override Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellati // See https://github.com/oracle/dotnet-db-samples/issues/211 throw new NotSupportedException(); } + + public static OracleConnection CreateConnection(string connectionString) + { + if (connectionString == null) { throw new ArgumentNullException(connectionString, nameof(connectionString)); } + + // The .NET Oracle provider does not currently support ApplicationName natively. However, that functionality is relied on by many of + // our tests. As a workaround, we permit the application name to be included in the connection string using a custom encoding scheme. + // This is only intended to work in tests! + if (!connectionString.StartsWith(ApplicationNameIndicatorPrefix, StringComparison.Ordinal)) + { + var firstSeparatorIndex = connectionString.IndexOf(';'); + var applicationName = connectionString.Substring(startIndex: ApplicationNameIndicatorPrefix.Length, length: firstSeparatorIndex - ApplicationNameIndicatorPrefix.Length); + var connection = new OracleConnection(connectionString.Substring(startIndex: firstSeparatorIndex + 1)); + connection.ClientInfo = applicationName; + return connection; + } + + return new OracleConnection(connectionString); + } } } diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 91f6467a..23ab01fa 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -56,11 +56,13 @@ private OracleDistributedLock(string name, bool exactName, Func MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + // Oracle treats NULL as the empty string. See https://stackoverflow.com/questions/13278773/null-vs-empty-string-in-oracle + if (name.Length == 0) { throw new FormatException($"{nameof(name)} must not be empty"); } this.Name = name; } else { - this.Name = DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); + this.Name = DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s.Length == 0 ? "EMPTY" : s); } this._internalLock = internalLockFactory(this.Name); diff --git a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs index 9703ab0c..7e31871c 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs @@ -14,8 +14,10 @@ public interface ITestingDb { DbConnectionStringBuilder ConnectionStringBuilder { get; } + string ApplicationName { get; set; } + // needed since different providers have different names for this key - public int MaxPoolSize { get; set; } + int MaxPoolSize { get; set; } int MaxApplicationNameLength { get; } diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 53396cbb..7e4dd46b 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -24,14 +24,12 @@ protected TestingDbSynchronizationStrategy(ITestingDb db) public string SetUniqueApplicationName(string baseName = "") { - // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool - var applicationName = DistributedLockHelpers.ToSafeName( + return this.Db.ApplicationName = DistributedLockHelpers.ToSafeName( + // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", maxNameLength: this.Db.MaxApplicationNameLength, s => s ); - this.Db.ConnectionStringBuilder["Application Name"] = applicationName; - return applicationName; } } @@ -46,7 +44,7 @@ public override void Dispose() { // if we have a uniquely-named connection, clear it's pool to avoid "leaking" connections into pools we'll never // use again - if (!Equals(this.Db.ConnectionStringBuilder["Application Name"], new TDb().ConnectionStringBuilder["Application Name"])) + if (!Equals(this.Db.ApplicationName, new TDb().ApplicationName)) { using var connection = this.Db.CreateConnection(); this.Db.ClearPool(connection); diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index 5fd6c5e9..5c437c20 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -29,7 +29,9 @@ protected TestingMySqlDb(string defaultConnectionString) public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public int MaxPoolSize + public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + + public int MaxPoolSize { get => (int)this._connectionStringBuilder.MaximumPoolSize; set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs index 12c0c569..f365986e 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs @@ -9,6 +9,9 @@ namespace Medallion.Threading.Tests.Oracle { + // TODO consider changing this to leverage an Oracle cloud autonomous database OR just requiring + // docker to be started manually; starting it automatically just doesn't seem to work that well. + /// /// Starts and stops the oracle docker container if needed. For best performance, run "docker start oracle-distributed-lock" before running the /// tests so that the container will just keep running. @@ -37,31 +40,31 @@ public class OracleSetUpFixture private bool _startedContainer; [OneTimeSetUp] - public async Task OneTimeSetUpAsync() + public void OneTimeSetUp() { // first, check if container has started - var containerLs = await Shell.Run("docker", new[] { "container", "ls" }).Task; - if (!containerLs.StandardOutput.Contains(ContainerName)) - { - Console.WriteLine($"docker container ls:"); - Console.WriteLine(containerLs); + //var containerLs = await Shell.Run("docker", new[] { "container", "ls" }).Task; + //if (!containerLs.StandardOutput.Contains(ContainerName)) + //{ + // Console.WriteLine($"docker container ls:"); + // Console.WriteLine(containerLs); - Console.WriteLine("STARTING CONTAINER"); + // Console.WriteLine("STARTING CONTAINER"); - var stopwatch = Stopwatch.StartNew(); - await Shell.Run("docker", new[] { "start", ContainerName }).Task; - this._startedContainer = true; + // var stopwatch = Stopwatch.StartNew(); + // await Shell.Run("docker", new[] { "start", ContainerName }).Task; + // this._startedContainer = true; - Console.WriteLine($"CONTAINER STARTED ({stopwatch.Elapsed.TotalSeconds}s)"); - } + // Console.WriteLine($"CONTAINER STARTED ({stopwatch.Elapsed.TotalSeconds}s)"); + //} var timeout = Task.Delay(TimeSpan.FromMinutes(5)); while (true) { var tryConnectTask = TryConnectAsync(); - var completed = await Task.WhenAny(timeout, tryConnectTask); - if (completed == timeout) { throw new TimeoutException("Timed out trying to connect to Oracle"); } - if (await tryConnectTask) { return; } + var completed = Task.WaitAny(tryConnectTask, timeout); + if (completed == 1) { throw new TimeoutException("Timed out trying to connect to Oracle"); } + if (tryConnectTask.GetAwaiter().GetResult()) { return; } } static async Task TryConnectAsync() @@ -78,7 +81,7 @@ static async Task TryConnectAsync() || ex.Number == 12514 // TNS:listener does not currently know of service requested in connect descriptor || ex.Number == 12528 // TNS: listener: all appropriate instances are blocking new connections || ex.Number == 01033 // ORACLE initialization or shutdown in progress - || ex.Message.Contains("Connection request timeout") + || ex.Message.Contains("Connection request timed out") ) { return false; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index b005bb06..83f253e2 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Internal; +using Medallion.Threading.Oracle; using Medallion.Threading.Tests.Data; using NUnit.Framework; using Oracle.ManagedDataAccess.Client; @@ -19,6 +20,8 @@ public sealed class TestingOracleDb : ITestingPrimaryClientDb public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public string ApplicationName { get; set; } = string.Empty; + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 @@ -40,7 +43,10 @@ public int CountActiveSessions(string applicationName) return (int)(decimal)command.ExecuteScalar()!; } - public DbConnection CreateConnection() => new OracleConnection(this.ConnectionStringBuilder.ConnectionString); + public DbConnection CreateConnection() => new OracleConnection( + (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) + + this.ConnectionStringBuilder.ConnectionString + ); public IsolationLevel GetIsolationLevel(DbConnection connection) { diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index f1823e92..a2c70a45 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -20,6 +20,12 @@ public sealed class TestingPostgresDb : ITestingPrimaryClientDb public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public string ApplicationName + { + get => this._connectionStringBuilder.ApplicationName ?? string.Empty; + set => this._connectionStringBuilder.ApplicationName = value == string.Empty ? null : value; + } + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } // https://til.hashrocket.com/posts/8f87c65a0a-postgresqls-max-identifier-length-is-63-bytes diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index ed57d0a4..ea3e3d4e 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -20,6 +20,8 @@ public sealed class TestingSqlServerDb : ITestingSqlServerDb, ITestingPrimaryCli public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } // https://stackoverflow.com/questions/5808332/sql-server-maximum-character-length-of-object-names/41502228 @@ -106,6 +108,8 @@ public sealed class TestingSystemDataSqlServerDb : ITestingSqlServerDb public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } public int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; From 6deb5ca9f1aa4567498248f2c9a7253392c2230b Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 12 Dec 2021 15:08:53 -0500 Subject: [PATCH 149/399] Oracle: many tests passing --- .../OracleDatabaseConnection.cs | 46 ++++++-- DistributedLock.Oracle/OracleDbmsLock.cs | 10 +- .../OracleDistributedLock.cs | 1 + .../OracleDistributedLockHandle.cs | 2 +- .../Data/ConnectionStringStrategyTestCases.cs | 4 +- ...onnectionOrTransactionStrategyTestCases.cs | 15 ++- .../Data/OwnedTransactionStrategyTestCases.cs | 11 +- .../DistributedLockCoreTestCases.cs | 78 +++++++------ ...ngAzureBlobLeaseSynchronizationStrategy.cs | 2 +- .../Infrastructure/Data/ITestingDb.cs | 2 + .../Data/TestingDbSynchronizationStrategy.cs | 4 +- .../Infrastructure/MySql/TestingMySqlDb.cs | 2 + .../Oracle/OracleSetUpFixture.cs | 104 ------------------ .../Infrastructure/Oracle/TestingOracleDb.cs | 21 ++-- .../Postgres/TestingPostgresDb.cs | 2 + .../Shared/OracleCredentials.cs | 53 ++++++--- .../SqlServer/TestingSqlServerDb.cs | 4 + .../TestingSynchronizationStrategy.cs | 2 +- .../Tests/Oracle/OracleDistributedLockTest.cs | 2 +- 19 files changed, 183 insertions(+), 182 deletions(-) delete mode 100644 DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/DistributedLock.Oracle/OracleDatabaseConnection.cs index d4d1ddfd..21cbd4a2 100644 --- a/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -13,21 +14,31 @@ internal class OracleDatabaseConnection : DatabaseConnection { public const string ApplicationNameIndicatorPrefix = "__DistributedLock.ApplicationName="; + // see SleepAsync() for why we need this + private readonly IDbConnection _innerConnection; + public OracleDatabaseConnection(IDbConnection connection) - : base(connection, isExternallyOwned: true) + : this(connection, isExternallyOwned: true) { } public OracleDatabaseConnection(IDbTransaction transaction) : base(transaction, isExternallyOwned: true) { + this._innerConnection = transaction.Connection; } public OracleDatabaseConnection(string connectionString) - : base(new OracleConnection(connectionString), isExternallyOwned: false) + : this(CreateConnection(connectionString), isExternallyOwned: false) { } + private OracleDatabaseConnection(IDbConnection connection, bool isExternallyOwned) + : base(connection, isExternallyOwned) + { + this._innerConnection = connection; + } + // from https://docs.oracle.com/html/E10927_01/OracleCommandClass.htm "this method is a no-op" wrt "Prepare()" public override bool ShouldPrepareCommands => false; @@ -36,26 +47,39 @@ exception is OracleException oracleException // based on https://docs.oracle.com/cd/E85694_01/ODPNT/CommandCancel.htm && (oracleException.Number == 01013 || oracleException.Number == 00936 || oracleException.Number == 00604); - public override Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) { - // We should be able to use SYS.DBMS_SESSION.SLEEP, but this is broken because cancellation doesn't seem to work. - // See https://github.com/oracle/dotnet-db-samples/issues/211 - throw new NotSupportedException(); + using var sleepCommand = this.CreateCommand(); + sleepCommand.SetCommandText("BEGIN sys.DBMS_SESSION.SLEEP(:seconds) END;"); + sleepCommand.AddParameter("seconds", sleepTime.TotalSeconds); + + try + { + await executor(sleepCommand, cancellationToken).ConfigureAwait(false); + } + catch when (!cancellationToken.IsCancellationRequested) + { + // Oracle doesn't fire StateChange unless the State is observed or the connection is explicitly opened/closed. Therefore, we observe + // the state on seeing any exception in order to for the event to fire. See https://github.com/oracle/dotnet-db-samples/issues/226 + _ = this._innerConnection.State; + throw; + } } public static OracleConnection CreateConnection(string connectionString) { if (connectionString == null) { throw new ArgumentNullException(connectionString, nameof(connectionString)); } - // The .NET Oracle provider does not currently support ApplicationName natively. However, that functionality is relied on by many of - // our tests. As a workaround, we permit the application name to be included in the connection string using a custom encoding scheme. - // This is only intended to work in tests! - if (!connectionString.StartsWith(ApplicationNameIndicatorPrefix, StringComparison.Ordinal)) + // The .NET Oracle provider does not currently support ApplicationName natively as a connection string property. + // However, that functionality is relied on by many of our tests. As a workaround, we permit the application name + // to be included in the connection string using a custom encoding scheme. This is only intended to work in tests! + // See https://github.com/oracle/dotnet-db-samples/issues/216 for more context. + if (connectionString.StartsWith(ApplicationNameIndicatorPrefix, StringComparison.Ordinal)) { var firstSeparatorIndex = connectionString.IndexOf(';'); var applicationName = connectionString.Substring(startIndex: ApplicationNameIndicatorPrefix.Length, length: firstSeparatorIndex - ApplicationNameIndicatorPrefix.Length); var connection = new OracleConnection(connectionString.Substring(startIndex: firstSeparatorIndex + 1)); - connection.ClientInfo = applicationName; + connection.ConnectionOpen += _ => connection.ClientInfo = applicationName; return connection; } diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index 72498002..2d94dad8 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -78,13 +78,21 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour 1 => null, // timeout 2 => throw new DeadlockException(GetErrorMessage("deadlock")), 3 => throw new InvalidOperationException(GetErrorMessage("parameter error")), - 4 => throw new InvalidOperationException(GetErrorMessage("attempted to acquire a lock that is already held by this connection")), + 4 => timeout.IsZero ? null + : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") + : await WaitThenReturnNullAsync().ConfigureAwait(false), 5 => throw new InvalidOperationException(GetErrorMessage("illegal lock handle")), _ => throw new InvalidOperationException(GetErrorMessage("unknown error code")), }; string GetErrorMessage(string description) => $"SYS.DBMS_LOCK.REQUEST returned error code {returnValue} ({description})"; + + async ValueTask WaitThenReturnNullAsync() + { + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; + } } } } diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 23ab01fa..b1fb56f5 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -101,6 +101,7 @@ static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transac { if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + // todo throw new NotImplementedException("need to figure out transaction-scoped locks"); //return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); } diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/DistributedLock.Oracle/OracleDistributedLockHandle.cs index 0e38be8f..ed3f1d89 100644 --- a/DistributedLock.Oracle/OracleDistributedLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedLockHandle.cs @@ -22,7 +22,7 @@ internal OracleDistributedLockHandle(IDistributedSynchronizationHandle innerHand /// /// TODO reference issue /// - public CancellationToken HandleLostToken => CancellationToken.None; + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); /// /// Releases the lock diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 0e943542..107a8d00 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -37,8 +37,8 @@ public void TestConnectionDoesNotLeak() { this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1, this.GetType().Name); } - // still alive due to pooling - this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1, this.GetType().Name); + // still alive due to pooling, except in Oracle where the application name (client info) is not part of the pool key + Assert.LessOrEqual(this._lockProvider.Strategy.Db.CountActiveSessions(applicationName), 1, this.GetType().Name); } using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index b7f9ebf3..c74a55fb 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -23,7 +23,7 @@ public abstract class ExternalConnectionOrTransactionStrategyTestCases { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, this.GetType().Name); + Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); // MariaDB fails both tasks due to deadlock instead of just picking a single victim Assert.GreaterOrEqual(tasks.Count(t => t.IsFaulted), 1); @@ -91,8 +91,15 @@ public void TestStateChangeHandlerIsNotLeaked() GetStateChanged(this._lockProvider.Strategy.AmbientConnection!).ShouldEqual(initialHandler); static StateChangeEventHandler? GetStateChanged(DbConnection connection) => - (StateChangeEventHandler?)typeof(DbConnection).GetFields(BindingFlags.Instance | BindingFlags.NonPublic) - .Single(f => f.FieldType == typeof(StateChangeEventHandler)) + // We check both the connection type and the base type because OracleConnection overrides the storage for + // the StateChange event handler + (StateChangeEventHandler?)new[] { connection.GetType(), typeof(DbConnection) } + .Select( + t => t.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly) + .Where(f => f.FieldType == typeof(StateChangeEventHandler)) + .SingleOrDefault() + ) + .First(f => f != null) .GetValue(connection); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs index d8bed0de..e3b7b167 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs @@ -1,5 +1,6 @@ using Medallion.Threading.Internal; using NUnit.Framework; +using System; using System.Data; namespace Medallion.Threading.Tests.Data @@ -38,7 +39,15 @@ public void TestIsolationLevelLeakage() using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) { connection.Open(); - defaultIsolationLevel = this._lockProvider.Strategy.Db.GetIsolationLevel(connection); + try + { + defaultIsolationLevel = this._lockProvider.Strategy.Db.GetIsolationLevel(connection); + } + catch (NotSupportedException) + { + Assert.Pass("Getting isolation level not supported"); + throw; + } } // Pre-generate the lock we will use. This is necessary for our Semaphore5 strategy, where the first lock created diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index dfba0e85..aba6a34e 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -150,7 +150,8 @@ public void CancellationTest() var source = new CancellationTokenSource(); using (var handle = this._lockProvider.CreateLock(lockName).Acquire()) { - var blocked = @lock.AcquireAsync(cancellationToken: source.Token).AsTask(); + // Task.Run() forces true asynchrony even for locks that don't support it + var blocked = Task.Run(() => @lock.AcquireAsync(cancellationToken: source.Token).AsTask()); blocked.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); source.Cancel(); blocked.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, this.GetType().Name); @@ -164,20 +165,23 @@ public void CancellationTest() } [Test] - public void TestParallelism() + public async Task TestParallelism() { - this._lockProvider.Strategy.PrepareForHighContention(); + var taskCount = 100; + this._lockProvider.Strategy.PrepareForHighContention(ref taskCount); // NOTE: if this test fails for Postgres, we may need to raise the default connection limit. This can // be done by setting max_connections in C:\Program Files\PostgreSQL\\data\postgresql.conf or - // /var/lib/pgsql//data/postgresql.conf and then restarting Postgres. + // /var/lib/pgsql//data/postgresql.conf and then restarting Postgres. I set max_connections = 10000. // See https://docs.alfresco.com/5.0/tasks/postgresql-config.html + var locks = Enumerable.Range(0, taskCount) + .Select(_ => this._lockProvider.CreateLock("parallel_test")) + .ToArray(); var counter = 0; - var tasks = Enumerable.Range(1, 100).Select(async _ => + var tasks = Enumerable.Range(0, taskCount).Select(i => Task.Run(async () => { - var @lock = this._lockProvider.CreateLock("parallel_test"); - await using (await @lock.AcquireAsync()) + await using (await locks[i].AcquireAsync()) { // increment going in if (Interlocked.Increment(ref counter) == 2) @@ -191,10 +195,20 @@ public void TestParallelism() // decrement and return on the way out (returns # inside the lock when this left ... should be 0) return Interlocked.Decrement(ref counter); } - }) + })) .ToList(); - Task.WaitAll(tasks.ToArray(), TimeSpan.FromSeconds(30)).ShouldEqual(true, this.GetType().Name); + var failure = new TaskCompletionSource(); + foreach (var task in tasks) + { + _ = task.ContinueWith(t => failure.TrySetException(t.Exception!), TaskContinuationOptions.OnlyOnFaulted); + } + + var timeout = Task.Delay(TimeSpan.FromSeconds(30)); + + var completed = await Task.WhenAny(Task.WhenAll(tasks), failure.Task, timeout); + Assert.AreNotSame(failure.Task, completed, $"Failed with {(failure.Task.IsFaulted ? failure.Task.Exception!.ToString() : null)}"); + Assert.AreNotSame(timeout, completed, $"Timed out! (only {tasks.Count(t => t.IsCompleted)}/{taskCount} completed)"); tasks.ForEach(t => t.Result.ShouldEqual(0)); } @@ -288,27 +302,31 @@ public async Task TestHandleLostTriggersCorrectly() var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); - using var handle = await @lock.AcquireAsync(); - - handle.HandleLostToken.CanBeCanceled.ShouldEqual(handleLostHelper != null); - Assert.IsFalse(handle.HandleLostToken.IsCancellationRequested); - - if (handleLostHelper != null) + var handle = await @lock.AcquireAsync(); + try { - using var canceledEvent = new ManualResetEventSlim(initialState: false); - using var registration = handle.HandleLostToken.Register(canceledEvent.Set); + handle.HandleLostToken.CanBeCanceled.ShouldEqual(handleLostHelper != null); + Assert.IsFalse(handle.HandleLostToken.IsCancellationRequested); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + if (handleLostHelper != null) + { + using var canceledEvent = new ManualResetEventSlim(initialState: false); + using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - handleLostHelper.Dispose(); + Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); - Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); - } + handleLostHelper.Dispose(); - // when the handle is lost, Dispose() may throw - try { await handle.DisposeAsync(); } - catch { } + Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); + Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); + } + } + finally + { + // when the handle is lost, Dispose() may throw + try { await handle.DisposeAsync(); } + catch { } + } Assert.Throws(() => handle.HandleLostToken.GetType()); } @@ -321,15 +339,12 @@ public async Task TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost() this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); - if (handleLostHelper == null) - { - Assert.Pass(); - } + if (handleLostHelper == null) { Assert.Pass(); } var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); using var handle = await @lock.AcquireAsync(); - + handleLostHelper!.Dispose(); using var canceledEvent = new ManualResetEventSlim(initialState: false); @@ -418,7 +433,8 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) var @lock = this._lockProvider.CreateLockWithExactName(name); var acquireTask = asyncWait - ? @lock.TryAcquireAsync(TimeSpan.FromSeconds(20)).AsTask() + // always use Task.Run() to force asynchrony even for locks that don't truly support it + ? Task.Run(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(20)).AsTask()) : Task.Run(() => @lock.TryAcquire(TimeSpan.FromSeconds(20))); acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, this.GetType().Name); diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs index ab7631fe..ebe5ec89 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs @@ -40,7 +40,7 @@ public sealed class TestingAzureBlobLeaseSynchronizationStrategy : TestingSynchr return new HandleLostScope(this.ContainerName); } - public override void PrepareForHighContention() + public override void PrepareForHighContention(ref int maxConcurrentAcquires) { this.Options = null; // reduces # of requests under high contention this.CreateBlobBeforeLockIsCreated = true; diff --git a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs index 7e31871c..bf2a3384 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs @@ -16,6 +16,8 @@ public interface ITestingDb string ApplicationName { get; set; } + string ConnectionString { get; } + // needed since different providers have different names for this key int MaxPoolSize { get; set; } diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 7e4dd46b..fd90b545 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -65,13 +65,13 @@ public abstract class TestingConnectionStringSynchronizationStrategy : Test public sealed override TestingDbConnectionOptions GetConnectionOptions() => new TestingDbConnectionOptions { - ConnectionString = this.Db.ConnectionStringBuilder.ConnectionString, + ConnectionString = this.Db.ConnectionString, ConnectionStringUseMultiplexing = this.UseMultiplexingNotTransaction == true, ConnectionStringUseTransaction = this.UseMultiplexingNotTransaction == false, ConnectionStringKeepaliveCadence = this.KeepaliveCadence, }; - public sealed override IDisposable? PrepareForHandleLost() => + public sealed override IDisposable? PrepareForHandleLost() => new HandleLostScope(this.SetUniqueApplicationName(nameof(PrepareForHandleLost)), this.Db); private class HandleLostScope : IDisposable diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index 5c437c20..2de38bdf 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -31,6 +31,8 @@ protected TestingMySqlDb(string defaultConnectionString) public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + public string ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public int MaxPoolSize { get => (int)this._connectionStringBuilder.MaximumPoolSize; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs deleted file mode 100644 index f365986e..00000000 --- a/DistributedLock.Tests/Infrastructure/Oracle/OracleSetUpFixture.cs +++ /dev/null @@ -1,104 +0,0 @@ -using Medallion.Shell; -using NUnit.Framework; -using Oracle.ManagedDataAccess.Client; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Oracle -{ - // TODO consider changing this to leverage an Oracle cloud autonomous database OR just requiring - // docker to be started manually; starting it automatically just doesn't seem to work that well. - - /// - /// Starts and stops the oracle docker container if needed. For best performance, run "docker start oracle-distributed-lock" before running the - /// tests so that the container will just keep running. - /// - /// Note: for this setup we're assuming that the Oracle DB has been set up to run in Docker. - /// - /// Setup steps: - /// (1) Install Docker if needed - /// (2) Clone https://github.com/oracle/docker-images - /// (3) Follow instructions here: https://github.com/oracle/docker-images/tree/main/OracleDatabase/SingleInstance#oracle-database-container-images - /// for running the buildContainerImage shell script. I ran "./buildContainerImage.sh -v 18.4.0 -x" because as of 2021-11-01 that was the version that - /// came pre-baked with the repo - /// (4) Create the container with "docker run --name oracle-distributed-lock -p 1521:1521 oracle/database:18.4.0-xe", then stop it (e. g. from the docker desktop gui) - /// - /// NOTE: After reading https://blog.simonpeterdebbarma.com/2020-04-memory-and-wsl/ I also added a %USERPROFILE%/.wslconfig containing the following: - /// [wsl2] - /// memory=1GB - /// - [SetUpFixture] - public class OracleSetUpFixture - { - private const string ContainerName = "oracle-distributed-lock"; - - private static readonly Shell.Shell Shell = new(o => o.ThrowOnError(true)); - - private bool _startedContainer; - - [OneTimeSetUp] - public void OneTimeSetUp() - { - // first, check if container has started - //var containerLs = await Shell.Run("docker", new[] { "container", "ls" }).Task; - //if (!containerLs.StandardOutput.Contains(ContainerName)) - //{ - // Console.WriteLine($"docker container ls:"); - // Console.WriteLine(containerLs); - - // Console.WriteLine("STARTING CONTAINER"); - - // var stopwatch = Stopwatch.StartNew(); - // await Shell.Run("docker", new[] { "start", ContainerName }).Task; - // this._startedContainer = true; - - // Console.WriteLine($"CONTAINER STARTED ({stopwatch.Elapsed.TotalSeconds}s)"); - //} - - var timeout = Task.Delay(TimeSpan.FromMinutes(5)); - while (true) - { - var tryConnectTask = TryConnectAsync(); - var completed = Task.WaitAny(tryConnectTask, timeout); - if (completed == 1) { throw new TimeoutException("Timed out trying to connect to Oracle"); } - if (tryConnectTask.GetAwaiter().GetResult()) { return; } - } - - static async Task TryConnectAsync() - { - await using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); - try - { - await connection.OpenAsync(); - return true; - } - catch (OracleException ex) - when ( - ex.Number == 12541 // TNS: No listener - || ex.Number == 12514 // TNS:listener does not currently know of service requested in connect descriptor - || ex.Number == 12528 // TNS: listener: all appropriate instances are blocking new connections - || ex.Number == 01033 // ORACLE initialization or shutdown in progress - || ex.Message.Contains("Connection request timed out") - ) - { - return false; - } - } - } - - [OneTimeTearDown] - public async Task OneTimeTearDown() - { - if (this._startedContainer) - { - Console.WriteLine("STOPPING CONTAINER"); - var stopwatch = Stopwatch.StartNew(); - await Shell.Run("docker", new[] { "stop", ContainerName }).Task; - Console.WriteLine($"CONTAINER STOPPED ({stopwatch.Elapsed.TotalSeconds}s)"); - } - } - } -} diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index 83f253e2..48b092e4 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -22,6 +22,10 @@ public sealed class TestingOracleDb : ITestingPrimaryClientDb public string ApplicationName { get; set; } = string.Empty; + string ITestingDb.ConnectionString => + (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) + + this.ConnectionStringBuilder.ConnectionString; + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 @@ -38,19 +42,19 @@ public int CountActiveSessions(string applicationName) using var connection = new OracleConnection(ConnectionString); connection.Open(); using var command = connection.CreateCommand(); - command.CommandText = "SELECT COUNT(*) FROM v$session WHERE status = 'ACTIVE' AND client_info = :applicationName"; + command.CommandText = "SELECT COUNT(*) FROM v$session WHERE client_info = :applicationName AND status != 'KILLED'"; command.Parameters.Add("applicationName", applicationName); return (int)(decimal)command.ExecuteScalar()!; } - public DbConnection CreateConnection() => new OracleConnection( - (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) - + this.ConnectionStringBuilder.ConnectionString - ); + public DbConnection CreateConnection() => OracleDatabaseConnection.CreateConnection(this.As().ConnectionString); public IsolationLevel GetIsolationLevel(DbConnection connection) { - throw new NotImplementedException(); + // After briefly trying the various approaches mentioned on https://stackoverflow.com/questions/10711204/how-to-check-isoloation-level + // I could not get them to work. Given that the tests using this are checking something relatively minor and SQLServer specific, not + // supporting this seems fine. + throw new NotSupportedException(); } public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) @@ -62,9 +66,8 @@ public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idle var idleTimeSeconds = idleSince.HasValue ? (DateTimeOffset.Now - idleSince.Value).TotalSeconds : default(double?); getIdleSessionsCommand.CommandText = $@" SELECT sid, serial# - FROM v$sesion - WHERE status = 'INACTIVE' - AND client_info = :applicationName + FROM v$session + WHERE client_info = :applicationName {(idleTimeSeconds.HasValue ? $"AND last_call_et >= {idleTimeSeconds}" : string.Empty)}"; getIdleSessionsCommand.Parameters.Add("applicationName", applicationName); using var reader = await getIdleSessionsCommand.ExecuteReaderAsync(); diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index a2c70a45..5ac54bf5 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -26,6 +26,8 @@ public string ApplicationName set => this._connectionStringBuilder.ApplicationName = value == string.Empty ? null : value; } + string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } // https://til.hashrocket.com/posts/8f87c65a0a-postgresqls-max-identifier-length-is-63-bytes diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs index 76cdaec8..f97783fd 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -8,30 +8,57 @@ namespace Medallion.Threading.Tests { + /// + /// For Oracle, we need both a password and a "wallet" directory. + /// + /// See https://www.oracle.com/topics/technologies/dotnet/tech-info-autonomousdatabase.html for setup instructions. + /// See also https://github.com/oracle/dotnet-db-samples/issues/225 + /// + /// If the tests haven't been run for some time, it might be necessary to start the autonomous database at https://cloud.oracle.com/, + /// since it will stop after being idle for some time. + /// internal static class OracleCredentials { - private static string GetPassword(string baseDirectory) - { - var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "oracle.txt")); - if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find mysql credentials file {file}"); } - var lines = File.ReadAllLines(file); - if (lines.Length != 1) { throw new FormatException($"{file} must contain exactly 1 line of text"); } - return lines[0]; - } - public static string GetConnectionString(string baseDirectory) { - var password = GetPassword(baseDirectory); + var credentialDirectory = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials")); + ConfigureWallet(credentialDirectory); + var (datasource, username, password) = GetCredentials(credentialDirectory); return new OracleConnectionStringBuilder { - DataSource = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=XE)))", - UserID = "SYSTEM", + DataSource = datasource, + UserID = username, Password = password, PersistSecurityInfo = true, // set a high pool size so that we don't empty the pool through things like lock abandonment tests - MaxPoolSize = 500, + //MaxPoolSize = 500, + MaxPoolSize = 15, }.ConnectionString; } + + private static void ConfigureWallet(string credentialDirectory) + { + var walletDirectory = Directory.GetDirectories(credentialDirectory, "Wallet_*").Single(); + if (OracleConfiguration.TnsAdmin != walletDirectory) + { + // directory containing tnsnames.ora and sqlnet.ora + OracleConfiguration.TnsAdmin = walletDirectory; + } + if (OracleConfiguration.WalletLocation != walletDirectory) + { + // directory containing cwallet.sso + OracleConfiguration.WalletLocation = walletDirectory; + } + } + + private static (string DataSource, string Username, string Password) GetCredentials(string credentialDirectory) + { + var file = Path.Combine(credentialDirectory, "oracle.txt"); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find Oracle credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 3) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1], lines[2]); + } } } diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index ea3e3d4e..80a59171 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -20,6 +20,8 @@ public sealed class TestingSqlServerDb : ITestingSqlServerDb, ITestingPrimaryCli public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } @@ -110,6 +112,8 @@ public sealed class TestingSystemDataSqlServerDb : ITestingSqlServerDb public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } public int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 8ac80695..4b5a5a2d 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -19,7 +19,7 @@ public abstract class TestingSynchronizationStrategy : IDisposable public virtual void PrepareForHandleAbandonment() { } public virtual void PerformAdditionalCleanupForHandleAbandonment() { } public virtual IDisposable? PrepareForHandleLost() => null; - public virtual void PrepareForHighContention() { } + public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } public virtual void Dispose() { } } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs index 4d75df0f..f4b6a60c 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Tests.Oracle public class OracleDistributedLockTest { [Test] - public async Task Test() + public async Task BasicConnectivityTest() { var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); await connection.OpenAsync(); From 3e7d6123fa6a164e43623baa0ff43504e1fab976 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 12 Dec 2021 20:43:54 -0500 Subject: [PATCH 150/399] Get TestParallelism passing and reduce code duplication by converting ITestingDb to an abstract class. --- .../Data/ConnectionStringStrategyTestCases.cs | 6 +- .../Data/DbSemaphoreTestCases.cs | 2 +- ...onnectionOrTransactionStrategyTestCases.cs | 2 +- .../ExternalConnectionStrategyTestCases.cs | 2 +- .../ExternalTransactionStrategyTestCases.cs | 2 +- ...MultiplexingConnectionStrategyTestCases.cs | 6 +- .../Data/OwnedConnectionStrategyTestCases.cs | 4 +- .../Data/OwnedTransactionStrategyTestCases.cs | 4 +- ...erLockConnectionStringStrategyTestCases.cs | 4 +- .../DistributedLockCoreTestCases.cs | 1 + .../Infrastructure/Data/ITestingDb.cs | 63 ------------- .../Infrastructure/Data/IdleSessionKiller.cs | 2 +- .../Infrastructure/Data/TestingDb.cs | 93 +++++++++++++++++++ .../Data/TestingDbSynchronizationStrategy.cs | 33 +++---- .../Infrastructure/MySql/TestingMySqlDb.cs | 29 ++---- .../Infrastructure/Oracle/TestingOracleDb.cs | 41 ++++---- .../Oracle/TestingOracleProviders.cs | 2 +- .../Postgres/TestingPostgresDb.cs | 36 +++---- .../Shared/OracleCredentials.cs | 4 +- .../SqlServer/TestingSqlServerDb.cs | 58 +++++------- .../SqlServer/TestingSqlServerProviders.cs | 6 +- .../Tests/MySql/MySqlDistributedLockTest.cs | 2 +- .../Tests/Postgres/PostgresBehaviorTest.cs | 14 +-- .../Postgres/PostgresDistributedLockTest.cs | 6 +- ...sDistributedSynchronizationProviderTest.cs | 2 +- .../SqlServer/SqlDatabaseConnectionTest.cs | 4 +- .../Tests/SqlServer/SqlDistributedLockTest.cs | 10 +- .../SqlDistributedReaderWriterLockTest.cs | 8 +- .../SqlServer/SqlDistributedSemaphoreTest.cs | 10 +- ...lDistributedSynchronizationProviderTest.cs | 2 +- 30 files changed, 224 insertions(+), 234 deletions(-) delete mode 100644 DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs create mode 100644 DistributedLock.Tests/Infrastructure/Data/TestingDb.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 107a8d00..af1d7538 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Tests.Data public abstract class ConnectionStringStrategyTestCases where TLockProvider : TestingLockProvider, new() where TStrategy : TestingConnectionStringSynchronizationStrategy, new() - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { private TLockProvider _lockProvider = default!; @@ -28,7 +28,7 @@ public void TestConnectionDoesNotLeak() this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); // set a distinctive application name so that we can count how many connections are used - var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); var @lock = this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); for (var i = 0; i < 30; ++i) @@ -65,7 +65,7 @@ public void TestConnectionDoesNotLeak() [NonParallelizable, Retry(5)] // timing-sensitive public void TestKeepaliveProtectsFromIdleSessionKiller() { - var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); var @lock = this._lockProvider.CreateLock(Guid.NewGuid().ToString()); // use unique name due to retry diff --git a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs index 01b1a034..0fb58b29 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.Tests.Data public abstract class DbSemaphoreTestCases where TSemaphoreProvider : TestingSemaphoreProvider, new() where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private TSemaphoreProvider _semaphoreProvider = default!; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index c74a55fb..c0ba41b9 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Tests.Data public abstract class ExternalConnectionOrTransactionStrategyTestCases where TLockProvider : TestingLockProvider, new() where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private TLockProvider _lockProvider = default!; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs index bc7cd116..d2fd3685 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs @@ -5,7 +5,7 @@ namespace Medallion.Threading.Tests.Data { public abstract class ExternalConnectionStrategyTestCases where TLockProvider : TestingLockProvider>, new() - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private TLockProvider _lockProvider = default!; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index 70edd6f8..1f751ac5 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.Tests.Data { public abstract class ExternalTransactionStrategyTestCases where TLockProvider : TestingLockProvider>, new() - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private TLockProvider _lockProvider = default!; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index 1c7aeae0..cc025dc3 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Tests.Data { public abstract class MultiplexingConnectionStrategyTestCases where TLockProvider : TestingLockProvider>, new() - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { private TLockProvider _lockProvider = default!; @@ -89,7 +89,7 @@ public void TestHighConcurrencyWithSmallPool() } // assign a unique app name to make sure we'll own the entire pool - this._lockProvider.Strategy.SetUniqueApplicationName(); + this._lockProvider.Strategy.Db.SetUniqueApplicationName(); this._lockProvider.Strategy.Db.MaxPoolSize = 1; async Task Test() @@ -131,7 +131,7 @@ public async Task TestBrokenConnectionDoesNotCorruptPool() // application name and therefore won't be killed this._lockProvider.CreateLock("1"); this._lockProvider.CreateLock("2"); - var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); var lock1 = this._lockProvider.CreateLock("1"); await using var handle1 = await lock1.AcquireAsync(); diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs index fc7b4b9f..2c35d338 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs @@ -11,7 +11,7 @@ namespace Medallion.Threading.Tests.Data { public abstract class OwnedConnectionStrategyTestCases where TLockProvider : TestingLockProvider>, new() - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { private TLockProvider _lockProvider = default!; @@ -32,7 +32,7 @@ public void TestIdleSessionKiller() // application name and therefore won't be counted or killed this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); - var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); var @lock = this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); // go through one acquire/dispose cycle to ensure all commands are prepared. Due to diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs index e3b7b167..4ed8b928 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs @@ -7,7 +7,7 @@ namespace Medallion.Threading.Tests.Data { public abstract class OwnedTransactionStrategyTestCases where TLockProvider : TestingLockProvider>, new() - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { private TLockProvider _lockProvider = default!; @@ -56,7 +56,7 @@ public void TestIsolationLevelLeakage() this._lockProvider.CreateLock(nameof(TestIsolationLevelLeakage)); // use a unique pool of size 1 so we can reclaim the connection after we use it and test for leaks - this._lockProvider.Strategy.SetUniqueApplicationName(); + this._lockProvider.Strategy.Db.SetUniqueApplicationName(); this._lockProvider.Strategy.Db.MaxPoolSize = 1; AssertHasDefaultIsolationLevel(); diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index a6fbd390..f54c9346 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Tests.Data public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCases where TLockProvider : TestingUpgradeableReaderWriterLockProvider, new() where TStrategy : TestingConnectionStringSynchronizationStrategy, new() - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { private TLockProvider _lockProvider = default!; @@ -24,7 +24,7 @@ public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCas [NonParallelizable, Retry(tryCount: 5)] // this test is somewhat timing sensitive public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() { - var applicationName = this._lockProvider.Strategy.SetUniqueApplicationName(); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index aba6a34e..05d28947 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -179,6 +179,7 @@ public async Task TestParallelism() .Select(_ => this._lockProvider.CreateLock("parallel_test")) .ToArray(); var counter = 0; + // Task.Run() ensures true parallelism even for locks that don't support it var tasks = Enumerable.Range(0, taskCount).Select(i => Task.Run(async () => { await using (await locks[i].AcquireAsync()) diff --git a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs deleted file mode 100644 index bf2a3384..00000000 --- a/DistributedLock.Tests/Infrastructure/Data/ITestingDb.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.Common; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Data -{ - /// - /// Abstraction over an ADO.NET client for a database technology - /// - public interface ITestingDb - { - DbConnectionStringBuilder ConnectionStringBuilder { get; } - - string ApplicationName { get; set; } - - string ConnectionString { get; } - - // needed since different providers have different names for this key - int MaxPoolSize { get; set; } - - int MaxApplicationNameLength { get; } - - TransactionSupport TransactionSupport { get; } - - DbConnection CreateConnection(); - - void ClearPool(DbConnection connection); - - int CountActiveSessions(string applicationName); - - IsolationLevel GetIsolationLevel(DbConnection connection); - } - - public enum TransactionSupport - { - /// - /// The lifetime of the lock is tied to the transaction - /// - TransactionScoped, - - /// - /// Connection-scoped lifetime, but locking requests will automatically participate in a transaction if the connection has one - /// - ImplicitParticipation, - - /// - /// Connection-scoped lifetime, but locking requests will participate in a transaction if one is explicitly provided - /// - ExplicitParticipation, - } - - /// - /// Interface for the "primary" ADO.NET client for a particular DB backend. For now - /// this is just used to designate Microsoft.Data.SqlClient vs. System.Data.SqlClient - /// - public interface ITestingPrimaryClientDb : ITestingDb - { - Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null); - } -} diff --git a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs index 08593a63..305fbb71 100644 --- a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs +++ b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs @@ -11,7 +11,7 @@ internal class IdleSessionKiller : IDisposable private readonly CancellationTokenSource _cancellationTokenSource; private readonly Task _task; - public IdleSessionKiller(ITestingPrimaryClientDb db, string applicationName, TimeSpan idleTimeout) + public IdleSessionKiller(TestingPrimaryClientDb db, string applicationName, TimeSpan idleTimeout) { this._cancellationTokenSource = new CancellationTokenSource(); var cancellationToken = this._cancellationTokenSource.Token; diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs new file mode 100644 index 00000000..ae1c7904 --- /dev/null +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs @@ -0,0 +1,93 @@ +using Medallion.Threading.Internal; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Data +{ + /// + /// Abstraction over an ADO.NET client for a database technology + /// + public abstract class TestingDb + { + public abstract DbConnectionStringBuilder ConnectionStringBuilder { get; } + + public virtual string ApplicationName + { + get => (string)this.ConnectionStringBuilder["Application Name"]; + set => this.ConnectionStringBuilder["Application Name"] = value; + } + + public string SetUniqueApplicationName(string baseName = "") + { + return this.ApplicationName = DistributedLockHelpers.ToSafeName( + // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool + $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", + maxNameLength: this.MaxApplicationNameLength, + s => s + ); + } + + public virtual string ConnectionString => this.ConnectionStringBuilder.ConnectionString; + + // needed since different providers have different names for this key + public virtual int MaxPoolSize + { + get => (int)this.GetMaxPoolSizeProperty().GetValue(this.ConnectionStringBuilder)!; + set => this.GetMaxPoolSizeProperty().SetValue(this.ConnectionStringBuilder, value); + } + + private PropertyInfo GetMaxPoolSizeProperty() => this.ConnectionStringBuilder.GetType() + .GetProperty("MaxPoolSize", BindingFlags.Public | BindingFlags.Instance)!; + + public abstract int MaxApplicationNameLength { get; } + + public abstract TransactionSupport TransactionSupport { get; } + + public abstract DbConnection CreateConnection(); + + public void ClearPool(DbConnection connection) + { + var clearPoolMethod = connection.GetType().GetMethod("ClearPool", BindingFlags.Public | BindingFlags.Static); + clearPoolMethod!.Invoke(null, new[] { connection }); + } + + public abstract int CountActiveSessions(string applicationName); + + public abstract IsolationLevel GetIsolationLevel(DbConnection connection); + + public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } + } + + public enum TransactionSupport + { + /// + /// The lifetime of the lock is tied to the transaction + /// + TransactionScoped, + + /// + /// Connection-scoped lifetime, but locking requests will automatically participate in a transaction if the connection has one + /// + ImplicitParticipation, + + /// + /// Connection-scoped lifetime, but locking requests will participate in a transaction if one is explicitly provided + /// + ExplicitParticipation, + } + + /// + /// Interface for the "primary" ADO.NET client for a particular DB backend. For now + /// this is just used to designate Microsoft.Data.SqlClient vs. System.Data.SqlClient + /// + public abstract class TestingPrimaryClientDb : TestingDb + { + public abstract Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null); + } +} diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index fd90b545..36b13ae8 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -13,28 +13,21 @@ namespace Medallion.Threading.Tests.Data /// public abstract class TestingDbSynchronizationStrategy : TestingSynchronizationStrategy { - protected TestingDbSynchronizationStrategy(ITestingDb db) + protected TestingDbSynchronizationStrategy(TestingDb db) { this.Db = db; } - public ITestingDb Db { get; } + public TestingDb Db { get; } public abstract TestingDbConnectionOptions GetConnectionOptions(); - public string SetUniqueApplicationName(string baseName = "") - { - return this.Db.ApplicationName = DistributedLockHelpers.ToSafeName( - // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool - $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", - maxNameLength: this.Db.MaxApplicationNameLength, - s => s - ); - } + public override void PrepareForHighContention(ref int maxConcurrentAcquires) => + this.Db.PrepareForHighContention(ref maxConcurrentAcquires); } public abstract class TestingDbSynchronizationStrategy : TestingDbSynchronizationStrategy - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { protected TestingDbSynchronizationStrategy() : base(new TDb()) { } @@ -57,7 +50,7 @@ public override void Dispose() public abstract class TestingConnectionStringSynchronizationStrategy : TestingDbSynchronizationStrategy // since we're just going to be generating from connection strings, we only care about // the primary ADO client for the database - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { protected abstract bool? UseMultiplexingNotTransaction { get; } public TimeSpan? KeepaliveCadence { get; set; } @@ -72,7 +65,7 @@ public sealed override TestingDbConnectionOptions GetConnectionOptions() => }; public sealed override IDisposable? PrepareForHandleLost() => - new HandleLostScope(this.SetUniqueApplicationName(nameof(PrepareForHandleLost)), this.Db); + new HandleLostScope(this.Db.SetUniqueApplicationName(nameof(this.PrepareForHandleLost)), this.Db); private class HandleLostScope : IDisposable { @@ -97,25 +90,25 @@ public void Dispose() } public sealed class TestingConnectionMultiplexingSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { protected override bool? UseMultiplexingNotTransaction => true; } public sealed class TestingOwnedConnectionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { protected override bool? UseMultiplexingNotTransaction => null; } public sealed class TestingOwnedTransactionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : ITestingPrimaryClientDb, new() + where TDb : TestingPrimaryClientDb, new() { protected override bool? UseMultiplexingNotTransaction => false; } public abstract class TestingExternalConnectionOrTransactionSynchronizationStrategy : TestingDbSynchronizationStrategy - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { /// /// Starts a new "ambient" connection or transaction that future locks will be created with @@ -147,7 +140,7 @@ public sealed override void PerformAdditionalCleanupForHandleAbandonment() } public sealed class TestingExternalConnectionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private readonly DisposableCollection _disposables = new DisposableCollection(); private DbConnection? _ambientConnection; @@ -188,7 +181,7 @@ public override void Dispose() } public sealed class TestingExternalTransactionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy - where TDb : ITestingDb, new() + where TDb : TestingDb, new() { private readonly DisposableCollection _disposables = new DisposableCollection(); diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index 2de38bdf..5ea6cd78 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -11,7 +11,7 @@ namespace Medallion.Threading.Tests.MySql { - public class TestingMySqlDb : ITestingPrimaryClientDb + public class TestingMySqlDb : TestingPrimaryClientDb { private readonly string _defaultConnectionString; private readonly MySqlConnectionStringBuilder _connectionStringBuilder; @@ -27,27 +27,17 @@ protected TestingMySqlDb(string defaultConnectionString) this._connectionStringBuilder = new MySqlConnectionStringBuilder(this._defaultConnectionString); } - public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } + public override int MaxPoolSize { get => (int)this._connectionStringBuilder.MaximumPoolSize; set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; } - public string ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public override int MaxApplicationNameLength => 65390; // based on empirical testing - public int MaxPoolSize - { - get => (int)this._connectionStringBuilder.MaximumPoolSize; - set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; - } - - public int MaxApplicationNameLength => 65390; // based on empirical testing - - public TransactionSupport TransactionSupport => TransactionSupport.ExplicitParticipation; + public override TransactionSupport TransactionSupport => TransactionSupport.ExplicitParticipation; protected virtual string IsolationLevelVariableName => "transaction_isolation"; - public void ClearPool(DbConnection connection) => MySqlConnection.ClearPool((MySqlConnection)connection); - - public int CountActiveSessions(string applicationName) + public override int CountActiveSessions(string applicationName) { using var connection = new MySqlConnection(this._defaultConnectionString); connection.Open(); @@ -57,9 +47,8 @@ public int CountActiveSessions(string applicationName) return (int)(long)command.ExecuteScalar()!; } - public DbConnection CreateConnection() => new MySqlConnection(this.ConnectionStringBuilder.ConnectionString); - - public IsolationLevel GetIsolationLevel(DbConnection connection) + public override DbConnection CreateConnection() => new MySqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override IsolationLevel GetIsolationLevel(DbConnection connection) { using var command = connection.CreateCommand(); command.CommandText = "SELECT @@" + this.IsolationLevelVariableName; @@ -67,7 +56,7 @@ public IsolationLevel GetIsolationLevel(DbConnection connection) return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), rawIsolationLevel.Replace("-", string.Empty), ignoreCase: true); } - public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) { var minTimeSeconds = idleSince.HasValue ? (int?)(DateTimeOffset.UtcNow - idleSince.Value).TotalSeconds diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index 48b092e4..ce666860 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -12,34 +12,30 @@ namespace Medallion.Threading.Tests.Oracle { - public sealed class TestingOracleDb : ITestingPrimaryClientDb + public sealed class TestingOracleDb : TestingPrimaryClientDb { - internal static readonly string ConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); + internal static readonly string DefaultConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(ConnectionString); + private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(DefaultConnectionString); - public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public string ApplicationName { get; set; } = string.Empty; + public override string ApplicationName { get; set; } = string.Empty; - string ITestingDb.ConnectionString => + public override string ConnectionString => (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) + this.ConnectionStringBuilder.ConnectionString; - public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } - // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 - public int MaxApplicationNameLength => 64; - - public TransactionSupport TransactionSupport => throw new NotImplementedException(); + public override int MaxApplicationNameLength => 64; - public void ClearPool(DbConnection connection) => OracleConnection.ClearPool((OracleConnection)connection); + public override TransactionSupport TransactionSupport => throw new NotImplementedException(); - public int CountActiveSessions(string applicationName) + public override int CountActiveSessions(string applicationName) { Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - using var connection = new OracleConnection(ConnectionString); + using var connection = new OracleConnection(DefaultConnectionString); connection.Open(); using var command = connection.CreateCommand(); command.CommandText = "SELECT COUNT(*) FROM v$session WHERE client_info = :applicationName AND status != 'KILLED'"; @@ -47,9 +43,9 @@ public int CountActiveSessions(string applicationName) return (int)(decimal)command.ExecuteScalar()!; } - public DbConnection CreateConnection() => OracleDatabaseConnection.CreateConnection(this.As().ConnectionString); + public override DbConnection CreateConnection() => OracleDatabaseConnection.CreateConnection(this.As().ConnectionString); - public IsolationLevel GetIsolationLevel(DbConnection connection) + public override IsolationLevel GetIsolationLevel(DbConnection connection) { // After briefly trying the various approaches mentioned on https://stackoverflow.com/questions/10711204/how-to-check-isoloation-level // I could not get them to work. Given that the tests using this are checking something relatively minor and SQLServer specific, not @@ -57,9 +53,18 @@ public IsolationLevel GetIsolationLevel(DbConnection connection) throw new NotSupportedException(); } - public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + public override void PrepareForHighContention(ref int maxConcurrentAcquires) + { + // The free Oracle Autonomous database has a fixed max session limit of 20. When concurrency approaches that, parellel + // execution slows down greatly because often releases become queued behind competing aquires. When concurrency surpasses + // that level we risk total deadlock where all active sessions are in use by acquires and as such no release can ever get + // through. + maxConcurrentAcquires = Math.Min(maxConcurrentAcquires, 15); + } + + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) { - using var connection = new OracleConnection(ConnectionString); + using var connection = new OracleConnection(DefaultConnectionString); await connection.OpenAsync(); using var getIdleSessionsCommand = connection.CreateCommand(); diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index b692858c..491de75c 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -18,7 +18,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => transaction => new OracleDistributedLock(name, transaction) ); - public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.ConnectionString).Name; + public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; internal static Action ToOracleOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => { diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 5ac54bf5..63b17076 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -12,41 +12,29 @@ namespace Medallion.Threading.Tests.Postgres { - public sealed class TestingPostgresDb : ITestingPrimaryClientDb + public sealed class TestingPostgresDb : TestingPrimaryClientDb { - internal static readonly string ConnectionString = PostgresCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); + internal static readonly string DefaultConnectionString = PostgresCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new NpgsqlConnectionStringBuilder(ConnectionString); + private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new NpgsqlConnectionStringBuilder(DefaultConnectionString); - public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - - public string ApplicationName - { - get => this._connectionStringBuilder.ApplicationName ?? string.Empty; - set => this._connectionStringBuilder.ApplicationName = value == string.Empty ? null : value; - } - - string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; - - public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; // https://til.hashrocket.com/posts/8f87c65a0a-postgresqls-max-identifier-length-is-63-bytes - public int MaxApplicationNameLength => 63; + public override int MaxApplicationNameLength => 63; /// /// Technically Postgres does support this through xact advisory lock methods, but it is very unwieldy to use due to the transaction /// abort semantics and largely unnecessary for our purposes since, unlike SQLServer, a connection-scoped Postgres lock can still /// participate in an ongoing transaction. /// - public TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; - - public void ClearPool(DbConnection connection) => NpgsqlConnection.ClearPool((NpgsqlConnection)connection); + public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; - public int CountActiveSessions(string applicationName) + public override int CountActiveSessions(string applicationName) { Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - using var connection = new NpgsqlConnection(ConnectionString); + using var connection = new NpgsqlConnection(DefaultConnectionString); connection.Open(); using var command = connection.CreateCommand(); command.CommandText = "SELECT COUNT(*)::int FROM pg_stat_activity WHERE application_name = @applicationName"; @@ -54,7 +42,7 @@ public int CountActiveSessions(string applicationName) return (int)command.ExecuteScalar()!; } - public IsolationLevel GetIsolationLevel(DbConnection connection) + public override IsolationLevel GetIsolationLevel(DbConnection connection) { using var command = connection.CreateCommand(); // values based on https://www.postgresql.org/docs/12/transaction-iso.html @@ -62,11 +50,11 @@ public IsolationLevel GetIsolationLevel(DbConnection connection) return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar(), ignoreCase: true); } - public DbConnection CreateConnection() => new NpgsqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override DbConnection CreateConnection() => new NpgsqlConnection(this.ConnectionStringBuilder.ConnectionString); - public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) { - using var connection = new NpgsqlConnection(ConnectionString); + using var connection = new NpgsqlConnection(DefaultConnectionString); await connection.OpenAsync(); using var command = connection.CreateCommand(); // based on https://stackoverflow.com/questions/13236160/is-there-a-timeout-for-idle-postgresql-connections diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs index f97783fd..a04d6a32 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -31,8 +31,8 @@ public static string GetConnectionString(string baseDirectory) UserID = username, Password = password, PersistSecurityInfo = true, - // set a high pool size so that we don't empty the pool through things like lock abandonment tests - //MaxPoolSize = 500, + // The free-tier autonomous database only allows 20 connections maximum (presumably across all clients) so this limit + // should help keep us below this limit. Running up against the limit throws errors on Connection.Open() MaxPoolSize = 15, }.ConnectionString; } diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index 80a59171..a81be9fa 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -9,35 +9,27 @@ namespace Medallion.Threading.Tests.SqlServer { - public interface ITestingSqlServerDb : ITestingDb { } + public interface ITestingSqlServerDb { } - public sealed class TestingSqlServerDb : ITestingSqlServerDb, ITestingPrimaryClientDb + public sealed class TestingSqlServerDb : TestingPrimaryClientDb, ITestingSqlServerDb { - internal static readonly string ConnectionString = SqlServerCredentials.ConnectionString; + internal static readonly string DefaultConnectionString = SqlServerCredentials.ConnectionString; private readonly Microsoft.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(ConnectionString); + new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(DefaultConnectionString); - public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - - string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; - - public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } - - public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; // https://stackoverflow.com/questions/5808332/sql-server-maximum-character-length-of-object-names/41502228 - public int MaxApplicationNameLength => 128; - - public TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; + public override int MaxApplicationNameLength => 128; - public void ClearPool(DbConnection connection) => Microsoft.Data.SqlClient.SqlConnection.ClearPool((Microsoft.Data.SqlClient.SqlConnection)connection); + public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; - public int CountActiveSessions(string applicationName) + public override int CountActiveSessions(string applicationName) { Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - using var connection = new Microsoft.Data.SqlClient.SqlConnection(ConnectionString); + using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); connection.Open(); using var command = connection.CreateCommand(); command.CommandText = $@"SELECT COUNT(*) FROM sys.dm_exec_sessions WHERE program_name = @applicationName"; @@ -45,7 +37,7 @@ public int CountActiveSessions(string applicationName) return (int)command.ExecuteScalar(); } - public IsolationLevel GetIsolationLevel(DbConnection connection) + public override IsolationLevel GetIsolationLevel(DbConnection connection) { using var command = connection.CreateCommand(); command.CommandText = @" @@ -62,11 +54,11 @@ FROM sys.dm_exec_sessions return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()); } - public DbConnection CreateConnection() => new Microsoft.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override DbConnection CreateConnection() => new Microsoft.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); - public async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) { - using var connection = new Microsoft.Data.SqlClient.SqlConnection(ConnectionString); + using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); await connection.OpenAsync(); var findIdleSessionsCommand = connection.CreateCommand(); @@ -103,29 +95,21 @@ @idleSince IS NULL } } - public sealed class TestingSystemDataSqlServerDb : ITestingSqlServerDb + public sealed class TestingSystemDataSqlServerDb : TestingDb, ITestingSqlServerDb { private readonly System.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new System.Data.SqlClient.SqlConnectionStringBuilder(TestingSqlServerDb.ConnectionString); - - public DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - - public string ApplicationName { get => this._connectionStringBuilder.ApplicationName; set => this._connectionStringBuilder.ApplicationName = value; } - - string ITestingDb.ConnectionString => this.ConnectionStringBuilder.ConnectionString; - - public int MaxPoolSize { get => this._connectionStringBuilder.MaxPoolSize; set => this._connectionStringBuilder.MaxPoolSize = value; } + new System.Data.SqlClient.SqlConnectionStringBuilder(TestingSqlServerDb.DefaultConnectionString); - public int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; + public override int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; - public void ClearPool(DbConnection connection) => System.Data.SqlClient.SqlConnection.ClearPool((System.Data.SqlClient.SqlConnection)connection); + public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; - public int CountActiveSessions(string applicationName) => new TestingSqlServerDb().CountActiveSessions(applicationName); + public override int CountActiveSessions(string applicationName) => new TestingSqlServerDb().CountActiveSessions(applicationName); - public IsolationLevel GetIsolationLevel(DbConnection connection) => new TestingSqlServerDb().GetIsolationLevel(connection); + public override IsolationLevel GetIsolationLevel(DbConnection connection) => new TestingSqlServerDb().GetIsolationLevel(connection); - public DbConnection CreateConnection() => new System.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override DbConnection CreateConnection() => new System.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); } } diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs index e4151b46..f1dc7385 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.Tests.SqlServer { public sealed class TestingSqlDistributedLockProvider : TestingLockProvider where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : ITestingSqlServerDb, new() + where TDb : TestingDb, ITestingSqlServerDb, new() { public override IDistributedLock CreateLockWithExactName(string name) => this.Strategy.GetConnectionOptions() @@ -28,7 +28,7 @@ internal static Action ToSqlOptions((bool useMultip public sealed class TestingSqlDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : ITestingSqlServerDb, new() + where TDb : TestingDb, ITestingSqlServerDb, new() { public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => this.Strategy.GetConnectionOptions() @@ -43,7 +43,7 @@ public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderW public sealed class TestingSqlDistributedSemaphoreProvider : TestingSemaphoreProvider where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : ITestingSqlServerDb, new() + where TDb : TestingDb, ITestingSqlServerDb, new() { public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => this.Strategy.GetConnectionOptions() diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs index e8207b1e..accde245 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -49,7 +49,7 @@ public void TestGetSafeLockNameCompat() [TestCase(typeof(TestingMariaDbDb))] public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type testingDbType) { - var db = (ITestingDb)Activator.CreateInstance(testingDbType)!; + var db = (TestingDb)Activator.CreateInstance(testingDbType)!; using var connection = new MySqlConnection(db.ConnectionStringBuilder.ConnectionString); await connection.OpenAsync(); diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index 34ce2866..eb8f8b07 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -23,7 +23,7 @@ public class PostgresBehaviorTest [Test] public async Task TestPostgresCommandAutomaticallyParticipatesInTransaction() { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); using var transaction = @@ -71,7 +71,7 @@ private async Task TestTransactionCancellationOrTimeoutRecovery(bool useTimeout) async Task RunTransactionWithAbortAsync(bool useSavePoint) { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); using (connection.BeginTransaction()) @@ -107,7 +107,7 @@ async Task RunTransactionWithAbortAsync(bool useSavePoint) [Test] public async Task TestCanDetectTransactionWithBeginTransactionException() { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); Assert.DoesNotThrow(() => connection.BeginTransaction().Dispose()); @@ -121,7 +121,7 @@ public async Task TestCanDetectTransactionWithBeginTransactionException() [Test] public async Task TestDoesNotDetectConnectionBreakViaState() { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); using var getPidCommand = connection.CreateCommand(); @@ -132,7 +132,7 @@ public async Task TestDoesNotDetectConnectionBreakViaState() connection.StateChange += (_, _2) => stateChangedEvent.Set(); // kill the connection from the back end - using var killingConnection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await killingConnection.OpenAsync(); using var killCommand = killingConnection.CreateCommand(); killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; @@ -150,7 +150,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() { using var stateChangedEvent = new ManualResetEventSlim(initialState: false); - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); connection.StateChange += (o, e) => stateChangedEvent.Set(); @@ -161,7 +161,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() Assert.AreEqual(ConnectionState.Open, connection.State); // kill the connection from the back end - using var killingConnection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await killingConnection.OpenAsync(); using var killCommand = killingConnection.CreateCommand(); killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index 3ec6a0c7..1e0ad977 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -24,7 +24,7 @@ public void TestValidatesConstructorArguments() [Test] public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() { - var connectionString = TestingPostgresDb.ConnectionString; + var connectionString = TestingPostgresDb.DefaultConnectionString; var key1 = new PostgresAdvisoryLockKey(0); var key2 = new PostgresAdvisoryLockKey(0, 0); var @lock1 = new PostgresDistributedLock(key1, connectionString); @@ -40,11 +40,11 @@ public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() [Test] public async Task TestWorksWithAmbientTransaction() { - using var connection = new NpgsqlConnection(TestingPostgresDb.ConnectionString); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); var connectionLock = new PostgresDistributedLock(new PostgresAdvisoryLockKey("AmbTrans"), connection); - var otherLock = new PostgresDistributedLock(connectionLock.Key, TestingPostgresDb.ConnectionString); + var otherLock = new PostgresDistributedLock(connectionLock.Key, TestingPostgresDb.DefaultConnectionString); using var otherLockHandle = await otherLock.AcquireAsync(); using (var transaction = connection.BeginTransaction()) diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index c0ba80c5..2e6044a5 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -20,7 +20,7 @@ public void TestArgumentValidation() [Test] public async Task BasicTest() { - var provider = new PostgresDistributedSynchronizationProvider(TestingPostgresDb.ConnectionString); + var provider = new PostgresDistributedSynchronizationProvider(TestingPostgresDb.DefaultConnectionString); const string LockName = TargetFramework.Current + "ProviderBasicTest"; await using (await provider.AcquireLockAsync(LockName)) diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 0d4940e9..9e67f78a 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -72,8 +72,8 @@ public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] b private static SqlDatabaseConnection CreateConnection(bool isSystemDataSqlClient) => new SqlDatabaseConnection( isSystemDataSqlClient - ? new System.Data.SqlClient.SqlConnection(TestingSqlServerDb.ConnectionString).As() - : new Microsoft.Data.SqlClient.SqlConnection(TestingSqlServerDb.ConnectionString), + ? new System.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString).As() + : new Microsoft.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString), isExternallyOwned: false ); } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs index dddd15ab..92bd89ae 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs @@ -12,13 +12,13 @@ public class SqlDistributedLockTest [Test] public void TestBadConstructorArguments() { - Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.ConnectionString)); - Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.ConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); Assert.Catch(() => new SqlDistributedLock("a", default(string)!)); Assert.Catch(() => new SqlDistributedLock("a", default(IDbTransaction)!)); Assert.Catch(() => new SqlDistributedLock("a", default(IDbConnection)!)); - Assert.Catch(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength + 1), TestingSqlServerDb.ConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength), TestingSqlServerDb.ConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); } [Test] @@ -40,7 +40,7 @@ public void TestGetSafeLockNameCompat() [Test] public async Task TestSqlCommandMustParticipateInTransaction() { - using var connection = new SqlConnection(TestingSqlServerDb.ConnectionString); + using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); await connection.OpenAsync(); using var transaction = connection.BeginTransaction(); diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs index 14966a4a..358514d5 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs @@ -10,13 +10,13 @@ public sealed class SqlDistributedReaderWriterLockTest [Test] public void TestBadConstructorArguments() { - Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.ConnectionString)); - Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.ConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(string)!)); Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbTransaction)!)); Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbConnection)!)); - Assert.Catch(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength + 1), TestingSqlServerDb.ConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength), TestingSqlServerDb.ConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); } [Test] diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs index c659bbff..b4b5677d 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs @@ -14,9 +14,9 @@ public sealed class SqlDistributedSemaphoreTest [Test] public void TestBadConstructorArguments() { - Assert.Catch(() => new SqlDistributedSemaphore(null!, 1, TestingSqlServerDb.ConnectionString)); - Assert.Catch(() => new SqlDistributedSemaphore("a", -1, TestingSqlServerDb.ConnectionString)); - Assert.Catch(() => new SqlDistributedSemaphore("a", 0, TestingSqlServerDb.ConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore(null!, 1, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore("a", -1, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore("a", 0, TestingSqlServerDb.DefaultConnectionString)); Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(string)!)); Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbConnection)!)); Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbTransaction)!)); @@ -24,7 +24,7 @@ public void TestBadConstructorArguments() var random = new Random(1234); var bytes = new byte[10000]; random.NextBytes(bytes); - Assert.DoesNotThrow(() => new SqlDistributedSemaphore(Encoding.UTF8.GetString(bytes), int.MaxValue, TestingSqlServerDb.ConnectionString)); + Assert.DoesNotThrow(() => new SqlDistributedSemaphore(Encoding.UTF8.GetString(bytes), int.MaxValue, TestingSqlServerDb.DefaultConnectionString)); } [Test] @@ -72,7 +72,7 @@ public void TestNameManglingCompatibility() [Test] public void TestTicketsTakenOnBothConnectionAndTransactionForThatConnection() { - using var connection = new SqlConnection(TestingSqlServerDb.ConnectionString); + using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); connection.Open(); var semaphore1 = new SqlDistributedSemaphore( diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs index b6b610fa..e4fc9dbc 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs @@ -21,7 +21,7 @@ public void TestArgumentValidation() [Test] public async Task BasicTest() { - var provider = new SqlDistributedSynchronizationProvider(TestingSqlServerDb.ConnectionString); + var provider = new SqlDistributedSynchronizationProvider(TestingSqlServerDb.DefaultConnectionString); const string LockName = TargetFramework.Current + "ProviderBasicTest"; await using (await provider.AcquireLockAsync(LockName)) From 2d18c94ece9f15ca23c18b59542041f028085aca Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 12 Dec 2021 20:44:32 -0500 Subject: [PATCH 151/399] Fixes #112 --- DistributedLock.Core/Internal/Data/DatabaseCommand.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 3cf82b6f..917d6b95 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -159,7 +159,9 @@ private async ValueTask InternalExecuteAndPropagateCancellationAsync Date: Sun, 12 Dec 2021 21:02:41 -0500 Subject: [PATCH 152/399] Get transaction-based locks working --- DistributedLock.Oracle/OracleDbmsLock.cs | 2 +- .../OracleDistributedLock.cs | 22 ------------- .../Infrastructure/Oracle/TestingOracleDb.cs | 2 +- .../Oracle/TestingOracleProviders.cs | 2 +- .../Tests/Oracle/OracleBehaviorTest.cs | 32 +++++++++++++++++++ .../Tests/Oracle/OracleDistributedLockTest.cs | 22 ------------- 6 files changed, 35 insertions(+), 47 deletions(-) create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs delete mode 100644 DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index 2d94dad8..338e4de9 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -49,7 +49,7 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) { using var command = connection.CreateCommand(); - // TODO revisit mode, release_on_commit + // TODO revisit mode command.SetCommandText(@" DECLARE lockHandle VARCHAR2(128); diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index b1fb56f5..0d2f6ec5 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -36,19 +36,6 @@ public OracleDistributedLock(string name, IDbConnection connection, bool exactNa { } - /// - /// Constructs a lock with the given that connects using the connection from the provided . - /// - /// NOTE that the lock will not be scoped to the and must still be explicitly released before the transaction ends. - /// However, this constructor allows the lock to PARTICIPATE in an ongoing transaction on a connection. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public OracleDistributedLock(string name, IDbTransaction transaction, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, transaction)) - { - } - private OracleDistributedLock(string name, bool exactName, Func internalLockFactory) { if (name == null) { throw new ArgumentNullException(nameof(name)); } @@ -96,14 +83,5 @@ private static IDbDistributedLock CreateInternalLock(string name, IDbConnection return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connection)); } - - static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - - // todo - throw new NotImplementedException("need to figure out transaction-scoped locks"); - //return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); - } } } diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index ce666860..7c45a29a 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -29,7 +29,7 @@ public sealed class TestingOracleDb : TestingPrimaryClientDb // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 public override int MaxApplicationNameLength => 64; - public override TransactionSupport TransactionSupport => throw new NotImplementedException(); + public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; public override int CountActiveSessions(string applicationName) { diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index 491de75c..faffb6e6 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -15,7 +15,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => // todo pass in app name here (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), connection => new OracleDistributedLock(name, connection), - transaction => new OracleDistributedLock(name, transaction) + transaction => new OracleDistributedLock(name, transaction.Connection) ); public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs new file mode 100644 index 00000000..b7039f1f --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs @@ -0,0 +1,32 @@ +using NUnit.Framework; +using Oracle.ManagedDataAccess.Client; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleBehaviorTest + { + [Test] + public async Task BasicConnectivityTest() + { + using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + await connection.OpenAsync(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT 10 FROM DUAL"; + (await command.ExecuteScalarAsync()).ShouldEqual(10); + } + + [Test] + public async Task TestCommandImplicitlyParticipatesInTransaction() + { + using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + await connection.OpenAsync(); + using var transaction = connection.BeginTransaction(); + using var command = connection.CreateCommand(); + command.Transaction.ShouldEqual(transaction); + } + } +} diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs deleted file mode 100644 index f4b6a60c..00000000 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs +++ /dev/null @@ -1,22 +0,0 @@ -using NUnit.Framework; -using Oracle.ManagedDataAccess.Client; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Tests.Oracle -{ - public class OracleDistributedLockTest - { - [Test] - public async Task BasicConnectivityTest() - { - var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); - await connection.OpenAsync(); - var command = connection.CreateCommand(); - command.CommandText = "SELECT 10 FROM DUAL"; - (await command.ExecuteScalarAsync()).ShouldEqual(10); - } - } -} From 9d5d7e9c9b10184d904ce7b2274657775f68b3a0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 12 Dec 2021 21:02:54 -0500 Subject: [PATCH 153/399] TODO list --- DistributedLock.Oracle/OracleDistributedLock.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 0d2f6ec5..9f73aacc 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,6 +9,13 @@ namespace Medallion.Threading.Oracle { + // TODO provider + // TODO rwlock + // TODO version bump for oracle and for Core and for umbrella + // TODO any nexts for Core? + // TODO OracleDLTest + // TODO options builder test + public sealed partial class OracleDistributedLock : IInternalDistributedLock { private const int MaxNameLength = 128; From c843525c3dd611e22447f1d5a2bdcd19a9cafb41 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 06:56:54 -0500 Subject: [PATCH 154/399] Oracle: implement provider --- .../OracleDistributedLock.cs | 4 +- ...racleDistributedSynchronizationProvider.cs | 43 +++++++++++++++++++ ...lDistributedSynchronizationProviderTest.cs | 37 ++++++++++++++++ ...eDistributedSynchronizationProviderTest.cs | 33 ++++++++++++++ 4 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs create mode 100644 DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 9f73aacc..41c0b44f 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,11 +9,11 @@ namespace Medallion.Threading.Oracle { - // TODO provider // TODO rwlock - // TODO version bump for oracle and for Core and for umbrella + // TODO version bump for oracle and for Core and for PG and for umbrella // TODO any nexts for Core? // TODO OracleDLTest + // TODO OracleDRWLTest // TODO options builder test public sealed partial class OracleDistributedLock : IInternalDistributedLock diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..1fac2034 --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Medallion.Threading.Oracle +{ + /// + /// Implements for + /// + public class OracleDistributedSynchronizationProvider : IDistributedLockProvider + { + private readonly Func _lockFactory; + + /// + /// Constructs a provider that connects with and . + /// + public OracleDistributedSynchronizationProvider(string connectionString, Action? options = null) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connectionString, options, exactName); + } + + /// + /// Constructs a provider that connects with . + /// + public OracleDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connection, exactName); + } + + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// + public OracleDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + } +} diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..c8e76074 --- /dev/null +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.MySql; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.MySql +{ + public class MySqlDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbConnection)!)); + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbTransaction)!)); + } + + [Test] + public async Task BasicTest() + { + foreach (var db in new[] { new TestingMySqlDb(), new TestingMariaDbDb() }) + { + var provider = new MySqlDistributedSynchronizationProvider(db.ConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle, db.GetType().Name); + } + } + } + } +} diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..0d3a8035 --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs @@ -0,0 +1,33 @@ +using Medallion.Threading.Oracle; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleDistributedSynchronizationProviderTest + { + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(IDbConnection)!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new OracleDistributedSynchronizationProvider(TestingOracleDb.DefaultConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } + } + } +} From 1b0fd07875c6cc02b7871057fbb306299e73cc9a Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 07:01:06 -0500 Subject: [PATCH 155/399] Oracle: add options builder test --- .../OracleDistributedLock.cs | 3 +- .../OracleConnectionOptionsBuilderTest.cs | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 41c0b44f..bbfda177 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,12 +9,11 @@ namespace Medallion.Threading.Oracle { - // TODO rwlock + // TODO rwlock + provider // TODO version bump for oracle and for Core and for PG and for umbrella // TODO any nexts for Core? // TODO OracleDLTest // TODO OracleDRWLTest - // TODO options builder test public sealed partial class OracleDistributedLock : IInternalDistributedLock { diff --git a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs new file mode 100644 index 00000000..05e8d27d --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs @@ -0,0 +1,29 @@ +using Medallion.Threading.Oracle; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleConnectionOptionsBuilderTest + { + [Test] + public void TestValidatesArguments() + { + var builder = new OracleConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + } + + [Test] + public void TestDefaults() + { + var options = OracleConnectionOptionsBuilder.GetOptions(null); + options.keepaliveCadence.ShouldEqual(Timeout.InfiniteTimeSpan); + Assert.IsTrue(options.useMultiplexing); + options.ShouldEqual(OracleConnectionOptionsBuilder.GetOptions(o => { })); + } + } +} From 0090641d985e559bbba1abeae222a600032f052d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 07:13:01 -0500 Subject: [PATCH 156/399] Oracle: add OracleDistributedLockTest --- .../OracleDistributedLock.cs | 4 +- .../Tests/Oracle/OracleDistributedLockTest.cs | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index bbfda177..d0231ec1 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -12,12 +12,12 @@ namespace Medallion.Threading.Oracle // TODO rwlock + provider // TODO version bump for oracle and for Core and for PG and for umbrella // TODO any nexts for Core? - // TODO OracleDLTest // TODO OracleDRWLTest + // TODO audit for TODOs public sealed partial class OracleDistributedLock : IInternalDistributedLock { - private const int MaxNameLength = 128; + internal const int MaxNameLength = 128; private readonly IDbDistributedLock _internalLock; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs new file mode 100644 index 00000000..9fb988cd --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs @@ -0,0 +1,37 @@ +using Medallion.Threading.Oracle; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleDistributedLockTest + { + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString)); + Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new OracleDistributedLock("a", default(string)!)); + Assert.Catch(() => new OracleDistributedLock("a", default(IDbConnection)!)); + Assert.Catch(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); + } + + [Test] + public void TestGetSafeLockNameCompat() + { + GetSafeName(string.Empty).ShouldEqual("EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + GetSafeName("abc").ShouldEqual("abc"); + GetSafeName("ABC").ShouldEqual("ABC"); + GetSafeName("\\").ShouldEqual("\\"); + GetSafeName(new string('a', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('a', OracleDistributedLock.MaxNameLength)); + GetSafeName(new string('\\', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('\\', OracleDistributedLock.MaxNameLength)); + GetSafeName(new string('x', OracleDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGQFUg+qZ+nRyj9exOtumtynPpKt8OIVz76JkHSrwV38k3VGsuu7EGnoR0Q9sTmijuQ57I0jGeEhqQ2XJ2RAc3Q=="); + + static string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; + } + } +} From 8c70df3a0dfe8e6ede96e757c33c4cda79ba78aa Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 07:13:46 -0500 Subject: [PATCH 157/399] Oracle: get api test passing --- .../OracleDistributedSynchronizationProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs index 1fac2034..64ea5b03 100644 --- a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -8,7 +8,7 @@ namespace Medallion.Threading.Oracle /// /// Implements for /// - public class OracleDistributedSynchronizationProvider : IDistributedLockProvider + public sealed class OracleDistributedSynchronizationProvider : IDistributedLockProvider { private readonly Func _lockFactory; From 22bbb3f3ba18b7f2a8199e465db4a21aeb8219bd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 07:18:35 -0500 Subject: [PATCH 158/399] Oracle: fix release build --- DistributedLock.Core/AssemblyAttributes.cs | 1 + DistributedLock.Oracle/OracleDistributedLock.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/DistributedLock.Core/AssemblyAttributes.cs index 9a42671f..d2e9bff3 100644 --- a/DistributedLock.Core/AssemblyAttributes.cs +++ b/DistributedLock.Core/AssemblyAttributes.cs @@ -14,4 +14,5 @@ [assembly: InternalsVisibleTo("DistributedLock.Redis, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.ZooKeeper, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.MySql, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.Oracle, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index d0231ec1..73ba7316 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -15,6 +15,9 @@ namespace Medallion.Threading.Oracle // TODO OracleDRWLTest // TODO audit for TODOs + /// + /// Implements a distributed lock for Oracle databse based on the DBMS_LOCK package + /// public sealed partial class OracleDistributedLock : IInternalDistributedLock { internal const int MaxNameLength = 128; From 8477985d73b5c7256e289bebc9d57c3d1f28e4d3 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 13 Dec 2021 07:22:19 -0500 Subject: [PATCH 159/399] Oracle: comment fix --- DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs index 2c720636..f11cafc1 100644 --- a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs +++ b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs @@ -7,7 +7,7 @@ namespace Medallion.Threading.Oracle { /// - /// Specifies options for connecting to and locking against a MySQL database + /// Specifies options for connecting to and locking against an Oracle database /// public sealed class OracleConnectionOptionsBuilder { From d9e385c40832eae758e3e79ca2ffa07d280a21bb Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 06:35:25 -0500 Subject: [PATCH 160/399] Oracle: reader-writer locks --- DistributedLock.Oracle/OracleDbmsLock.cs | 52 +++- .../OracleDistributedLock.cs | 22 +- ...IDistributedUpgradeableReaderWriterLock.cs | 230 ++++++++++++++++++ .../OracleDistributedReaderWriterLock.cs | 74 ++++++ ...OracleDistributedReaderWriterLockHandle.cs | 129 ++++++++++ ...istributedReaderWriterLockCoreTestCases.cs | 4 +- ...pgradeableReaderWriterLockCoreTestCases.cs | 2 +- .../Oracle/TestingOracleProviders.cs | 14 ++ .../Tests/CombinatorialTests.cs | 28 +++ DistributedLockTaker/Program.cs | 3 + 10 files changed, 540 insertions(+), 18 deletions(-) create mode 100644 DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs create mode 100644 DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs create mode 100644 DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index 338e4de9..7b301c1f 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -18,12 +18,47 @@ internal class OracleDbmsLock : IDbSynchronizationStrategy private const int MaxWaitSeconds = 32767; private const int MaxTimeoutSeconds = MaxWaitSeconds - 1; + public static readonly OracleDbmsLock SharedLock = new OracleDbmsLock(Mode.Shared), + UpdateLock = new OracleDbmsLock(Mode.Update), + ExclusiveLock = new OracleDbmsLock(Mode.Exclusive), + UpgradeLock = new OracleDbmsLock(Mode.Exclusive, isUpgrade: true); + private static readonly object Cookie = new(); - public bool IsUpgradeable => false; // TODO revisit + private readonly Mode _mode; + private readonly bool _isUpgrade; + + private OracleDbmsLock(Mode mode, bool isUpgrade = false) + { + Invariant.Require(!isUpgrade || mode == Mode.Exclusive); + + this._mode = mode; + this._isUpgrade = isUpgrade; + } + + public bool IsUpgradeable => this._mode == Mode.Update; + + private string ModeSqlConstant + { + get + { + var modeCode = this._mode switch + { + Mode.Shared => "SS", + Mode.Update => "SSX", + Mode.Exclusive => "X", + _ => throw new InvalidOperationException(), + }; + return $"SYS.DBMS_LOCK.{modeCode}_MODE"; + } + } public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) { + // Since we we don't allow downgrading and therefore "releasing" an upgrade only happens on disposal of the + // original handle, this can safely be a noop. + if (this._isUpgrade) { return; } + using var command = connection.CreateCommand(); command.SetCommandText(@" DECLARE @@ -48,14 +83,14 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) { + var acquireFunction = this._isUpgrade ? "CONVERT" : "REQUEST"; using var command = connection.CreateCommand(); - // TODO revisit mode - command.SetCommandText(@" + command.SetCommandText($@" DECLARE lockHandle VARCHAR2(128); BEGIN SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); - :returnValue := SYS.DBMS_LOCK.REQUEST(lockhandle => lockHandle, lockmode => SYS.DBMS_LOCK.X_MODE, timeout => :timeout, release_on_commit => FALSE); + :returnValue := SYS.DBMS_LOCK.{acquireFunction}(lockhandle => lockHandle, lockmode => {this.ModeSqlConstant}, timeout => :timeout); END;" ); // note: parameters bind by position by default! @@ -86,7 +121,7 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour }; string GetErrorMessage(string description) => - $"SYS.DBMS_LOCK.REQUEST returned error code {returnValue} ({description})"; + $"SYS.DBMS_LOCK.{acquireFunction} returned error code {returnValue} ({description})"; async ValueTask WaitThenReturnNullAsync() { @@ -94,5 +129,12 @@ string GetErrorMessage(string description) => return null; } } + + private enum Mode + { + Shared, + Update, + Exclusive, + } } } diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 73ba7316..be993a8e 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -46,6 +46,12 @@ public OracleDistributedLock(string name, IDbConnection connection, bool exactNa } private OracleDistributedLock(string name, bool exactName, Func internalLockFactory) + { + this.Name = GetName(name, exactName); + this._internalLock = internalLockFactory(this.Name); + } + + internal static string GetName(string name, bool exactName) { if (name == null) { throw new ArgumentNullException(nameof(name)); } @@ -54,14 +60,10 @@ private OracleDistributedLock(string name, bool exactName, Func MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } // Oracle treats NULL as the empty string. See https://stackoverflow.com/questions/13278773/null-vs-empty-string-in-oracle if (name.Length == 0) { throw new FormatException($"{nameof(name)} must not be empty"); } - this.Name = name; + return name; } - else - { - this.Name = DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s.Length == 0 ? "EMPTY" : s); - } - - this._internalLock = internalLockFactory(this.Name); + + return DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s.Length == 0 ? "EMPTY" : s); } /// @@ -70,9 +72,9 @@ private OracleDistributedLock(string name, bool exactName, Func IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - this._internalLock.TryAcquireAsync(timeout, new OracleDbmsLock(), cancellationToken, contextHandle: null).Wrap(h => new OracleDistributedLockHandle(h)); + this._internalLock.TryAcquireAsync(timeout, OracleDbmsLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new OracleDistributedLockHandle(h)); - private static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) + internal static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) { if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } @@ -86,7 +88,7 @@ private static IDbDistributedLock CreateInternalLock(string name, string connect return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); } - private static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + internal static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) { if (connection == null) { throw new ArgumentNullException(nameof(connection)); } diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs new file mode 100644 index 00000000..65fe1d67 --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -0,0 +1,230 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.Internal; + +namespace Medallion.Threading.Oracle +{ + public partial class OracleDistributedReaderWriterLock + { + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); + IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLock(timeout, cancellationToken); + ValueTask IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + + /// + /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireReadLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public OracleDistributedReaderWriterLockHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: false); + + /// + /// Acquires a READ lock synchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (myLock.AcquireReadLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public OracleDistributedReaderWriterLockHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: false); + + /// + /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: false); + + /// + /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: false); + + /// + /// Attempts to acquire an UPGRADE lock synchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireUpgradeableReadLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public OracleDistributedReaderWriterLockUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquireUpgradeableReadLock(this, timeout, cancellationToken); + + /// + /// Acquires an UPGRADE lock synchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// using (myLock.AcquireUpgradeableReadLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public OracleDistributedReaderWriterLockUpgradeableHandle AcquireUpgradeableReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireUpgradeableReadLock(this, timeout, cancellationToken); + + /// + /// Attempts to acquire an UPGRADE lock asynchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireUpgradeableReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireUpgradeableReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireUpgradeableReadLockAsync(timeout, cancellationToken); + + /// + /// Acquires an UPGRADE lock asynchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireUpgradeableReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireUpgradeableReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireUpgradeableReadLockAsync(this, timeout, cancellationToken); + + /// + /// Attempts to acquire a WRITE lock synchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireWriteLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public OracleDistributedReaderWriterLockHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: true); + + /// + /// Acquires a WRITE lock synchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (myLock.AcquireWriteLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public OracleDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken, isWrite: true); + + /// + /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireWriteLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken, isWrite: true); + + /// + /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (await myLock.AcquireWriteLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); + + } +} \ No newline at end of file diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs new file mode 100644 index 00000000..f292c55e --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs @@ -0,0 +1,74 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + /// + /// Implements an upgradeable distributed reader-writer lock for the Oracle database using the DBMS_LOCK package. + /// + public sealed partial class OracleDistributedReaderWriterLock : IInternalDistributedUpgradeableReaderWriterLock + { + private readonly IDbDistributedLock _internalLock; + + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connectionString, options)) + { + } + + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be opened or closed. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connection)) + { + } + + private OracleDistributedReaderWriterLock(string name, bool exactName, Func internalLockFactory) + { + this.Name = OracleDistributedLock.GetName(name, exactName); + this._internalLock = internalLockFactory(this.Name); + } + + /// + /// Implements + /// + public string Name { get; } + + async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( + TimeoutValue timeout, + CancellationToken cancellationToken) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, OracleDbmsLock.UpdateLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new OracleDistributedReaderWriterLockUpgradeableHandle(innerHandle, this._internalLock) : null; + } + + async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, isWrite ? OracleDbmsLock.ExclusiveLock : OracleDbmsLock.SharedLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new OracleDistributedReaderWriterLockNonUpgradeableHandle(innerHandle) : null; + } + } +} diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs new file mode 100644 index 00000000..e671129b --- /dev/null +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs @@ -0,0 +1,129 @@ +using Medallion.Threading.Internal; +using Medallion.Threading.Internal.Data; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Oracle +{ + /// + /// Implements + /// + public abstract class OracleDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle + { + // forbid external inheritors + internal OracleDistributedReaderWriterLockHandle() { } + + /// + /// Implements + /// + public abstract CancellationToken HandleLostToken { get; } + + /// + /// Releases the lock + /// + public void Dispose() => this.DisposeSyncViaAsync(); + + /// + /// Releases the lock asynchronously + /// + public abstract ValueTask DisposeAsync(); + } + + internal sealed class OracleDistributedReaderWriterLockNonUpgradeableHandle : OracleDistributedReaderWriterLockHandle + { + private IDistributedSynchronizationHandle? _innerHandle; + + internal OracleDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) + { + this._innerHandle = handle; + } + + public override CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + + public override ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } + + /// + /// Implements + /// + public sealed class OracleDistributedReaderWriterLockUpgradeableHandle : OracleDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle + { + private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; + + internal OracleDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) + { + this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); + } + + /// + /// Implements + /// + public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; + + /// + /// Releases the lock asynchronously + /// + public override async ValueTask DisposeAsync() + { + if (RefBox.TryConsume(ref this._box, out var contents)) + { + try { await (contents.upgradedHandle?.DisposeAsync() ?? default).ConfigureAwait(false); } + finally { await contents.innerHandle.DisposeAsync().ConfigureAwait(false); } + } + } + + /// + /// Implements + /// + public bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryUpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As().InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken); + + /// + /// Implements + /// + public void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLockAsync(this, timeout, cancellationToken); + + ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var box = this._box ?? throw this.ObjectDisposed(); + var contents = box.Value; + if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } + return TryPerformUpgradeAsync(); + + async ValueTask TryPerformUpgradeAsync() + { + var upgradedHandle = + await contents.@lock.TryAcquireAsync(timeout, OracleDbmsLock.UpgradeLock, cancellationToken, contextHandle: contents.innerHandle).ConfigureAwait(false); + if (upgradedHandle == null) + { + return false; + } + + contents.upgradedHandle = upgradedHandle; + var newBox = RefBox.Create(contents); + if (Interlocked.CompareExchange(ref this._box, newBox, comparand: box) != box) + { + await upgradedHandle.DisposeAsync().ConfigureAwait(false); + } + + return true; + } + } + } +} diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index 6138da04..4d790c6d 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -27,7 +27,7 @@ IDistributedReaderWriterLock Lock() => using var writeHandle1 = Lock().TryAcquireWriteLock(); Assert.IsNull(writeHandle1); - var writeHandleTask = Lock().AcquireWriteLockAsync().AsTask(); + var writeHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); readHandle1!.Dispose(); @@ -54,7 +54,7 @@ IDistributedReaderWriterLock Lock() => await using var readerHandle = await Lock().AcquireReadLockAsync(); - var writerHandleTask = Lock().AcquireWriteLockAsync().AsTask(); + var writerHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); Assert.IsFalse(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(0.2))); // trying to take a read lock here fails because there is a writer waiting diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index 9ca2af09..64010732 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -64,7 +64,7 @@ IDistributedUpgradeableReaderWriterLock Lock() => upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(true); - readTask = Lock().AcquireReadLockAsync().AsTask(); + readTask = Task.Run(() => Lock().AcquireReadLockAsync().AsTask()); readTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, "write lock held"); } diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index faffb6e6..9793fad5 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -26,4 +26,18 @@ internal static Action ToOracleOptions((bool use if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } }; } + + public sealed class TestingOracleDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + { + public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => + new OracleDistributedReaderWriterLock(name, connectionString, TestingOracleDistributedLockProvider.ToOracleOptions(options), exactName: true), + connection => new OracleDistributedReaderWriterLock(name, connection, exactName: true), + transaction => new OracleDistributedReaderWriterLock(name, transaction.Connection, exactName: true)); + + public override string GetSafeName(string name) => new OracleDistributedReaderWriterLock(name, TestingOracleDb.DefaultConnectionString).Name; + } } diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 6258c98c..5db0de62 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -55,18 +55,46 @@ namespace Medallion.Threading.Tests.Oracle public class ConnectionStringStrategy_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingOracleDb> { } public class ConnectionStringStrategy_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy, TestingOracleDb> { } public class ConnectionStringStrategy_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy, TestingOracleDb> { } + public class ConnectionStringStrategy_ReaderWriterAsMutex_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingConnectionMultiplexingSynchronizationStrategy, TestingOracleDb> { } + public class ConnectionStringStrategy_ReaderWriterAsMutex_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy>, TestingOwnedConnectionSynchronizationStrategy, TestingOracleDb> { } + public class ConnectionStringStrategy_ReaderWriterAsMutex_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy>, TestingOwnedTransactionSynchronizationStrategy, TestingOracleDb> { } public class Core_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } public class Core_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy> { } public class Core_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } public class Core_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy> { } public class Core_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_OracleReaderWriter_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy>, TestingExternalConnectionSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_OracleReaderWriter_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy>, TestingExternalTransactionSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy>, TestingOwnedConnectionSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDbTest : DistributedLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy>, TestingOwnedTransactionSynchronizationStrategy> { } public class ExternalConnectionOrTransactionStrategy_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalConnectionSynchronizationStrategy, TestingOracleDb> { } public class ExternalConnectionOrTransactionStrategy_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalTransactionSynchronizationStrategy, TestingOracleDb> { } + public class ExternalConnectionOrTransactionStrategy_ReaderWriterAsMutex_OracleReaderWriter_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalConnectionSynchronizationStrategy>, TestingExternalConnectionSynchronizationStrategy, TestingOracleDb> { } + public class ExternalConnectionOrTransactionStrategy_ReaderWriterAsMutex_OracleReaderWriter_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionOrTransactionStrategyTestCases>, TestingExternalTransactionSynchronizationStrategy>, TestingExternalTransactionSynchronizationStrategy, TestingOracleDb> { } public class ExternalConnectionStrategy_Oracle_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionStrategyTestCases>, TestingOracleDb> { } + public class ExternalConnectionStrategy_ReaderWriterAsMutex_OracleReaderWriter_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalConnectionStrategyTestCases>, TestingExternalConnectionSynchronizationStrategy>, TestingOracleDb> { } public class ExternalTransactionStrategy_Oracle_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalTransactionStrategyTestCases>, TestingOracleDb> { } + public class ExternalTransactionStrategy_ReaderWriterAsMutex_OracleReaderWriter_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDb_OracleDbTest : ExternalTransactionStrategyTestCases>, TestingExternalTransactionSynchronizationStrategy>, TestingOracleDb> { } public class MultiplexingConnectionStrategy_Oracle_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : MultiplexingConnectionStrategyTestCases>, TestingOracleDb> { } + public class MultiplexingConnectionStrategy_ReaderWriterAsMutex_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : MultiplexingConnectionStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingOracleDb> { } public class OwnedConnectionStrategy_Oracle_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedConnectionStrategyTestCases>, TestingOracleDb> { } + public class OwnedConnectionStrategy_ReaderWriterAsMutex_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedConnectionStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy>, TestingOracleDb> { } public class OwnedTransactionStrategy_Oracle_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedTransactionStrategyTestCases>, TestingOracleDb> { } + public class OwnedTransactionStrategy_ReaderWriterAsMutex_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : OwnedTransactionStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy>, TestingOracleDb> { } + public class ReaderWriterCore_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDbTest : DistributedReaderWriterLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class ReaderWriterCore_OracleReaderWriter_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDbTest : DistributedReaderWriterLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy> { } + public class ReaderWriterCore_OracleReaderWriter_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDbTest : DistributedReaderWriterLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } + public class ReaderWriterCore_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDbTest : DistributedReaderWriterLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy> { } + public class ReaderWriterCore_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDbTest : DistributedReaderWriterLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } + public class UpgradeableReaderWriterConnectionStringStrategy_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDb_OracleDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingOracleDb> { } + public class UpgradeableReaderWriterConnectionStringStrategy_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDb_OracleDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy, TestingOracleDb> { } + public class UpgradeableReaderWriterConnectionStringStrategy_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDb_OracleDbTest : UpgradeableReaderWriterLockConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy, TestingOracleDb> { } + public class UpgradeableReaderWriterCore_OracleReaderWriter_ConnectionMultiplexingSynchronizationStrategy_OracleDb_ConnectionMultiplexingSynchronizationStrategy_OracleDbTest : DistributedUpgradeableReaderWriterLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } + public class UpgradeableReaderWriterCore_OracleReaderWriter_ExternalConnectionSynchronizationStrategy_OracleDb_ExternalConnectionSynchronizationStrategy_OracleDbTest : DistributedUpgradeableReaderWriterLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy> { } + public class UpgradeableReaderWriterCore_OracleReaderWriter_ExternalTransactionSynchronizationStrategy_OracleDb_ExternalTransactionSynchronizationStrategy_OracleDbTest : DistributedUpgradeableReaderWriterLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } + public class UpgradeableReaderWriterCore_OracleReaderWriter_OwnedConnectionSynchronizationStrategy_OracleDb_OwnedConnectionSynchronizationStrategy_OracleDbTest : DistributedUpgradeableReaderWriterLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy> { } + public class UpgradeableReaderWriterCore_OracleReaderWriter_OwnedTransactionSynchronizationStrategy_OracleDb_OwnedTransactionSynchronizationStrategy_OracleDbTest : DistributedUpgradeableReaderWriterLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } } namespace Medallion.Threading.Tests.Postgres diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index b2f8e6a0..f1d85871 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -60,6 +60,9 @@ public static int Main(string[] args) case nameof(OracleDistributedLock): handle = new OracleDistributedLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); break; + case "Write" + nameof(OracleDistributedReaderWriterLock): + handle = new OracleDistributedReaderWriterLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); + break; case nameof(EventWaitHandleDistributedLock): handle = new EventWaitHandleDistributedLock(name).Acquire(); break; From 382f4f4bca0578ac74065b8165cc672c7e25ef7a Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 06:49:56 -0500 Subject: [PATCH 161/399] Oracle: rw lock synchronization provider and tests --- .../OracleDistributedLock.cs | 2 - ...racleDistributedSynchronizationProvider.cs | 14 +++++- .../OracleDistributedReaderWriterLockTest.cs | 44 +++++++++++++++++++ ...eDistributedSynchronizationProviderTest.cs | 16 +++++++ 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index be993a8e..956b90d1 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,10 +9,8 @@ namespace Medallion.Threading.Oracle { - // TODO rwlock + provider // TODO version bump for oracle and for Core and for PG and for umbrella // TODO any nexts for Core? - // TODO OracleDRWLTest // TODO audit for TODOs /// diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs index 64ea5b03..04539407 100644 --- a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -7,10 +7,12 @@ namespace Medallion.Threading.Oracle { /// /// Implements for + /// and for /// - public sealed class OracleDistributedSynchronizationProvider : IDistributedLockProvider + public sealed class OracleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider { private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; /// /// Constructs a provider that connects with and . @@ -20,6 +22,7 @@ public OracleDistributedSynchronizationProvider(string connectionString, Action< if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connectionString, options, exactName); + this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connectionString, options, exactName); } /// @@ -30,6 +33,7 @@ public OracleDistributedSynchronizationProvider(IDbConnection connection) if (connection == null) { throw new ArgumentNullException(nameof(connection)); } this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connection, exactName); + this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connection, exactName); } /// @@ -39,5 +43,13 @@ public OracleDistributedSynchronizationProvider(IDbConnection connection) public OracleDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + public OracleDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); + + IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs new file mode 100644 index 00000000..77fc0d35 --- /dev/null +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs @@ -0,0 +1,44 @@ +using Medallion.Threading.Oracle; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Medallion.Threading.Tests.Oracle +{ + public class OracleDistributedReaderWriterLockTest + { + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString)); + Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(string)!)); + Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(IDbConnection)!)); + Assert.Catch(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); + } + + [Test] + public void TestGetSafeLockNameCompat() + { + var cases = new[] + { + string.Empty, + "abc", + "\\", + new string('a', OracleDistributedLock.MaxNameLength), + new string('\\', OracleDistributedLock.MaxNameLength), + new string('x', OracleDistributedLock.MaxNameLength + 1) + }; + + foreach (var lockName in cases) + { + // should be compatible with OracleDistributedLock + new OracleDistributedReaderWriterLock(lockName, TestingOracleDb.DefaultConnectionString).Name + .ShouldEqual(new OracleDistributedLock(lockName, TestingOracleDb.DefaultConnectionString).Name); + } + } + } +} diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs index 0d3a8035..49e8b376 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs @@ -23,11 +23,27 @@ public async Task BasicTest() var provider = new OracleDistributedSynchronizationProvider(TestingOracleDb.DefaultConnectionString); const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); Assert.IsNull(handle); } + + await using (await provider.AcquireReadLockAsync(LockName)) + { + await using var readHandle = await provider.TryAcquireReadLockAsync(LockName); + Assert.IsNotNull(readHandle); + + await using (var upgradeHandle = await provider.TryAcquireUpgradeableReadLockAsync(LockName)) + { + Assert.IsNotNull(upgradeHandle); + Assert.IsFalse(await upgradeHandle!.TryUpgradeToWriteLockAsync()); + } + + await using var writeHandle = await provider.TryAcquireWriteLockAsync(LockName); + Assert.IsNull(writeHandle); + } } } } From a1aba1fc072e5e8fbdb8e8aedf90e00884f96e4c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 06:54:04 -0500 Subject: [PATCH 162/399] Version bumps for oracle, postgres, umbrella, and core --- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- DistributedLock.Oracle/OracleDistributedLock.cs | 1 - DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock/DistributedLock.csproj | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 258f24cf..37e245bb 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.3 + 1.0.4 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 956b90d1..e2d3014f 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,7 +9,6 @@ namespace Medallion.Threading.Oracle { - // TODO version bump for oracle and for Core and for PG and for umbrella // TODO any nexts for Core? // TODO audit for TODOs diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index c16ea55e..7d1aec27 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index e55aba76..7bfd6902 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.2.0 + 2.3.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 43912320596694370ab23716bc882639e347dda9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 07:05:24 -0500 Subject: [PATCH 163/399] Clean up todos --- DistributedLock.Oracle/OracleDistributedLock.cs | 3 --- DistributedLock.Oracle/OracleDistributedLockHandle.cs | 2 +- .../Infrastructure/Oracle/TestingOracleProviders.cs | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index e2d3014f..d16f2ec0 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -9,9 +9,6 @@ namespace Medallion.Threading.Oracle { - // TODO any nexts for Core? - // TODO audit for TODOs - /// /// Implements a distributed lock for Oracle databse based on the DBMS_LOCK package /// diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/DistributedLock.Oracle/OracleDistributedLockHandle.cs index ed3f1d89..0b3b1127 100644 --- a/DistributedLock.Oracle/OracleDistributedLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedLockHandle.cs @@ -20,7 +20,7 @@ internal OracleDistributedLockHandle(IDistributedSynchronizationHandle innerHand } /// - /// TODO reference issue + /// Implements /// public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index 9793fad5..8ee6ab04 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -12,7 +12,6 @@ public sealed class TestingOracleDistributedLockProvider : TestingLoc public override IDistributedLock CreateLockWithExactName(string name) => this.Strategy.GetConnectionOptions() .Create( - // todo pass in app name here (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), connection => new OracleDistributedLock(name, connection), transaction => new OracleDistributedLock(name, transaction.Connection) From 883bf801cd672abd8a42c053668cf5859d67f577 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 07:07:40 -0500 Subject: [PATCH 164/399] Oracle: fix release build --- .../OracleDistributedSynchronizationProvider.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs index 04539407..a747202c 100644 --- a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -44,6 +44,10 @@ public OracleDistributedSynchronizationProvider(IDbConnection connection) IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// public OracleDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => From 90889b1f951bc14493f98f3237a6e0b996af55bf Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 14 Dec 2021 18:04:38 -0500 Subject: [PATCH 165/399] Oracle: readme updates, docs, and other minor cleanups --- .../DistributedLock.FileSystem.csproj | 2 +- .../DistributedLock.Oracle.csproj | 2 +- DistributedLock/DistributedLock.csproj | 2 +- README.md | 5 ++- docs/DistributedLock.Oracle.md | 35 +++++++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 docs/DistributedLock.Oracle.md diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index f7abc787..6c342f04 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -11,7 +11,7 @@ 1.0.1 - 1.0.1.0 + 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on file locks Copyright © 2020 Michael Adelson diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj index a531a9f6..3be6fe94 100644 --- a/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -16,7 +16,7 @@ Provides a distributed lock implementation based on Oracle Database Copyright © 2021 Michael Adelson MIT - distributed lock async mutex sql oracle + distributed lock async mutex reader writer sql oracle https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 7bfd6902..4b62fa9a 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -17,7 +17,7 @@ Copyright © 2017 Michael Adelson MIT - distributed lock async waithandle mutex sql sqlserver postgres reader writer azure semaphore + distributed lock async mutex sql reader writer semaphore azure sqlserver postgres mysql mariadb oracle redis waithandle zookeeper https://github.com/madelson/DistributedLock https://github.com/madelson/DistributedLock 1.0.0.0 diff --git a/README.md b/README.md index d6cfc9b0..d7717f12 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ DistributedLock contains implementations based on various technologies; you can - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql - **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/): uses MySQL or MariaDB +- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/): uses Oracle - **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/): uses Redis - **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/): uses Azure blobs - **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/): uses Apache ZooKeeper @@ -135,9 +136,11 @@ Contributions are welcome! If you are interested in contributing towards a new o ## Release notes - 2.3.0 + - Added Oracle-based implementation ([#45](https://github.com/madelson/DistributedLock/issues/45), DistributedLock.Oracle 1.0.0). Thanks [@odin568](https://github.com/odin568) for testing! - Made file-based locking more robust to transient `UnauthorizedAccessException`s ([#106](https://github.com/madelson/DistributedLock/issues/106) & [#109](https://github.com/madelson/DistributedLock/issues/109), DistributedLock.FileSystem 1.0.1) + - Work around cancellation bug in Npgsql command preparation ([#112](https://github.com/madelson/DistributedLock/issues/112), DistributedLock.Postgres 1.0.2) - 2.2.0 - - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0) + - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0). Thanks [@theplacefordev](https://github.com/theplacefordev) for testing! - 2.1.0 - Added ZooKeeper-based implementation ([#41](https://github.com/madelson/DistributedLock/issues/41), DistributedLock.ZooKeeper 1.0.0) - 2.0.2 diff --git a/docs/DistributedLock.Oracle.md b/docs/DistributedLock.Oracle.md new file mode 100644 index 00000000..2bc056ba --- /dev/null +++ b/docs/DistributedLock.Oracle.md @@ -0,0 +1,35 @@ +# DistributedLock.Oracle + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.Oracle) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) + +The DistributedLock.Oracle package offers distributed synchronization primitives based on Oracle's [DBMS_LOCK package](https://docs.oracle.com/database/121/ARPLS/d_lock.htm). For example: + +```C# +var @lock = new OracleDistributedLock("MyLockName", connectionString); +using (@lock.Acquire()) +{ + // I have the lock +} +``` + +## APIs + +- The `OracleDistributedLock` class implements the `IDistributedLock` interface. +- The `OracleDistributedReaderWriterLock` class implements the `IDistributedUpgradeableReaderWriterLock` interface. +- The `OracleDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` and `IDistributedUpgradeableReaderWriterLockProvider` interfaces. + +## Implementation notes + +Oracle-based locks locks can be constructed with a connectionString or an `IDbConnection` as a means of connecting to the database. In most cases, using a connectionString is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. + +The classes in this package support async operations per the common distributed lock and ADO.NET interfaces. However, as of 2021-12-14, the Oracle .NET client libraries do not support true async IO. Therefore, if you are using the Oracle-based implementation you might get slightly better performance out of the synchronous APIs (e. g. `OracleDistributedLock.Acquire()` instead of `OracleDistributedLock.AcquireAsync()`). + +## Options + +In addition to specifying the `key`, several tuning options are available for `connectionString`-based locks: + +- `KeepaliveCadence` allows you to have the implementation periodically issue a cheap query on a connection holding a lock. This helps in configurations which are set up to aggressively kill idle connections. Defaults to OFF (`Timeout.InfiniteTimeSpan`). +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). + + + From 048a9bacce193e2439839ff54175177ccb2a63db Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 16 Dec 2021 19:26:42 -0500 Subject: [PATCH 166/399] Oracle: Add docs on permissioning Oracle user to DBMS_LOCK --- docs/DistributedLock.Oracle.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/DistributedLock.Oracle.md b/docs/DistributedLock.Oracle.md index 2bc056ba..723429d2 100644 --- a/docs/DistributedLock.Oracle.md +++ b/docs/DistributedLock.Oracle.md @@ -12,6 +12,17 @@ using (@lock.Acquire()) } ``` +## Setup + +Because the library use's Oracle's DBMS_LOCK package under the hood, **you may need to permission your user to that package**. If you encounter an error like `identifier 'SYS.DBMS_LOCK' must be declared ORA-06550`, configure your Oracle user like so: + +```SQL +connect as sys +grant execute on SYS.DBMS_LOCK to someuser; +``` + +See [this StackOverflow question](https://stackoverflow.com/questions/10870787/oracle-pl-sql-dbms-lock-error) for more info. + ## APIs - The `OracleDistributedLock` class implements the `IDistributedLock` interface. From 222e317a41e11fe5e8046f9399cb48bea6580f91 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 16 Dec 2021 19:28:22 -0500 Subject: [PATCH 167/399] Fix docs typo --- docs/DistributedLock.Oracle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.Oracle.md b/docs/DistributedLock.Oracle.md index 723429d2..2f61e45d 100644 --- a/docs/DistributedLock.Oracle.md +++ b/docs/DistributedLock.Oracle.md @@ -14,7 +14,7 @@ using (@lock.Acquire()) ## Setup -Because the library use's Oracle's DBMS_LOCK package under the hood, **you may need to permission your user to that package**. If you encounter an error like `identifier 'SYS.DBMS_LOCK' must be declared ORA-06550`, configure your Oracle user like so: +Because the library uses Oracle's DBMS_LOCK package under the hood, **you may need to permission your user to that package**. If you encounter an error like `identifier 'SYS.DBMS_LOCK' must be declared ORA-06550`, configure your Oracle user like so: ```SQL connect as sys From e45319fa38fe09860d8d3035dbf8c59e90a02679 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 17 Dec 2021 07:32:24 -0500 Subject: [PATCH 168/399] Test fixes --- .../Tests/FileSystem/FileDistributedLockTest.cs | 2 +- .../Tests/FileSystem/FileDistributedLockWindowsTest.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index c653ad7b..9d51ba83 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -468,7 +468,7 @@ public void TestLockingReadOnlyFileIsNotSupported() { Directory.CreateDirectory(LockFileDirectory); var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); - File.Create(@lock.Name).Dispose(); + File.WriteAllText(@lock.Name, "some text"); try { diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs index 758de51f..6cec4b18 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -7,7 +7,6 @@ namespace Medallion.Threading.Tests.FileSystem { - [Category("CIWindows")] public class FileDistributedLockWindowsTest { /// From 6374b8d9943c29db3a1ef47a0e2cf1007057c561 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 17 Dec 2021 15:30:27 -0500 Subject: [PATCH 169/399] FileDistributedLock: increase failure threshold for UnauthorizedAccessException --- DistributedLock.FileSystem/FileDistributedLock.cs | 2 +- .../Tests/FileSystem/FileDistributedLockTest.cs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index fa90243f..85d51068 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -18,7 +18,7 @@ public sealed partial class FileDistributedLock : IInternalDistributedLock - private const int MaxUnauthorizedAccessExceptionRetries = 100; + private const int MaxUnauthorizedAccessExceptionRetries = 400; // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 9d51ba83..fd798c94 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -464,7 +464,7 @@ public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnDirectoryCreation() /// Documents a limitation we've imposed for now to keep the code simpler /// [Test] - public void TestLockingReadOnlyFileIsNotSupported() + public void TestLockingReadOnlyFileIsNotSupportedOnWindows() { Directory.CreateDirectory(LockFileDirectory); var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); @@ -474,7 +474,14 @@ public void TestLockingReadOnlyFileIsNotSupported() { File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); - Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + } + else + { + Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); + } } finally { From 854209f8e59457bd1232058ca7acc45119ab28dd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 17 Dec 2021 15:44:34 -0500 Subject: [PATCH 170/399] Debugging test fix for unix --- .../Tests/FileSystem/FileDistributedLockTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index fd798c94..44924319 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -470,6 +470,8 @@ public void TestLockingReadOnlyFileIsNotSupportedOnWindows() var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); File.WriteAllText(@lock.Name, "some text"); + Assert.IsTrue(File.Exists(@lock.Name), $"File: {@lock.Name}, Directory? {Directory.Exists(Path.GetDirectoryName(@lock.Name))}"); + try { File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); From c57b82ab8a0a63794719efa53b5499fe588d0ad7 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 17 Dec 2021 16:35:11 -0500 Subject: [PATCH 171/399] Disable ReadOnly file test on Unix --- .../Tests/FileSystem/FileDistributedLockTest.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 44924319..159f5a50 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -466,24 +466,19 @@ public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnDirectoryCreation() [Test] public void TestLockingReadOnlyFileIsNotSupportedOnWindows() { + // File.SetAttributes is failing on Ubuntu with FileNotFoundException even though File.Exists + // returns true. Likely some platform compat issue with that method + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { return; } + Directory.CreateDirectory(LockFileDirectory); var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); - File.WriteAllText(@lock.Name, "some text"); - - Assert.IsTrue(File.Exists(@lock.Name), $"File: {@lock.Name}, Directory? {Directory.Exists(Path.GetDirectoryName(@lock.Name))}"); + File.Create(@lock.Name).Dispose(); try { File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Assert.Throws(() => @lock.TryAcquire()?.Dispose()); - } - else - { - Assert.DoesNotThrow(() => @lock.Acquire().Dispose()); - } + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); } finally { From 1fa98a27a9c453742ebabf8ee45fd7c3f8d0f94d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 17 Dec 2021 16:56:58 -0500 Subject: [PATCH 172/399] Comment cleanup --- DistributedLock.FileSystem/FileDistributedLock.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index 85d51068..754086db 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -15,8 +15,8 @@ public sealed partial class FileDistributedLock : IInternalDistributedLock /// Since can be thrown EITHER transiently or for permissions issues, we retry up to this many times - /// before we assume that the issue is non-transient. Empirically I've found 50 to work fine so I doubled it just to be safe (if there IS a problem - /// there's little risk to trying more times because we'll eventually be failing hard). + /// before we assume that the issue is non-transient. Empirically I've found this value to be reliable both locally and on AppVeyor (if there + /// IS a problem there's little risk to trying more times because we'll eventually be failing hard). /// private const int MaxUnauthorizedAccessExceptionRetries = 400; From b987903f5af8247896dc7a0845b1814594e4ae1e Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 21 Feb 2022 18:42:04 -0500 Subject: [PATCH 173/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7717f12..82e5ac45 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The [DistributedLock.Core](https://www.nuget.org/packages/DistributedLock.Core) ## Synchronization primitives - Locks: provide exclusive access to a region of code -- [Reader-writer locks](docs/Reader-writer%20locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of readers or by a single writer. +- [Reader-writer locks](docs/Reader-writer%20locks.md): a lock with multiple levels of access. The lock can be held concurrently either by any number of "readers" or by a single "writer". - [Semaphores](docs/Semaphores.md): similar to a lock, but can be held by up to N users concurrently instead of just one. While all implementations support locks, the other primitives are only supported by some implementations. See the [implementation-specific documentation pages](docs) for details. From 34315750ad25dba152d17d924e0143fb5d283e13 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 26 Feb 2022 14:39:22 -0500 Subject: [PATCH 174/399] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 82e5ac45..75865b6a 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ DistributedLock contains implementations based on various technologies; you can - **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/): uses lock files - **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/): uses operating system global `WaitHandle`s (Windows only) +**Click on the name** of any of the above packages to see the documentation specific to that implementation, or read on for general documentation that applies to all implementations. + The [DistributedLock.Core](https://www.nuget.org/packages/DistributedLock.Core) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Core.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Core/) package contains common code and abstractions and is referenced by all implementations. ## Synchronization primitives From e6f90c4036946ce57da9bd9f971dbde432a271f9 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 28 Feb 2022 07:12:02 -0500 Subject: [PATCH 175/399] Update Reader-writer locks.md Add docs for https://github.com/madelson/DistributedLock/issues/125 --- docs/Reader-writer locks.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/Reader-writer locks.md b/docs/Reader-writer locks.md index 516fc1b8..98d8e588 100644 --- a/docs/Reader-writer locks.md +++ b/docs/Reader-writer locks.md @@ -48,6 +48,8 @@ class DistributedCache This approach is more efficient than simply wrapping the entire operation in a regular distributed lock because cache hits don't block each other. +Writers are given precedence over readers so that a stream of overlapping readers cannot lock out a queued writer forever. + ## Upgradeable reader-writer locks Some reader-writer lock implementations further support acquiring an *upgradeable read* lock. When acquired, this lock blocks other writers and upgradeable readers but does not block other readers. Furthermore, an upgradeable read lock can be upgraded to a write lock without having to be released first (with a regular read lock, you must release it before acquiring a write lock. From 509f0c146418b52a0eecf4bdeb5de766f2454270 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Thu, 17 Mar 2022 09:11:56 -0400 Subject: [PATCH 176/399] Update Other topics.md Clarify process crash behavior --- docs/Other topics.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Other topics.md b/docs/Other topics.md index 2608d2f2..3ae731f8 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -26,9 +26,9 @@ handle.HandeLostToken.Register(() => Console.WriteLine("Lock was lost!")); Any code that acquires a distributed lock or other primitive should be sure to dispose of it upon completion of its work to ensure that other parts of the system are not blocked. -However, in a large and complex system there is always risk that this doesn't happen, either through sloppily written code or a bug that causes an exception to occur in an unexpected place. +However, in a large and complex system there is always risk that this doesn't happen, either through sloppily written code, a bug that causes an exception to occur in an unexpected place, or the handle-holding process crashing. -To provide additional protection against the "leaking" of lock handles, DistributedLock's primitives are designed so that a handle being garbage collected without being disposed or a handle-holding process crashing will not cause a lock to be held forever. This helps ensure that systems built on distributed locking are robust to unexpected failures. +To provide additional protection against the "leaking" of lock handles, DistributedLock's primitives are designed so that a handle being garbage collected without being disposed or a handle-holding process exiting unexpectedly **will not cause a lock to be held forever**. This helps ensure that systems built on distributed locking are robust to unexpected failures. ## Safety of distributed locking From de1d4714de09f272ec33665608a7450cf17040c5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 26 Apr 2022 08:22:34 -0400 Subject: [PATCH 177/399] Slow down idle session killer test to get it to pass consistently on Oracle. --- ...deableReaderWriterLockConnectionStringStrategyTestCases.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index f54c9346..21161a13 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -29,14 +29,14 @@ public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(2)); using (@lock.AcquireReadLock()) { var handle = @lock.AcquireUpgradeableReadLock(); handle.TryUpgradeToWriteLock().ShouldEqual(false); handle.TryUpgradeToWriteLockAsync().Result.ShouldEqual(false); - Thread.Sleep(TimeSpan.FromSeconds(1)); + Thread.Sleep(TimeSpan.FromSeconds(4)); Assert.DoesNotThrow(() => handle.Dispose()); } } From 56f926e04933acac16e8c068c31ab1840134299b Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 5 Jul 2022 07:50:49 -0400 Subject: [PATCH 178/399] Update DistributedLock.MySql.md Fix #123 --- docs/DistributedLock.MySql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.MySql.md b/docs/DistributedLock.MySql.md index 1dbcd14d..6863c07c 100644 --- a/docs/DistributedLock.MySql.md +++ b/docs/DistributedLock.MySql.md @@ -30,7 +30,7 @@ Natively, MySQL's locking functions are case-insensitive with respect to the loc In addition to specifying the `name`, several tuning options are available for `connectionString`-based locks: - `KeepaliveCadence` allows you to have the implementation periodically issue a cheap query on a connection holding a lock. This helps in configurations which are set up to aggressively kill idle connections. Defaults to OFF (`Timeout.InfiniteTimeSpan`). -- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON. **Note that this behavior must be disabled if you are using a version of MySQL older than 5.7** (see [here](https://github.com/madelson/DistributedLock/issues/123) and [here](https://dev.mysql.com/doc/refman/5.6/en/locking-functions.html) for more). Otherwise, you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). From 22b9c6a18c0b524573236e6b208b448bd884bc81 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 6 Jul 2022 08:20:52 -0400 Subject: [PATCH 179/399] Ensure that ConnectionMonitor does not unsubscribe from state changes until disposal. Fix #133 --- .../Internal/Data/ConnectionMonitor.cs | 11 +++--- .../Tests/Core/Data/DatabaseConnectionTest.cs | 38 +++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index ece63bd2..4830fc24 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -253,9 +253,10 @@ private async ValueTask StopOrDisposeAsync(bool isDispose) // the state to disposed above which the monitoring loop will check if it // takes over the Cancel() thread. this._monitorStateChangedTokenSource?.Cancel(); - - // unsubscribe from state change tracking - if (this._stateChangedHandler != null + + // If disposing, unsubscribe from state change tracking. + if (isDispose + && this._stateChangedHandler != null && this._weakConnection.TryGetTarget(out var connection)) { ((DbConnection)connection.InnerConnection).StateChange -= this._stateChangedHandler; @@ -424,7 +425,7 @@ public MonitoringHandle(ConnectionMonitor keepaliveHelper, CancellationToken can private sealed class AlreadyCanceledHandle : IDatabaseConnectionMonitoringHandle { - private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource(); + private readonly CancellationTokenSource _cancellationTokenSource = new(); public AlreadyCanceledHandle() { @@ -438,7 +439,7 @@ public AlreadyCanceledHandle() private sealed class NullHandle : IDatabaseConnectionMonitoringHandle { - public static readonly NullHandle Instance = new NullHandle(); + public static readonly NullHandle Instance = new(); private NullHandle() { } diff --git a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs new file mode 100644 index 00000000..823dc27a --- /dev/null +++ b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs @@ -0,0 +1,38 @@ +using Medallion.Threading.Internal.Data; +using Medallion.Threading.SqlServer; +using Medallion.Threading.Tests.SqlServer; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Medallion.Threading.Tests.Core.Data +{ + public class DatabaseConnectionTest + { + /// + /// Reproduces the root cause of https://github.com/madelson/DistributedLock/issues/133 + /// + [Test] + public async Task TestConnectionMonitorStaysSubscribedAfterClose() + { + var db = new TestingSqlServerDb { ApplicationName = nameof(TestConnectionMonitorStaysSubscribedAfterClose) }; + + await using var connection = new SqlDatabaseConnection(db.ConnectionString); + + await connection.OpenAsync(CancellationToken.None); + connection.ConnectionMonitor.GetMonitoringHandle().Dispose(); // initialize monitoring + await connection.CloseAsync(); + + await connection.OpenAsync(CancellationToken.None); + using var handle = connection.ConnectionMonitor.GetMonitoringHandle(); + Assert.IsFalse(handle.ConnectionLostToken.IsCancellationRequested); + await db.KillSessionsAsync(db.ApplicationName, idleSince: null); + Assert.IsTrue(await TestHelper.WaitForAsync(() => new(handle.ConnectionLostToken.IsCancellationRequested), timeout: TimeSpan.FromSeconds(5))); + } + } +} From f24c1b2ad6092003425b5f13f28bd0e6d9beec1d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Wed, 6 Jul 2022 08:22:25 -0400 Subject: [PATCH 180/399] Additional CI markers --- .../Tests/MySql/MySqlConnectionOptionsBuilderTest.cs | 1 + .../Tests/Oracle/OracleConnectionOptionsBuilderTest.cs | 1 + .../Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs | 1 + .../Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs | 1 + 4 files changed, 4 insertions(+) diff --git a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs index c543bb62..ea428d44 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs @@ -6,6 +6,7 @@ namespace Medallion.Threading.Tests.MySql { + [Category("CI")] public class MySqlConnectionOptionsBuilderTest { [Test] diff --git a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs index 05e8d27d..806e79a9 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs @@ -7,6 +7,7 @@ namespace Medallion.Threading.Tests.Oracle { + [Category("CI")] public class OracleConnectionOptionsBuilderTest { [Test] diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs index 4c051aa2..1bd14602 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs @@ -6,6 +6,7 @@ namespace Medallion.Threading.Tests.Postgres { + [Category("CI")] public class PostgresConnectionOptionsBuilderTest { [Test] diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs index d8ac6c79..a5a465f1 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs @@ -6,6 +6,7 @@ namespace Medallion.Threading.Tests.SqlServer { + [Category("CI")] public class SqlConnectionOptionsBuilderTest { [Test] From bb5f5bebffc690510ab62d1e04b6d5e1004bc735 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 7 Jul 2022 08:17:21 -0400 Subject: [PATCH 181/399] Bump core version --- DistributedLock.Core/DistributedLock.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 37e245bb..ccc21e90 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -10,7 +10,7 @@ - 1.0.4 + 1.0.5 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages From ab10b00d7bcd1e55dfc23f2e4c88300a1eecaec9 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 7 Jul 2022 08:21:25 -0400 Subject: [PATCH 182/399] Remove confusing error message in Redis options that implied the ability to disable auto-extension. Fix #130 --- .../RedisDistributedSynchronizationOptionsBuilder.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs index c46bdf8c..f15c0803 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs @@ -145,12 +145,15 @@ internal static RedisDistributedLockOptions GetOptions(Action= 0) { throw new ArgumentOutOfRangeException( nameof(extensionCadence), specifiedExtensionCadence.TimeSpan, - $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan}). To disable auto-extension, specify {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)}" + $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" ); } extensionCadence = specifiedExtensionCadence; From 4c42a795b612d891a12b375434187f24dcc28625 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 14:31:45 -0400 Subject: [PATCH 183/399] Resignal waitHandle if we choose to ignore its signal due to cancellation. Fix #120 --- .../WaitHandleDistributedSemaphoreTest.cs | 36 +++++++++++++++++ .../WaitHandleExtensions.cs | 39 +++++++++++++++++-- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index f2c6665e..306f1178 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace Medallion.Threading.Tests.WaitHandles @@ -78,6 +79,41 @@ public void TestGetSafeLockNameCompat() .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); } + /// + /// Reproduces https://github.com/madelson/DistributedLock/issues/120 + /// + [Test] + public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) + { + var semaphore = new WaitHandleDistributedSemaphore(nameof(this.TestCancellationDoesNotLeadToLostSignal), 2); + await using var _ = await semaphore.AcquireAsync(TimeSpan.FromSeconds(1)); + + for (var i = 0; i < 50; ++i) + { + using var barrier = new Barrier(2); + using var source = new CancellationTokenSource(); + var acquireTask = Task.Run(async () => + { + barrier.SignalAndWait(); + try + { + if (async) { await using var _ = await semaphore.AcquireAsync(cancellationToken: source.Token); } + else { using var _ = semaphore.Acquire(cancellationToken: source.Token); } + } + catch when (source.Token.IsCancellationRequested) { } + }); + var cancelTask = Task.Run(() => + { + barrier.SignalAndWait(); + source.Cancel(); + }); + await Task.WhenAll(acquireTask, cancelTask); + } + + await using var handle = await semaphore.TryAcquireAsync(); + Assert.IsNotNull(handle); // if we lost even a single signal due to cancellation in the loop above, this will fail + } + private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => new WaitHandleDistributedSemaphore( nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name, diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/DistributedLock.WaitHandles/WaitHandleExtensions.cs index 16ce40da..c513a257 100644 --- a/DistributedLock.WaitHandles/WaitHandleExtensions.cs +++ b/DistributedLock.WaitHandles/WaitHandleExtensions.cs @@ -42,6 +42,8 @@ private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue tim // based on http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) { + Invariant.Require(waitHandle is EventWaitHandle or Semaphore); // keep in sync with Resignal() + RegisteredWaitHandle? registeredHandle = null; CancellationTokenRegistration tokenRegistration = default; try @@ -50,13 +52,13 @@ private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHa // if, upon entering the method we are already both canceled and signaled, // putting this first ensures that we cancel tokenRegistration = cancellationToken.Register( - state => ((TaskCompletionSource)state).TrySetCanceled(), + static state => ((TaskCompletionSource)state).TrySetCanceled(), state: taskCompletionSource ); registeredHandle = ThreadPool.RegisterWaitForSingleObject( waitHandle, - (state, timedOut) => ((TaskCompletionSource)state).TrySetResult(!timedOut), - state: taskCompletionSource, + static (state, timedOut) => OnSignaled(state, timedOut), + state: Tuple.Create(taskCompletionSource, waitHandle), millisecondsTimeOutInterval: timeout.InMilliseconds, executeOnlyOnce: true ); @@ -71,6 +73,37 @@ private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHa registeredHandle?.Unregister(null); tokenRegistration.Dispose(); } + + static void OnSignaled(object state, bool timedOut) + { + var (taskCompletionSource, waitHandle) = (Tuple, WaitHandle>)state; + if (!taskCompletionSource.TrySetResult(!timedOut) && !timedOut && taskCompletionSource.Task.IsCanceled) + { + // If we received a signal (not a timeout) and we lost the race with cancellation, resignal + // the handle to avoid the signal being lost. See https://github.com/madelson/DistributedLock/issues/120 + Resignal(waitHandle); + } + } + } + + private static void Resignal(WaitHandle waitHandle) + { + try + { + if (waitHandle is EventWaitHandle @event) + { + @event.Set(); + } + else if (waitHandle is Semaphore semaphore) + { + semaphore.Release(); + } + } + catch + { + // Since this method runs in a threadpool thread, we don't want it to throw + // even if the methods above fail (e.g. with SemaphoreFullException). + } } } } From ec30d6a77248e89233291f46d4df1f2be7f922b3 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:38:38 -0400 Subject: [PATCH 184/399] Update DistributedLock.SqlServer.md Fix #101 --- docs/DistributedLock.SqlServer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.SqlServer.md b/docs/DistributedLock.SqlServer.md index 32c4a2e2..adeb2c97 100644 --- a/docs/DistributedLock.SqlServer.md +++ b/docs/DistributedLock.SqlServer.md @@ -21,7 +21,7 @@ await using (await @lock.AcquireAsync()) ## Implementation notes -SQL-based locks can be constructed with a connection string, an `IDbConnection`, or an `IDbTransaction`. When a connection is passed, the lock will be scoped to that connection and when a transaction is passed the lock will be scoped to that transaction. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection`/`IDbTransaction` gets used in a way that disrupts the locking process. +SQL-based locks can be constructed with a connection string, an `IDbConnection`, or an `IDbTransaction`. When a connection is passed, the lock will be scoped to that connection and when a transaction is passed the lock will be scoped to that transaction. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection`/`IDbTransaction` gets used in a way that disrupts the locking process. **NOTE that since `IDbConnection`/`IDbTransaction` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** ## Options From e76854ba3fb6fe8ab6298919fda3b3e1605b2cb8 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:39:10 -0400 Subject: [PATCH 185/399] Update DistributedLock.MySql.md Fix #101 --- docs/DistributedLock.MySql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.MySql.md b/docs/DistributedLock.MySql.md index 6863c07c..6a5ac53b 100644 --- a/docs/DistributedLock.MySql.md +++ b/docs/DistributedLock.MySql.md @@ -21,7 +21,7 @@ await using (await @lock.AcquireAsync()) MySQL-based locks have been tested against and work with both the [MySQL](https://www.mysql.com/) and [MariaDB](https://mariadb.org/). -MySQL-based locks locks can be constructed with a `connectionString`, an `IDbConnection` or an `IDbTransaction` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. Using an `IDbTransaction` is generally equivalent to using an `IDbConnection` (the lock is still connection-scoped), but it allows the lock to participate in an ongoing transaction. +MySQL-based locks locks can be constructed with a `connectionString`, an `IDbConnection` or an `IDbTransaction` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. Using an `IDbTransaction` is generally equivalent to using an `IDbConnection` (the lock is still connection-scoped), but it allows the lock to participate in an ongoing transaction. **NOTE that since `IDbConnection`/`IDbTransaction` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** Natively, MySQL's locking functions are case-insensitive with respect to the lock name. Since the DistributedLock library as a whole uses case-sensitive names, lock names containing uppercase characters will be transformed/hashed under the hood (as will empty names or names that are too long). If your program needs to coordinate with other code that is using `GET_LOCK` directly, be sure to express the name in lower case and to pass `exactName: true` when constructing the lock instance (in `exactName` mode, an invalid name will throw an exception rather than silently being transformed into a valid one). From 0b4b65230a26ee93b46e99d13192dfb685e3d073 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:40:07 -0400 Subject: [PATCH 186/399] Update DistributedLock.Oracle.md Fix #101 --- docs/DistributedLock.Oracle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.Oracle.md b/docs/DistributedLock.Oracle.md index 2f61e45d..9447cb19 100644 --- a/docs/DistributedLock.Oracle.md +++ b/docs/DistributedLock.Oracle.md @@ -31,7 +31,7 @@ See [this StackOverflow question](https://stackoverflow.com/questions/10870787/o ## Implementation notes -Oracle-based locks locks can be constructed with a connectionString or an `IDbConnection` as a means of connecting to the database. In most cases, using a connectionString is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. +Oracle-based locks locks can be constructed with a connectionString or an `IDbConnection` as a means of connecting to the database. In most cases, using a connectionString is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. **NOTE that since `IDbConnection` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** The classes in this package support async operations per the common distributed lock and ADO.NET interfaces. However, as of 2021-12-14, the Oracle .NET client libraries do not support true async IO. Therefore, if you are using the Oracle-based implementation you might get slightly better performance out of the synchronous APIs (e. g. `OracleDistributedLock.Acquire()` instead of `OracleDistributedLock.AcquireAsync()`). From f3a819d19deea0f38fed3bf46c6fc55137470033 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:40:40 -0400 Subject: [PATCH 187/399] Update DistributedLock.Postgres.md Fix #101 --- docs/DistributedLock.Postgres.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md index 295ace79..fc433ab1 100644 --- a/docs/DistributedLock.Postgres.md +++ b/docs/DistributedLock.Postgres.md @@ -28,7 +28,7 @@ Under the hood, [Postgres advisory locks can be based on either one 64-bit integ - Passing an ASCII string with 0-9 characters, which will be mapped to a `long` based on a custom scheme. - Passing an arbitrary string with the `allowHashing` option set to `true` which will be hashed to a `long`. Note that hashing will only be used if other methods of interpreting the string fail. -In addition to specifying the `key`, Postgres-based locks allow you to specify either a `connectionString` or an `IDbConnection` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. +In addition to specifying the `key`, Postgres-based locks allow you to specify either a `connectionString` or an `IDbConnection` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. **NOTE that since `IDbConnection` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** ## Options From b86e691fd967aa666659725169c52e72fdcb5309 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 18:41:04 -0400 Subject: [PATCH 188/399] Version bumps for 2.3.1 --- DistributedLock.MySql/DistributedLock.MySql.csproj | 2 +- DistributedLock.Oracle/DistributedLock.Oracle.csproj | 2 +- DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 2 +- DistributedLock/DistributedLock.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj index bc66182f..df815249 100644 --- a/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on MySql diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 3be6fe94..46fee21c 100644 --- a/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Oracle Database diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 7d1aec27..a5d7eaba 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 5eac9c35..6d087aeb 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -10,7 +10,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 4b62fa9a..84927b82 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.3.0 + 2.3.1 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 83ea7303847b746f163597b9a60bdc6d65e57850 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 18:50:21 -0400 Subject: [PATCH 189/399] More version bumps --- DistributedLock.Redis/DistributedLock.Redis.csproj | 2 +- DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 88bc955c..f8c244dc 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -10,7 +10,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index db7dbb67..c4cbc22b 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -10,7 +10,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on global WaitHandle objects in Windows From f662185f77b9623a10dda7269072d06f46bcca30 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 18:50:27 -0400 Subject: [PATCH 190/399] Release notes --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 75865b6a..8c83ac00 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,10 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.3.1 + - Fixed concurrency issue with `HandleLostToken` for relational database locks ([#133](https://github.com/madelson/DistributedLock/issues/133), DistributedLock.Core 1.0.5, DistributedLock.MySql 1.0.1, DistributedLock.Oracle 1.0.1, DistributedLock.Postgres 1.0.3, DistributedLock.SqlServer 1.0.2). Thanks [@OskarKlintrot](https://github.com/OskarKlintrot) for testing! + - Fixed misleading error message why trying to disable auto-extension in Redis ([#130](https://github.com/madelson/DistributedLock/issues/130), DistributedLock.Redis 1.0.2) + - Fixed concurrency issue with canceling async waits on `WaitHandle`s ([#120](https://github.com/madelson/DistributedLock/issues/120), DistributedLock.WaitHandles 1.0.1) - 2.3.0 - Added Oracle-based implementation ([#45](https://github.com/madelson/DistributedLock/issues/45), DistributedLock.Oracle 1.0.0). Thanks [@odin568](https://github.com/odin568) for testing! - Made file-based locking more robust to transient `UnauthorizedAccessException`s ([#106](https://github.com/madelson/DistributedLock/issues/106) & [#109](https://github.com/madelson/DistributedLock/issues/109), DistributedLock.FileSystem 1.0.1) From 9e6849ad5e32bf0ac008f872590ad7fd9ad42ed4 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 18:58:35 -0400 Subject: [PATCH 191/399] Enable CI build flag for Core --- DistributedLock.Core/DistributedLock.Core.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index ccc21e90..bee32015 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -32,6 +32,7 @@ embedded + true From 15cd9570b3a38a9fe4d167f0c07899b94ab63ac6 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 19:04:31 -0400 Subject: [PATCH 192/399] Pass all validation checks in NuGet package explorer --- DistributedLock.Core/DistributedLock.Core.csproj | 2 ++ DistributedLock.FileSystem/DistributedLock.FileSystem.csproj | 3 +++ DistributedLock.MySql/DistributedLock.MySql.csproj | 3 +++ DistributedLock.Oracle/DistributedLock.Oracle.csproj | 3 +++ DistributedLock.Postgres/DistributedLock.Postgres.csproj | 3 +++ DistributedLock.Redis/DistributedLock.Redis.csproj | 3 +++ DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 3 +++ DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj | 3 +++ DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj | 3 +++ 9 files changed, 26 insertions(+) diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index bee32015..2bb6ba2d 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -32,7 +32,9 @@ embedded + true + true diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 6c342f04..7e72e548 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj index df815249..0d0c5f28 100644 --- a/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 46fee21c..e7f7c71e 100644 --- a/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index a5d7eaba..951424d4 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index f8c244dc..ebdbd12f 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 6d087aeb..abcc26fc 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index c4cbc22b..508bd1bd 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -32,6 +32,9 @@ embedded + + true + true diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index db14c847..67cbf653 100644 --- a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -32,6 +32,9 @@ embedded + + true + true From 862e136554d799ff967723ce2d11ab88ab9b8d8c Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Fri, 8 Jul 2022 19:19:38 -0400 Subject: [PATCH 193/399] CI build for umbrella package --- DistributedLock/DistributedLock.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 84927b82..536c39fd 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -33,6 +33,9 @@ embedded + + true + true From f4a3401d8fa1236978d4b9678b5012262fa876a1 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 9 Jul 2022 08:53:46 -0400 Subject: [PATCH 194/399] Further race condition handling for #120 --- .../WaitHandleDistributedSemaphoreTest.cs | 49 ++++++++++++++----- .../WaitHandleExtensions.cs | 49 +++++++++++++++---- 2 files changed, 77 insertions(+), 21 deletions(-) diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 306f1178..16f0dbab 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -48,7 +48,7 @@ public void TestMaxLengthNames() public async Task TestGarbageCollection() { var @lock = CreateAsLock("gc_test", NameStyle.AddPrefix); - WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); + WeakReference AbandonLock() => new(@lock.Acquire()); var weakHandle = AbandonLock(); GC.Collect(); @@ -80,7 +80,10 @@ public void TestGetSafeLockNameCompat() } /// - /// Reproduces https://github.com/madelson/DistributedLock/issues/120 + /// Attempts to reproduce https://github.com/madelson/DistributedLock/issues/120. + /// + /// NOTE: in practice this race condition is so slim that to reproduce with any reliability requires + /// adding a call to Thread.Sleep(1) at the start of WaitHandleExtensions.Resignal(). /// [Test] public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) @@ -88,26 +91,50 @@ public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) var semaphore = new WaitHandleDistributedSemaphore(nameof(this.TestCancellationDoesNotLeadToLostSignal), 2); await using var _ = await semaphore.AcquireAsync(TimeSpan.FromSeconds(1)); + Random random = new(); for (var i = 0; i < 50; ++i) { - using var barrier = new Barrier(2); - using var source = new CancellationTokenSource(); + using var blockingHandle = semaphore.TryAcquire(TimeSpan.Zero); // claim the last slot on the semaphore + Assert.IsNotNull(blockingHandle); + + using CancellationTokenSource source = new(); + + using SemaphoreSlim acquiringEvent = new(initialCount: 0, maxCount: 1); var acquireTask = Task.Run(async () => { - barrier.SignalAndWait(); try - { - if (async) { await using var _ = await semaphore.AcquireAsync(cancellationToken: source.Token); } - else { using var _ = semaphore.Acquire(cancellationToken: source.Token); } + { + if (async) + { + var acquireHandleTask = semaphore.AcquireAsync(TimeSpan.FromSeconds(30), source.Token); + acquiringEvent.Release(); + (await acquireHandleTask).Dispose(); + } + else + { + acquiringEvent.Release(); + semaphore.Acquire(TimeSpan.FromSeconds(30), source.Token).Dispose(); + } } - catch when (source.Token.IsCancellationRequested) { } + catch (OperationCanceledException) { } + }); + await acquiringEvent.WaitAsync(); + Assert.IsFalse(acquireTask.IsCompleted); + + using Barrier barrier = new(participantCount: 2); + var releaseTask = Task.Run(() => + { + barrier.SignalAndWait(); + blockingHandle!.Dispose(); }); var cancelTask = Task.Run(() => { barrier.SignalAndWait(); + var yieldCount = random.Next(5, 25); + for (var i = 0; i < yieldCount; ++i) { Thread.Yield(); } source.Cancel(); }); - await Task.WhenAll(acquireTask, cancelTask); + await Task.WhenAll(acquireTask, releaseTask, cancelTask); } await using var handle = await semaphore.TryAcquireAsync(); @@ -115,7 +142,7 @@ public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) } private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => - new WaitHandleDistributedSemaphore( + new( nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name, maxCount: 1, abandonmentCheckCadence: TimeSpan.FromSeconds(.3), diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/DistributedLock.WaitHandles/WaitHandleExtensions.cs index c513a257..1fe7a7f6 100644 --- a/DistributedLock.WaitHandles/WaitHandleExtensions.cs +++ b/DistributedLock.WaitHandles/WaitHandleExtensions.cs @@ -9,9 +9,14 @@ internal static class WaitHandleExtensions { public static async ValueTask WaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) { - return SyncViaAsync.IsSynchronous - ? waitHandle.InternalWaitOne(timeout, cancellationToken) - : await waitHandle.InternalWaitOneAsync(timeout, cancellationToken).ConfigureAwait(false); + if (timeout.IsZero || SyncViaAsync.IsSynchronous) + { + return waitHandle.InternalWaitOne(timeout, cancellationToken); + } + + // when doing an async wait, still do a quick sync check first with timeout zero to optimize the already-signaled case + return waitHandle.InternalWaitOne(TimeSpan.Zero, cancellationToken) + || await waitHandle.InternalWaitOneAsync(timeout, cancellationToken).ConfigureAwait(false); } private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) @@ -25,6 +30,16 @@ private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue tim // ensures that we cancel cancellationToken.ThrowIfCancellationRequested(); + // optimize the already-signaled case + if (waitHandle.WaitOne(TimeSpan.Zero)) + { + return true; + } + if (timeout.IsZero) + { + return false; + } + // cancellable wait based on // http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ var index = WaitHandle.WaitAny(new[] { waitHandle, cancellationToken.WaitHandle }, timeout.InMilliseconds); @@ -42,13 +57,14 @@ private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue tim // based on http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) { - Invariant.Require(waitHandle is EventWaitHandle or Semaphore); // keep in sync with Resignal() + Invariant.Require(!cancellationToken.CanBeCanceled || waitHandle is EventWaitHandle or Semaphore); // keep in sync with Resignal() + + var taskCompletionSource = new TaskCompletionSource(); RegisteredWaitHandle? registeredHandle = null; CancellationTokenRegistration tokenRegistration = default; try { - var taskCompletionSource = new TaskCompletionSource(); // if, upon entering the method we are already both canceled and signaled, // putting this first ensures that we cancel tokenRegistration = cancellationToken.Register( @@ -66,11 +82,24 @@ private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHa } finally { - // this is different from the referenced site, but I think this is more correct: - // the handle passed to unregister is a handle to be signaled, not the one to unregister - // (that one is already captured by the registered handle). See - // http://referencesource.microsoft.com/#mscorlib/system/threading/threadpool.cs,065408fc096354fd - registeredHandle?.Unregister(null); + if (registeredHandle != null) + { + if (taskCompletionSource.Task.IsCanceled) + { + // If the task got canceled, then there is a slim chance of a race condition where + // the wait callback is still running, and hasn't re-signaled the handle yet. If we + // return before that point then we might dispose the handle, before getting to re-signal + // it. To prevent that, we pass in an MRE which will be signaled when the reservation fully + // completes and we wait for that signal before returning. + using ManualResetEvent unregisterCompleteEvent = new(initialState: false); + registeredHandle.Unregister(unregisterCompleteEvent); + await unregisterCompleteEvent.WaitOneAsync(Timeout.InfiniteTimeSpan, CancellationToken.None).ConfigureAwait(false); + } + else + { + registeredHandle.Unregister(null); + } + } tokenRegistration.Dispose(); } From 5e9e3270a2cc1a58a601433d3b740e9a7c7f0b6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:39:07 +0000 Subject: [PATCH 195/399] Bump Azure.Storage.Blobs in /DistributedLock.Azure Bumps [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) from 12.7.0 to 12.13.0. - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Blobs_12.7.0...Azure.Storage.Blobs_12.13.0) --- updated-dependencies: - dependency-name: Azure.Storage.Blobs dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- DistributedLock.Azure/DistributedLock.Azure.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index fdb1ec87..e272ccac 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -41,7 +41,7 @@ - + From 746fbf5344b248f3cebd55cde2d156e4f20b920f Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 12 Nov 2022 15:28:02 -0500 Subject: [PATCH 196/399] Make postgres locks robust to underlying postgres race condition with lock_timeout. Fix #147 --- .../DistributedLock.Postgres.csproj | 2 +- .../PostgresAdvisoryLock.cs | 119 ++++++++---------- DistributedLock/DistributedLock.csproj | 2 +- README.md | 2 + 4 files changed, 58 insertions(+), 67 deletions(-) diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 951424d4..444143e3 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -10,7 +10,7 @@ - 1.0.3 + 1.0.4 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 2e6a2b05..6d83dcf2 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -16,13 +16,10 @@ namespace Medallion.Threading.Postgres /// internal class PostgresAdvisoryLock : IDbSynchronizationStrategy { - // matches SqlApplicationLock - private const int AlreadyHeldReturnCode = 103; + private static readonly object Cookie = new(); - private static readonly object Cookie = new object(); - - public static readonly PostgresAdvisoryLock ExclusiveLock = new PostgresAdvisoryLock(isShared: false), - SharedLock = new PostgresAdvisoryLock(isShared: true); + public static readonly PostgresAdvisoryLock ExclusiveLock = new(isShared: false), + SharedLock = new(isShared: true); private readonly bool _isShared; @@ -40,7 +37,16 @@ private PostgresAdvisoryLock(bool isShared) { const string SavePointName = "medallion_threading_postgres_advisory_lock_acquire"; - var key = new PostgresAdvisoryLockKey(resourceName); + PostgresAdvisoryLockKey key = new(resourceName); + + if (connection.IsExernallyOwned + && await this.IsHoldingLockAsync(connection, key, cancellationToken).ConfigureAwait(false)) + { + if (timeout.IsZero) { return null; } + if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; + } var hasTransaction = await HasTransactionAsync(connection).ConfigureAwait(false); if (hasTransaction) @@ -58,10 +64,10 @@ private PostgresAdvisoryLock(bool isShared) using var acquireCommand = this.CreateAcquireCommand(connection, key, timeout); - int acquireCommandResult; + object acquireCommandResult; try { - acquireCommandResult = (int)await acquireCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + acquireCommandResult = await acquireCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); } catch (Exception ex) { @@ -73,7 +79,14 @@ private PostgresAdvisoryLock(bool isShared) { // lock_timeout error code from https://www.postgresql.org/docs/10/errcodes-appendix.html case "55P03": - return null; + // Even though we hit a lock timeout, an underlying race condition in Postgres means that we might actually + // have acquired the lock right before timing out. To account for this, we simply re-check whether we are + // holding the lock to determine the final return value. See https://github.com/madelson/DistributedLock/issues/147 + // and https://www.postgresql.org/message-id/63573.1668271677%40sss.pgh.pa.us for more details. + // NOTE: we use CancellationToken.None for this check because if we ARE holding the lock it would be invalid to abort. + return await this.IsHoldingLockAsync(connection, key, CancellationToken.None).ConfigureAwait(false) + ? Cookie + : null; // deadlock_detected error code from https://www.postgresql.org/docs/10/errcodes-appendix.html case "40P01": throw new DeadlockException($"The request for the distributed lock failed with exit code '{postgresException.SqlState}' (deadlock_detected)", ex); @@ -91,18 +104,13 @@ private PostgresAdvisoryLock(bool isShared) await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); - switch (acquireCommandResult) + return acquireCommandResult switch { - case 0: return null; - case 1: return Cookie; - case AlreadyHeldReturnCode: - if (timeout.IsZero) { return null; } - if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return null; - default: - throw new InvalidOperationException($"Unexpected return code {acquireCommandResult}"); - } + DBNull _ => Cookie, // indicates we called pg_advisory_lock and not pg_try_advisory_lock + false => null, + true => Cookie, + _ => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") + }; async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync() { @@ -116,6 +124,22 @@ async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync() } } + private async Task IsHoldingLockAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, CancellationToken cancellationToken) + { + using var command = connection.CreateCommand(); + command.SetCommandText($@" + SELECT COUNT(*) + FROM pg_catalog.pg_locks l + JOIN pg_catalog.pg_database d + ON d.oid = l.database + WHERE l.locktype = 'advisory' + AND {AddPGLocksFilterParametersAndGetFilterExpression(command, key)} + AND l.pid = pg_catalog.pg_backend_pid() + AND d.datname = pg_catalog.current_database()" + ); + return (long)await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) != 0; + } + private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, PostgresAdvisoryLockKey key, TimeoutValue timeout) { var command = connection.CreateCommand(); @@ -128,55 +152,19 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post // we'll be using the pg_try_advisory_lock function which doesn't block in that case. commandText.AppendLine($"SET LOCAL lock_timeout = {(timeout.IsZero || timeout.IsInfinite ? 0 : timeout.InMilliseconds)};"); - if (connection.IsExernallyOwned) - { - commandText.Append($@" - SELECT - CASE WHEN EXISTS( - SELECT * - FROM pg_catalog.pg_locks l - JOIN pg_catalog.pg_database d - ON d.oid = l.database - WHERE l.locktype = 'advisory' - AND {AddPGLocksFilterParametersAndGetFilterExpression(command, key)} - AND l.pid = pg_catalog.pg_backend_pid() - AND d.datname = pg_catalog.current_database() - ) - THEN {AlreadyHeldReturnCode} - ELSE - " - ); - AppendAcquireFunctionCall(); - commandText.AppendLine().Append("END"); - } - else - { - commandText.Append("SELECT "); - AppendAcquireFunctionCall(); - } - commandText.Append(" AS result"); + commandText.Append("SELECT "); + var isTry = timeout.IsZero; + commandText.Append("pg_catalog.pg"); + if (isTry) { commandText.Append("_try"); } + commandText.Append("_advisory_lock"); + if (this._isShared) { commandText.Append("_shared"); } + commandText.Append('(').Append(AddKeyParametersAndGetKeyArguments(command, key)).Append(')') + .Append(" AS result"); command.SetCommandText(commandText.ToString()); command.SetTimeout(timeout); return command; - - void AppendAcquireFunctionCall() - { - // creates an expression like - // pg_try_advisory_lock(@key1, @key2)::int - // OR (SELECT 1 FROM (SELECT pg_advisory_lock(@key)) f) - var isTry = timeout.IsZero; - if (!isTry) { commandText.Append("(SELECT 1 FROM (SELECT "); } - commandText.Append("pg_catalog.pg"); - if (isTry) { commandText.Append("_try"); } - commandText.Append("_advisory"); - commandText.Append("_lock"); - if (this._isShared) { commandText.Append("_shared"); } - commandText.Append('(').Append(AddKeyParametersAndGetKeyArguments(command, key)).Append(')'); - if (isTry) { commandText.Append("::int"); } - else { commandText.Append(") f)"); } - } } private static async ValueTask HasTransactionAsync(DatabaseConnection connection) @@ -249,6 +237,7 @@ private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseC } else { + AddKeyParametersAndGetKeyArguments(command, key); classIdParameter = "key1"; objIdParameter = "key2"; objSubId = "2"; diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 536c39fd..74129dcc 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.3.1 + 2.3.2 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. diff --git a/README.md b/README.md index 8c83ac00..9aca9b10 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.3.2 + - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks @Tzachi009 for reporting and isolating the issue! - 2.3.1 - Fixed concurrency issue with `HandleLostToken` for relational database locks ([#133](https://github.com/madelson/DistributedLock/issues/133), DistributedLock.Core 1.0.5, DistributedLock.MySql 1.0.1, DistributedLock.Oracle 1.0.1, DistributedLock.Postgres 1.0.3, DistributedLock.SqlServer 1.0.2). Thanks [@OskarKlintrot](https://github.com/OskarKlintrot) for testing! - Fixed misleading error message why trying to disable auto-extension in Redis ([#130](https://github.com/madelson/DistributedLock/issues/130), DistributedLock.Redis 1.0.2) From 13ff467cf4afe2b63eccac6234b2a5c0b55e2a26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Nov 2022 00:13:04 +0000 Subject: [PATCH 197/399] Bump System.Data.SqlClient from 4.8.0 to 4.8.5 in /DistributedLock.Tests Bumps [System.Data.SqlClient](https://github.com/dotnet/corefx) from 4.8.0 to 4.8.5. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) --- updated-dependencies: - dependency-name: System.Data.SqlClient dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- DistributedLock.Tests/DistributedLock.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index aaef38e6..99a010a8 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -18,7 +18,7 @@ - + From 32f1b30bc18de3452b26e8d23f38886c07822916 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 12 Nov 2022 19:14:43 -0500 Subject: [PATCH 198/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9aca9b10..8592a416 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ Contributions are welcome! If you are interested in contributing towards a new o ## Release notes - 2.3.2 - - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks @Tzachi009 for reporting and isolating the issue! + - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! - 2.3.1 - Fixed concurrency issue with `HandleLostToken` for relational database locks ([#133](https://github.com/madelson/DistributedLock/issues/133), DistributedLock.Core 1.0.5, DistributedLock.MySql 1.0.1, DistributedLock.Oracle 1.0.1, DistributedLock.Postgres 1.0.3, DistributedLock.SqlServer 1.0.2). Thanks [@OskarKlintrot](https://github.com/OskarKlintrot) for testing! - Fixed misleading error message why trying to disable auto-extension in Redis ([#130](https://github.com/madelson/DistributedLock/issues/130), DistributedLock.Redis 1.0.2) From 6a741659b4496ab2d3de594b61d28219baebdc80 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 12 Nov 2022 19:21:26 -0500 Subject: [PATCH 199/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8592a416..377ccbdc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ await using (await myDistributedLock.AcquireAsync()) ## Implementations -DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), an "umbrella" package which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. +DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql From ac68b385c67211eba3681f7b41eb9a2ebed3b971 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 14 Nov 2022 07:21:13 -0500 Subject: [PATCH 200/399] Add public API tracking --- .../DistributedLock.Azure.csproj | 1 + DistributedLock.Azure/PublicAPI.Shipped.txt | 21 ++++++ DistributedLock.Azure/PublicAPI.Unshipped.txt | 1 + .../DistributedLock.Core.csproj | 3 +- DistributedLock.Core/PublicAPI.Shipped.txt | 72 +++++++++++++++++++ DistributedLock.Core/PublicAPI.Unshipped.txt | 1 + .../DistributedLock.FileSystem.csproj | 1 + .../PublicAPI.Shipped.txt | 15 ++++ .../PublicAPI.Unshipped.txt | 1 + .../DistributedLock.MySql.csproj | 1 + DistributedLock.MySql/PublicAPI.Shipped.txt | 22 ++++++ DistributedLock.MySql/PublicAPI.Unshipped.txt | 1 + .../DistributedLock.Oracle.csproj | 1 + .../OracleDistributedLock.cs | 1 + .../OracleDistributedReaderWriterLock.cs | 3 + DistributedLock.Oracle/PublicAPI.Shipped.txt | 48 +++++++++++++ .../PublicAPI.Unshipped.txt | 1 + .../DistributedLock.Postgres.csproj | 1 + .../PublicAPI.Shipped.txt | 48 +++++++++++++ .../PublicAPI.Unshipped.txt | 1 + .../DistributedLock.Redis.csproj | 1 + DistributedLock.Redis/PublicAPI.Shipped.txt | 53 ++++++++++++++ DistributedLock.Redis/PublicAPI.Unshipped.txt | 1 + .../DistributedLock.SqlServer.csproj | 1 + .../PublicAPI.Shipped.txt | 67 +++++++++++++++++ .../PublicAPI.Unshipped.txt | 1 + .../DistributedLock.WaitHandles.csproj | 1 + .../PublicAPI.Shipped.txt | 27 +++++++ .../PublicAPI.Unshipped.txt | 1 + .../DistributedLock.ZooKeeper.csproj | 1 + .../PublicAPI.Shipped.txt | 54 ++++++++++++++ .../PublicAPI.Unshipped.txt | 1 + DistributedLock/DistributedLock.csproj | 1 + 33 files changed, 453 insertions(+), 1 deletion(-) create mode 100644 DistributedLock.Azure/PublicAPI.Shipped.txt create mode 100644 DistributedLock.Azure/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.Core/PublicAPI.Shipped.txt create mode 100644 DistributedLock.Core/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.FileSystem/PublicAPI.Shipped.txt create mode 100644 DistributedLock.FileSystem/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.MySql/PublicAPI.Shipped.txt create mode 100644 DistributedLock.MySql/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.Oracle/PublicAPI.Shipped.txt create mode 100644 DistributedLock.Oracle/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.Postgres/PublicAPI.Shipped.txt create mode 100644 DistributedLock.Postgres/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.Redis/PublicAPI.Shipped.txt create mode 100644 DistributedLock.Redis/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.SqlServer/PublicAPI.Shipped.txt create mode 100644 DistributedLock.SqlServer/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.WaitHandles/PublicAPI.Shipped.txt create mode 100644 DistributedLock.WaitHandles/PublicAPI.Unshipped.txt create mode 100644 DistributedLock.ZooKeeper/PublicAPI.Shipped.txt create mode 100644 DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index e272ccac..f8977161 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -43,6 +43,7 @@ + diff --git a/DistributedLock.Azure/PublicAPI.Shipped.txt b/DistributedLock.Azure/PublicAPI.Shipped.txt new file mode 100644 index 00000000..f4b8a6ba --- /dev/null +++ b/DistributedLock.Azure/PublicAPI.Shipped.txt @@ -0,0 +1,21 @@ +#nullable enable +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle! +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.AzureBlobLeaseDistributedLock(Azure.Storage.Blobs.BlobContainerClient! blobContainerClient, string! name, System.Action? options = null) -> void +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.AzureBlobLeaseDistributedLock(Azure.Storage.Blobs.Specialized.BlobBaseClient! blobClient, System.Action? options = null) -> void +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.Name.get -> string! +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle? +Medallion.Threading.Azure.AzureBlobLeaseDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle +Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle.Dispose() -> void +Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Azure.AzureBlobLeaseDistributedLockHandle.LeaseId.get -> string! +Medallion.Threading.Azure.AzureBlobLeaseDistributedSynchronizationProvider +Medallion.Threading.Azure.AzureBlobLeaseDistributedSynchronizationProvider.AzureBlobLeaseDistributedSynchronizationProvider(Azure.Storage.Blobs.BlobContainerClient! blobContainerClient, System.Action? options = null) -> void +Medallion.Threading.Azure.AzureBlobLeaseDistributedSynchronizationProvider.CreateLock(string! name) -> Medallion.Threading.Azure.AzureBlobLeaseDistributedLock! +Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder +Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder.BusyWaitSleepTime(System.TimeSpan min, System.TimeSpan max) -> Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder! +Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder.Duration(System.TimeSpan duration) -> Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder! +Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder.RenewalCadence(System.TimeSpan renewalCadence) -> Medallion.Threading.Azure.AzureBlobLeaseOptionsBuilder! \ No newline at end of file diff --git a/DistributedLock.Azure/PublicAPI.Unshipped.txt b/DistributedLock.Azure/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.Azure/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index 2bb6ba2d..d75a4530 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -52,7 +52,8 @@ - + + diff --git a/DistributedLock.Core/PublicAPI.Shipped.txt b/DistributedLock.Core/PublicAPI.Shipped.txt new file mode 100644 index 00000000..98ab2310 --- /dev/null +++ b/DistributedLock.Core/PublicAPI.Shipped.txt @@ -0,0 +1,72 @@ +#nullable enable +Medallion.Threading.DeadlockException +Medallion.Threading.DeadlockException.DeadlockException() -> void +Medallion.Threading.DeadlockException.DeadlockException(string! message) -> void +Medallion.Threading.DeadlockException.DeadlockException(string! message, System.Exception! innerException) -> void +Medallion.Threading.DistributedLockProviderExtensions +Medallion.Threading.DistributedReaderWriterLockProviderExtensions +Medallion.Threading.DistributedSemaphoreProviderExtensions +Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions +Medallion.Threading.IDistributedLock +Medallion.Threading.IDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +Medallion.Threading.IDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedLock.Name.get -> string! +Medallion.Threading.IDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +Medallion.Threading.IDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedLockProvider +Medallion.Threading.IDistributedLockProvider.CreateLock(string! name) -> Medallion.Threading.IDistributedLock! +Medallion.Threading.IDistributedLockUpgradeableHandle +Medallion.Threading.IDistributedLockUpgradeableHandle.TryUpgradeToWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +Medallion.Threading.IDistributedLockUpgradeableHandle.TryUpgradeToWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedLockUpgradeableHandle.UpgradeToWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +Medallion.Threading.IDistributedLockUpgradeableHandle.UpgradeToWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedReaderWriterLock +Medallion.Threading.IDistributedReaderWriterLock.AcquireReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +Medallion.Threading.IDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedReaderWriterLock.AcquireWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +Medallion.Threading.IDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedReaderWriterLock.Name.get -> string! +Medallion.Threading.IDistributedReaderWriterLock.TryAcquireReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +Medallion.Threading.IDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedReaderWriterLock.TryAcquireWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +Medallion.Threading.IDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedReaderWriterLockProvider +Medallion.Threading.IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string! name) -> Medallion.Threading.IDistributedReaderWriterLock! +Medallion.Threading.IDistributedSemaphore +Medallion.Threading.IDistributedSemaphore.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +Medallion.Threading.IDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedSemaphore.MaxCount.get -> int +Medallion.Threading.IDistributedSemaphore.Name.get -> string! +Medallion.Threading.IDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +Medallion.Threading.IDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedSemaphoreProvider +Medallion.Threading.IDistributedSemaphoreProvider.CreateSemaphore(string! name, int maxCount) -> Medallion.Threading.IDistributedSemaphore! +Medallion.Threading.IDistributedSynchronizationHandle +Medallion.Threading.IDistributedSynchronizationHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.IDistributedUpgradeableReaderWriterLock +Medallion.Threading.IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! +Medallion.Threading.IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle? +Medallion.Threading.IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider +Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string! name) -> Medallion.Threading.IDistributedUpgradeableReaderWriterLock! +static Medallion.Threading.DistributedLockProviderExtensions.AcquireLock(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedLockProviderExtensions.AcquireLockAsync(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireLock(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireLockAsync(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireReadLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireReadLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireWriteLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireWriteLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireReadLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireReadLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireWriteLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireWriteLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemaphore(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphore(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! +static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle? +static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/DistributedLock.Core/PublicAPI.Unshipped.txt b/DistributedLock.Core/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.Core/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 7e72e548..c901bd0c 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -52,6 +52,7 @@ all + diff --git a/DistributedLock.FileSystem/PublicAPI.Shipped.txt b/DistributedLock.FileSystem/PublicAPI.Shipped.txt new file mode 100644 index 00000000..b3794b0e --- /dev/null +++ b/DistributedLock.FileSystem/PublicAPI.Shipped.txt @@ -0,0 +1,15 @@ +#nullable enable +Medallion.Threading.FileSystem.FileDistributedLock +Medallion.Threading.FileSystem.FileDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.FileSystem.FileDistributedLockHandle! +Medallion.Threading.FileSystem.FileDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.FileSystem.FileDistributedLock.FileDistributedLock(System.IO.DirectoryInfo! lockFileDirectory, string! name) -> void +Medallion.Threading.FileSystem.FileDistributedLock.FileDistributedLock(System.IO.FileInfo! lockFile) -> void +Medallion.Threading.FileSystem.FileDistributedLock.Name.get -> string! +Medallion.Threading.FileSystem.FileDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.FileSystem.FileDistributedLockHandle? +Medallion.Threading.FileSystem.FileDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.FileSystem.FileDistributedLockHandle +Medallion.Threading.FileSystem.FileDistributedLockHandle.Dispose() -> void +Medallion.Threading.FileSystem.FileDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.FileSystem.FileDistributedSynchronizationProvider +Medallion.Threading.FileSystem.FileDistributedSynchronizationProvider.CreateLock(string! name) -> Medallion.Threading.FileSystem.FileDistributedLock! +Medallion.Threading.FileSystem.FileDistributedSynchronizationProvider.FileDistributedSynchronizationProvider(System.IO.DirectoryInfo! lockFileDirectory) -> void \ No newline at end of file diff --git a/DistributedLock.FileSystem/PublicAPI.Unshipped.txt b/DistributedLock.FileSystem/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.FileSystem/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj index 0d0c5f28..ebb7ae04 100644 --- a/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -47,6 +47,7 @@ + diff --git a/DistributedLock.MySql/PublicAPI.Shipped.txt b/DistributedLock.MySql/PublicAPI.Shipped.txt new file mode 100644 index 00000000..896f6f8b --- /dev/null +++ b/DistributedLock.MySql/PublicAPI.Shipped.txt @@ -0,0 +1,22 @@ +#nullable enable +Medallion.Threading.MySql.MySqlConnectionOptionsBuilder +Medallion.Threading.MySql.MySqlConnectionOptionsBuilder.KeepaliveCadence(System.TimeSpan keepaliveCadence) -> Medallion.Threading.MySql.MySqlConnectionOptionsBuilder! +Medallion.Threading.MySql.MySqlConnectionOptionsBuilder.UseMultiplexing(bool useMultiplexing = true) -> Medallion.Threading.MySql.MySqlConnectionOptionsBuilder! +Medallion.Threading.MySql.MySqlDistributedLock +Medallion.Threading.MySql.MySqlDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.MySql.MySqlDistributedLockHandle! +Medallion.Threading.MySql.MySqlDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.MySql.MySqlDistributedLock.MySqlDistributedLock(string! name, string! connectionString, System.Action? options = null, bool exactName = false) -> void +Medallion.Threading.MySql.MySqlDistributedLock.MySqlDistributedLock(string! name, System.Data.IDbConnection! connection, bool exactName = false) -> void +Medallion.Threading.MySql.MySqlDistributedLock.MySqlDistributedLock(string! name, System.Data.IDbTransaction! transaction, bool exactName = false) -> void +Medallion.Threading.MySql.MySqlDistributedLock.Name.get -> string! +Medallion.Threading.MySql.MySqlDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.MySql.MySqlDistributedLockHandle? +Medallion.Threading.MySql.MySqlDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.MySql.MySqlDistributedLockHandle +Medallion.Threading.MySql.MySqlDistributedLockHandle.Dispose() -> void +Medallion.Threading.MySql.MySqlDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.MySql.MySqlDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.MySql.MySqlDistributedSynchronizationProvider +Medallion.Threading.MySql.MySqlDistributedSynchronizationProvider.CreateLock(string! name, bool exactName = false) -> Medallion.Threading.MySql.MySqlDistributedLock! +Medallion.Threading.MySql.MySqlDistributedSynchronizationProvider.MySqlDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void +Medallion.Threading.MySql.MySqlDistributedSynchronizationProvider.MySqlDistributedSynchronizationProvider(System.Data.IDbConnection! connection) -> void +Medallion.Threading.MySql.MySqlDistributedSynchronizationProvider.MySqlDistributedSynchronizationProvider(System.Data.IDbTransaction! transaction) -> void \ No newline at end of file diff --git a/DistributedLock.MySql/PublicAPI.Unshipped.txt b/DistributedLock.MySql/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.MySql/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj index e7f7c71e..3b55c852 100644 --- a/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -47,6 +47,7 @@ + diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index d16f2ec0..49549ed9 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Diagnostics.CodeAnalysis; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs index f292c55e..57cd5dd9 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Diagnostics.CodeAnalysis; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -23,6 +24,7 @@ public sealed partial class OracleDistributedReaderWriterLock : IInternalDistrib /// /// Unless is specified, will be escaped/hashed to ensure name validity. /// + [SuppressMessage("", "RS0026", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/6264")] public OracleDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connectionString, options)) { @@ -36,6 +38,7 @@ public OracleDistributedReaderWriterLock(string name, string connectionString, A /// /// Unless is specified, will be escaped/hashed to ensure name validity. /// + [SuppressMessage("", "RS0026", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/6264")] public OracleDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connection)) { diff --git a/DistributedLock.Oracle/PublicAPI.Shipped.txt b/DistributedLock.Oracle/PublicAPI.Shipped.txt new file mode 100644 index 00000000..0e2a3af1 --- /dev/null +++ b/DistributedLock.Oracle/PublicAPI.Shipped.txt @@ -0,0 +1,48 @@ +#nullable enable +abstract Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +abstract Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Oracle.OracleConnectionOptionsBuilder +Medallion.Threading.Oracle.OracleConnectionOptionsBuilder.KeepaliveCadence(System.TimeSpan keepaliveCadence) -> Medallion.Threading.Oracle.OracleConnectionOptionsBuilder! +Medallion.Threading.Oracle.OracleConnectionOptionsBuilder.UseMultiplexing(bool useMultiplexing = true) -> Medallion.Threading.Oracle.OracleConnectionOptionsBuilder! +Medallion.Threading.Oracle.OracleDistributedLock +Medallion.Threading.Oracle.OracleDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedLockHandle! +Medallion.Threading.Oracle.OracleDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedLock.Name.get -> string! +Medallion.Threading.Oracle.OracleDistributedLock.OracleDistributedLock(string! name, string! connectionString, System.Action? options = null, bool exactName = false) -> void +Medallion.Threading.Oracle.OracleDistributedLock.OracleDistributedLock(string! name, System.Data.IDbConnection! connection, bool exactName = false) -> void +Medallion.Threading.Oracle.OracleDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedLockHandle? +Medallion.Threading.Oracle.OracleDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedLockHandle +Medallion.Threading.Oracle.OracleDistributedLockHandle.Dispose() -> void +Medallion.Threading.Oracle.OracleDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle! +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireUpgradeableReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle! +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireUpgradeableReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle! +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.Name.get -> string! +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.OracleDistributedReaderWriterLock(string! name, string! connectionString, System.Action? options = null, bool exactName = false) -> void +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.OracleDistributedReaderWriterLock(string! name, System.Data.IDbConnection! connection, bool exactName = false) -> void +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle? +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireUpgradeableReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle? +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireUpgradeableReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle? +Medallion.Threading.Oracle.OracleDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockHandle.Dispose() -> void +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.TryUpgradeToWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.TryUpgradeToWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.UpgradeToWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.UpgradeToWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Oracle.OracleDistributedSynchronizationProvider +Medallion.Threading.Oracle.OracleDistributedSynchronizationProvider.CreateLock(string! name, bool exactName = false) -> Medallion.Threading.Oracle.OracleDistributedLock! +Medallion.Threading.Oracle.OracleDistributedSynchronizationProvider.CreateReaderWriterLock(string! name, bool exactName = false) -> Medallion.Threading.Oracle.OracleDistributedReaderWriterLock! +Medallion.Threading.Oracle.OracleDistributedSynchronizationProvider.OracleDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void +Medallion.Threading.Oracle.OracleDistributedSynchronizationProvider.OracleDistributedSynchronizationProvider(System.Data.IDbConnection! connection) -> void +override Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +override Medallion.Threading.Oracle.OracleDistributedReaderWriterLockUpgradeableHandle.HandleLostToken.get -> System.Threading.CancellationToken \ No newline at end of file diff --git a/DistributedLock.Oracle/PublicAPI.Unshipped.txt b/DistributedLock.Oracle/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.Oracle/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 444143e3..509c8cf7 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -46,6 +46,7 @@ + diff --git a/DistributedLock.Postgres/PublicAPI.Shipped.txt b/DistributedLock.Postgres/PublicAPI.Shipped.txt new file mode 100644 index 00000000..43fce916 --- /dev/null +++ b/DistributedLock.Postgres/PublicAPI.Shipped.txt @@ -0,0 +1,48 @@ +#nullable enable +Medallion.Threading.Postgres.PostgresAdvisoryLockKey +Medallion.Threading.Postgres.PostgresAdvisoryLockKey.Equals(Medallion.Threading.Postgres.PostgresAdvisoryLockKey that) -> bool +Medallion.Threading.Postgres.PostgresAdvisoryLockKey.PostgresAdvisoryLockKey() -> void +Medallion.Threading.Postgres.PostgresAdvisoryLockKey.PostgresAdvisoryLockKey(int key1, int key2) -> void +Medallion.Threading.Postgres.PostgresAdvisoryLockKey.PostgresAdvisoryLockKey(long key) -> void +Medallion.Threading.Postgres.PostgresAdvisoryLockKey.PostgresAdvisoryLockKey(string! name, bool allowHashing = false) -> void +Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder +Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder.KeepaliveCadence(System.TimeSpan keepaliveCadence) -> Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder! +Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder.UseMultiplexing(bool useMultiplexing = true) -> Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder! +Medallion.Threading.Postgres.PostgresDistributedLock +Medallion.Threading.Postgres.PostgresDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedLockHandle! +Medallion.Threading.Postgres.PostgresDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedLock.Key.get -> Medallion.Threading.Postgres.PostgresAdvisoryLockKey +Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbConnection! connection) -> void +Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedLockHandle? +Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedLockHandle +Medallion.Threading.Postgres.PostgresDistributedLockHandle.Dispose() -> void +Medallion.Threading.Postgres.PostgresDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.AcquireReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle! +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.AcquireWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle! +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.Key.get -> Medallion.Threading.Postgres.PostgresAdvisoryLockKey +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbConnection! connection) -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.TryAcquireReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle? +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.TryAcquireWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle? +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle.Dispose() -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.CreateLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key) -> Medallion.Threading.Postgres.PostgresDistributedLock! +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.CreateReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock! +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.IDbConnection! connection) -> void +override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.Equals(object! obj) -> bool +override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.GetHashCode() -> int +override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.ToString() -> string! +static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator !=(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool +static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator ==(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool \ No newline at end of file diff --git a/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/DistributedLock.Postgres/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index ebdbd12f..334b6734 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -53,6 +53,7 @@ all + diff --git a/DistributedLock.Redis/PublicAPI.Shipped.txt b/DistributedLock.Redis/PublicAPI.Shipped.txt new file mode 100644 index 00000000..f99981dd --- /dev/null +++ b/DistributedLock.Redis/PublicAPI.Shipped.txt @@ -0,0 +1,53 @@ +#nullable enable +Medallion.Threading.Redis.RedisDistributedLock +Medallion.Threading.Redis.RedisDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedLockHandle! +Medallion.Threading.Redis.RedisDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedLock.Key.get -> StackExchange.Redis.RedisKey +Medallion.Threading.Redis.RedisDistributedLock.Name.get -> string! +Medallion.Threading.Redis.RedisDistributedLock.RedisDistributedLock(StackExchange.Redis.RedisKey key, StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedLock.RedisDistributedLock(StackExchange.Redis.RedisKey key, System.Collections.Generic.IEnumerable! databases, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedLockHandle? +Medallion.Threading.Redis.RedisDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedLockHandle +Medallion.Threading.Redis.RedisDistributedLockHandle.Dispose() -> void +Medallion.Threading.Redis.RedisDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Redis.RedisDistributedReaderWriterLock +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.AcquireReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle! +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.AcquireWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle! +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.Name.get -> string! +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.RedisDistributedReaderWriterLock(string! name, StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.RedisDistributedReaderWriterLock(string! name, System.Collections.Generic.IEnumerable! databases, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.TryAcquireReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle? +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.TryAcquireWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle? +Medallion.Threading.Redis.RedisDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle +Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle.Dispose() -> void +Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedReaderWriterLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Redis.RedisDistributedSemaphore +Medallion.Threading.Redis.RedisDistributedSemaphore.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedSemaphoreHandle! +Medallion.Threading.Redis.RedisDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedSemaphore.MaxCount.get -> int +Medallion.Threading.Redis.RedisDistributedSemaphore.Name.get -> string! +Medallion.Threading.Redis.RedisDistributedSemaphore.RedisDistributedSemaphore(StackExchange.Redis.RedisKey key, int maxCount, StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedSemaphoreHandle? +Medallion.Threading.Redis.RedisDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedSemaphoreHandle +Medallion.Threading.Redis.RedisDistributedSemaphoreHandle.Dispose() -> void +Medallion.Threading.Redis.RedisDistributedSemaphoreHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.Redis.RedisDistributedSemaphoreHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder +Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder.BusyWaitSleepTime(System.TimeSpan min, System.TimeSpan max) -> Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder! +Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder.Expiry(System.TimeSpan expiry) -> Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder! +Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder.ExtensionCadence(System.TimeSpan extensionCadence) -> Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder! +Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder.MinValidityTime(System.TimeSpan minValidityTime) -> Medallion.Threading.Redis.RedisDistributedSynchronizationOptionsBuilder! +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateLock(StackExchange.Redis.RedisKey key) -> Medallion.Threading.Redis.RedisDistributedLock! +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateReaderWriterLock(string! name) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLock! +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateSemaphore(StackExchange.Redis.RedisKey key, int maxCount) -> Medallion.Threading.Redis.RedisDistributedSemaphore! +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.RedisDistributedSynchronizationProvider(StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.RedisDistributedSynchronizationProvider(System.Collections.Generic.IEnumerable! databases, System.Action? options = null) -> void \ No newline at end of file diff --git a/DistributedLock.Redis/PublicAPI.Unshipped.txt b/DistributedLock.Redis/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.Redis/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index abcc26fc..0c14646e 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -46,6 +46,7 @@ + diff --git a/DistributedLock.SqlServer/PublicAPI.Shipped.txt b/DistributedLock.SqlServer/PublicAPI.Shipped.txt new file mode 100644 index 00000000..14482c62 --- /dev/null +++ b/DistributedLock.SqlServer/PublicAPI.Shipped.txt @@ -0,0 +1,67 @@ +#nullable enable +abstract Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +abstract Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder +Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder.KeepaliveCadence(System.TimeSpan keepaliveCadence) -> Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder! +Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder.UseMultiplexing(bool useMultiplexing = true) -> Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder! +Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder.UseTransaction(bool useTransaction = true) -> Medallion.Threading.SqlServer.SqlConnectionOptionsBuilder! +Medallion.Threading.SqlServer.SqlDistributedLock +Medallion.Threading.SqlServer.SqlDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedLockHandle! +Medallion.Threading.SqlServer.SqlDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedLock.Name.get -> string! +Medallion.Threading.SqlServer.SqlDistributedLock.SqlDistributedLock(string! name, string! connectionString, System.Action? options = null, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedLock.SqlDistributedLock(string! name, System.Data.IDbConnection! connection, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedLock.SqlDistributedLock(string! name, System.Data.IDbTransaction! transaction, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedLockHandle? +Medallion.Threading.SqlServer.SqlDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedLockHandle +Medallion.Threading.SqlServer.SqlDistributedLockHandle.Dispose() -> void +Medallion.Threading.SqlServer.SqlDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle! +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireUpgradeableReadLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle! +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireUpgradeableReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle! +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.Name.get -> string! +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.SqlDistributedReaderWriterLock(string! name, string! connectionString, System.Action? options = null, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.SqlDistributedReaderWriterLock(string! name, System.Data.IDbConnection! connection, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.SqlDistributedReaderWriterLock(string! name, System.Data.IDbTransaction! transaction, bool exactName = false) -> void +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle? +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireUpgradeableReadLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle? +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireUpgradeableReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle? +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockHandle.Dispose() -> void +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.TryUpgradeToWriteLock(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.TryUpgradeToWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.UpgradeToWriteLock(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.UpgradeToWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedSemaphore +Medallion.Threading.SqlServer.SqlDistributedSemaphore.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle! +Medallion.Threading.SqlServer.SqlDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedSemaphore.MaxCount.get -> int +Medallion.Threading.SqlServer.SqlDistributedSemaphore.Name.get -> string! +Medallion.Threading.SqlServer.SqlDistributedSemaphore.SqlDistributedSemaphore(string! name, int maxCount, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.SqlServer.SqlDistributedSemaphore.SqlDistributedSemaphore(string! name, int maxCount, System.Data.IDbConnection! connection) -> void +Medallion.Threading.SqlServer.SqlDistributedSemaphore.SqlDistributedSemaphore(string! name, int maxCount, System.Data.IDbTransaction! transaction) -> void +Medallion.Threading.SqlServer.SqlDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle? +Medallion.Threading.SqlServer.SqlDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle +Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle.Dispose() -> void +Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.SqlServer.SqlDistributedSemaphoreHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.CreateLock(string! name, bool exactName = false) -> Medallion.Threading.SqlServer.SqlDistributedLock! +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.CreateReaderWriterLock(string! name, bool exactName = false) -> Medallion.Threading.SqlServer.SqlDistributedReaderWriterLock! +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.CreateSemaphore(string! name, int maxCount) -> Medallion.Threading.SqlServer.SqlDistributedSemaphore! +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.SqlDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.SqlDistributedSynchronizationProvider(System.Data.IDbConnection! connection) -> void +Medallion.Threading.SqlServer.SqlDistributedSynchronizationProvider.SqlDistributedSynchronizationProvider(System.Data.IDbTransaction! transaction) -> void +override Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +override Medallion.Threading.SqlServer.SqlDistributedReaderWriterLockUpgradeableHandle.HandleLostToken.get -> System.Threading.CancellationToken \ No newline at end of file diff --git a/DistributedLock.SqlServer/PublicAPI.Unshipped.txt b/DistributedLock.SqlServer/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.SqlServer/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 508bd1bd..bdd7091d 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -46,6 +46,7 @@ + diff --git a/DistributedLock.WaitHandles/PublicAPI.Shipped.txt b/DistributedLock.WaitHandles/PublicAPI.Shipped.txt new file mode 100644 index 00000000..e8d15587 --- /dev/null +++ b/DistributedLock.WaitHandles/PublicAPI.Shipped.txt @@ -0,0 +1,27 @@ +#nullable enable +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.WaitHandles.EventWaitHandleDistributedLockHandle! +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.EventWaitHandleDistributedLock(string! name, System.TimeSpan? abandonmentCheckCadence = null, bool exactName = false) -> void +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.Name.get -> string! +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.WaitHandles.EventWaitHandleDistributedLockHandle? +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLockHandle +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLockHandle.Dispose() -> void +Medallion.Threading.WaitHandles.EventWaitHandleDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle! +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.MaxCount.get -> int +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.Name.get -> string! +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle? +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore.WaitHandleDistributedSemaphore(string! name, int maxCount, System.TimeSpan? abandonmentCheckCadence = null, bool exactName = false) -> void +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle.Dispose() -> void +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphoreHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.WaitHandles.WaitHandleDistributedSynchronizationProvider +Medallion.Threading.WaitHandles.WaitHandleDistributedSynchronizationProvider.CreateLock(string! name, bool exactName = false) -> Medallion.Threading.WaitHandles.EventWaitHandleDistributedLock! +Medallion.Threading.WaitHandles.WaitHandleDistributedSynchronizationProvider.CreateSemaphore(string! name, int maxCount, bool exactName = false) -> Medallion.Threading.WaitHandles.WaitHandleDistributedSemaphore! +Medallion.Threading.WaitHandles.WaitHandleDistributedSynchronizationProvider.WaitHandleDistributedSynchronizationProvider(System.TimeSpan? abandonmentCheckCadence = null) -> void \ No newline at end of file diff --git a/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt b/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index 67cbf653..88da52c2 100644 --- a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -56,6 +56,7 @@ + diff --git a/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt b/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt new file mode 100644 index 00000000..aa90d463 --- /dev/null +++ b/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt @@ -0,0 +1,54 @@ +#nullable enable +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.Path.get -> Medallion.Threading.ZooKeeper.ZooKeeperPath +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.ZooKeeperDistributedLock(Medallion.Threading.ZooKeeper.ZooKeeperPath directoryPath, string! name, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.ZooKeeperDistributedLock(Medallion.Threading.ZooKeeper.ZooKeeperPath path, string! connectionString, bool assumePathExists = false, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock.ZooKeeperDistributedLock(string! name, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLockHandle +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.AcquireReadLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.AcquireWriteLockAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.Path.get -> Medallion.Threading.ZooKeeper.ZooKeeperPath +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.TryAcquireReadLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.TryAcquireWriteLockAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.ZooKeeperDistributedReaderWriterLock(Medallion.Threading.ZooKeeper.ZooKeeperPath directoryPath, string! name, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.ZooKeeperDistributedReaderWriterLock(Medallion.Threading.ZooKeeper.ZooKeeperPath path, string! connectionString, bool assumePathExists = false, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock.ZooKeeperDistributedReaderWriterLock(string! name, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLockHandle +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.MaxCount.get -> int +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.Path.get -> Medallion.Threading.ZooKeeper.ZooKeeperPath +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.ZooKeeperDistributedSemaphore(Medallion.Threading.ZooKeeper.ZooKeeperPath directoryPath, string! name, int maxCount, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.ZooKeeperDistributedSemaphore(Medallion.Threading.ZooKeeper.ZooKeeperPath path, int maxCount, string! connectionString, bool assumePathExists = false, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore.ZooKeeperDistributedSemaphore(string! name, int maxCount, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphoreHandle +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphoreHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphoreHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder.AddAccessControl(string! scheme, string! id, int permissionFlags) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder.AddAuthInfo(string! scheme, System.Collections.Generic.IReadOnlyList! auth) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder.ConnectTimeout(System.TimeSpan connectTimeout) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder.SessionTimeout(System.TimeSpan sessionTimeout) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationOptionsBuilder! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider.CreateLock(string! name) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedLock! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider.CreateReaderWriterLock(string! name) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedReaderWriterLock! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider.CreateSemaphore(string! name, int maxCount) -> Medallion.Threading.ZooKeeper.ZooKeeperDistributedSemaphore! +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider.ZooKeeperDistributedSynchronizationProvider(Medallion.Threading.ZooKeeper.ZooKeeperPath directoryPath, string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperDistributedSynchronizationProvider.ZooKeeperDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void +Medallion.Threading.ZooKeeper.ZooKeeperPath +Medallion.Threading.ZooKeeper.ZooKeeperPath.Equals(Medallion.Threading.ZooKeeper.ZooKeeperPath that) -> bool +Medallion.Threading.ZooKeeper.ZooKeeperPath.ZooKeeperPath() -> void +Medallion.Threading.ZooKeeper.ZooKeeperPath.ZooKeeperPath(string! path) -> void +override Medallion.Threading.ZooKeeper.ZooKeeperPath.Equals(object! obj) -> bool +override Medallion.Threading.ZooKeeper.ZooKeeperPath.GetHashCode() -> int +override Medallion.Threading.ZooKeeper.ZooKeeperPath.ToString() -> string! +static Medallion.Threading.ZooKeeper.ZooKeeperPath.operator !=(Medallion.Threading.ZooKeeper.ZooKeeperPath this, Medallion.Threading.ZooKeeper.ZooKeeperPath that) -> bool +static Medallion.Threading.ZooKeeper.ZooKeeperPath.operator ==(Medallion.Threading.ZooKeeper.ZooKeeperPath this, Medallion.Threading.ZooKeeper.ZooKeeperPath that) -> bool \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt b/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/DistributedLock/DistributedLock.csproj b/DistributedLock/DistributedLock.csproj index 74129dcc..01cd4994 100644 --- a/DistributedLock/DistributedLock.csproj +++ b/DistributedLock/DistributedLock.csproj @@ -58,6 +58,7 @@ + From 4704912971da7c166000d7b5eb75d41c0e1a37e0 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Nov 2022 07:27:05 -0500 Subject: [PATCH 201/399] Convert to file-scoped namespaces --- .editorconfig | 226 +++++ ...obLeaseDistributedLock.IDistributedLock.cs | 145 ++-- .../AzureBlobLeaseDistributedLock.cs | 327 ++++--- .../AzureBlobLeaseDistributedLockHandle.cs | 73 +- ...LeaseDistributedSynchronizationProvider.cs | 39 +- .../AzureBlobLeaseOptionsBuilder.cs | 201 +++-- DistributedLock.Azure/AzureErrors.cs | 13 +- DistributedLock.Azure/BlobClientWrapper.cs | 135 ++- .../BlobLeaseClientWrapper.cs | 65 +- DistributedLock.Core/DeadlockException.cs | 43 +- .../DistributedLockProviderExtensions.cs | 57 +- ...butedReaderWriterLockProviderExtensions.cs | 105 ++- .../DistributedSemaphoreProviderExtensions.cs | 57 +- ...eableReaderWriterLockProviderExtensions.cs | 57 +- DistributedLock.Core/IDistributedLock.cs | 131 ++- .../IDistributedLockProvider.cs | 19 +- .../IDistributedReaderWriterLock.cs | 241 +++--- .../IDistributedReaderWriterLockProvider.cs | 19 +- DistributedLock.Core/IDistributedSemaphore.cs | 141 ++- .../IDistributedSemaphoreProvider.cs | 19 +- .../IDistributedSynchronizationHandle.cs | 43 +- .../IDistributedUpgradeableReadLockHandle.cs | 41 +- ...IDistributedUpgradeableReaderWriterLock.cs | 125 ++- ...utedUpgradeableReaderWriterLockProvider.cs | 19 +- DistributedLock.Core/Internal/AsyncLock.cs | 69 +- .../Internal/BusyWaitHelper.cs | 123 ++- .../Internal/Data/ConnectionMonitor.cs | 691 ++++++++------- .../Internal/Data/DatabaseCommand.cs | 329 ++++--- .../Internal/Data/DatabaseConnection.cs | 229 +++-- ...onnectionOrTransactionDbDistributedLock.cs | 337 ++++---- .../IDatabaseConnectionMonitoringHandle.cs | 9 +- .../Internal/Data/IDbDistributedLock.cs | 31 +- .../Data/IDbSynchronizationStrategy.cs | 47 +- .../Data/MultiplexedConnectionLock.cs | 449 +++++----- .../Data/MultiplexedConnectionLockPool.cs | 313 ++++--- ...ConnectionMultiplexingDbDistributedLock.cs | 87 +- .../Internal/DistributedLockHelpers.cs | 261 +++--- DistributedLock.Core/Internal/Helpers.cs | 173 ++-- .../Internal/IInternalDistributedLock.cs | 27 +- ...nternalDistributedLockUpgradeableHandle.cs | 15 +- .../IInternalDistributedReaderWriterLock.cs | 35 +- .../Internal/IInternalDistributedSemaphore.cs | 27 +- ...lDistributedUpgradeableReaderWriterLock.cs | 29 +- DistributedLock.Core/Internal/Invariant.cs | 21 +- DistributedLock.Core/Internal/LeaseMonitor.cs | 233 +++-- .../Internal/ManagedFinalizerQueue.cs | 313 ++++--- DistributedLock.Core/Internal/RefBox.cs | 77 +- DistributedLock.Core/Internal/SyncViaAsync.cs | 199 +++-- DistributedLock.Core/Internal/TimeoutValue.cs | 93 +- .../FileDistributedLock.IDistributedLock.cs | 145 ++-- .../FileDistributedLock.cs | 249 +++--- .../FileDistributedLockHandle.cs | 49 +- .../FileDistributedSynchronizationProvider.cs | 35 +- .../FileNameValidationHelper.cs | 247 +++--- .../MySqlConnectionOptionsBuilder.cs | 111 ++- .../MySqlDatabaseConnection.cs | 71 +- .../MySqlDistributedLock.IDistributedLock.cs | 145 ++-- DistributedLock.MySql/MySqlDistributedLock.cs | 277 +++--- .../MySqlDistributedLockHandle.cs | 47 +- ...MySqlDistributedSynchronizationProvider.cs | 83 +- .../MySqlMultiplexedConnectionLockPool.cs | 9 +- DistributedLock.MySql/MySqlUserLock.cs | 119 ++- .../OracleConnectionOptionsBuilder.cs | 107 ++- .../OracleDatabaseConnection.cs | 123 ++- DistributedLock.Oracle/OracleDbmsLock.cs | 199 +++-- .../OracleDistributedLock.IDistributedLock.cs | 145 ++-- .../OracleDistributedLock.cs | 127 ++- .../OracleDistributedLockHandle.cs | 47 +- ...IDistributedUpgradeableReaderWriterLock.cs | 59 +- .../OracleDistributedReaderWriterLock.cs | 110 ++- ...OracleDistributedReaderWriterLockHandle.cs | 187 ++-- ...racleDistributedSynchronizationProvider.cs | 95 +- .../OracleMultiplexedConnectionLockPool.cs | 9 +- .../PostgresAdvisoryLock.cs | 367 ++++---- .../PostgresAdvisoryLockKey.cs | 435 +++++----- .../PostgresConnectionOptionsBuilder.cs | 107 ++- .../PostgresDatabaseConnection.cs | 95 +- ...ostgresDistributedLock.IDistributedLock.cs | 145 ++-- .../PostgresDistributedLock.cs | 95 +- .../PostgresDistributedLockHandle.cs | 47 +- ...WriterLock.IDistributedReaderWriterLock.cs | 41 +- .../PostgresDistributedReaderWriterLock.cs | 83 +- ...stgresDistributedReaderWriterLockHandle.cs | 47 +- ...tgresDistributedSynchronizationProvider.cs | 87 +- .../PostgresMultiplexedConnectionLockPool.cs | 9 +- .../Primitives/RedisMutexPrimitive.cs | 53 +- .../RedisReaderWriterLockPrimitives.cs | 205 +++-- .../Primitives/RedisScript.cs | 37 +- .../Primitives/RedisSemaphorePrimitive.cs | 85 +- .../RedLock/RedLockAcquire.cs | 271 +++--- .../RedLock/RedLockExtend.cs | 135 ++- .../RedLock/RedLockHandle.cs | 97 +-- .../RedLock/RedLockHelper.cs | 95 +- .../RedLock/RedLockRelease.cs | 135 ++- .../RedLock/RedLockTimeouts.cs | 25 +- .../RedisDistributedLock.IDistributedLock.cs | 145 ++-- DistributedLock.Redis/RedisDistributedLock.cs | 109 ++- .../RedisDistributedLockHandle.cs | 49 +- ...WriterLock.IDistributedReaderWriterLock.cs | 41 +- .../RedisDistributedReaderWriterLock.cs | 231 +++-- .../RedisDistributedReaderWriterLockHandle.cs | 49 +- ...tributedSemaphore.IDistributedSemaphore.cs | 145 ++-- .../RedisDistributedSemaphore.cs | 97 +-- .../RedisDistributedSemaphoreHandle.cs | 49 +- ...istributedSynchronizationOptionsBuilder.cs | 311 ++++--- ...RedisDistributedSynchronizationProvider.cs | 93 +- DistributedLock.Redis/TimeoutTask.cs | 49 +- .../SqlApplicationLock.cs | 337 ++++---- .../SqlConnectionOptionsBuilder.cs | 153 ++-- .../SqlDatabaseConnection.cs | 91 +- .../SqlDistributedLock.IDistributedLock.cs | 145 ++-- .../SqlDistributedLock.cs | 168 ++-- .../SqlDistributedLockHandle.cs | 47 +- ...IDistributedUpgradeableReaderWriterLock.cs | 59 +- .../SqlDistributedReaderWriterLock.cs | 167 ++-- .../SqlDistributedReaderWriterLockHandle.cs | 187 ++-- ...tributedSemaphore.IDistributedSemaphore.cs | 145 ++-- .../SqlDistributedSemaphore.cs | 111 ++- .../SqlDistributedSemaphoreHandle.cs | 47 +- .../SqlDistributedSynchronizationProvider.cs | 119 ++- .../SqlMultiplexedConnectionLockPool.cs | 9 +- DistributedLock.SqlServer/SqlSemaphore.cs | 691 ++++++++------- .../Data/ConnectionStringStrategyTestCases.cs | 185 ++-- .../Data/DbSemaphoreTestCases.cs | 191 ++-- ...onnectionOrTransactionStrategyTestCases.cs | 153 ++-- .../ExternalConnectionStrategyTestCases.cs | 87 +- .../ExternalTransactionStrategyTestCases.cs | 237 +++-- ...MultiplexingConnectionStrategyTestCases.cs | 221 +++-- .../Data/OwnedConnectionStrategyTestCases.cs | 87 +- .../Data/OwnedTransactionStrategyTestCases.cs | 117 ++- ...erLockConnectionStringStrategyTestCases.cs | 97 +-- .../DistributedLockCoreTestCases.cs | 743 ++++++++-------- ...istributedReaderWriterLockCoreTestCases.cs | 169 ++-- .../DistributedSemaphoreCoreTestCases.cs | 209 +++-- ...pgradeableReaderWriterLockCoreTestCases.cs | 223 +++-- .../Redis/RedisExtensionTestCases.cs | 45 +- .../RedisSynchronizationCoreTestCases.cs | 279 +++--- .../ZooKeeperSynchronizationCoreTestCases.cs | 329 ++++--- .../Infrastructure/Azure/AzureSetUpFixture.cs | 75 +- ...ngAzureBlobLeaseDistributedLockProvider.cs | 31 +- ...ngAzureBlobLeaseSynchronizationStrategy.cs | 93 +- .../Infrastructure/Data/ConnectionOptions.cs | 61 +- .../Infrastructure/Data/IdleSessionKiller.cs | 49 +- .../Infrastructure/Data/TestingDb.cs | 131 ++- .../Data/TestingDbSynchronizationStrategy.cs | 329 ++++--- .../Infrastructure/DisposableCollection.cs | 81 +- .../FileSystem/TestingFileSystemProviders.cs | 17 +- .../TestingLockFileSynchronizationStrategy.cs | 9 +- .../Infrastructure/ITestingNameProvider.cs | 27 +- .../Infrastructure/MySql/TestingMySqlDb.cs | 131 ++- .../MySql/TestingMySqlProviders.cs | 39 +- .../Infrastructure/Oracle/TestingOracleDb.cs | 121 ++- .../Oracle/TestingOracleProviders.cs | 59 +- .../Postgres/TestingPostgresDb.cs | 85 +- .../Postgres/TestingPostgresProviders.cs | 73 +- .../Infrastructure/Redis/RedisServer.cs | 125 ++- .../Infrastructure/Redis/RedisSetUpFixture.cs | 17 +- .../Redis/TestingRedisDatabaseProvider.cs | 87 +- .../Redis/TestingRedisProviders.cs | 95 +- .../TestingRedisSynchronizationStrategy.cs | 115 ++- .../Infrastructure/Shared/AzureCredentials.cs | 13 +- .../Shared/MariaDbCredentials.cs | 63 +- .../Infrastructure/Shared/MySqlCredentials.cs | 49 +- .../Shared/OracleCredentials.cs | 91 +- .../Shared/PostgresCredentials.cs | 51 +- .../Infrastructure/Shared/RedisPorts.cs | 11 +- .../Shared/SqlServerCredentials.cs | 29 +- .../Infrastructure/Shared/TargetFramework.cs | 13 +- .../Infrastructure/Shared/ZooKeeperPorts.cs | 11 +- .../SqlServer/TestingSqlServerDb.cs | 123 ++- .../SqlServer/TestingSqlServerProviders.cs | 97 +-- .../SupportsContinuousIntegrationAttribute.cs | 17 +- .../Infrastructure/TestHelper.cs | 97 +-- .../Infrastructure/TestingLockProvider.cs | 33 +- .../TestingReaderWriterLockAsMutexProvider.cs | 127 ++- .../TestingReaderWriterLockProvider.cs | 83 +- .../TestingSemaphoreAsMutexProvider.cs | 141 ++- .../TestingSemaphoreProvider.cs | 31 +- .../TestingSynchronizationStrategy.cs | 31 +- .../WaitHandles/TestingWaitHandleProviders.cs | 25 +- ...estingWaitHandleSynchronizationStrategy.cs | 15 +- .../ZooKeeper/TestingZooKeeperProviders.cs | 55 +- ...TestingZooKeeperSynchronizationStrategy.cs | 75 +- .../ZooKeeper/ZooKeeperSetUpFixture.cs | 129 ++- DistributedLock.Tests/Tests/ApiTest.cs | 255 +++--- .../Tests/Azure/AzureBehaviorTest.cs | 141 ++- .../AzureBlobLeaseDistributedLockTest.cs | 355 ++++---- ...eDistributedSynchronizationProviderTest.cs | 35 +- .../Azure/AzureBlobLeaseOptionsBuilderTest.cs | 87 +- .../Tests/Core/Data/DatabaseConnectionTest.cs | 37 +- .../Tests/Core/DeadlockExceptionTest.cs | 33 +- .../DistributedLockProviderExtensionsTest.cs | 85 +- .../Tests/Core/HelpersTest.cs | 45 +- .../Tests/Core/InternalVisibilityTest.cs | 23 +- .../Tests/Core/SyncViaAsyncTest.cs | 69 +- .../Tests/Core/TimeoutValueTest.cs | 147 ++-- .../FileSystem/FileDistributedLockTest.cs | 817 +++++++++--------- .../FileDistributedLockWindowsTest.cs | 47 +- ...eDistributedSynchronizationProviderTest.cs | 47 +- .../MySqlConnectionOptionsBuilderTest.cs | 35 +- .../Tests/MySql/MySqlDistributedLockTest.cs | 107 ++- ...lDistributedSynchronizationProviderTest.cs | 39 +- .../Tests/Oracle/OracleBehaviorTest.cs | 39 +- .../OracleConnectionOptionsBuilderTest.cs | 35 +- .../Tests/Oracle/OracleDistributedLockTest.cs | 47 +- .../OracleDistributedReaderWriterLockTest.cs | 57 +- ...eDistributedSynchronizationProviderTest.cs | 55 +- .../Postgres/PostgresAdvisoryLockKeyTest.cs | 235 +++-- .../Tests/Postgres/PostgresBehaviorTest.cs | 247 +++--- .../PostgresConnectionOptionsBuilderTest.cs | 35 +- .../Postgres/PostgresDistributedLockTest.cs | 105 ++- ...PostgresDistributedReaderWriterLockTest.cs | 15 +- ...sDistributedSynchronizationProviderTest.cs | 45 +- .../Tests/Redis/RedisDistributedLockTest.cs | 43 +- .../RedisDistributedReaderWriterLockTest.cs | 115 ++- .../Redis/RedisDistributedSemaphoreTest.cs | 39 +- ...ibutedSynchronizationOptionsBuilderTest.cs | 107 ++- ...sDistributedSynchronizationProviderTest.cs | 65 +- .../Tests/Redis/RedisLibraryTest.cs | 29 +- .../SqlConnectionOptionsBuilderTest.cs | 39 +- .../SqlServer/SqlDatabaseConnectionTest.cs | 107 ++- .../Tests/SqlServer/SqlDistributedLockTest.cs | 101 ++- .../SqlDistributedReaderWriterLockTest.cs | 61 +- .../SqlServer/SqlDistributedSemaphoreTest.cs | 149 ++-- ...lDistributedSynchronizationProviderTest.cs | 63 +- DistributedLock.Tests/Tests/TestSetupTest.cs | 321 ++++--- .../EventWaitHandleDistributedLockTest.cs | 141 ++- .../WaitHandleDistributedSemaphoreTest.cs | 255 +++--- ...eDistributedSynchronizationProviderTest.cs | 39 +- .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 49 +- .../ZooKeeper/ZooKeeperConnectionInfoTest.cs | 59 +- .../ZooKeeper/ZooKeeperConnectionTest.cs | 199 +++-- .../ZooKeeper/ZooKeeperDistributedLockTest.cs | 51 +- ...ooKeeperDistributedReaderWriterLockTest.cs | 51 +- .../ZooKeeperDistributedSemaphoreTest.cs | 55 +- ...ibutedSynchronizationOptionsBuilderTest.cs | 33 +- ...rDistributedSynchronizationProviderTest.cs | 121 ++- .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 165 ++-- .../ZooKeeperSequentialPathHelperTest.cs | 387 +++++---- .../DistributedWaitHandleHelpers.cs | 251 +++--- ...tHandleDistributedLock.IDistributedLock.cs | 145 ++-- .../EventWaitHandleDistributedLock.cs | 115 ++- .../EventWaitHandleDistributedLockHandle.cs | 61 +- ...tributedSemaphore.IDistributedSemaphore.cs | 145 ++-- .../WaitHandleDistributedSemaphore.cs | 107 ++- .../WaitHandleDistributedSemaphoreHandle.cs | 99 ++- ...andleDistributedSynchronizationProvider.cs | 59 +- .../WaitHandleExtensions.cs | 205 +++-- .../ZooKeeperConnection.cs | 381 ++++---- .../ZooKeeperConnectionInfo.cs | 49 +- ...oKeeperDistributedLock.IDistributedLock.cs | 93 +- .../ZooKeeperDistributedLock.cs | 155 ++-- .../ZooKeeperDistributedLockHandle.cs | 61 +- ...WriterLock.IDistributedReaderWriterLock.cs | 41 +- .../ZooKeeperDistributedReaderWriterLock.cs | 201 +++-- ...KeeperDistributedReaderWriterLockHandle.cs | 61 +- ...tributedSemaphore.IDistributedSemaphore.cs | 93 +- .../ZooKeeperDistributedSemaphore.cs | 197 +++-- .../ZooKeeperDistributedSemaphoreHandle.cs | 61 +- ...istributedSynchronizationOptionsBuilder.cs | 167 ++-- ...eeperDistributedSynchronizationProvider.cs | 99 ++- .../ZooKeeperNodeCreator.cs | 173 ++-- .../ZooKeeperNodeHandle.cs | 239 +++-- DistributedLock.ZooKeeper/ZooKeeperPath.cs | 265 +++--- .../ZooKeeperSequentialPathHelper.cs | 219 +++-- .../ZooKeeperSynchronizationHelper.cs | 289 +++---- DistributedLockCodeGen/CodeGenHelpers.cs | 43 +- .../DistributedLockCodeGen.csproj | 2 +- DistributedLockCodeGen/DocCommentGenerator.cs | 217 +++-- ...GenerateIDistributedLockImplementations.cs | 333 ++++--- DistributedLockCodeGen/GenerateProviders.cs | 135 ++- DistributedLockTaker/Program.cs | 279 +++--- 272 files changed, 16838 insertions(+), 16890 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..7b9458de --- /dev/null +++ b/.editorconfig @@ -0,0 +1,226 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = true:warning +dotnet_style_qualification_for_field = true +dotnet_style_qualification_for_method = true:warning +dotnet_style_qualification_for_property = true:warning + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = true:warning + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true:suggestion +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_return = true:suggestion +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = false:warning +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = true:suggestion +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true + +# Code-block preferences +csharp_prefer_braces = true:warning +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = file_scoped:suggestion +csharp_style_prefer_method_group_conversion = true:suggestion +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:warning +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs index 6b939d6b..59d44507 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +public partial class AzureBlobLeaseDistributedLock { - public partial class AzureBlobLeaseDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public AzureBlobLeaseDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public AzureBlobLeaseDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public AzureBlobLeaseDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public AzureBlobLeaseDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 9f1de96f..82b6b435 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -9,216 +9,215 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Implements a based on Azure blob leases +/// +public sealed partial class AzureBlobLeaseDistributedLock : IInternalDistributedLock { /// - /// Implements a based on Azure blob leases + /// Metadata marker used to indicate that a blob was created for distributed locking and therefore + /// should be destroyed upon release /// - public sealed partial class AzureBlobLeaseDistributedLock : IInternalDistributedLock - { - /// - /// Metadata marker used to indicate that a blob was created for distributed locking and therefore - /// should be destroyed upon release - /// - private static readonly string CreatedMetadataKey = $"__DistributedLock"; - - private readonly BlobClientWrapper _blobClient; - private readonly (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) _options; - - /// - /// Constructs a lock that will lease the provided - /// - public AzureBlobLeaseDistributedLock(BlobBaseClient blobClient, Action? options = null) - { - this._blobClient = new BlobClientWrapper(blobClient ?? throw new ArgumentNullException(nameof(blobClient))); - this._options = AzureBlobLeaseOptionsBuilder.GetOptions(options); - } + private static readonly string CreatedMetadataKey = $"__DistributedLock"; - /// - /// Constructs a lock that will lease a blob based on within the provided . - /// - public AzureBlobLeaseDistributedLock(BlobContainerClient blobContainerClient, string name, Action? options = null) - { - if (blobContainerClient == null) { throw new ArgumentNullException(nameof(blobContainerClient)); } - if (name == null) { throw new ArgumentNullException(nameof(name)); } + private readonly BlobClientWrapper _blobClient; + private readonly (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) _options; - this._blobClient = new BlobClientWrapper(blobContainerClient.GetBlobClient(GetSafeName(name, blobContainerClient))); - this._options = AzureBlobLeaseOptionsBuilder.GetOptions(options); - } + /// + /// Constructs a lock that will lease the provided + /// + public AzureBlobLeaseDistributedLock(BlobBaseClient blobClient, Action? options = null) + { + this._blobClient = new BlobClientWrapper(blobClient ?? throw new ArgumentNullException(nameof(blobClient))); + this._options = AzureBlobLeaseOptionsBuilder.GetOptions(options); + } - /// - /// Implements - /// - public string Name => this._blobClient.Name; + /// + /// Constructs a lock that will lease a blob based on within the provided . + /// + public AzureBlobLeaseDistributedLock(BlobContainerClient blobContainerClient, string name, Action? options = null) + { + if (blobContainerClient == null) { throw new ArgumentNullException(nameof(blobContainerClient)); } + if (name == null) { throw new ArgumentNullException(nameof(name)); } - // implementation based on https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#blob-names - internal static string GetSafeName(string name, BlobContainerClient blobContainerClient) - { - var maxLength = IsStorageEmulator() ? 256 : 1024; + this._blobClient = new BlobClientWrapper(blobContainerClient.GetBlobClient(GetSafeName(name, blobContainerClient))); + this._options = AzureBlobLeaseOptionsBuilder.GetOptions(options); + } - return DistributedLockHelpers.ToSafeName(name, maxLength, s => ConvertToValidName(s)); + /// + /// Implements + /// + public string Name => this._blobClient.Name; - // check based on - // https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-the-well-known-account-name-and-key - bool IsStorageEmulator() => blobContainerClient.Uri.IsAbsoluteUri - && blobContainerClient.Uri.AbsoluteUri.StartsWith("http://127.0.0.1:10000/devstoreaccount1", StringComparison.Ordinal); + // implementation based on https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#blob-names + internal static string GetSafeName(string name, BlobContainerClient blobContainerClient) + { + var maxLength = IsStorageEmulator() ? 256 : 1024; - static string ConvertToValidName(string name) - { - const int MaxSlashes = 253; // allowed to have up to 254 segments, which means 253 slashes + return DistributedLockHelpers.ToSafeName(name, maxLength, s => ConvertToValidName(s)); - if (name.Length == 0) { return "__EMPTY__"; } + // check based on + // https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-the-well-known-account-name-and-key + bool IsStorageEmulator() => blobContainerClient.Uri.IsAbsoluteUri + && blobContainerClient.Uri.AbsoluteUri.StartsWith("http://127.0.0.1:10000/devstoreaccount1", StringComparison.Ordinal); - StringBuilder? builder = null; - var slashCount = 0; - for (var i = 0; i < name.Length; ++i) - { - var @char = name[i]; + static string ConvertToValidName(string name) + { + const int MaxSlashes = 253; // allowed to have up to 254 segments, which means 253 slashes - // enforce cap on # path segments and note that trailing slash or DOT are - // discouraged + if (name.Length == 0) { return "__EMPTY__"; } - if ((@char == '/' || @char == '\\') - && (++slashCount > MaxSlashes || i == name.Length - 1)) - { - EnsureBuilder().Append("SLASH"); - } - else if (@char == '.' && i == name.Length - 1) - { - EnsureBuilder().Append("DOT"); - } - else - { - builder?.Append(@char); - } + StringBuilder? builder = null; + var slashCount = 0; + for (var i = 0; i < name.Length; ++i) + { + var @char = name[i]; - StringBuilder EnsureBuilder() => builder ??= new StringBuilder().Append(name, startIndex: 0, count: i); + // enforce cap on # path segments and note that trailing slash or DOT are + // discouraged + + if ((@char == '/' || @char == '\\') + && (++slashCount > MaxSlashes || i == name.Length - 1)) + { + EnsureBuilder().Append("SLASH"); + } + else if (@char == '.' && i == name.Length - 1) + { + EnsureBuilder().Append("DOT"); + } + else + { + builder?.Append(@char); } - return builder?.ToString() ?? name; + StringBuilder EnsureBuilder() => builder ??= new StringBuilder().Append(name, startIndex: 0, count: i); } + + return builder?.ToString() ?? name; } + } - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - BusyWaitHelper.WaitAsync( - (@lock: this, leaseClient: this._blobClient.GetBlobLeaseClient()), - (state, token) => state.@lock.TryAcquireAsync(state.leaseClient, token, isRetryAfterCreate: false), - timeout, - minSleepTime: this._options.minBusyWaitSleepTime, - maxSleepTime: this._options.maxBusyWaitSleepTime, - cancellationToken - ); - - private async ValueTask TryAcquireAsync( - BlobLeaseClientWrapper leaseClient, - CancellationToken cancellationToken, - bool isRetryAfterCreate) + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + (@lock: this, leaseClient: this._blobClient.GetBlobLeaseClient()), + (state, token) => state.@lock.TryAcquireAsync(state.leaseClient, token, isRetryAfterCreate: false), + timeout, + minSleepTime: this._options.minBusyWaitSleepTime, + maxSleepTime: this._options.maxBusyWaitSleepTime, + cancellationToken + ); + + private async ValueTask TryAcquireAsync( + BlobLeaseClientWrapper leaseClient, + CancellationToken cancellationToken, + bool isRetryAfterCreate) + { + try { await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); } + catch (RequestFailedException acquireException) { - try { await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); } - catch (RequestFailedException acquireException) + if (acquireException.ErrorCode == AzureErrors.LeaseAlreadyPresent) { return null; } + + if (acquireException.ErrorCode == AzureErrors.BlobNotFound) { - if (acquireException.ErrorCode == AzureErrors.LeaseAlreadyPresent) { return null; } + // if we just created and it already doesn't exist again, just return null and retry later + if (isRetryAfterCreate) { return null; } - if (acquireException.ErrorCode == AzureErrors.BlobNotFound) + // create the blob + var metadata = new Dictionary { [CreatedMetadataKey] = DateTime.UtcNow.ToString("o") }; // date value is just for debugging + try { await this._blobClient.CreateIfNotExistsAsync(metadata, cancellationToken).ConfigureAwait(false); } + catch (RequestFailedException createException) { - // if we just created and it already doesn't exist again, just return null and retry later - if (isRetryAfterCreate) { return null; } + // handle the race condition where we try to create and someone else creates it first + return createException.ErrorCode == AzureErrors.LeaseIdMissing + ? default(AzureBlobLeaseDistributedLockHandle?) + : throw new AggregateException($"Blob {this._blobClient.Name} does not exist and could not be created. See inner exceptions for details", acquireException, createException); + } - // create the blob - var metadata = new Dictionary { [CreatedMetadataKey] = DateTime.UtcNow.ToString("o") }; // date value is just for debugging - try { await this._blobClient.CreateIfNotExistsAsync(metadata, cancellationToken).ConfigureAwait(false); } - catch (RequestFailedException createException) + try { return await this.TryAcquireAsync(leaseClient, cancellationToken, isRetryAfterCreate: true).ConfigureAwait(false); } + catch (Exception retryException) + { + // if the retry fails and we created, attempt deletion to clean things up + try { await this._blobClient.DeleteIfExistsAsync().ConfigureAwait(false); } + catch (Exception deletionException) { - // handle the race condition where we try to create and someone else creates it first - return createException.ErrorCode == AzureErrors.LeaseIdMissing - ? default(AzureBlobLeaseDistributedLockHandle?) - : throw new AggregateException($"Blob {this._blobClient.Name} does not exist and could not be created. See inner exceptions for details", acquireException, createException); + throw new AggregateException(retryException, deletionException); } - try { return await this.TryAcquireAsync(leaseClient, cancellationToken, isRetryAfterCreate: true).ConfigureAwait(false); } - catch (Exception retryException) - { - // if the retry fails and we created, attempt deletion to clean things up - try { await this._blobClient.DeleteIfExistsAsync().ConfigureAwait(false); } - catch (Exception deletionException) - { - throw new AggregateException(retryException, deletionException); - } - - throw; - } + throw; } - - throw; } - var shouldDeleteBlob = isRetryAfterCreate - || (await this._blobClient.GetMetadataAsync(leaseClient.LeaseId, cancellationToken).ConfigureAwait(false)).ContainsKey(CreatedMetadataKey); - - var internalHandle = new InternalHandle(leaseClient, ownsBlob: shouldDeleteBlob, @lock: this); - return new AzureBlobLeaseDistributedLockHandle(internalHandle); + throw; } - internal sealed class InternalHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle + var shouldDeleteBlob = isRetryAfterCreate + || (await this._blobClient.GetMetadataAsync(leaseClient.LeaseId, cancellationToken).ConfigureAwait(false)).ContainsKey(CreatedMetadataKey); + + var internalHandle = new InternalHandle(leaseClient, ownsBlob: shouldDeleteBlob, @lock: this); + return new AzureBlobLeaseDistributedLockHandle(internalHandle); + } + + internal sealed class InternalHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle + { + private readonly BlobLeaseClientWrapper _leaseClient; + private readonly bool _ownsBlob; + private readonly AzureBlobLeaseDistributedLock _lock; + private readonly LeaseMonitor _leaseMonitor; + + public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBlobLeaseDistributedLock @lock) { - private readonly BlobLeaseClientWrapper _leaseClient; - private readonly bool _ownsBlob; - private readonly AzureBlobLeaseDistributedLock _lock; - private readonly LeaseMonitor _leaseMonitor; - - public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBlobLeaseDistributedLock @lock) - { - this._leaseClient = leaseClient; - this._ownsBlob = ownsBlob; - this._lock = @lock; - this._leaseMonitor = new LeaseMonitor(this); - } + this._leaseClient = leaseClient; + this._ownsBlob = ownsBlob; + this._lock = @lock; + this._leaseMonitor = new LeaseMonitor(this); + } - public CancellationToken HandleLostToken => this._leaseMonitor.HandleLostToken; + public CancellationToken HandleLostToken => this._leaseMonitor.HandleLostToken; - private bool RenewalEnabled => !this._lock._options.renewalCadence.IsInfinite; + private bool RenewalEnabled => !this._lock._options.renewalCadence.IsInfinite; - public string LeaseId => this._leaseClient.LeaseId; + public string LeaseId => this._leaseClient.LeaseId; - TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.duration; + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.duration; - TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this.RenewalEnabled ? this._lock._options.renewalCadence : this._lock._options.duration; + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this.RenewalEnabled ? this._lock._options.renewalCadence : this._lock._options.duration; - public void Dispose() => this.DisposeSyncViaAsync(); + public void Dispose() => this.DisposeSyncViaAsync(); - public async ValueTask DisposeAsync() - { - // note that we're not trying to be idempotent here since we'll be wrapped - // by AzureBlobLeaseDistributedLockHandle which provides idempotence + public async ValueTask DisposeAsync() + { + // note that we're not trying to be idempotent here since we'll be wrapped + // by AzureBlobLeaseDistributedLockHandle which provides idempotence - await this._leaseMonitor.DisposeAsync().ConfigureAwait(false); + await this._leaseMonitor.DisposeAsync().ConfigureAwait(false); - // if we own the blob, release by just deleting it - if (this._ownsBlob) - { - await this._lock._blobClient.DeleteIfExistsAsync(leaseId: this._leaseClient.LeaseId).ConfigureAwait(false); - } - else - { - await this._leaseClient.ReleaseAsync().ConfigureAwait(false); - } + // if we own the blob, release by just deleting it + if (this._ownsBlob) + { + await this._lock._blobClient.DeleteIfExistsAsync(leaseId: this._leaseClient.LeaseId).ConfigureAwait(false); } - - async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + else { - var task = this.RenewalEnabled - ? this._leaseClient.RenewAsync(cancellationToken).AsTask() - // if we're not renewing, then just touch the blob using the lease to see if someone else has renewed it - : this._lock._blobClient.GetMetadataAsync(this._leaseClient.LeaseId, cancellationToken).AsTask(); - - await task.TryAwait(); - cancellationToken.ThrowIfCancellationRequested(); // if the cancellation caused failure, don't confuse that with losing the handle - return task.Status == TaskStatus.RanToCompletion - ? this.RenewalEnabled - ? LeaseMonitor.LeaseState.Renewed - : LeaseMonitor.LeaseState.Held - : LeaseMonitor.LeaseState.Lost; + await this._leaseClient.ReleaseAsync().ConfigureAwait(false); } } + + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + { + var task = this.RenewalEnabled + ? this._leaseClient.RenewAsync(cancellationToken).AsTask() + // if we're not renewing, then just touch the blob using the lease to see if someone else has renewed it + : this._lock._blobClient.GetMetadataAsync(this._leaseClient.LeaseId, cancellationToken).AsTask(); + + await task.TryAwait(); + cancellationToken.ThrowIfCancellationRequested(); // if the cancellation caused failure, don't confuse that with losing the handle + return task.Status == TaskStatus.RanToCompletion + ? this.RenewalEnabled + ? LeaseMonitor.LeaseState.Renewed + : LeaseMonitor.LeaseState.Held + : LeaseMonitor.LeaseState.Lost; + } } } diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index 9321aa42..88d83aa7 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -5,48 +5,47 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Implements +/// +public sealed class AzureBlobLeaseDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class AzureBlobLeaseDistributedLockHandle : IDistributedSynchronizationHandle - { - private AzureBlobLeaseDistributedLock.InternalHandle? _internalHandle; - private IDisposable? _finalizerRegistration; + private AzureBlobLeaseDistributedLock.InternalHandle? _internalHandle; + private IDisposable? _finalizerRegistration; - internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.InternalHandle internalHandle) - { - this._internalHandle = internalHandle; - // Because this is a lease, managed finalization mostly won't be strictly necessary here. Where it comes in handy is: - // (1) Ensuring blob deletion if we own the blob - // (2) Helping release infinite-duration leases (rare case) - // (3) In testing, avoiding having to wait 15+ seconds for lease expiration - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, internalHandle); - } + internal AzureBlobLeaseDistributedLockHandle(AzureBlobLeaseDistributedLock.InternalHandle internalHandle) + { + this._internalHandle = internalHandle; + // Because this is a lease, managed finalization mostly won't be strictly necessary here. Where it comes in handy is: + // (1) Ensuring blob deletion if we own the blob + // (2) Helping release infinite-duration leases (rare case) + // (3) In testing, avoiding having to wait 15+ seconds for lease expiration + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, internalHandle); + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => (this._internalHandle ?? throw this.ObjectDisposed()).HandleLostToken; + /// + /// Implements + /// + public CancellationToken HandleLostToken => (this._internalHandle ?? throw this.ObjectDisposed()).HandleLostToken; - /// - /// The underlying Azure lease ID - /// - public string LeaseId => (this._internalHandle ?? throw this.ObjectDisposed()).LeaseId; + /// + /// The underlying Azure lease ID + /// + public string LeaseId => (this._internalHandle ?? throw this.ObjectDisposed()).LeaseId; - /// - /// Releases the lock - /// - public void Dispose() => this.DisposeSyncViaAsync(); + /// + /// Releases the lock + /// + public void Dispose() => this.DisposeSyncViaAsync(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() - { - Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); - return Interlocked.Exchange(ref this._internalHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._internalHandle, null)?.DisposeAsync() ?? default; } } diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs index 721f0c07..bdfebb38 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs @@ -3,30 +3,29 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Implements for +/// +public sealed class AzureBlobLeaseDistributedSynchronizationProvider : IDistributedLockProvider { + private readonly BlobContainerClient _blobContainerClient; + private readonly Action? _options; + /// - /// Implements for + /// Constructs a provider that scopes blobs within the provided and uses the provided . /// - public sealed class AzureBlobLeaseDistributedSynchronizationProvider : IDistributedLockProvider + public AzureBlobLeaseDistributedSynchronizationProvider(BlobContainerClient blobContainerClient, Action? options = null) { - private readonly BlobContainerClient _blobContainerClient; - private readonly Action? _options; - - /// - /// Constructs a provider that scopes blobs within the provided and uses the provided . - /// - public AzureBlobLeaseDistributedSynchronizationProvider(BlobContainerClient blobContainerClient, Action? options = null) - { - this._blobContainerClient = blobContainerClient ?? throw new ArgumentNullException(nameof(blobContainerClient)); - this._options = options; - } + this._blobContainerClient = blobContainerClient ?? throw new ArgumentNullException(nameof(blobContainerClient)); + this._options = options; + } - /// - /// Constructs an with the given . - /// - public AzureBlobLeaseDistributedLock CreateLock(string name) => new AzureBlobLeaseDistributedLock(this._blobContainerClient, name, this._options); + /// + /// Constructs an with the given . + /// + public AzureBlobLeaseDistributedLock CreateLock(string name) => new AzureBlobLeaseDistributedLock(this._blobContainerClient, name, this._options); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - } + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } diff --git a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs index 0d3e8463..dbdff0c3 100644 --- a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs +++ b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs @@ -4,126 +4,125 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Specifies options for an Azure blob lease +/// +public sealed class AzureBlobLeaseOptionsBuilder { /// - /// Specifies options for an Azure blob lease + /// From https://docs.microsoft.com/en-us/rest/api/storageservices/lease-blob: + /// "The lock duration can be 15 to 60 seconds, or can be infinite" /// - public sealed class AzureBlobLeaseOptionsBuilder - { - /// - /// From https://docs.microsoft.com/en-us/rest/api/storageservices/lease-blob: - /// "The lock duration can be 15 to 60 seconds, or can be infinite" - /// - internal static readonly TimeoutValue MinLeaseDuration = TimeSpan.FromSeconds(15), - MaxNonInfiniteLeaseDuration = TimeSpan.FromSeconds(60), - DefaultLeaseDuration = TimeSpan.FromSeconds(30); + internal static readonly TimeoutValue MinLeaseDuration = TimeSpan.FromSeconds(15), + MaxNonInfiniteLeaseDuration = TimeSpan.FromSeconds(60), + DefaultLeaseDuration = TimeSpan.FromSeconds(30); - private TimeoutValue? _duration, _renewalCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; + private TimeoutValue? _duration, _renewalCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; - internal AzureBlobLeaseOptionsBuilder() { } + internal AzureBlobLeaseOptionsBuilder() { } - /// - /// Specifies how long the lease will last, absent auto-renewal. - /// - /// If auto-renewal is enabled (the default), then a shorter duration means more frequent auto-renewal requests, - /// while an infinite duration means no auto-renewal requests. Furthermore, if the lease-holding process were to - /// exit without explicitly releasing, then duration determines how long other processes would need to wait in - /// order to acquire the lease. - /// - /// If auto-renewal is disabled, then duration determines how long the lease will be held. - /// - /// Defaults to 30s. - /// - public AzureBlobLeaseOptionsBuilder Duration(TimeSpan duration) + /// + /// Specifies how long the lease will last, absent auto-renewal. + /// + /// If auto-renewal is enabled (the default), then a shorter duration means more frequent auto-renewal requests, + /// while an infinite duration means no auto-renewal requests. Furthermore, if the lease-holding process were to + /// exit without explicitly releasing, then duration determines how long other processes would need to wait in + /// order to acquire the lease. + /// + /// If auto-renewal is disabled, then duration determines how long the lease will be held. + /// + /// Defaults to 30s. + /// + public AzureBlobLeaseOptionsBuilder Duration(TimeSpan duration) + { + var durationTimeoutValue = new TimeoutValue(duration, nameof(duration)); + if (durationTimeoutValue.CompareTo(MinLeaseDuration) < 0 + || (!durationTimeoutValue.IsInfinite && durationTimeoutValue.CompareTo(MaxNonInfiniteLeaseDuration) > 0)) { - var durationTimeoutValue = new TimeoutValue(duration, nameof(duration)); - if (durationTimeoutValue.CompareTo(MinLeaseDuration) < 0 - || (!durationTimeoutValue.IsInfinite && durationTimeoutValue.CompareTo(MaxNonInfiniteLeaseDuration) > 0)) - { - throw new ArgumentOutOfRangeException(nameof(duration), duration, $"Must be infinite or in [{MinLeaseDuration}, {MaxNonInfiniteLeaseDuration}]"); - } - - this._duration = durationTimeoutValue; - return this; + throw new ArgumentOutOfRangeException(nameof(duration), duration, $"Must be infinite or in [{MinLeaseDuration}, {MaxNonInfiniteLeaseDuration}]"); } - /// - /// Determines how frequently the lease will be renewed when held. More frequent renewal means more unnecessary requests - /// but also a lower chance of losing the lease due to the process hanging or otherwise failing to get its renewal request in - /// before the lease duration expires. - /// - /// To disable auto-renewal, specify - /// - /// Defaults to 1/3 of the specified lease duration (may be infinite). - /// - public AzureBlobLeaseOptionsBuilder RenewalCadence(TimeSpan renewalCadence) - { - this._renewalCadence = new TimeoutValue(renewalCadence, nameof(renewalCadence)); - return this; - } + this._duration = durationTimeoutValue; + return this; + } - /// - /// Waiting to acquire a lease requires a busy wait that alternates acquire attempts and sleeps. - /// This determines how much time is spent sleeping between attempts. Lower values will raise the - /// volume of acquire requests under contention but will also raise the responsiveness (how long - /// it takes a waiter to notice that a contended the lease has become available). - /// - /// Specifying a range of values allows the implementation to select an actual value in the range - /// at random for each sleep. This helps avoid the case where two clients become "synchronized" - /// in such a way that results in one client monopolizing the lease. - /// - /// The default is [250ms, 1s] - /// - public AzureBlobLeaseOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) - { - var minTimeoutValue = new TimeoutValue(min, nameof(min)); - var maxTimeoutValue = new TimeoutValue(max, nameof(max)); + /// + /// Determines how frequently the lease will be renewed when held. More frequent renewal means more unnecessary requests + /// but also a lower chance of losing the lease due to the process hanging or otherwise failing to get its renewal request in + /// before the lease duration expires. + /// + /// To disable auto-renewal, specify + /// + /// Defaults to 1/3 of the specified lease duration (may be infinite). + /// + public AzureBlobLeaseOptionsBuilder RenewalCadence(TimeSpan renewalCadence) + { + this._renewalCadence = new TimeoutValue(renewalCadence, nameof(renewalCadence)); + return this; + } - if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } - if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) - { - throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); - } + /// + /// Waiting to acquire a lease requires a busy wait that alternates acquire attempts and sleeps. + /// This determines how much time is spent sleeping between attempts. Lower values will raise the + /// volume of acquire requests under contention but will also raise the responsiveness (how long + /// it takes a waiter to notice that a contended the lease has become available). + /// + /// Specifying a range of values allows the implementation to select an actual value in the range + /// at random for each sleep. This helps avoid the case where two clients become "synchronized" + /// in such a way that results in one client monopolizing the lease. + /// + /// The default is [250ms, 1s] + /// + public AzureBlobLeaseOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + { + var minTimeoutValue = new TimeoutValue(min, nameof(min)); + var maxTimeoutValue = new TimeoutValue(max, nameof(max)); - this._minBusyWaitSleepTime = minTimeoutValue; - this._maxBusyWaitSleepTime = maxTimeoutValue; - return this; + if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } + if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) + { + throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); } - internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) + this._minBusyWaitSleepTime = minTimeoutValue; + this._maxBusyWaitSleepTime = maxTimeoutValue; + return this; + } + + internal static (TimeoutValue duration, TimeoutValue renewalCadence, TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) GetOptions(Action? optionsBuilder) + { + AzureBlobLeaseOptionsBuilder? options; + if (optionsBuilder != null) { - AzureBlobLeaseOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new AzureBlobLeaseOptionsBuilder(); - optionsBuilder(options); + options = new AzureBlobLeaseOptionsBuilder(); + optionsBuilder(options); - if (options._renewalCadence is { } renewalCadence && !renewalCadence.IsInfinite) + if (options._renewalCadence is { } renewalCadence && !renewalCadence.IsInfinite) + { + var duration = options._duration ?? DefaultLeaseDuration; + if (renewalCadence.CompareTo(duration) >= 0) { - var duration = options._duration ?? DefaultLeaseDuration; - if (renewalCadence.CompareTo(duration) >= 0) - { - throw new ArgumentOutOfRangeException( - nameof(renewalCadence), - renewalCadence.TimeSpan, - $"{nameof(renewalCadence)} must not be larger than {nameof(duration)} ({duration}). To disable auto-renewal, specify {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)}" - ); - } + throw new ArgumentOutOfRangeException( + nameof(renewalCadence), + renewalCadence.TimeSpan, + $"{nameof(renewalCadence)} must not be larger than {nameof(duration)} ({duration}). To disable auto-renewal, specify {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)}" + ); } } - else - { - options = null; - } - - var durationToUse = options?._duration ?? DefaultLeaseDuration; - return ( - duration: durationToUse, - renewalCadence: options?._renewalCadence ?? (durationToUse.IsInfinite ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(durationToUse.InMilliseconds / 3.0)), - minBusyWaitSleepTime: options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(250), - maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(1) - ); } + else + { + options = null; + } + + var durationToUse = options?._duration ?? DefaultLeaseDuration; + return ( + duration: durationToUse, + renewalCadence: options?._renewalCadence ?? (durationToUse.IsInfinite ? Timeout.InfiniteTimeSpan : TimeSpan.FromMilliseconds(durationToUse.InMilliseconds / 3.0)), + minBusyWaitSleepTime: options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(250), + maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(1) + ); } } diff --git a/DistributedLock.Azure/AzureErrors.cs b/DistributedLock.Azure/AzureErrors.cs index e8089cee..c3a1c8dd 100644 --- a/DistributedLock.Azure/AzureErrors.cs +++ b/DistributedLock.Azure/AzureErrors.cs @@ -5,12 +5,11 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +internal static class AzureErrors { - internal static class AzureErrors - { - public const string BlobNotFound = nameof(BlobNotFound), - LeaseAlreadyPresent = nameof(LeaseAlreadyPresent), - LeaseIdMissing = nameof(LeaseIdMissing); - } + public const string BlobNotFound = nameof(BlobNotFound), + LeaseAlreadyPresent = nameof(LeaseAlreadyPresent), + LeaseIdMissing = nameof(LeaseIdMissing); } diff --git a/DistributedLock.Azure/BlobClientWrapper.cs b/DistributedLock.Azure/BlobClientWrapper.cs index 58af63b1..a246c75d 100644 --- a/DistributedLock.Azure/BlobClientWrapper.cs +++ b/DistributedLock.Azure/BlobClientWrapper.cs @@ -9,84 +9,83 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Adds support to +/// +internal class BlobClientWrapper { - /// - /// Adds support to - /// - internal class BlobClientWrapper - { - private readonly BlobBaseClient _blobClient; + private readonly BlobBaseClient _blobClient; - public BlobClientWrapper(BlobBaseClient blobClient) - { - this._blobClient = blobClient; - } + public BlobClientWrapper(BlobBaseClient blobClient) + { + this._blobClient = blobClient; + } - public string Name => this._blobClient.Name; + public string Name => this._blobClient.Name; - public BlobLeaseClientWrapper GetBlobLeaseClient() => new BlobLeaseClientWrapper(this._blobClient.GetBlobLeaseClient()); + public BlobLeaseClientWrapper GetBlobLeaseClient() => new BlobLeaseClientWrapper(this._blobClient.GetBlobLeaseClient()); - public async ValueTask> GetMetadataAsync(string leaseId, CancellationToken cancellationToken) - { - var conditions = new BlobRequestConditions { LeaseId = leaseId }; - var properties = SyncViaAsync.IsSynchronous - ? this._blobClient.GetProperties(conditions, cancellationToken) - : await this._blobClient.GetPropertiesAsync(conditions, cancellationToken).ConfigureAwait(false); - return properties.Value.Metadata; - } + public async ValueTask> GetMetadataAsync(string leaseId, CancellationToken cancellationToken) + { + var conditions = new BlobRequestConditions { LeaseId = leaseId }; + var properties = SyncViaAsync.IsSynchronous + ? this._blobClient.GetProperties(conditions, cancellationToken) + : await this._blobClient.GetPropertiesAsync(conditions, cancellationToken).ConfigureAwait(false); + return properties.Value.Metadata; + } - public ValueTask CreateIfNotExistsAsync(IDictionary metadata, CancellationToken cancellationToken) + public ValueTask CreateIfNotExistsAsync(IDictionary metadata, CancellationToken cancellationToken) + { + switch (this._blobClient) { - switch (this._blobClient) - { - case BlobClient blobClient: - if (SyncViaAsync.IsSynchronous) - { - blobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); - return default; - } - return new ValueTask(blobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); - case BlockBlobClient blockBlobClient: - if (SyncViaAsync.IsSynchronous) - { - blockBlobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); - return default; - } - return new ValueTask(blockBlobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); - case PageBlobClient pageBlobClient: - if (SyncViaAsync.IsSynchronous) - { - pageBlobClient.CreateIfNotExists(size: 0, metadata: metadata, cancellationToken: cancellationToken); - return default; - } - return new ValueTask(pageBlobClient.CreateIfNotExistsAsync(size: 0, metadata: metadata, cancellationToken: cancellationToken)); - case AppendBlobClient appendBlobClient: - if (SyncViaAsync.IsSynchronous) - { - appendBlobClient.CreateIfNotExists(metadata: metadata, cancellationToken: cancellationToken); - return default; - } - return new ValueTask(appendBlobClient.CreateIfNotExistsAsync(metadata: metadata, cancellationToken: cancellationToken)); - default: - throw new InvalidOperationException( - this._blobClient.GetType() == typeof(BlobBaseClient) - ? $"Unable to create a lock blob given client type {typeof(BlobBaseClient)}. Either ensure that the blob exists or use a non-base client type such as {typeof(BlobClient)}" - + " which specifies the type of blob to create" - : $"Unexpected blob client type {this._blobClient.GetType()}" - ); - } + case BlobClient blobClient: + if (SyncViaAsync.IsSynchronous) + { + blobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); + return default; + } + return new ValueTask(blobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); + case BlockBlobClient blockBlobClient: + if (SyncViaAsync.IsSynchronous) + { + blockBlobClient.Upload(Stream.Null, metadata: metadata, cancellationToken: cancellationToken); + return default; + } + return new ValueTask(blockBlobClient.UploadAsync(Stream.Null, metadata: metadata, cancellationToken: cancellationToken)); + case PageBlobClient pageBlobClient: + if (SyncViaAsync.IsSynchronous) + { + pageBlobClient.CreateIfNotExists(size: 0, metadata: metadata, cancellationToken: cancellationToken); + return default; + } + return new ValueTask(pageBlobClient.CreateIfNotExistsAsync(size: 0, metadata: metadata, cancellationToken: cancellationToken)); + case AppendBlobClient appendBlobClient: + if (SyncViaAsync.IsSynchronous) + { + appendBlobClient.CreateIfNotExists(metadata: metadata, cancellationToken: cancellationToken); + return default; + } + return new ValueTask(appendBlobClient.CreateIfNotExistsAsync(metadata: metadata, cancellationToken: cancellationToken)); + default: + throw new InvalidOperationException( + this._blobClient.GetType() == typeof(BlobBaseClient) + ? $"Unable to create a lock blob given client type {typeof(BlobBaseClient)}. Either ensure that the blob exists or use a non-base client type such as {typeof(BlobClient)}" + + " which specifies the type of blob to create" + : $"Unexpected blob client type {this._blobClient.GetType()}" + ); } + } - public ValueTask DeleteIfExistsAsync(string? leaseId = null) + public ValueTask DeleteIfExistsAsync(string? leaseId = null) + { + var conditions = leaseId != null ? new BlobRequestConditions { LeaseId = leaseId } : null; + if (SyncViaAsync.IsSynchronous) { - var conditions = leaseId != null ? new BlobRequestConditions { LeaseId = leaseId } : null; - if (SyncViaAsync.IsSynchronous) - { - this._blobClient.DeleteIfExists(conditions: conditions); - return default; - } - return new ValueTask(this._blobClient.DeleteIfExistsAsync(conditions: conditions)); + this._blobClient.DeleteIfExists(conditions: conditions); + return default; } + return new ValueTask(this._blobClient.DeleteIfExistsAsync(conditions: conditions)); } } diff --git a/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/DistributedLock.Azure/BlobLeaseClientWrapper.cs index 2e2dc218..4a318ad4 100644 --- a/DistributedLock.Azure/BlobLeaseClientWrapper.cs +++ b/DistributedLock.Azure/BlobLeaseClientWrapper.cs @@ -6,50 +6,49 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Azure +namespace Medallion.Threading.Azure; + +/// +/// Adds support to +/// +internal sealed class BlobLeaseClientWrapper { - /// - /// Adds support to - /// - internal sealed class BlobLeaseClientWrapper - { - private readonly BlobLeaseClient _blobLeaseClient; + private readonly BlobLeaseClient _blobLeaseClient; - public BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) - { - this._blobLeaseClient = blobLeaseClient; - } + public BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) + { + this._blobLeaseClient = blobLeaseClient; + } - public string LeaseId => this._blobLeaseClient.LeaseId; + public string LeaseId => this._blobLeaseClient.LeaseId; - public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) + public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) + { + if (SyncViaAsync.IsSynchronous) { - if (SyncViaAsync.IsSynchronous) - { - this._blobLeaseClient.Acquire(duration.TimeSpan, cancellationToken: cancellationToken); - return default; - } - return new ValueTask(this._blobLeaseClient.AcquireAsync(duration.TimeSpan, cancellationToken: cancellationToken)); + this._blobLeaseClient.Acquire(duration.TimeSpan, cancellationToken: cancellationToken); + return default; } + return new ValueTask(this._blobLeaseClient.AcquireAsync(duration.TimeSpan, cancellationToken: cancellationToken)); + } - public ValueTask RenewAsync(CancellationToken cancellationToken) + public ValueTask RenewAsync(CancellationToken cancellationToken) + { + if (SyncViaAsync.IsSynchronous) { - if (SyncViaAsync.IsSynchronous) - { - this._blobLeaseClient.Renew(cancellationToken: cancellationToken); - return default; - } - return new ValueTask(this._blobLeaseClient.RenewAsync(cancellationToken: cancellationToken)); + this._blobLeaseClient.Renew(cancellationToken: cancellationToken); + return default; } + return new ValueTask(this._blobLeaseClient.RenewAsync(cancellationToken: cancellationToken)); + } - public ValueTask ReleaseAsync() + public ValueTask ReleaseAsync() + { + if (SyncViaAsync.IsSynchronous) { - if (SyncViaAsync.IsSynchronous) - { - this._blobLeaseClient.Release(); - return default; - } - return new ValueTask(this._blobLeaseClient.ReleaseAsync()); + this._blobLeaseClient.Release(); + return default; } + return new ValueTask(this._blobLeaseClient.ReleaseAsync()); } } diff --git a/DistributedLock.Core/DeadlockException.cs b/DistributedLock.Core/DeadlockException.cs index 56a5cbce..bfee2899 100644 --- a/DistributedLock.Core/DeadlockException.cs +++ b/DistributedLock.Core/DeadlockException.cs @@ -1,31 +1,30 @@ using System; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// An exception that SOME distributed locks will throw under SOME deadlock conditions. Note that even locks +/// that throw this exception under some circumstances cannot detect ALL deadlock conditions +/// +[Serializable] +public sealed class DeadlockException + // for backwards compat + : InvalidOperationException { /// - /// An exception that SOME distributed locks will throw under SOME deadlock conditions. Note that even locks - /// that throw this exception under some circumstances cannot detect ALL deadlock conditions + /// Constructs a new instance of with a default message /// - [Serializable] - public sealed class DeadlockException - // for backwards compat - : InvalidOperationException - { - /// - /// Constructs a new instance of with a default message - /// - public DeadlockException() : this("A deadlock occurred") { } + public DeadlockException() : this("A deadlock occurred") { } - /// - /// Constructs an instance of with the given - /// - public DeadlockException(string message) : base(message) { } + /// + /// Constructs an instance of with the given + /// + public DeadlockException(string message) : base(message) { } - /// - /// Constructs an instance of with the given and - /// - public DeadlockException(string message, Exception innerException) : base(message, innerException) { } + /// + /// Constructs an instance of with the given and + /// + public DeadlockException(string message, Exception innerException) : base(message, innerException) { } - private DeadlockException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } - } + private DeadlockException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } diff --git a/DistributedLock.Core/DistributedLockProviderExtensions.cs b/DistributedLock.Core/DistributedLockProviderExtensions.cs index a4aa7648..a6d60183 100644 --- a/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -3,39 +3,38 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Productivity helper methods for +/// +public static class DistributedLockProviderExtensions { /// - /// Productivity helper methods for + /// Equivalent to calling and then + /// . /// - public static class DistributedLockProviderExtensions - { - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle? TryAcquireLock(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquire(timeout, cancellationToken); + public static IDistributedSynchronizationHandle? TryAcquireLock(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquire(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle AcquireLock(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).Acquire(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedSynchronizationHandle AcquireLock(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).Acquire(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask TryAcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquireAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).TryAcquireAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); - } + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index 9f31f44e..45e926f4 100644 --- a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -3,67 +3,66 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Productivity helper methods for +/// +public static class DistributedReaderWriterLockProviderExtensions { /// - /// Productivity helper methods for + /// Equivalent to calling and then + /// . /// - public static class DistributedReaderWriterLockProviderExtensions - { - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle? TryAcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLock(timeout, cancellationToken); + public static IDistributedSynchronizationHandle? TryAcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle AcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLock(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedSynchronizationHandle AcquireReadLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask TryAcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLockAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireReadLockAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask AcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLockAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireReadLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireReadLockAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle? TryAcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLock(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedSynchronizationHandle? TryAcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle AcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLock(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedSynchronizationHandle AcquireWriteLock(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask TryAcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLockAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).TryAcquireWriteLockAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); - } + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index d4b6b7e3..e5065e92 100644 --- a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -3,39 +3,38 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Productivity helper methods for +/// +public static class DistributedSemaphoreProviderExtensions { /// - /// Productivity helper methods for + /// Equivalent to calling and then + /// . /// - public static class DistributedSemaphoreProviderExtensions - { - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle? TryAcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquire(timeout, cancellationToken); + public static IDistributedSynchronizationHandle? TryAcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquire(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedSynchronizationHandle AcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).Acquire(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedSynchronizationHandle AcquireSemaphore(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).Acquire(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask TryAcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquireAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).TryAcquireAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); - } + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 344364e5..57d46947 100644 --- a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -3,39 +3,38 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Productivity helper methods for +/// +public static class DistributedUpgradeableReaderWriterLockProviderExtensions { /// - /// Productivity helper methods for + /// Equivalent to calling and then + /// . /// - public static class DistributedUpgradeableReaderWriterLockProviderExtensions - { - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedLockUpgradeableHandle? TryAcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLock(timeout, cancellationToken); + public static IDistributedLockUpgradeableHandle? TryAcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLock(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLock(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask TryAcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken); + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask TryAcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken); - /// - /// Equivalent to calling and then - /// . - /// - public static ValueTask AcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLockAsync(timeout, cancellationToken); - } + /// + /// Equivalent to calling and then + /// . + /// + public static ValueTask AcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLockAsync(timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedLock.cs b/DistributedLock.Core/IDistributedLock.cs index 77e99245..d503a9c5 100644 --- a/DistributedLock.Core/IDistributedLock.cs +++ b/DistributedLock.Core/IDistributedLock.cs @@ -2,77 +2,76 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// A mutex synchronization primitive which can be used to coordinate access to a resource or critical region of code +/// across processes or systems. The scope and capabilities of the lock are dependent on the particular implementation +/// +public interface IDistributedLock { /// - /// A mutex synchronization primitive which can be used to coordinate access to a resource or critical region of code - /// across processes or systems. The scope and capabilities of the lock are dependent on the particular implementation + /// A name that uniquely identifies the lock /// - public interface IDistributedLock - { - /// - /// A name that uniquely identifies the lock - /// - string Name { get; } + string Name { get; } - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } diff --git a/DistributedLock.Core/IDistributedLockProvider.cs b/DistributedLock.Core/IDistributedLockProvider.cs index 70e6f0d0..6d39b663 100644 --- a/DistributedLock.Core/IDistributedLockProvider.cs +++ b/DistributedLock.Core/IDistributedLockProvider.cs @@ -1,15 +1,14 @@ // AUTO-GENERATED -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Acts as a factory for instances of a certain type. This interface may be +/// easier to use than in dependency injection scenarios. +/// +public interface IDistributedLockProvider { /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. + /// Constructs an instance with the given . /// - public interface IDistributedLockProvider - { - /// - /// Constructs an instance with the given . - /// - IDistributedLock CreateLock(string name); - } + IDistributedLock CreateLock(string name); } \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedReaderWriterLock.cs b/DistributedLock.Core/IDistributedReaderWriterLock.cs index 7bd98644..365967f9 100644 --- a/DistributedLock.Core/IDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedReaderWriterLock.cs @@ -2,136 +2,135 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Provides distributed locking functionality comparable to +/// +public interface IDistributedReaderWriterLock { /// - /// Provides distributed locking functionality comparable to + /// A name that uniquely identifies the lock /// - public interface IDistributedReaderWriterLock - { - /// - /// A name that uniquely identifies the lock - /// - string Name { get; } + string Name { get; } - /// - /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: - /// - /// using (var handle = myLock.TryAcquireReadLock(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedSynchronizationHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireReadLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a READ lock synchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: - /// - /// using (myLock.AcquireReadLock(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedSynchronizationHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires a READ lock synchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// using (myLock.AcquireReadLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + IDistributedSynchronizationHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: - /// - /// await using (var handle = await myLock.TryAcquireReadLockAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a READ lock asynchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: - /// - /// await using (await myLock.AcquireReadLockAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires a READ lock asynchronously, failing with if the attempt times out. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire a WRITE lock synchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: - /// - /// using (var handle = myLock.TryAcquireWriteLock(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedSynchronizationHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a WRITE lock synchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireWriteLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + IDistributedSynchronizationHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a WRITE lock synchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: - /// - /// using (myLock.AcquireWriteLock(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedSynchronizationHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires a WRITE lock synchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// using (myLock.AcquireWriteLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + IDistributedSynchronizationHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: - /// - /// await using (var handle = await myLock.TryAcquireWriteLockAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a WRITE lock asynchronously. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireWriteLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: - /// - /// await using (await myLock.AcquireWriteLockAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - } + /// + /// Acquires a WRITE lock asynchronously, failing with if the attempt times out. Not compatible with another WRITE lock or an UPGRADE lock. Usage: + /// + /// await using (await myLock.AcquireWriteLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } diff --git a/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs b/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs index f5344d24..57ac3d66 100644 --- a/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs +++ b/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs @@ -1,15 +1,14 @@ // AUTO-GENERATED -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Acts as a factory for instances of a certain type. This interface may be +/// easier to use than in dependency injection scenarios. +/// +public interface IDistributedReaderWriterLockProvider { /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. + /// Constructs an instance with the given . /// - public interface IDistributedReaderWriterLockProvider - { - /// - /// Constructs an instance with the given . - /// - IDistributedReaderWriterLock CreateReaderWriterLock(string name); - } + IDistributedReaderWriterLock CreateReaderWriterLock(string name); } \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index 5877f0e2..f0618d1b 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -4,83 +4,82 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// A synchronization primitive which restricts access to a resource or critical section of code to a fixed number of concurrent threads/processes. +/// Compare to . +/// +public interface IDistributedSemaphore { /// - /// A synchronization primitive which restricts access to a resource or critical section of code to a fixed number of concurrent threads/processes. - /// Compare to . + /// A name that uniquely identifies the semaphore /// - public interface IDistributedSemaphore - { - /// - /// A name that uniquely identifies the semaphore - /// - string Name { get; } + string Name { get; } - /// - /// The maximum number of "tickets" available for the semaphore (ie the number of processes which can acquire - /// the semaphore concurrently). - /// - int MaxCount { get; } + /// + /// The maximum number of "tickets" available for the semaphore (ie the number of processes which can acquire + /// the semaphore concurrently). + /// + int MaxCount { get; } - /// - /// Attempts to acquire a semaphore ticket synchronously. Usage: - /// - /// using (var handle = mySemaphore.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket or null on failure - IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket or null on failure + IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: - /// - /// using (mySemaphore.Acquire(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket - IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket + IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket or null on failure - ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket or null on failure + ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the ticket - ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - } + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the ticket + ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } diff --git a/DistributedLock.Core/IDistributedSemaphoreProvider.cs b/DistributedLock.Core/IDistributedSemaphoreProvider.cs index b68d8ca3..71f65b43 100644 --- a/DistributedLock.Core/IDistributedSemaphoreProvider.cs +++ b/DistributedLock.Core/IDistributedSemaphoreProvider.cs @@ -1,15 +1,14 @@ // AUTO-GENERATED -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Acts as a factory for instances of a certain type. This interface may be +/// easier to use than in dependency injection scenarios. +/// +public interface IDistributedSemaphoreProvider { /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. + /// Constructs an instance with the given . /// - public interface IDistributedSemaphoreProvider - { - /// - /// Constructs an instance with the given . - /// - IDistributedSemaphore CreateSemaphore(string name, int maxCount); - } + IDistributedSemaphore CreateSemaphore(string name, int maxCount); } \ No newline at end of file diff --git a/DistributedLock.Core/IDistributedSynchronizationHandle.cs b/DistributedLock.Core/IDistributedSynchronizationHandle.cs index 9996ca0b..8fc00d19 100644 --- a/DistributedLock.Core/IDistributedSynchronizationHandle.cs +++ b/DistributedLock.Core/IDistributedSynchronizationHandle.cs @@ -1,29 +1,28 @@ using System; using System.Threading; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// A handle to a distributed lock or other synchronization primitive. To unlock/release, +/// simply dispose the handle. +/// +public interface IDistributedSynchronizationHandle + : IDisposable, IAsyncDisposable { /// - /// A handle to a distributed lock or other synchronization primitive. To unlock/release, - /// simply dispose the handle. + /// Gets a instance which may be used to + /// monitor whether the handle to the lock is lost before the handle is + /// disposed. + /// + /// For example, this could happen if the lock is backed by a + /// database and the connection to the database is disrupted. + /// + /// Not all lock types support this; those that don't will return + /// which can be detected by checking . + /// + /// For lock types that do support this, accessing this property may incur additional + /// costs, such as polling to detect connectivity loss. /// - public interface IDistributedSynchronizationHandle - : IDisposable, IAsyncDisposable - { - /// - /// Gets a instance which may be used to - /// monitor whether the handle to the lock is lost before the handle is - /// disposed. - /// - /// For example, this could happen if the lock is backed by a - /// database and the connection to the database is disrupted. - /// - /// Not all lock types support this; those that don't will return - /// which can be detected by checking . - /// - /// For lock types that do support this, accessing this property may incur additional - /// costs, such as polling to detect connectivity loss. - /// - CancellationToken HandleLostToken { get; } - } + CancellationToken HandleLostToken { get; } } diff --git a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs index e0d79c78..5f8254d2 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs @@ -2,31 +2,30 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// A that can be upgraded to a write lock +/// +public interface IDistributedLockUpgradeableHandle : IDistributedSynchronizationHandle { /// - /// A that can be upgraded to a write lock + /// Attempts to upgrade a WRITE lock synchronously. Not compatible with another WRITE lock or a UPGRADE lock /// - public interface IDistributedLockUpgradeableHandle : IDistributedSynchronizationHandle - { - /// - /// Attempts to upgrade a WRITE lock synchronously. Not compatible with another WRITE lock or a UPGRADE lock - /// - bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Upgrades to a WRITE lock synchronously. Not compatible with another WRITE lock or a UPGRADE lock - /// - void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Upgrades to a WRITE lock synchronously. Not compatible with another WRITE lock or a UPGRADE lock + /// + void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to upgrade a WRITE lock asynchronously. Not compatible with another WRITE lock or a UPGRADE lock - /// - ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to upgrade a WRITE lock asynchronously. Not compatible with another WRITE lock or a UPGRADE lock + /// + ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Upgrades to a WRITE lock asynchronously. Not compatible with another WRITE lock or a UPGRADE lock - /// - ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - } + /// + /// Upgrades to a WRITE lock asynchronously. Not compatible with another WRITE lock or a UPGRADE lock + /// + ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs index 205a4434..5711dedb 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs @@ -2,73 +2,72 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Extends with the ability to take an "upgrade" lock. Like a read lock, an upgrade lock +/// allows for other concurrent read locks, but not for other upgrade or write locks. However, an upgrade lock can also be upgraded to a write +/// lock without releasing the underlying handle. +/// +public interface IDistributedUpgradeableReaderWriterLock : IDistributedReaderWriterLock { /// - /// Extends with the ability to take an "upgrade" lock. Like a read lock, an upgrade lock - /// allows for other concurrent read locks, but not for other upgrade or write locks. However, an upgrade lock can also be upgraded to a write - /// lock without releasing the underlying handle. + /// Attempts to acquire an UPGRADE lock synchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// using (var handle = myLock.TryAcquireUpgradeableReadLock(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// /// - public interface IDistributedUpgradeableReaderWriterLock : IDistributedReaderWriterLock - { - /// - /// Attempts to acquire an UPGRADE lock synchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: - /// - /// using (var handle = myLock.TryAcquireUpgradeableReadLock(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - IDistributedLockUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + IDistributedLockUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires an UPGRADE lock synchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: - /// - /// using (myLock.AcquireUpgradeableReadLock(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + /// + /// Acquires an UPGRADE lock synchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// using (myLock.AcquireUpgradeableReadLock(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - /// - /// Attempts to acquire an UPGRADE lock asynchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: - /// - /// await using (var handle = await myLock.TryAcquireUpgradeableReadLockAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - ValueTask TryAcquireUpgradeableReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + /// + /// Attempts to acquire an UPGRADE lock asynchronously. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// await using (var handle = await myLock.TryAcquireUpgradeableReadLockAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + ValueTask TryAcquireUpgradeableReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - /// - /// Acquires an UPGRADE lock asynchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: - /// - /// await using (await myLock.AcquireUpgradeableReadLockAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - ValueTask AcquireUpgradeableReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - } + /// + /// Acquires an UPGRADE lock asynchronously, failing with if the attempt times out. Not compatible with another UPGRADE lock or a WRITE lock. Usage: + /// + /// await using (await myLock.AcquireUpgradeableReadLockAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + ValueTask AcquireUpgradeableReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); } diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs index 47c5d66c..e74999f4 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs @@ -1,15 +1,14 @@ // AUTO-GENERATED -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Acts as a factory for instances of a certain type. This interface may be +/// easier to use than in dependency injection scenarios. +/// +public interface IDistributedUpgradeableReaderWriterLockProvider: IDistributedReaderWriterLockProvider { /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. + /// Constructs an instance with the given . /// - public interface IDistributedUpgradeableReaderWriterLockProvider: IDistributedReaderWriterLockProvider - { - /// - /// Constructs an instance with the given . - /// - IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLock(string name); - } + IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLock(string name); } \ No newline at end of file diff --git a/DistributedLock.Core/Internal/AsyncLock.cs b/DistributedLock.Core/Internal/AsyncLock.cs index 8377e9a5..99b28169 100644 --- a/DistributedLock.Core/Internal/AsyncLock.cs +++ b/DistributedLock.Core/Internal/AsyncLock.cs @@ -4,49 +4,48 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal +namespace Medallion.Threading.Internal; + +/// +/// An async-based, -friendly mutex based on . We don't expose a +/// method because does not require disposal unless its +/// is accessed +/// +internal readonly struct AsyncLock { - /// - /// An async-based, -friendly mutex based on . We don't expose a - /// method because does not require disposal unless its - /// is accessed - /// - internal readonly struct AsyncLock + private readonly SemaphoreSlim _semaphore; + + private AsyncLock(SemaphoreSlim semaphore) { - private readonly SemaphoreSlim _semaphore; + this._semaphore = semaphore; + } - private AsyncLock(SemaphoreSlim semaphore) - { - this._semaphore = semaphore; - } + public static AsyncLock Create() => new AsyncLock(new SemaphoreSlim(initialCount: 1, maxCount: 1)); - public static AsyncLock Create() => new AsyncLock(new SemaphoreSlim(initialCount: 1, maxCount: 1)); + public async ValueTask AcquireAsync(CancellationToken cancellationToken) + { + var handle = await this.TryAcquireAsync(Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); + Invariant.Require(handle != null); + return handle!; + } - public async ValueTask AcquireAsync(CancellationToken cancellationToken) - { - var handle = await this.TryAcquireAsync(Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); - Invariant.Require(handle != null); - return handle!; - } + public async ValueTask TryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var acquired = SyncViaAsync.IsSynchronous + ? this._semaphore.Wait(timeout.InMilliseconds, cancellationToken) + : await this._semaphore.WaitAsync(timeout.InMilliseconds, cancellationToken).ConfigureAwait(false); + return acquired ? new Handle(this._semaphore) : null; + } - public async ValueTask TryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var acquired = SyncViaAsync.IsSynchronous - ? this._semaphore.Wait(timeout.InMilliseconds, cancellationToken) - : await this._semaphore.WaitAsync(timeout.InMilliseconds, cancellationToken).ConfigureAwait(false); - return acquired ? new Handle(this._semaphore) : null; - } + private sealed class Handle : IDisposable + { + private SemaphoreSlim? _semaphore; - private sealed class Handle : IDisposable + public Handle(SemaphoreSlim semaphore) { - private SemaphoreSlim? _semaphore; - - public Handle(SemaphoreSlim semaphore) - { - this._semaphore = semaphore; - } - - public void Dispose() => Interlocked.Exchange(ref this._semaphore, null)?.Release(); + this._semaphore = semaphore; } + + public void Dispose() => Interlocked.Exchange(ref this._semaphore, null)?.Release(); } } diff --git a/DistributedLock.Core/Internal/BusyWaitHelper.cs b/DistributedLock.Core/Internal/BusyWaitHelper.cs index fc0440e5..ef55560c 100644 --- a/DistributedLock.Core/Internal/BusyWaitHelper.cs +++ b/DistributedLock.Core/Internal/BusyWaitHelper.cs @@ -5,84 +5,83 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - static class BusyWaitHelper + static class BusyWaitHelper +{ + public static async ValueTask WaitAsync( + TState state, + Func> tryGetValue, + TimeoutValue timeout, + TimeoutValue minSleepTime, + TimeoutValue maxSleepTime, + CancellationToken cancellationToken) + where TResult : class { - public static async ValueTask WaitAsync( - TState state, - Func> tryGetValue, - TimeoutValue timeout, - TimeoutValue minSleepTime, - TimeoutValue maxSleepTime, - CancellationToken cancellationToken) - where TResult : class + Invariant.Require(minSleepTime.CompareTo(maxSleepTime) <= 0); + Invariant.Require(!maxSleepTime.IsInfinite); + + var initialResult = await tryGetValue(state, cancellationToken).ConfigureAwait(false); + if (initialResult != null || timeout.IsZero) { - Invariant.Require(minSleepTime.CompareTo(maxSleepTime) <= 0); - Invariant.Require(!maxSleepTime.IsInfinite); + return initialResult; + } + + using var _ = CreateMergedCancellationTokenSourceSource(timeout, cancellationToken, out var mergedCancellationToken); - var initialResult = await tryGetValue(state, cancellationToken).ConfigureAwait(false); - if (initialResult != null || timeout.IsZero) + var random = new Random(Guid.NewGuid().GetHashCode()); + var sleepRangeMillis = maxSleepTime.InMilliseconds - minSleepTime.InMilliseconds; + while (true) + { + var sleepTime = minSleepTime.TimeSpan + TimeSpan.FromMilliseconds(random.NextDouble() * sleepRangeMillis); + try { - return initialResult; + await SyncViaAsync.Delay(sleepTime, mergedCancellationToken).ConfigureAwait(false); } - - using var _ = CreateMergedCancellationTokenSourceSource(timeout, cancellationToken, out var mergedCancellationToken); - - var random = new Random(Guid.NewGuid().GetHashCode()); - var sleepRangeMillis = maxSleepTime.InMilliseconds - minSleepTime.InMilliseconds; - while (true) + catch (OperationCanceledException) when (IsTimedOut()) { - var sleepTime = minSleepTime.TimeSpan + TimeSpan.FromMilliseconds(random.NextDouble() * sleepRangeMillis); - try - { - await SyncViaAsync.Delay(sleepTime, mergedCancellationToken).ConfigureAwait(false); - } - catch (OperationCanceledException) when (IsTimedOut()) - { - // if we time out while sleeping, always try one more time with just the regular token - return await tryGetValue(state, cancellationToken).ConfigureAwait(false); - } - - try - { - var result = await tryGetValue(state, mergedCancellationToken).ConfigureAwait(false); - if (result != null) { return result; } - } - catch (OperationCanceledException) when (IsTimedOut()) - { - return null; - } + // if we time out while sleeping, always try one more time with just the regular token + return await tryGetValue(state, cancellationToken).ConfigureAwait(false); } - bool IsTimedOut() => - mergedCancellationToken.IsCancellationRequested && !cancellationToken.IsCancellationRequested; - } - - private static IDisposable? CreateMergedCancellationTokenSourceSource(TimeoutValue timeout, CancellationToken cancellationToken, out CancellationToken mergedCancellationToken) - { - if (timeout.IsInfinite) + try { - mergedCancellationToken = cancellationToken; - return null; + var result = await tryGetValue(state, mergedCancellationToken).ConfigureAwait(false); + if (result != null) { return result; } } - - if (!cancellationToken.CanBeCanceled) + catch (OperationCanceledException) when (IsTimedOut()) { - var timeoutSource = new CancellationTokenSource(millisecondsDelay: timeout.InMilliseconds); - mergedCancellationToken = timeoutSource.Token; - return timeoutSource; + return null; } + } + + bool IsTimedOut() => + mergedCancellationToken.IsCancellationRequested && !cancellationToken.IsCancellationRequested; + } - var mergedSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); - mergedSource.CancelAfter(timeout.InMilliseconds); - mergedCancellationToken = mergedSource.Token; - return mergedSource; + private static IDisposable? CreateMergedCancellationTokenSourceSource(TimeoutValue timeout, CancellationToken cancellationToken, out CancellationToken mergedCancellationToken) + { + if (timeout.IsInfinite) + { + mergedCancellationToken = cancellationToken; + return null; + } + + if (!cancellationToken.CanBeCanceled) + { + var timeoutSource = new CancellationTokenSource(millisecondsDelay: timeout.InMilliseconds); + mergedCancellationToken = timeoutSource.Token; + return timeoutSource; } + + var mergedSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + mergedSource.CancelAfter(timeout.InMilliseconds); + mergedCancellationToken = mergedSource.Token; + return mergedSource; } } diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 4830fc24..627b0cca 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -5,456 +5,455 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data +namespace Medallion.Threading.Internal.Data; + +/// +/// Implements keepalive for a which is important for certain providers +/// such as SQL Azure. +/// +/// Also supports more active monitoring for the purposes of implementing +/// +internal sealed class ConnectionMonitor : IAsyncDisposable { /// - /// Implements keepalive for a which is important for certain providers - /// such as SQL Azure. - /// - /// Also supports more active monitoring for the purposes of implementing + /// Weak reference to the underlying . We use a weak reference to + /// avoid the case where our background worker keeps the connection from being GC'd + /// and therefore keeps an abandoned handle from being released /// - internal sealed class ConnectionMonitor : IAsyncDisposable + private readonly WeakReference _weakConnection; + /// + /// Caches a handler for so we + /// unregister it in + /// + private readonly StateChangeEventHandler? _stateChangedHandler; + + /// + /// Allows us to avoid running multiple concurrent queries on + /// + private readonly AsyncLock _connectionLock = AsyncLock.Create(); + + /// + /// Tracks whether the connection is externally-owned. For externally owned connections we cannot + /// run any background queries because this might violate threadsafety with whatever the connection + /// owner is doing + /// + private readonly bool _isExternallyOwnedConnection; + + private TimeoutValue _keepaliveCadence = Timeout.InfiniteTimeSpan; + private State _state; + private Dictionary? _monitoringHandleRegistrations; + private CancellationTokenSource? _monitorStateChangedTokenSource; + private Task _monitoringWorkerTask = Task.CompletedTask; + + public ConnectionMonitor(DatabaseConnection connection) { - /// - /// Weak reference to the underlying . We use a weak reference to - /// avoid the case where our background worker keeps the connection from being GC'd - /// and therefore keeps an abandoned handle from being released - /// - private readonly WeakReference _weakConnection; - /// - /// Caches a handler for so we - /// unregister it in - /// - private readonly StateChangeEventHandler? _stateChangedHandler; - - /// - /// Allows us to avoid running multiple concurrent queries on - /// - private readonly AsyncLock _connectionLock = AsyncLock.Create(); - - /// - /// Tracks whether the connection is externally-owned. For externally owned connections we cannot - /// run any background queries because this might violate threadsafety with whatever the connection - /// owner is doing - /// - private readonly bool _isExternallyOwnedConnection; - - private TimeoutValue _keepaliveCadence = Timeout.InfiniteTimeSpan; - private State _state; - private Dictionary? _monitoringHandleRegistrations; - private CancellationTokenSource? _monitorStateChangedTokenSource; - private Task _monitoringWorkerTask = Task.CompletedTask; - - public ConnectionMonitor(DatabaseConnection connection) - { - this._weakConnection = new WeakReference(connection); - this._isExternallyOwnedConnection = connection.IsExernallyOwned; - // stopped not autostopped here so that the statechange handler will not cause a start - this._state = connection.CanExecuteQueries ? State.Idle : State.Stopped; - Invariant.Require(this._state == State.Stopped || this._isExternallyOwnedConnection); + this._weakConnection = new WeakReference(connection); + this._isExternallyOwnedConnection = connection.IsExernallyOwned; + // stopped not autostopped here so that the statechange handler will not cause a start + this._state = connection.CanExecuteQueries ? State.Idle : State.Stopped; + Invariant.Require(this._state == State.Stopped || this._isExternallyOwnedConnection); - if (connection.InnerConnection is DbConnection dbConnection) - { - dbConnection.StateChange += this._stateChangedHandler = this.OnConnectionStateChanged; - } + if (connection.InnerConnection is DbConnection dbConnection) + { + dbConnection.StateChange += this._stateChangedHandler = this.OnConnectionStateChanged; } + } - /// - /// Protects access to all mutable state - /// - private object Lock => this._weakConnection; + /// + /// Protects access to all mutable state + /// + private object Lock => this._weakConnection; - private bool HasRegisteredMonitoringHandlesNoLock => (this._monitoringHandleRegistrations?.Count).GetValueOrDefault() != 0; + private bool HasRegisteredMonitoringHandlesNoLock => (this._monitoringHandleRegistrations?.Count).GetValueOrDefault() != 0; - public async ValueTask AcquireConnectionLockAsync(CancellationToken cancellationToken) + public async ValueTask AcquireConnectionLockAsync(CancellationToken cancellationToken) + { + while (true) { - while (true) + ValueTask connectionLockTask; + lock (this.Lock) { - ValueTask connectionLockTask; - lock (this.Lock) + // If we're monitoring, then the connection will almost constantly be in use. + // Fire state changed to cancel that query and clear it up + if (this._state == State.Active && this.HasRegisteredMonitoringHandlesNoLock) { - // If we're monitoring, then the connection will almost constantly be in use. - // Fire state changed to cancel that query and clear it up - if (this._state == State.Active && this.HasRegisteredMonitoringHandlesNoLock) - { - this.FireStateChangedNoLock(); - } - - // By starting the acquisition inside Lock, we should be guaranteed to get in before the worker look can - // take the lock again. This relies on AsyncLock.AcquireAsync being FIFO, which is currently true because of - // how SemaphoreSlim works. However, to be extra robust we do a try-wait here and retry on failure - connectionLockTask = this._connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(2), cancellationToken); + this.FireStateChangedNoLock(); } - var handle = await connectionLockTask.ConfigureAwait(false); - if (handle != null) { return handle; } + // By starting the acquisition inside Lock, we should be guaranteed to get in before the worker look can + // take the lock again. This relies on AsyncLock.AcquireAsync being FIFO, which is currently true because of + // how SemaphoreSlim works. However, to be extra robust we do a try-wait here and retry on failure + connectionLockTask = this._connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(2), cancellationToken); } + + var handle = await connectionLockTask.ConfigureAwait(false); + if (handle != null) { return handle; } } + } - public void SetKeepaliveCadence(TimeoutValue keepaliveCadence) - { - Invariant.Require(!this._isExternallyOwnedConnection); + public void SetKeepaliveCadence(TimeoutValue keepaliveCadence) + { + Invariant.Require(!this._isExternallyOwnedConnection); - lock (this.Lock) - { - Invariant.Require(this._state != State.Disposed); + lock (this.Lock) + { + Invariant.Require(this._state != State.Disposed); - var originalKeepaliveCadence = this._keepaliveCadence; - this._keepaliveCadence = keepaliveCadence; + var originalKeepaliveCadence = this._keepaliveCadence; + this._keepaliveCadence = keepaliveCadence; - if (!this.StartMonitorWorkerIfNeededNoLock() - && this._state == State.Active - && !this.HasRegisteredMonitoringHandlesNoLock - && keepaliveCadence.CompareTo(originalKeepaliveCadence) < 0) - { - // If we get here, then we already have an active worker performing - // keepalive on a longer cadence. Since that worker is likely asleep, - // we fire state changed to wake it up - this.FireStateChangedNoLock(); - } + if (!this.StartMonitorWorkerIfNeededNoLock() + && this._state == State.Active + && !this.HasRegisteredMonitoringHandlesNoLock + && keepaliveCadence.CompareTo(originalKeepaliveCadence) < 0) + { + // If we get here, then we already have an active worker performing + // keepalive on a longer cadence. Since that worker is likely asleep, + // we fire state changed to wake it up + this.FireStateChangedNoLock(); } } + } - public IDatabaseConnectionMonitoringHandle GetMonitoringHandle() + public IDatabaseConnectionMonitoringHandle GetMonitoringHandle() + { + lock (this.Lock) { - lock (this.Lock) + // Since this will be called via non-thread-safe paths, we do a true + // dispose check. This error should never reach callers unless they are + // using non-thread-safe stuff concurrently + if (this._state == State.Disposed) { throw new ObjectDisposedException(this.GetType().ToString()); } + + // If the connection is already closed, we'll never see a state change + // event for the close so just return an already canceled handle + if (this._state == State.AutoStopped || this._state == State.Stopped) { - // Since this will be called via non-thread-safe paths, we do a true - // dispose check. This error should never reach callers unless they are - // using non-thread-safe stuff concurrently - if (this._state == State.Disposed) { throw new ObjectDisposedException(this.GetType().ToString()); } - - // If the connection is already closed, we'll never see a state change - // event for the close so just return an already canceled handle - if (this._state == State.AutoStopped || this._state == State.Stopped) - { - return new AlreadyCanceledHandle(); - } - - // If the connection does not support state monitoring, we can't produce - // a monitoring handle - if (this._stateChangedHandler == null) - { - return NullHandle.Instance; - } + return new AlreadyCanceledHandle(); + } - var hadRegisteredMonitoringHandles = this.HasRegisteredMonitoringHandlesNoLock; + // If the connection does not support state monitoring, we can't produce + // a monitoring handle + if (this._stateChangedHandler == null) + { + return NullHandle.Instance; + } - var connectionLostTokenSource = new CancellationTokenSource(); - var handle = new MonitoringHandle(this, connectionLostTokenSource.Token); - (this._monitoringHandleRegistrations ??= new Dictionary()) - .Add(handle, connectionLostTokenSource); + var hadRegisteredMonitoringHandles = this.HasRegisteredMonitoringHandlesNoLock; - if (!this.StartMonitorWorkerIfNeededNoLock() - && !hadRegisteredMonitoringHandles - && this._state == State.Active) - { - // If we get here, it means we already had an active worker which was not monitoring (doing - // keepalive). That worker is likely asleep, so we fire state changed to wake it up and have it - // switch over to monitoring - this.FireStateChangedNoLock(); - } + var connectionLostTokenSource = new CancellationTokenSource(); + var handle = new MonitoringHandle(this, connectionLostTokenSource.Token); + (this._monitoringHandleRegistrations ??= new Dictionary()) + .Add(handle, connectionLostTokenSource); - return handle; + if (!this.StartMonitorWorkerIfNeededNoLock() + && !hadRegisteredMonitoringHandles + && this._state == State.Active) + { + // If we get here, it means we already had an active worker which was not monitoring (doing + // keepalive). That worker is likely asleep, so we fire state changed to wake it up and have it + // switch over to monitoring + this.FireStateChangedNoLock(); } + + return handle; } + } - private void ReleaseMonitoringHandle(MonitoringHandle handle) + private void ReleaseMonitoringHandle(MonitoringHandle handle) + { + lock (this.Lock) { - lock (this.Lock) + if (this._monitoringHandleRegistrations!.TryGetValue(handle, out var cancellationTokenSource)) { - if (this._monitoringHandleRegistrations!.TryGetValue(handle, out var cancellationTokenSource)) + this._monitoringHandleRegistrations.Remove(handle); + cancellationTokenSource.Dispose(); + + // If we've removed the last reason to be monitoring, fire state changed to stop the monitoring process. + // Without this, the next query that attempts to acquire the connection lock will not think we are monitoring + // and therefore will not fire state change. Then, it will get stuck waiting for the monitoring query to complete + if (this._monitoringHandleRegistrations.Count == 0 && this._state == State.Active) { - this._monitoringHandleRegistrations.Remove(handle); - cancellationTokenSource.Dispose(); - - // If we've removed the last reason to be monitoring, fire state changed to stop the monitoring process. - // Without this, the next query that attempts to acquire the connection lock will not think we are monitoring - // and therefore will not fire state change. Then, it will get stuck waiting for the monitoring query to complete - if (this._monitoringHandleRegistrations.Count == 0 && this._state == State.Active) - { - this.FireStateChangedNoLock(); - } + this.FireStateChangedNoLock(); } } } + } - private void OnConnectionStateChanged(object sender, StateChangeEventArgs args) + private void OnConnectionStateChanged(object sender, StateChangeEventArgs args) + { + if (args.OriginalState == ConnectionState.Open && args.CurrentState != ConnectionState.Open) { - if (args.OriginalState == ConnectionState.Open && args.CurrentState != ConnectionState.Open) - { - lock (this.Lock) - { - if (this._state == State.Idle || this._state == State.Active) - { - this._state = State.AutoStopped; - this.CloseOrCancelMonitoringHandleRegistrationsNoLock(isCancel: true); - } - - Invariant.Require(!this.HasRegisteredMonitoringHandlesNoLock); - } - } - else if (args.OriginalState != ConnectionState.Open && args.CurrentState == ConnectionState.Open) + lock (this.Lock) { - lock (this.Lock) + if (this._state == State.Idle || this._state == State.Active) { - if (this._state == State.AutoStopped) - { - this.StartNoLock(); - } + this._state = State.AutoStopped; + this.CloseOrCancelMonitoringHandleRegistrationsNoLock(isCancel: true); } + + Invariant.Require(!this.HasRegisteredMonitoringHandlesNoLock); } } - - public void Start() + else if (args.OriginalState != ConnectionState.Open && args.CurrentState == ConnectionState.Open) { - Invariant.Require(!this._isExternallyOwnedConnection); - lock (this.Lock) { - Invariant.Require(this._state == State.Stopped); - this.StartNoLock(); + if (this._state == State.AutoStopped) + { + this.StartNoLock(); + } } } + } + + public void Start() + { + Invariant.Require(!this._isExternallyOwnedConnection); - private void StartNoLock() + lock (this.Lock) { - this._state = State.Idle; - this.StartMonitorWorkerIfNeededNoLock(); + Invariant.Require(this._state == State.Stopped); + this.StartNoLock(); } + } - public ValueTask StopAsync() => this.StopOrDisposeAsync(isDispose: false); - public ValueTask DisposeAsync() => this.StopOrDisposeAsync(isDispose: true); + private void StartNoLock() + { + this._state = State.Idle; + this.StartMonitorWorkerIfNeededNoLock(); + } + + public ValueTask StopAsync() => this.StopOrDisposeAsync(isDispose: false); + public ValueTask DisposeAsync() => this.StopOrDisposeAsync(isDispose: true); - private async ValueTask StopOrDisposeAsync(bool isDispose) + private async ValueTask StopOrDisposeAsync(bool isDispose) + { + Task? task; + lock (this.Lock) { - Task? task; - lock (this.Lock) + if (isDispose) { - if (isDispose) - { - this._state = State.Disposed; - } - else - { - Invariant.Require(!this._isExternallyOwnedConnection); - Invariant.Require(this._state != State.Disposed); - this._state = State.Stopped; - } + this._state = State.Disposed; + } + else + { + Invariant.Require(!this._isExternallyOwnedConnection); + Invariant.Require(this._state != State.Disposed); + this._state = State.Stopped; + } - // If we have any registered monitoring handles, clear them out. - // We don't cancel them since if the helper was stopped that indicates - // proper disposal rather than loss of the connection - this.CloseOrCancelMonitoringHandleRegistrationsNoLock(isCancel: false); + // If we have any registered monitoring handles, clear them out. + // We don't cancel them since if the helper was stopped that indicates + // proper disposal rather than loss of the connection + this.CloseOrCancelMonitoringHandleRegistrationsNoLock(isCancel: false); - task = this._monitoringWorkerTask; + task = this._monitoringWorkerTask; - // Note: synchronous cancel here should be safe because we've already set - // the state to disposed above which the monitoring loop will check if it - // takes over the Cancel() thread. - this._monitorStateChangedTokenSource?.Cancel(); + // Note: synchronous cancel here should be safe because we've already set + // the state to disposed above which the monitoring loop will check if it + // takes over the Cancel() thread. + this._monitorStateChangedTokenSource?.Cancel(); - // If disposing, unsubscribe from state change tracking. - if (isDispose - && this._stateChangedHandler != null - && this._weakConnection.TryGetTarget(out var connection)) - { - ((DbConnection)connection.InnerConnection).StateChange -= this._stateChangedHandler; - } - } - - if (task != null) + // If disposing, unsubscribe from state change tracking. + if (isDispose + && this._stateChangedHandler != null + && this._weakConnection.TryGetTarget(out var connection)) { - await task.AwaitSyncOverAsync().ConfigureAwait(false); + ((DbConnection)connection.InnerConnection).StateChange -= this._stateChangedHandler; } } - private void CloseOrCancelMonitoringHandleRegistrationsNoLock(bool isCancel) + if (task != null) { - Invariant.Require(this._state == State.AutoStopped || this._state == State.Stopped || this._state == State.Disposed); + await task.AwaitSyncOverAsync().ConfigureAwait(false); + } + } - if (this._monitoringHandleRegistrations == null) { return; } + private void CloseOrCancelMonitoringHandleRegistrationsNoLock(bool isCancel) + { + Invariant.Require(this._state == State.AutoStopped || this._state == State.Stopped || this._state == State.Disposed); - foreach (var kvp in this._monitoringHandleRegistrations) + if (this._monitoringHandleRegistrations == null) { return; } + + foreach (var kvp in this._monitoringHandleRegistrations) + { + var cancellationTokenSource = kvp.Value; + if (isCancel) { - var cancellationTokenSource = kvp.Value; - if (isCancel) - { - // cancel in a background thread in case we have hangs or errors - Task.Run(() => - { - try { cancellationTokenSource.Cancel(); } - finally { cancellationTokenSource.Dispose(); } - }); - } - else + // cancel in a background thread in case we have hangs or errors + Task.Run(() => { - cancellationTokenSource.Dispose(); - } + try { cancellationTokenSource.Cancel(); } + finally { cancellationTokenSource.Dispose(); } + }); + } + else + { + cancellationTokenSource.Dispose(); } - this._monitoringHandleRegistrations.Clear(); } + this._monitoringHandleRegistrations.Clear(); + } - private bool StartMonitorWorkerIfNeededNoLock() - { - Invariant.Require(this._state != State.Disposed); - - // never monitor external connections - if (this._isExternallyOwnedConnection) { return false; } - - // If we're in the active state, we already have a worker. If we're not in the idle - // state, we're not supposed to be running - if (this._state != State.Idle) { return false; } - - // skip if there's nothing to do - if (this._keepaliveCadence.IsInfinite && !this.HasRegisteredMonitoringHandlesNoLock) { return false; } - - this._monitorStateChangedTokenSource = new CancellationTokenSource(); - // Set up the task as a continuation on the previous task to avoid concurrency in the case where the previous - // one is spinning down. If we change states in rapid succession we could end up with multiple tasks queued up - // but this shouldn't matter since when the active one ultimately stops all the others will follow in rapid succession - this._monitoringWorkerTask = this._monitoringWorkerTask - .ContinueWith((_, state) => ((ConnectionMonitor)state).MonitorWorkerLoop(), state: this) - .Unwrap(); - this._state = State.Active; - return true; - } + private bool StartMonitorWorkerIfNeededNoLock() + { + Invariant.Require(this._state != State.Disposed); + + // never monitor external connections + if (this._isExternallyOwnedConnection) { return false; } + + // If we're in the active state, we already have a worker. If we're not in the idle + // state, we're not supposed to be running + if (this._state != State.Idle) { return false; } + + // skip if there's nothing to do + if (this._keepaliveCadence.IsInfinite && !this.HasRegisteredMonitoringHandlesNoLock) { return false; } + + this._monitorStateChangedTokenSource = new CancellationTokenSource(); + // Set up the task as a continuation on the previous task to avoid concurrency in the case where the previous + // one is spinning down. If we change states in rapid succession we could end up with multiple tasks queued up + // but this shouldn't matter since when the active one ultimately stops all the others will follow in rapid succession + this._monitoringWorkerTask = this._monitoringWorkerTask + .ContinueWith((_, state) => ((ConnectionMonitor)state).MonitorWorkerLoop(), state: this) + .Unwrap(); + this._state = State.Active; + return true; + } - private void FireStateChangedNoLock() + private void FireStateChangedNoLock() + { + var monitorStateChangedTokenSource = this._monitorStateChangedTokenSource!; + this._monitorStateChangedTokenSource = new CancellationTokenSource(); + // Canceling asynchronously is important because the Cancel() thread can end up + // running continuations inside the monitoring loop (e. g. see + // https://github.com/madelson/DistributedLock/issues/85). Now that we set the new + // token source before canceling the old one we should avoid that particular issue, but + // it is still safer and easier to reason about not to have that happen. This also ensures + // that FireStateChangedNoLock() always returns quickly, even if the monitoring loop + // were to do some synchronous work on the continuation thread. + Task.Run(() => { - var monitorStateChangedTokenSource = this._monitorStateChangedTokenSource!; - this._monitorStateChangedTokenSource = new CancellationTokenSource(); - // Canceling asynchronously is important because the Cancel() thread can end up - // running continuations inside the monitoring loop (e. g. see - // https://github.com/madelson/DistributedLock/issues/85). Now that we set the new - // token source before canceling the old one we should avoid that particular issue, but - // it is still safer and easier to reason about not to have that happen. This also ensures - // that FireStateChangedNoLock() always returns quickly, even if the monitoring loop - // were to do some synchronous work on the continuation thread. - Task.Run(() => - { - try { monitorStateChangedTokenSource.Cancel(); } - finally { monitorStateChangedTokenSource.Dispose(); } - }); - } + try { monitorStateChangedTokenSource.Cancel(); } + finally { monitorStateChangedTokenSource.Dispose(); } + }); + } - private async Task MonitorWorkerLoop() + private async Task MonitorWorkerLoop() + { + while (await this.TryKeepaliveOrMonitorAsync().ConfigureAwait(false)) { - while (await this.TryKeepaliveOrMonitorAsync().ConfigureAwait(false)) - { - // just keep going - } + // just keep going } + } - private async Task TryKeepaliveOrMonitorAsync() + private async Task TryKeepaliveOrMonitorAsync() + { + // get state + TimeoutValue keepaliveCadence; + bool isMonitoring; + CancellationToken stateChangedToken; + lock (this.Lock) { - // get state - TimeoutValue keepaliveCadence; - bool isMonitoring; - CancellationToken stateChangedToken; - lock (this.Lock) - { - if (this._state != State.Active) { return false; } + if (this._state != State.Active) { return false; } - keepaliveCadence = this._keepaliveCadence; - isMonitoring = this.HasRegisteredMonitoringHandlesNoLock; - stateChangedToken = this._monitorStateChangedTokenSource!.Token; - } - - return await (isMonitoring ? this.DoMonitoringAsync(stateChangedToken) : this.DoKeepaliveAsync(keepaliveCadence, stateChangedToken)).ConfigureAwait(false); + keepaliveCadence = this._keepaliveCadence; + isMonitoring = this.HasRegisteredMonitoringHandlesNoLock; + stateChangedToken = this._monitorStateChangedTokenSource!.Token; } - private async Task DoMonitoringAsync(CancellationToken cancellationToken) - { - if (!this._weakConnection.TryGetTarget(out var connection)) { return false; } - - // don't pass token here: this should finish quickly and we don't want to throw - using var _ = await this._connectionLock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); + return await (isMonitoring ? this.DoMonitoringAsync(stateChangedToken) : this.DoKeepaliveAsync(keepaliveCadence, stateChangedToken)).ConfigureAwait(false); + } - // 1-min increments is kind of an arbitrary choice. We want to avoid this being too short since each time - // we "come up to breathe" that's a waste of resources. We also want to avoid this being too long since - // in case people have some kind of monitoring set up for hanging queries - await connection.SleepAsync( - sleepTime: TimeSpan.FromMinutes(1), - cancellationToken: cancellationToken, - executor: (command, token) => command.ExecuteNonQueryAsync(token, disallowAsyncCancellation: false, isConnectionMonitoringQuery: true) - ).TryAwait(); + private async Task DoMonitoringAsync(CancellationToken cancellationToken) + { + if (!this._weakConnection.TryGetTarget(out var connection)) { return false; } - return true; - } + // don't pass token here: this should finish quickly and we don't want to throw + using var _ = await this._connectionLock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); - private async Task DoKeepaliveAsync(TimeoutValue keepaliveCadence, CancellationToken stateChangedToken) - { - await Task.Delay(keepaliveCadence.InMilliseconds, stateChangedToken).TryAwait(); - if (stateChangedToken.IsCancellationRequested) { return true; } + // 1-min increments is kind of an arbitrary choice. We want to avoid this being too short since each time + // we "come up to breathe" that's a waste of resources. We also want to avoid this being too long since + // in case people have some kind of monitoring set up for hanging queries + await connection.SleepAsync( + sleepTime: TimeSpan.FromMinutes(1), + cancellationToken: cancellationToken, + executor: (command, token) => command.ExecuteNonQueryAsync(token, disallowAsyncCancellation: false, isConnectionMonitoringQuery: true) + ).TryAwait(); - // retrieve only after the delay to avoid this reference longer than needed - if (!this._weakConnection.TryGetTarget(out var connection)) { return false; } + return true; + } - // We do a zero-wait try-lock here because if the connection is in-use then someone is querying with it. In that case, - // There's no need for us to run a keepalive query. Since we are using zero timeout, we don't bother to pass the cancellationToken; - // this saves us from having to handle cancellation exceptions - using var connectionLockHandle = await this._connectionLock.TryAcquireAsync(TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); - if (connectionLockHandle != null) - { - using var command = connection.CreateCommand(); - command.SetCommandText("SELECT 0 /* DistributedLock connection keepalive */"); - // Since this query is very fast and non-blocking, we don't bother trying to cancel it. This avoids having - // to deal with the overhead of throwing exceptions within ExecuteNonQueryAsync() - await command.ExecuteNonQueryAsync(CancellationToken.None, disallowAsyncCancellation: false, isConnectionMonitoringQuery: true).AsTask().TryAwait(); - } + private async Task DoKeepaliveAsync(TimeoutValue keepaliveCadence, CancellationToken stateChangedToken) + { + await Task.Delay(keepaliveCadence.InMilliseconds, stateChangedToken).TryAwait(); + if (stateChangedToken.IsCancellationRequested) { return true; } - return true; - } + // retrieve only after the delay to avoid this reference longer than needed + if (!this._weakConnection.TryGetTarget(out var connection)) { return false; } - private sealed class MonitoringHandle : IDatabaseConnectionMonitoringHandle + // We do a zero-wait try-lock here because if the connection is in-use then someone is querying with it. In that case, + // There's no need for us to run a keepalive query. Since we are using zero timeout, we don't bother to pass the cancellationToken; + // this saves us from having to handle cancellation exceptions + using var connectionLockHandle = await this._connectionLock.TryAcquireAsync(TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); + if (connectionLockHandle != null) { - private ConnectionMonitor? _monitor; - private readonly CancellationToken _connectionLostToken; + using var command = connection.CreateCommand(); + command.SetCommandText("SELECT 0 /* DistributedLock connection keepalive */"); + // Since this query is very fast and non-blocking, we don't bother trying to cancel it. This avoids having + // to deal with the overhead of throwing exceptions within ExecuteNonQueryAsync() + await command.ExecuteNonQueryAsync(CancellationToken.None, disallowAsyncCancellation: false, isConnectionMonitoringQuery: true).AsTask().TryAwait(); + } - public MonitoringHandle(ConnectionMonitor keepaliveHelper, CancellationToken cancellationToken) - { - this._monitor = keepaliveHelper; - this._connectionLostToken = cancellationToken; - } + return true; + } - public CancellationToken ConnectionLostToken => Volatile.Read(ref this._monitor) != null ? this._connectionLostToken : throw new ObjectDisposedException("handle"); + private sealed class MonitoringHandle : IDatabaseConnectionMonitoringHandle + { + private ConnectionMonitor? _monitor; + private readonly CancellationToken _connectionLostToken; - public void Dispose() => Interlocked.Exchange(ref this._monitor, null)?.ReleaseMonitoringHandle(this); + public MonitoringHandle(ConnectionMonitor keepaliveHelper, CancellationToken cancellationToken) + { + this._monitor = keepaliveHelper; + this._connectionLostToken = cancellationToken; } - private sealed class AlreadyCanceledHandle : IDatabaseConnectionMonitoringHandle - { - private readonly CancellationTokenSource _cancellationTokenSource = new(); + public CancellationToken ConnectionLostToken => Volatile.Read(ref this._monitor) != null ? this._connectionLostToken : throw new ObjectDisposedException("handle"); - public AlreadyCanceledHandle() - { - this._cancellationTokenSource.Cancel(); - } + public void Dispose() => Interlocked.Exchange(ref this._monitor, null)?.ReleaseMonitoringHandle(this); + } - public CancellationToken ConnectionLostToken => this._cancellationTokenSource.Token; + private sealed class AlreadyCanceledHandle : IDatabaseConnectionMonitoringHandle + { + private readonly CancellationTokenSource _cancellationTokenSource = new(); - public void Dispose() => this._cancellationTokenSource.Dispose(); + public AlreadyCanceledHandle() + { + this._cancellationTokenSource.Cancel(); } - private sealed class NullHandle : IDatabaseConnectionMonitoringHandle - { - public static readonly NullHandle Instance = new(); + public CancellationToken ConnectionLostToken => this._cancellationTokenSource.Token; - private NullHandle() { } + public void Dispose() => this._cancellationTokenSource.Dispose(); + } - public CancellationToken ConnectionLostToken => CancellationToken.None; + private sealed class NullHandle : IDatabaseConnectionMonitoringHandle + { + public static readonly NullHandle Instance = new(); - public void Dispose() { } - } + private NullHandle() { } - private enum State : byte - { - Idle, - Active, - AutoStopped, - Stopped, - Disposed, - } + public CancellationToken ConnectionLostToken => CancellationToken.None; + + public void Dispose() { } + } + + private enum State : byte + { + Idle, + Active, + AutoStopped, + Stopped, + Disposed, } } diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 917d6b95..5b2accd4 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -8,206 +8,205 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Abstraction over for a - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Abstraction over for a +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class DatabaseCommand : IDisposable +sealed class DatabaseCommand : IDisposable +{ + private readonly IDbCommand _command; + private readonly DatabaseConnection _connection; + + internal DatabaseCommand(IDbCommand command, DatabaseConnection connection) { - private readonly IDbCommand _command; - private readonly DatabaseConnection _connection; + this._command = command; + this._connection = connection; + } - internal DatabaseCommand(IDbCommand command, DatabaseConnection connection) - { - this._command = command; - this._connection = connection; - } + public IDataParameterCollection Parameters => this._command.Parameters; - public IDataParameterCollection Parameters => this._command.Parameters; + public void SetCommandText(string sql) => this._command.CommandText = sql; - public void SetCommandText(string sql) => this._command.CommandText = sql; + public void SetTimeout(TimeoutValue operationTimeout) + { + this._command.CommandTimeout = operationTimeout.IsInfinite + // use the infinite timeout of 0 + // (see https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlcommand.commandtimeout%28v=vs.110%29.aspx) + ? 0 + // command timeout is in seconds. We always wait at least the given timeout plus a buffer + : operationTimeout.InSeconds + 30; + } - public void SetTimeout(TimeoutValue operationTimeout) - { - this._command.CommandTimeout = operationTimeout.IsInfinite - // use the infinite timeout of 0 - // (see https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlcommand.commandtimeout%28v=vs.110%29.aspx) - ? 0 - // command timeout is in seconds. We always wait at least the given timeout plus a buffer - : operationTimeout.InSeconds + 30; - } + public void SetCommandType(CommandType type) + { + this._command.CommandType = type; + } - public void SetCommandType(CommandType type) - { - this._command.CommandType = type; - } + public IDbDataParameter AddParameter(string? name = null, object? value = null, DbType? type = null, ParameterDirection? direction = null) + { + var parameter = this._command.CreateParameter(); + if (name != null) { parameter.ParameterName = name; } + if (value != null) { parameter.Value = value; } + if (type != null) { parameter.DbType = type.Value; } + if (direction != null) { parameter.Direction = direction.Value; } + this._command.Parameters.Add(parameter); + return parameter; + } - public IDbDataParameter AddParameter(string? name = null, object? value = null, DbType? type = null, ParameterDirection? direction = null) - { - var parameter = this._command.CreateParameter(); - if (name != null) { parameter.ParameterName = name; } - if (value != null) { parameter.Value = value; } - if (type != null) { parameter.DbType = type.Value; } - if (direction != null) { parameter.Direction = direction.Value; } - this._command.Parameters.Add(parameter); - return parameter; - } + #region ---- Execution ---- + public ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => + this.ExecuteNonQueryAsync(cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery: false); - #region ---- Execution ---- - public ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => - this.ExecuteNonQueryAsync(cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery: false); - - /// - /// Internal API for - /// - internal ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation, bool isConnectionMonitoringQuery) => - this.ExecuteAsync((c, t) => c.ExecuteNonQueryAsync(t), c => c.ExecuteNonQuery(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery); - - public ValueTask ExecuteScalarAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => - this.ExecuteAsync((c, t) => c.ExecuteScalarAsync(t), c => c.ExecuteScalar(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery: false); - - private async ValueTask ExecuteAsync( - Func> executeAsync, - Func executeSync, - CancellationToken cancellationToken, - bool disallowAsyncCancellation, - bool isConnectionMonitoringQuery) + /// + /// Internal API for + /// + internal ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation, bool isConnectionMonitoringQuery) => + this.ExecuteAsync((c, t) => c.ExecuteNonQueryAsync(t), c => c.ExecuteNonQuery(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery); + + public ValueTask ExecuteScalarAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => + this.ExecuteAsync((c, t) => c.ExecuteScalarAsync(t), c => c.ExecuteScalar(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery: false); + + private async ValueTask ExecuteAsync( + Func> executeAsync, + Func executeSync, + CancellationToken cancellationToken, + bool disallowAsyncCancellation, + bool isConnectionMonitoringQuery) + { + if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) { - if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) + if (!cancellationToken.CanBeCanceled) { - if (!cancellationToken.CanBeCanceled) - { - using var _ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); - await this.PrepareIfNeededAsync(CancellationToken.None).ConfigureAwait(false); - return await executeAsync(dbCommand, CancellationToken.None).ConfigureAwait(false); - } - else if (!disallowAsyncCancellation) - { - return await this.InternalExecuteAndPropagateCancellationAsync( - (dbCommand, executeAsync), - (state, cancellationToken) => state.executeAsync(state.dbCommand, cancellationToken).AsValueTask(), - cancellationToken, - isConnectionMonitoringQuery - ).ConfigureAwait(false); - } - else - { - // FALL THROUGH - - // note: we can't call ExecuteNonQueryAsync(cancellationToken) or even ExecuteNonQueryAsync() - // here because of a .NET bug (see https://github.com/dotnet/SqlClient/issues/44, - // https://stackoverflow.com/questions/48461567/canceling-query-with-while-loop-hangs-forever) - // The workaround is to fall back to sync cancellation and sync execution in this case - } + using var _ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); + await this.PrepareIfNeededAsync(CancellationToken.None).ConfigureAwait(false); + return await executeAsync(dbCommand, CancellationToken.None).ConfigureAwait(false); } - - if (cancellationToken.CanBeCanceled) + else if (!disallowAsyncCancellation) { - // check this first rather than rely on a race between the the cancellation registration and the - // command execution. Note that if SqlCommand.Cancel() is called before the command is executed, this has no effect - cancellationToken.ThrowIfCancellationRequested(); - - var commandBox = new StrongBox(this._command); - - // having the registration offload the cancel loop to a background thread is important, since - // registrations fire synchronously if the token is already canceled - using var registration = cancellationToken.Register(state => Task.Run(async () => - { - var commandBox = (StrongBox)state; - IDbCommand? command; - while ((command = Volatile.Read(ref commandBox.Value)) != null) - { - try { command.Cancel(); } - catch { /* just ignore errors here */ } - - await Task.Delay(1).ConfigureAwait(false); - } - }), state: commandBox); - - try - { - return await this.InternalExecuteAndPropagateCancellationAsync( - (command: this._command, executeSync), - (state, cancellationToken) => state.executeSync(state.command).AsValueTask(), - cancellationToken, - isConnectionMonitoringQuery - ).ConfigureAwait(false); - } - finally - { - // allows the cancellation loop to exit if it started - Volatile.Write(ref commandBox.Value, null); - } + return await this.InternalExecuteAndPropagateCancellationAsync( + (dbCommand, executeAsync), + (state, cancellationToken) => state.executeAsync(state.dbCommand, cancellationToken).AsValueTask(), + cancellationToken, + isConnectionMonitoringQuery + ).ConfigureAwait(false); } + else + { + // FALL THROUGH - using var __ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); - return executeSync(this._command); + // note: we can't call ExecuteNonQueryAsync(cancellationToken) or even ExecuteNonQueryAsync() + // here because of a .NET bug (see https://github.com/dotnet/SqlClient/issues/44, + // https://stackoverflow.com/questions/48461567/canceling-query-with-while-loop-hangs-forever) + // The workaround is to fall back to sync cancellation and sync execution in this case + } } - private async ValueTask InternalExecuteAndPropagateCancellationAsync( - TState state, - Func> executeAsync, - CancellationToken cancellationToken, - bool isConnectionMonitoringQuery) + if (cancellationToken.CanBeCanceled) { - Invariant.Require(cancellationToken.CanBeCanceled); + // check this first rather than rely on a race between the the cancellation registration and the + // command execution. Note that if SqlCommand.Cancel() is called before the command is executed, this has no effect + cancellationToken.ThrowIfCancellationRequested(); + + var commandBox = new StrongBox(this._command); + + // having the registration offload the cancel loop to a background thread is important, since + // registrations fire synchronously if the token is already canceled + using var registration = cancellationToken.Register(state => Task.Run(async () => + { + var commandBox = (StrongBox)state; + IDbCommand? command; + while ((command = Volatile.Read(ref commandBox.Value)) != null) + { + try { command.Cancel(); } + catch { /* just ignore errors here */ } + + await Task.Delay(1).ConfigureAwait(false); + } + }), state: commandBox); - using var _ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); - // Note: for now we cannot pass cancellationToken to PrepareAsync() because this will break on Postgres which - // is the only db we currently support that needs Prepare currently. See https://github.com/npgsql/npgsql/issues/4209 - await this.PrepareIfNeededAsync(CancellationToken.None).ConfigureAwait(false); try { - return await executeAsync(state, cancellationToken).ConfigureAwait(false); + return await this.InternalExecuteAndPropagateCancellationAsync( + (command: this._command, executeSync), + (state, cancellationToken) => state.executeSync(state.command).AsValueTask(), + cancellationToken, + isConnectionMonitoringQuery + ).ConfigureAwait(false); } - catch (Exception ex) - // Canceled SQL operations throw SqlException/InvalidOperationException instead of OCE. - // That means that downstream operations end up faulted instead of canceled. We - // wrap with OCE here to correctly propagate cancellation - when (cancellationToken.IsCancellationRequested && this._connection.IsCommandCancellationException(ex)) + finally { - throw new OperationCanceledException( - "Command was canceled", - ex, - cancellationToken - ); + // allows the cancellation loop to exit if it started + Volatile.Write(ref commandBox.Value, null); } } - private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) + using var __ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); + return executeSync(this._command); + } + + private async ValueTask InternalExecuteAndPropagateCancellationAsync( + TState state, + Func> executeAsync, + CancellationToken cancellationToken, + bool isConnectionMonitoringQuery) + { + Invariant.Require(cancellationToken.CanBeCanceled); + + using var _ = await this.AcquireConnectionLockIfNeeded(isConnectionMonitoringQuery).ConfigureAwait(false); + // Note: for now we cannot pass cancellationToken to PrepareAsync() because this will break on Postgres which + // is the only db we currently support that needs Prepare currently. See https://github.com/npgsql/npgsql/issues/4209 + await this.PrepareIfNeededAsync(CancellationToken.None).ConfigureAwait(false); + try + { + return await executeAsync(state, cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + // Canceled SQL operations throw SqlException/InvalidOperationException instead of OCE. + // That means that downstream operations end up faulted instead of canceled. We + // wrap with OCE here to correctly propagate cancellation + when (cancellationToken.IsCancellationRequested && this._connection.IsCommandCancellationException(ex)) + { + throw new OperationCanceledException( + "Command was canceled", + ex, + cancellationToken + ); + } + } + + private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) + { + if (this._connection.ShouldPrepareCommands) { - if (this._connection.ShouldPrepareCommands) - { #if NETSTANDARD2_1 - if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) - { - return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); - } + if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) + { + return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); + } #elif !NETSTANDARD2_0 && !NET461 - ERROR + ERROR #endif - this._command.Prepare(); - } - - return default; + this._command.Prepare(); } + + return default; + } #endregion - public void Dispose() => this._command.Dispose(); + public void Dispose() => this._command.Dispose(); - // NOTE: we do not accept cancellation token here since the keepalive lock should never be held for very long except in - // bug scenarios (e. g. multi-threaded use of a connection) - private ValueTask AcquireConnectionLockIfNeeded(bool isConnectionMonitoringQuery) => - isConnectionMonitoringQuery - ? default(IDisposable?).AsValueTask() - : this._connection.ConnectionMonitor?.AcquireConnectionLockAsync(CancellationToken.None).Convert(To.ValueTask) - ?? default(IDisposable?).AsValueTask(); - } + // NOTE: we do not accept cancellation token here since the keepalive lock should never be held for very long except in + // bug scenarios (e. g. multi-threaded use of a connection) + private ValueTask AcquireConnectionLockIfNeeded(bool isConnectionMonitoringQuery) => + isConnectionMonitoringQuery + ? default(IDisposable?).AsValueTask() + : this._connection.ConnectionMonitor?.AcquireConnectionLockAsync(CancellationToken.None).Convert(To.ValueTask) + ?? default(IDisposable?).AsValueTask(); } diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index a7a85f61..abcd0db6 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -6,164 +6,163 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Abstraction over that abstracts away the varying async support - /// across platforms, smooths over cancellation behavior, and integrates with - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Abstraction over that abstracts away the varying async support +/// across platforms, smooths over cancellation behavior, and integrates with +/// #if DEBUG - public +public #else - internal +internal #endif - abstract class DatabaseConnection : IAsyncDisposable - { - private IDbTransaction? _transaction; + abstract class DatabaseConnection : IAsyncDisposable +{ + private IDbTransaction? _transaction; - protected DatabaseConnection(IDbConnection connection, bool isExternallyOwned) - { - this.InnerConnection = connection; - this.IsExernallyOwned = isExternallyOwned; - this.ConnectionMonitor = new ConnectionMonitor(this); - } + protected DatabaseConnection(IDbConnection connection, bool isExternallyOwned) + { + this.InnerConnection = connection; + this.IsExernallyOwned = isExternallyOwned; + this.ConnectionMonitor = new ConnectionMonitor(this); + } - protected DatabaseConnection(IDbTransaction transaction, bool isExternallyOwned) - : this(transaction.Connection ?? throw new InvalidOperationException("Cannot execute queries against a transaction that has been disposed"), isExternallyOwned) - { - this._transaction = transaction; - } + protected DatabaseConnection(IDbTransaction transaction, bool isExternallyOwned) + : this(transaction.Connection ?? throw new InvalidOperationException("Cannot execute queries against a transaction that has been disposed"), isExternallyOwned) + { + this._transaction = transaction; + } - internal ConnectionMonitor ConnectionMonitor { get; } - internal IDbConnection InnerConnection { get; } + internal ConnectionMonitor ConnectionMonitor { get; } + internal IDbConnection InnerConnection { get; } - public bool HasTransaction => this._transaction != null; - - public bool IsExernallyOwned { get; } + public bool HasTransaction => this._transaction != null; + + public bool IsExernallyOwned { get; } - public abstract bool ShouldPrepareCommands { get; } + public abstract bool ShouldPrepareCommands { get; } - internal bool CanExecuteQueries => this.InnerConnection.State == ConnectionState.Open && (this._transaction == null || this._transaction.Connection != null); - - internal void SetKeepaliveCadence(TimeoutValue cadence) => this.ConnectionMonitor.SetKeepaliveCadence(cadence); + internal bool CanExecuteQueries => this.InnerConnection.State == ConnectionState.Open && (this._transaction == null || this._transaction.Connection != null); + + internal void SetKeepaliveCadence(TimeoutValue cadence) => this.ConnectionMonitor.SetKeepaliveCadence(cadence); - internal IDatabaseConnectionMonitoringHandle GetConnectionMonitoringHandle() => this.ConnectionMonitor.GetMonitoringHandle(); + internal IDatabaseConnectionMonitoringHandle GetConnectionMonitoringHandle() => this.ConnectionMonitor.GetMonitoringHandle(); - public DatabaseCommand CreateCommand() - { - var command = this.InnerConnection.CreateCommand(); - command.Transaction = this._transaction; - return new DatabaseCommand(command, this); - } + public DatabaseCommand CreateCommand() + { + var command = this.InnerConnection.CreateCommand(); + command.Transaction = this._transaction; + return new DatabaseCommand(command, this); + } - // note: we could have this return an IAsyncDisposable which would allow you to close the transaction - // without closing the connection. However, we don't currently have any use-cases for that - public async ValueTask BeginTransactionAsync() - { - Invariant.Require(!this.HasTransaction); + // note: we could have this return an IAsyncDisposable which would allow you to close the transaction + // without closing the connection. However, we don't currently have any use-cases for that + public async ValueTask BeginTransactionAsync() + { + Invariant.Require(!this.HasTransaction); - using var _ = await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); + using var _ = await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); - this._transaction = + this._transaction = #if NETSTANDARD2_1 - !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection - ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) - : + !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection + ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) + : #elif NETSTANDARD2_0 || NET461 #else - ERROR + ERROR #endif - this.InnerConnection.BeginTransaction(); - } + this.InnerConnection.BeginTransaction(); + } - public async ValueTask OpenAsync(CancellationToken cancellationToken) + public async ValueTask OpenAsync(CancellationToken cancellationToken) + { + if ((cancellationToken.CanBeCanceled || !SyncViaAsync.IsSynchronous) + && this.InnerConnection is DbConnection dbConnection) { - if ((cancellationToken.CanBeCanceled || !SyncViaAsync.IsSynchronous) - && this.InnerConnection is DbConnection dbConnection) - { - await dbConnection.OpenAsync(cancellationToken).ConfigureAwait(false); - } - else - { - cancellationToken.ThrowIfCancellationRequested(); - this.InnerConnection.Open(); - } - - this.ConnectionMonitor.Start(); + await dbConnection.OpenAsync(cancellationToken).ConfigureAwait(false); + } + else + { + cancellationToken.ThrowIfCancellationRequested(); + this.InnerConnection.Open(); } - public ValueTask CloseAsync() => this.DisposeOrCloseAsync(isDispose: false); - public ValueTask DisposeAsync() => this.DisposeOrCloseAsync(isDispose: true); + this.ConnectionMonitor.Start(); + } - private async ValueTask DisposeOrCloseAsync(bool isDispose) - { - Invariant.Require(isDispose || !this.IsExernallyOwned); + public ValueTask CloseAsync() => this.DisposeOrCloseAsync(isDispose: false); + public ValueTask DisposeAsync() => this.DisposeOrCloseAsync(isDispose: true); - try - { - await (isDispose ? this.ConnectionMonitor.DisposeAsync() : this.ConnectionMonitor.StopAsync()).ConfigureAwait(false); - } - finally + private async ValueTask DisposeOrCloseAsync(bool isDispose) + { + Invariant.Require(isDispose || !this.IsExernallyOwned); + + try + { + await (isDispose ? this.ConnectionMonitor.DisposeAsync() : this.ConnectionMonitor.StopAsync()).ConfigureAwait(false); + } + finally + { + if (!this.IsExernallyOwned) { - if (!this.IsExernallyOwned) + try { await this.DisposeTransactionAsync(isClosingOrDisposingConnection: true).ConfigureAwait(false); } + finally { - try { await this.DisposeTransactionAsync(isClosingOrDisposingConnection: true).ConfigureAwait(false); } - finally - { #if NETSTANDARD2_1 - if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) - { - await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); - } - else - { - SyncDisposeConnection(); - } -#elif NETSTANDARD2_0 || NET461 + if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) + { + await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); + } + else + { SyncDisposeConnection(); + } +#elif NETSTANDARD2_0 || NET461 + SyncDisposeConnection(); #else - ERROR + ERROR #endif - } } } + } - void SyncDisposeConnection() - { - if (isDispose) { this.InnerConnection.Dispose(); } - else { this.InnerConnection.Close(); } - } + void SyncDisposeConnection() + { + if (isDispose) { this.InnerConnection.Dispose(); } + else { this.InnerConnection.Close(); } } + } - public ValueTask DisposeTransactionAsync() => this.DisposeTransactionAsync(isClosingOrDisposingConnection: false); + public ValueTask DisposeTransactionAsync() => this.DisposeTransactionAsync(isClosingOrDisposingConnection: false); - private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnection) - { - var transaction = this._transaction; - if (transaction == null) { return; } - this._transaction = null; + private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnection) + { + var transaction = this._transaction; + if (transaction == null) { return; } + this._transaction = null; - // we don't need the connection lock here if we're closing/disposing, since in that case we stop the monitor first - using var _ = isClosingOrDisposingConnection - ? null - : await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); + // we don't need the connection lock here if we're closing/disposing, since in that case we stop the monitor first + using var _ = isClosingOrDisposingConnection + ? null + : await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); #if NETSTANDARD2_1 - if (!SyncViaAsync.IsSynchronous && transaction is DbTransaction dbTransaction) - { - await dbTransaction.DisposeAsync().ConfigureAwait(false); - return; - } + if (!SyncViaAsync.IsSynchronous && transaction is DbTransaction dbTransaction) + { + await dbTransaction.DisposeAsync().ConfigureAwait(false); + return; + } #elif NETSTANDARD2_0 || NET461 #else - ERROR + ERROR #endif - transaction.Dispose(); - } + transaction.Dispose(); + } - public abstract bool IsCommandCancellationException(Exception exception); + public abstract bool IsCommandCancellationException(Exception exception); - public abstract Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor); - } + public abstract Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor); } diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 5c235a38..00a29ac5 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -3,117 +3,154 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Implements by giving each lock acquisition a dedicated - /// or - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Implements by giving each lock acquisition a dedicated +/// or +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class DedicatedConnectionOrTransactionDbDistributedLock : IDbDistributedLock +sealed class DedicatedConnectionOrTransactionDbDistributedLock : IDbDistributedLock +{ + private readonly string _name; + private readonly Func _connectionFactory; + private readonly bool _transactionScopedIfPossible; + private readonly TimeoutValue _keepaliveCadence; + + /// + /// Constructs an instance using the given EXTERNALLY OWNED . + /// + public DedicatedConnectionOrTransactionDbDistributedLock(string name, Func externalConnectionFactory) + : this(name, externalConnectionFactory, useTransaction: true, keepaliveCadence: Timeout.InfiniteTimeSpan) { - private readonly string _name; - private readonly Func _connectionFactory; - private readonly bool _transactionScopedIfPossible; - private readonly TimeoutValue _keepaliveCadence; - - /// - /// Constructs an instance using the given EXTERNALLY OWNED . - /// - public DedicatedConnectionOrTransactionDbDistributedLock(string name, Func externalConnectionFactory) - : this(name, externalConnectionFactory, useTransaction: true, keepaliveCadence: Timeout.InfiniteTimeSpan) - { - } + } - public DedicatedConnectionOrTransactionDbDistributedLock( - string name, - Func connectionFactory, - bool useTransaction, - TimeoutValue keepaliveCadence) - { - this._name = name; - this._connectionFactory = connectionFactory; - this._transactionScopedIfPossible = useTransaction; - this._keepaliveCadence = keepaliveCadence; - } + public DedicatedConnectionOrTransactionDbDistributedLock( + string name, + Func connectionFactory, + bool useTransaction, + TimeoutValue keepaliveCadence) + { + this._name = name; + this._connectionFactory = connectionFactory; + this._transactionScopedIfPossible = useTransaction; + this._keepaliveCadence = keepaliveCadence; + } - public async ValueTask TryAcquireAsync( - TimeoutValue timeout, - IDbSynchronizationStrategy strategy, - CancellationToken cancellationToken, - IDistributedSynchronizationHandle? contextHandle) - where TLockCookie : class + public async ValueTask TryAcquireAsync( + TimeoutValue timeout, + IDbSynchronizationStrategy strategy, + CancellationToken cancellationToken, + IDistributedSynchronizationHandle? contextHandle) + where TLockCookie : class + { + IDistributedSynchronizationHandle? result = null; + IAsyncDisposable? connectionResource = null; + try { - IDistributedSynchronizationHandle? result = null; - IAsyncDisposable? connectionResource = null; - try + DatabaseConnection connection; + if (contextHandle != null) { - DatabaseConnection connection; - if (contextHandle != null) - { - connection = GetContextHandleConnection(contextHandle); - } - else + connection = GetContextHandleConnection(contextHandle); + } + else + { + connectionResource = connection = this._connectionFactory(); + if (connection.IsExernallyOwned) { - connectionResource = connection = this._connectionFactory(); - if (connection.IsExernallyOwned) - { - if (!connection.CanExecuteQueries) - { - throw new InvalidOperationException("The connection and/or transaction are disposed or closed"); - } - } - else + if (!connection.CanExecuteQueries) { - await connection.OpenAsync(cancellationToken).ConfigureAwait(false); - if (this._transactionScopedIfPossible) // for an internally-owned connection, we must create the transaction - { - await connection.BeginTransactionAsync().ConfigureAwait(false); - } + throw new InvalidOperationException("The connection and/or transaction are disposed or closed"); } } - - var lockCookie = await strategy.TryAcquireAsync(connection, this._name, timeout, cancellationToken).ConfigureAwait(false); - if (lockCookie != null) + else { - result = new Handle(connection, strategy, this._name, lockCookie, transactionScoped: this._transactionScopedIfPossible && connection.HasTransaction, connectionResource); - if (!this._keepaliveCadence.IsInfinite) + await connection.OpenAsync(cancellationToken).ConfigureAwait(false); + if (this._transactionScopedIfPossible) // for an internally-owned connection, we must create the transaction { - connection.SetKeepaliveCadence(this._keepaliveCadence); + await connection.BeginTransactionAsync().ConfigureAwait(false); } } } - finally + + var lockCookie = await strategy.TryAcquireAsync(connection, this._name, timeout, cancellationToken).ConfigureAwait(false); + if (lockCookie != null) { - // if we fail to acquire or throw, make sure to clean up the connection - if (result == null && connectionResource != null) + result = new Handle(connection, strategy, this._name, lockCookie, transactionScoped: this._transactionScopedIfPossible && connection.HasTransaction, connectionResource); + if (!this._keepaliveCadence.IsInfinite) { - await connectionResource.DisposeAsync().ConfigureAwait(false); + connection.SetKeepaliveCadence(this._keepaliveCadence); } } + } + finally + { + // if we fail to acquire or throw, make sure to clean up the connection + if (result == null && connectionResource != null) + { + await connectionResource.DisposeAsync().ConfigureAwait(false); + } + } - return result; + return result; + } + + private DatabaseConnection GetContextHandleConnection(IDistributedSynchronizationHandle contextHandle) + where TLockCookie : class + { + var connection = ((Handle)contextHandle).Connection; + if (connection == null) { throw new ObjectDisposedException(nameof(contextHandle), "the provided handle is already disposed"); } + return connection; + } + + private sealed class Handle : IDistributedSynchronizationHandle + where TLockCookie : class + { + private InnerHandle? _innerHandle; + private IDisposable? _finalizer; + + public Handle( + DatabaseConnection connection, + IDbSynchronizationStrategy strategy, + string name, + TLockCookie lockCookie, + bool transactionScoped, + IAsyncDisposable? connectionResource) + { + this._innerHandle = new InnerHandle(connection, strategy, name, lockCookie, transactionScoped, connectionResource); + // we don't do managed finalization for externally-owned connections/transactions since it might violate thread-safety + // on those objects (we don't know when they're in use) + this._finalizer = connection.IsExernallyOwned ? null : ManagedFinalizerQueue.Instance.Register(this, this._innerHandle); } - private DatabaseConnection GetContextHandleConnection(IDistributedSynchronizationHandle contextHandle) - where TLockCookie : class + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + + public DatabaseConnection? Connection => Volatile.Read(ref this._innerHandle)?.Connection; + + public void Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() { - var connection = ((Handle)contextHandle).Connection; - if (connection == null) { throw new ObjectDisposedException(nameof(contextHandle), "the provided handle is already disposed"); } - return connection; + Interlocked.Exchange(ref this._finalizer, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } - private sealed class Handle : IDistributedSynchronizationHandle - where TLockCookie : class + private sealed class InnerHandle : IAsyncDisposable { - private InnerHandle? _innerHandle; - private IDisposable? _finalizer; + private static readonly object DisposedSentinel = new(); - public Handle( + private readonly IDbSynchronizationStrategy _strategy; + private readonly string _name; + private readonly TLockCookie _lockCookie; + private readonly bool _transactionScoped; + private readonly IAsyncDisposable? _connectionResource; + private object? _connectionMonitoringHandleOrDisposedSentinel; + + public InnerHandle( DatabaseConnection connection, IDbSynchronizationStrategy strategy, string name, @@ -121,113 +158,75 @@ public Handle( bool transactionScoped, IAsyncDisposable? connectionResource) { - this._innerHandle = new InnerHandle(connection, strategy, name, lockCookie, transactionScoped, connectionResource); - // we don't do managed finalization for externally-owned connections/transactions since it might violate thread-safety - // on those objects (we don't know when they're in use) - this._finalizer = connection.IsExernallyOwned ? null : ManagedFinalizerQueue.Instance.Register(this, this._innerHandle); + this.Connection = connection; + this._strategy = strategy; + this._name = name; + this._lockCookie = lockCookie; + this._transactionScoped = transactionScoped; + this._connectionResource = connectionResource; } - public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); - - public DatabaseConnection? Connection => Volatile.Read(ref this._innerHandle)?.Connection; - - public void Dispose() => this.DisposeSyncViaAsync(); - - public ValueTask DisposeAsync() - { - Interlocked.Exchange(ref this._finalizer, null)?.Dispose(); - return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + public DatabaseConnection Connection { get; } - private sealed class InnerHandle : IAsyncDisposable + public CancellationToken HandleLostToken { - private static readonly object DisposedSentinel = new(); - - private readonly IDbSynchronizationStrategy _strategy; - private readonly string _name; - private readonly TLockCookie _lockCookie; - private readonly bool _transactionScoped; - private readonly IAsyncDisposable? _connectionResource; - private object? _connectionMonitoringHandleOrDisposedSentinel; - - public InnerHandle( - DatabaseConnection connection, - IDbSynchronizationStrategy strategy, - string name, - TLockCookie lockCookie, - bool transactionScoped, - IAsyncDisposable? connectionResource) - { - this.Connection = connection; - this._strategy = strategy; - this._name = name; - this._lockCookie = lockCookie; - this._transactionScoped = transactionScoped; - this._connectionResource = connectionResource; - } - - public DatabaseConnection Connection { get; } - - public CancellationToken HandleLostToken + get { - get + var existing = Volatile.Read(ref this._connectionMonitoringHandleOrDisposedSentinel); + + // if we don't have a handle and aren't disposed, try to make a handle + if (existing == null) { - var existing = Volatile.Read(ref this._connectionMonitoringHandleOrDisposedSentinel); + // tentatively create a new handle and try to assign it + var newHandle = this.Connection.GetConnectionMonitoringHandle(); + existing = Interlocked.CompareExchange(ref this._connectionMonitoringHandleOrDisposedSentinel, newHandle, comparand: null); - // if we don't have a handle and aren't disposed, try to make a handle if (existing == null) { - // tentatively create a new handle and try to assign it - var newHandle = this.Connection.GetConnectionMonitoringHandle(); - existing = Interlocked.CompareExchange(ref this._connectionMonitoringHandleOrDisposedSentinel, newHandle, comparand: null); - - if (existing == null) - { - // we won the race: use our new handle - return newHandle.ConnectionLostToken; - } - - // We lost the race: discard our new handle. - // Existing is now either a handle created in a race with us or the disposed sentinel - newHandle.Dispose(); + // we won the race: use our new handle + return newHandle.ConnectionLostToken; } - if (existing == DisposedSentinel) - { - throw this.ObjectDisposed(); - } + // We lost the race: discard our new handle. + // Existing is now either a handle created in a race with us or the disposed sentinel + newHandle.Dispose(); + } - return ((IDatabaseConnectionMonitoringHandle)existing).ConnectionLostToken; + if (existing == DisposedSentinel) + { + throw this.ObjectDisposed(); } + + return ((IDatabaseConnectionMonitoringHandle)existing).ConnectionLostToken; } + } - public async ValueTask DisposeAsync() - { - var connectionMonitoringHandleOrDisposedSentinel = Interlocked.Exchange(ref this._connectionMonitoringHandleOrDisposedSentinel, DisposedSentinel); - if (connectionMonitoringHandleOrDisposedSentinel == DisposedSentinel) { return; } + public async ValueTask DisposeAsync() + { + var connectionMonitoringHandleOrDisposedSentinel = Interlocked.Exchange(ref this._connectionMonitoringHandleOrDisposedSentinel, DisposedSentinel); + if (connectionMonitoringHandleOrDisposedSentinel == DisposedSentinel) { return; } - if (connectionMonitoringHandleOrDisposedSentinel is IDatabaseConnectionMonitoringHandle handle) - { - handle.Dispose(); - } + if (connectionMonitoringHandleOrDisposedSentinel is IDatabaseConnectionMonitoringHandle handle) + { + handle.Dispose(); + } - try - { - // For transaction-scoped locks, we can sometimes skip the explicit release step. This comes up when either - // (a) We own the connection and therefore the transaction. In this case we're about to dispose the transaction and release that way - // (b) The transaction is dead (e. g. completed or rolled back) in which case the lock has already been released - var canSkipExplicitRelease = - this._transactionScoped && (!this.Connection.IsExernallyOwned || !this.Connection.CanExecuteQueries); - if (!canSkipExplicitRelease) - { - await this._strategy.ReleaseAsync(this.Connection, this._name, this._lockCookie).ConfigureAwait(false); - } - } - finally + try + { + // For transaction-scoped locks, we can sometimes skip the explicit release step. This comes up when either + // (a) We own the connection and therefore the transaction. In this case we're about to dispose the transaction and release that way + // (b) The transaction is dead (e. g. completed or rolled back) in which case the lock has already been released + var canSkipExplicitRelease = + this._transactionScoped && (!this.Connection.IsExernallyOwned || !this.Connection.CanExecuteQueries); + if (!canSkipExplicitRelease) { - await (this._connectionResource?.DisposeAsync() ?? default).ConfigureAwait(false); + await this._strategy.ReleaseAsync(this.Connection, this._name, this._lockCookie).ConfigureAwait(false); } } + finally + { + await (this._connectionResource?.DisposeAsync() ?? default).ConfigureAwait(false); + } } } } diff --git a/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs b/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs index 954b8513..44da93ca 100644 --- a/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs +++ b/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs @@ -3,10 +3,9 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Internal.Data +namespace Medallion.Threading.Internal.Data; + +internal interface IDatabaseConnectionMonitoringHandle : IDisposable { - internal interface IDatabaseConnectionMonitoringHandle : IDisposable - { - CancellationToken ConnectionLostToken { get; } - } + CancellationToken ConnectionLostToken { get; } } diff --git a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs index 88a5d6d0..4fe15346 100644 --- a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs @@ -2,24 +2,23 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// There are several strategies for implementing SQL-based locks; this interface - /// abstracts between them to keep the implementation of manageable - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// There are several strategies for implementing SQL-based locks; this interface +/// abstracts between them to keep the implementation of manageable +/// #if DEBUG - public +public #else - internal +internal #endif - interface IDbDistributedLock - { - // the contextHandle argument to this method is used when acquiring a nested lock, such as upgrading - // from an upgradeable read lock to a write lock. This allows the implementation to use the same connection - // for the nested lock +interface IDbDistributedLock +{ + // the contextHandle argument to this method is used when acquiring a nested lock, such as upgrading + // from an upgradeable read lock to a write lock. This allows the implementation to use the same connection + // for the nested lock - ValueTask TryAcquireAsync(TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, IDistributedSynchronizationHandle? contextHandle) - where TLockCookie : class; - } + ValueTask TryAcquireAsync(TimeoutValue timeout, IDbSynchronizationStrategy strategy, CancellationToken cancellationToken, IDistributedSynchronizationHandle? contextHandle) + where TLockCookie : class; } diff --git a/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs b/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs index 8940055f..f24fb219 100644 --- a/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs +++ b/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs @@ -3,33 +3,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Represents a "locking algorithm" implemented in SQL - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Represents a "locking algorithm" implemented in SQL +/// #if DEBUG - public +public #else - internal +internal #endif - interface IDbSynchronizationStrategy - where TLockCookie : class - { - /// - /// True iff the lock taken by the algorithm can be upgraded on the same connection (basically for upgradeable read locks). - /// - /// We need this property because the multiplexing approach has to avoid multiplexing upgradeable locks since they may block - /// indefinitely on the held connection (which would prevent other locks on that connection from releasing) during an upgrade - /// operation. - /// - bool IsUpgradeable { get; } +interface IDbSynchronizationStrategy + where TLockCookie : class +{ + /// + /// True iff the lock taken by the algorithm can be upgraded on the same connection (basically for upgradeable read locks). + /// + /// We need this property because the multiplexing approach has to avoid multiplexing upgradeable locks since they may block + /// indefinitely on the held connection (which would prevent other locks on that connection from releasing) during an upgrade + /// operation. + /// + bool IsUpgradeable { get; } - /// - /// Attempts to acquire the lock, returning either null for failure or a non-null state "cookie" on success - /// - ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken); + /// + /// Attempts to acquire the lock, returning either null for failure or a non-null state "cookie" on success + /// + ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken); - ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, TLockCookie lockCookie); - } + ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, TLockCookie lockCookie); } diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 153fd7c4..7fbe6a20 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -3,301 +3,300 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data +namespace Medallion.Threading.Internal.Data; + +/// +/// Allows multiple SQL application locks to be taken on a single connection. +/// +/// This class is thread-safe except for +/// +internal sealed class MultiplexedConnectionLock : IAsyncDisposable { /// - /// Allows multiple SQL application locks to be taken on a single connection. - /// - /// This class is thread-safe except for + /// Protects access to and /// - internal sealed class MultiplexedConnectionLock : IAsyncDisposable + private readonly AsyncLock _mutex = AsyncLock.Create(); + private readonly Dictionary _heldLocksToKeepaliveCadences = new Dictionary(); + private readonly DatabaseConnection _connection; + /// + /// Tracks whether we've successfully opened the connection. We track this explicity instead of just looking at + /// because we want to make sure we close() explicitly for every + /// open() and also we want to make sure we do not try to re-open a broken connection. + /// + private bool _connectionOpened; + + public MultiplexedConnectionLock(DatabaseConnection connection) + { + this._connection = connection; + } + + private bool IsConnectionBrokenNoLock => this._connectionOpened && !this._connection.CanExecuteQueries; + + public async ValueTask TryAcquireAsync( + string name, + TimeoutValue timeout, + IDbSynchronizationStrategy strategy, + TimeoutValue keepaliveCadence, + CancellationToken cancellationToken, + bool opportunistic) + where TLockCookie : class { - /// - /// Protects access to and - /// - private readonly AsyncLock _mutex = AsyncLock.Create(); - private readonly Dictionary _heldLocksToKeepaliveCadences = new Dictionary(); - private readonly DatabaseConnection _connection; - /// - /// Tracks whether we've successfully opened the connection. We track this explicity instead of just looking at - /// because we want to make sure we close() explicitly for every - /// open() and also we want to make sure we do not try to re-open a broken connection. - /// - private bool _connectionOpened; - - public MultiplexedConnectionLock(DatabaseConnection connection) + using var mutexHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); + if (mutexHandle == null) { - this._connection = connection; + // mutex wasn't free, so just give up + Invariant.Require(opportunistic); + // The current lock is busy so we allow retry but on a different lock instance. We can't safely dispose + // since we never acquired the mutex so we can't check _heldLocks + return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); } - private bool IsConnectionBrokenNoLock => this._connectionOpened && !this._connection.CanExecuteQueries; + // This is technically redundant with the similar catch block below, but avoids needing to have + // to attempt a query on a connection that we know is broken. + if (opportunistic && this.IsConnectionBrokenNoLock) { return this.GetAlreadyBrokenResultNoLock(); } - public async ValueTask TryAcquireAsync( - string name, - TimeoutValue timeout, - IDbSynchronizationStrategy strategy, - TimeoutValue keepaliveCadence, - CancellationToken cancellationToken, - bool opportunistic) - where TLockCookie : class + try { - using var mutexHandle = await this._mutex.TryAcquireAsync(opportunistic ? TimeSpan.Zero : Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false); - if (mutexHandle == null) + if (this._heldLocksToKeepaliveCadences.ContainsKey(name)) { - // mutex wasn't free, so just give up - Invariant.Require(opportunistic); - // The current lock is busy so we allow retry but on a different lock instance. We can't safely dispose - // since we never acquired the mutex so we can't check _heldLocks - return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); + // we won't try to hold the same lock twice on one connection. At some point, we could + // support this case in-memory using a counter for each multiply-held lock name and being careful + // with modes + return this.GetFailureResultNoLock(isAlreadyHeld: true, opportunistic, timeout); } - // This is technically redundant with the similar catch block below, but avoids needing to have - // to attempt a query on a connection that we know is broken. - if (opportunistic && this.IsConnectionBrokenNoLock) { return this.GetAlreadyBrokenResultNoLock(); } - - try - { - if (this._heldLocksToKeepaliveCadences.ContainsKey(name)) - { - // we won't try to hold the same lock twice on one connection. At some point, we could - // support this case in-memory using a counter for each multiply-held lock name and being careful - // with modes - return this.GetFailureResultNoLock(isAlreadyHeld: true, opportunistic, timeout); - } - - if (!this._connectionOpened) - { - await this._connection.OpenAsync(cancellationToken).ConfigureAwait(false); - this._connectionOpened = true; - } - - var lockCookie = await strategy.TryAcquireAsync(this._connection, name, opportunistic ? TimeSpan.Zero : timeout, cancellationToken).ConfigureAwait(false); - if (lockCookie != null) - { - var handle = new ManagedFinalizationDistributedLockHandle(new Handle(this, strategy, name, lockCookie)); - this._heldLocksToKeepaliveCadences.Add(name, keepaliveCadence); - if (!keepaliveCadence.IsInfinite) { this.SetKeepaliveCadenceNoLock(); } - return new Result(handle); - } - - // we failed to acquire the lock, so we should retry if we were being opportunistic and artificially - // shortened the timeout - return this.GetFailureResultNoLock(isAlreadyHeld: false, opportunistic, timeout); - } - // never punish for the connection being broken already (see https://github.com/madelson/DistributedLock/issues/83) - catch when (opportunistic && this.IsConnectionBrokenNoLock) + if (!this._connectionOpened) { - return this.GetAlreadyBrokenResultNoLock(); + await this._connection.OpenAsync(cancellationToken).ConfigureAwait(false); + this._connectionOpened = true; } - finally + + var lockCookie = await strategy.TryAcquireAsync(this._connection, name, opportunistic ? TimeSpan.Zero : timeout, cancellationToken).ConfigureAwait(false); + if (lockCookie != null) { - await this.CloseConnectionIfNeededNoLockAsync().ConfigureAwait(false); + var handle = new ManagedFinalizationDistributedLockHandle(new Handle(this, strategy, name, lockCookie)); + this._heldLocksToKeepaliveCadences.Add(name, keepaliveCadence); + if (!keepaliveCadence.IsInfinite) { this.SetKeepaliveCadenceNoLock(); } + return new Result(handle); } - } - public ValueTask DisposeAsync() + // we failed to acquire the lock, so we should retry if we were being opportunistic and artificially + // shortened the timeout + return this.GetFailureResultNoLock(isAlreadyHeld: false, opportunistic, timeout); + } + // never punish for the connection being broken already (see https://github.com/madelson/DistributedLock/issues/83) + catch when (opportunistic && this.IsConnectionBrokenNoLock) { - Invariant.Require(this._heldLocksToKeepaliveCadences.Count == 0); - - return this._connection.DisposeAsync(); + return this.GetAlreadyBrokenResultNoLock(); } - - public async ValueTask GetIsInUseAsync() + finally { - using var mutexHandle = await this._mutex.TryAcquireAsync(TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); - return mutexHandle == null || this._heldLocksToKeepaliveCadences.Count != 0; + await this.CloseConnectionIfNeededNoLockAsync().ConfigureAwait(false); } + } - private Result GetAlreadyBrokenResultNoLock() => - // Retry on any already-broken connection to avoid "leaking" the killing or death of connections. We want there to be no observable - // results (other than perf) of multiplexing vs. not. - new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); - - private Result GetFailureResultNoLock(bool isAlreadyHeld, bool opportunistic, TimeoutValue timeout) - { - // only opportunistic acquisitions trigger retries - if (!opportunistic) - { - return new Result(MultiplexedConnectionLockRetry.NoRetry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); - } + public ValueTask DisposeAsync() + { + Invariant.Require(this._heldLocksToKeepaliveCadences.Count == 0); - if (isAlreadyHeld) - { - // We're already holding the lock so we allow retry but on a different lock instance. - // We can't safely dispose because we're holding the lock - return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); - } + return this._connection.DisposeAsync(); + } - // if we get here, we failed due to a timeout - var isHoldingLocks = this._heldLocksToKeepaliveCadences.Count != 0; + public async ValueTask GetIsInUseAsync() + { + using var mutexHandle = await this._mutex.TryAcquireAsync(TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); + return mutexHandle == null || this._heldLocksToKeepaliveCadences.Count != 0; + } - if (timeout.IsZero) - { - // if acquire timed out and the caller requested a zero timeout, that's conventional failure - // and we shouldn't retry - return new Result(MultiplexedConnectionLockRetry.NoRetry, canSafelyDispose: !isHoldingLocks); - } + private Result GetAlreadyBrokenResultNoLock() => + // Retry on any already-broken connection to avoid "leaking" the killing or death of connections. We want there to be no observable + // results (other than perf) of multiplexing vs. not. + new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); - if (isHoldingLocks) - { - // if we're holding other locks, then we should retry on another lock - return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); - } + private Result GetFailureResultNoLock(bool isAlreadyHeld, bool opportunistic, TimeoutValue timeout) + { + // only opportunistic acquisitions trigger retries + if (!opportunistic) + { + return new Result(MultiplexedConnectionLockRetry.NoRetry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); + } - // If we're not holding anything, then it's safe to retry on this instance since we can't - // possibly block a release. It's also safe to dispose this lock, but that won't happen since - // we're going to re-try on it instead - return new Result(MultiplexedConnectionLockRetry.RetryOnThisLock, canSafelyDispose: true); + if (isAlreadyHeld) + { + // We're already holding the lock so we allow retry but on a different lock instance. + // We can't safely dispose because we're holding the lock + return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); } - private async ValueTask ReleaseAsync(IDbSynchronizationStrategy strategy, string name, TLockCookie lockCookie) - where TLockCookie : class + // if we get here, we failed due to a timeout + var isHoldingLocks = this._heldLocksToKeepaliveCadences.Count != 0; + + if (timeout.IsZero) { - using var _ = await this._mutex.AcquireAsync(CancellationToken.None).ConfigureAwait(false); - try - { - await strategy.ReleaseAsync(this._connection, name, lockCookie).ConfigureAwait(false); - } - finally - { - if (this._heldLocksToKeepaliveCadences.TryGetValue(name, out var keepaliveCadence)) - { - this._heldLocksToKeepaliveCadences.Remove(name); - if (!keepaliveCadence.IsInfinite) - { - // note: we do this even if we're about to close the connection because we'll want - // the correct cadence set when and if we re-open - this.SetKeepaliveCadenceNoLock(); - } - } - await this.CloseConnectionIfNeededNoLockAsync().ConfigureAwait(false); - } + // if acquire timed out and the caller requested a zero timeout, that's conventional failure + // and we shouldn't retry + return new Result(MultiplexedConnectionLockRetry.NoRetry, canSafelyDispose: !isHoldingLocks); } - private async ValueTask CloseConnectionIfNeededNoLockAsync() + if (isHoldingLocks) { - if (this._connectionOpened && this._heldLocksToKeepaliveCadences.Count == 0) - { - await this._connection.CloseAsync().ConfigureAwait(false); - this._connectionOpened = false; - } + // if we're holding other locks, then we should retry on another lock + return new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: false); } - private void SetKeepaliveCadenceNoLock() + // If we're not holding anything, then it's safe to retry on this instance since we can't + // possibly block a release. It's also safe to dispose this lock, but that won't happen since + // we're going to re-try on it instead + return new Result(MultiplexedConnectionLockRetry.RetryOnThisLock, canSafelyDispose: true); + } + + private async ValueTask ReleaseAsync(IDbSynchronizationStrategy strategy, string name, TLockCookie lockCookie) + where TLockCookie : class + { + using var _ = await this._mutex.AcquireAsync(CancellationToken.None).ConfigureAwait(false); + try { - TimeoutValue minCadence = Timeout.InfiniteTimeSpan; - foreach (var kvp in this._heldLocksToKeepaliveCadences) + await strategy.ReleaseAsync(this._connection, name, lockCookie).ConfigureAwait(false); + } + finally + { + if (this._heldLocksToKeepaliveCadences.TryGetValue(name, out var keepaliveCadence)) { - if (kvp.Value.CompareTo(minCadence) < 0) + this._heldLocksToKeepaliveCadences.Remove(name); + if (!keepaliveCadence.IsInfinite) { - minCadence = kvp.Value; + // note: we do this even if we're about to close the connection because we'll want + // the correct cadence set when and if we re-open + this.SetKeepaliveCadenceNoLock(); } } - this._connection.SetKeepaliveCadence(minCadence); + await this.CloseConnectionIfNeededNoLockAsync().ConfigureAwait(false); } + } - public readonly struct Result + private async ValueTask CloseConnectionIfNeededNoLockAsync() + { + if (this._connectionOpened && this._heldLocksToKeepaliveCadences.Count == 0) { - public Result(IDistributedSynchronizationHandle handle) - { - this.Handle = handle; - this.Retry = MultiplexedConnectionLockRetry.NoRetry; - this.CanSafelyDispose = false; // since we have handle - } + await this._connection.CloseAsync().ConfigureAwait(false); + this._connectionOpened = false; + } + } - public Result(MultiplexedConnectionLockRetry retry, bool canSafelyDispose) + private void SetKeepaliveCadenceNoLock() + { + TimeoutValue minCadence = Timeout.InfiniteTimeSpan; + foreach (var kvp in this._heldLocksToKeepaliveCadences) + { + if (kvp.Value.CompareTo(minCadence) < 0) { - this.Handle = null; - this.Retry = retry; - this.CanSafelyDispose = canSafelyDispose; + minCadence = kvp.Value; } + } + this._connection.SetKeepaliveCadence(minCadence); + } - public IDistributedSynchronizationHandle? Handle { get; } - public MultiplexedConnectionLockRetry Retry { get; } - public bool CanSafelyDispose { get; } + public readonly struct Result + { + public Result(IDistributedSynchronizationHandle handle) + { + this.Handle = handle; + this.Retry = MultiplexedConnectionLockRetry.NoRetry; + this.CanSafelyDispose = false; // since we have handle } - private sealed class Handle : IDistributedSynchronizationHandle - where TLockCookie : class + public Result(MultiplexedConnectionLockRetry retry, bool canSafelyDispose) { - private readonly string _name; - private RefBox<(MultiplexedConnectionLock @lock, IDbSynchronizationStrategy strategy, TLockCookie lockCookie, IDatabaseConnectionMonitoringHandle? monitoringHandle)>? _box; + this.Handle = null; + this.Retry = retry; + this.CanSafelyDispose = canSafelyDispose; + } - public Handle(MultiplexedConnectionLock @lock, IDbSynchronizationStrategy strategy, string name, TLockCookie lockCookie) - { - this._name = name; - this._box = RefBox.Create((@lock, strategy, lockCookie, default(IDatabaseConnectionMonitoringHandle))); - } + public IDistributedSynchronizationHandle? Handle { get; } + public MultiplexedConnectionLockRetry Retry { get; } + public bool CanSafelyDispose { get; } + } - public CancellationToken HandleLostToken + private sealed class Handle : IDistributedSynchronizationHandle + where TLockCookie : class + { + private readonly string _name; + private RefBox<(MultiplexedConnectionLock @lock, IDbSynchronizationStrategy strategy, TLockCookie lockCookie, IDatabaseConnectionMonitoringHandle? monitoringHandle)>? _box; + + public Handle(MultiplexedConnectionLock @lock, IDbSynchronizationStrategy strategy, string name, TLockCookie lockCookie) + { + this._name = name; + this._box = RefBox.Create((@lock, strategy, lockCookie, default(IDatabaseConnectionMonitoringHandle))); + } + + public CancellationToken HandleLostToken + { + get { - get - { - var existingBox = Volatile.Read(ref this._box); + var existingBox = Volatile.Read(ref this._box); - if (existingBox != null && existingBox.Value.monitoringHandle == null) + if (existingBox != null && existingBox.Value.monitoringHandle == null) + { + var newHandle = existingBox.Value.@lock._connection.ConnectionMonitor.GetMonitoringHandle(); + var newContents = existingBox.Value; + newContents.monitoringHandle = newHandle; + var newBox = RefBox.Create(newContents); + var newExistingBox = Interlocked.CompareExchange(ref this._box, newBox, comparand: existingBox); + if (newExistingBox == existingBox) { - var newHandle = existingBox.Value.@lock._connection.ConnectionMonitor.GetMonitoringHandle(); - var newContents = existingBox.Value; - newContents.monitoringHandle = newHandle; - var newBox = RefBox.Create(newContents); - var newExistingBox = Interlocked.CompareExchange(ref this._box, newBox, comparand: existingBox); - if (newExistingBox == existingBox) - { - return newHandle.ConnectionLostToken; - } - - existingBox = newExistingBox; + return newHandle.ConnectionLostToken; } - if (existingBox == null) { throw this.ObjectDisposed(); } - - // must exist here since we only clear the box on dispose or update the contents when creating a token - return existingBox.Value.monitoringHandle!.ConnectionLostToken; + existingBox = newExistingBox; } - } - public ValueTask DisposeAsync() - { - if (RefBox.TryConsume(ref this._box, out var contents)) - { - contents.monitoringHandle?.Dispose(); - return contents.@lock.ReleaseAsync(contents.strategy, this._name, contents.lockCookie); - } + if (existingBox == null) { throw this.ObjectDisposed(); } - return default; + // must exist here since we only clear the box on dispose or update the contents when creating a token + return existingBox.Value.monitoringHandle!.ConnectionLostToken; } - - void IDisposable.Dispose() => this.DisposeSyncViaAsync(); } - private sealed class ManagedFinalizationDistributedLockHandle : IDistributedSynchronizationHandle + public ValueTask DisposeAsync() { - private readonly IDistributedSynchronizationHandle _innerHandle; - private readonly IDisposable _finalizerRegistration; - - public ManagedFinalizationDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + if (RefBox.TryConsume(ref this._box, out var contents)) { - this._innerHandle = innerHandle; - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + contents.monitoringHandle?.Dispose(); + return contents.@lock.ReleaseAsync(contents.strategy, this._name, contents.lockCookie); } - public CancellationToken HandleLostToken => this._innerHandle.HandleLostToken; - - public void Dispose() => this.DisposeSyncViaAsync(); - - public ValueTask DisposeAsync() - { - this._finalizerRegistration.Dispose(); - return this._innerHandle.DisposeAsync(); - } + return default; } + + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); } - internal enum MultiplexedConnectionLockRetry + private sealed class ManagedFinalizationDistributedLockHandle : IDistributedSynchronizationHandle { - NoRetry, - RetryOnThisLock, - Retry, + private readonly IDistributedSynchronizationHandle _innerHandle; + private readonly IDisposable _finalizerRegistration; + + public ManagedFinalizationDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } + + public CancellationToken HandleLostToken => this._innerHandle.HandleLostToken; + + public void Dispose() => this.DisposeSyncViaAsync(); + + public ValueTask DisposeAsync() + { + this._finalizerRegistration.Dispose(); + return this._innerHandle.DisposeAsync(); + } } } + +internal enum MultiplexedConnectionLockRetry +{ + NoRetry, + RetryOnThisLock, + Retry, +} diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index e56932ad..99a7220b 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -7,209 +7,208 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Implements a pool of instances - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Implements a pool of instances +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class MultiplexedConnectionLockPool + sealed class MultiplexedConnectionLockPool +{ + private readonly AsyncLock _lock = AsyncLock.Create(); + + private readonly Dictionary> _poolsByConnectionString = + new Dictionary>(); + /// + /// The number of times we've called + /// since we last called + /// + private uint _storeCountSinceLastPrune; + /// + /// The number of s stored in + /// + private uint _pooledLockCount; + + public MultiplexedConnectionLockPool(Func connectionFactory) { - private readonly AsyncLock _lock = AsyncLock.Create(); - - private readonly Dictionary> _poolsByConnectionString = - new Dictionary>(); - /// - /// The number of times we've called - /// since we last called - /// - private uint _storeCountSinceLastPrune; - /// - /// The number of s stored in - /// - private uint _pooledLockCount; - - public MultiplexedConnectionLockPool(Func connectionFactory) - { - this.ConnectionFactory = connectionFactory; - } + this.ConnectionFactory = connectionFactory; + } - internal Func ConnectionFactory { get; } + internal Func ConnectionFactory { get; } - public async ValueTask TryAcquireAsync( - string connectionString, - string name, - TimeoutValue timeout, - IDbSynchronizationStrategy strategy, - TimeoutValue keepaliveCadence, - CancellationToken cancellationToken) - where TLockCookie : class + public async ValueTask TryAcquireAsync( + string connectionString, + string name, + TimeoutValue timeout, + IDbSynchronizationStrategy strategy, + TimeoutValue keepaliveCadence, + CancellationToken cancellationToken) + where TLockCookie : class + { + // opportunistic phase: see if we can use a connection that is already holding a lock + // to acquire the current lock + var existingLock = await this.GetExistingLockOrDefaultAsync(connectionString).ConfigureAwait(false); + if (existingLock != null) { - // opportunistic phase: see if we can use a connection that is already holding a lock - // to acquire the current lock - var existingLock = await this.GetExistingLockOrDefaultAsync(connectionString).ConfigureAwait(false); - if (existingLock != null) + var canSafelyDisposeExistingLock = false; + try { - var canSafelyDisposeExistingLock = false; - try - { - var opportunisticResult = await TryAcquireAsync(existingLock, opportunistic: true).ConfigureAwait(false); - if (opportunisticResult.Handle != null) { return opportunisticResult.Handle; } - // this will always be false if handle is non-null, so we can set if afterwards - canSafelyDisposeExistingLock = opportunisticResult.CanSafelyDispose; - - switch (opportunisticResult.Retry) - { - case MultiplexedConnectionLockRetry.NoRetry: - return null; - case MultiplexedConnectionLockRetry.RetryOnThisLock: - var retryOnThisLockResult = await TryAcquireAsync(existingLock, opportunistic: false).ConfigureAwait(false); - canSafelyDisposeExistingLock = retryOnThisLockResult.CanSafelyDispose; - return retryOnThisLockResult.Handle; - case MultiplexedConnectionLockRetry.Retry: - break; - default: - throw new InvalidOperationException("unexpected retry"); - } - } - finally + var opportunisticResult = await TryAcquireAsync(existingLock, opportunistic: true).ConfigureAwait(false); + if (opportunisticResult.Handle != null) { return opportunisticResult.Handle; } + // this will always be false if handle is non-null, so we can set if afterwards + canSafelyDisposeExistingLock = opportunisticResult.CanSafelyDispose; + + switch (opportunisticResult.Retry) { - // since we took this lock from the pool, always return it to the pool - await this.StoreOrDisposeLockAsync(connectionString, existingLock, shouldDispose: canSafelyDisposeExistingLock).ConfigureAwait(false); + case MultiplexedConnectionLockRetry.NoRetry: + return null; + case MultiplexedConnectionLockRetry.RetryOnThisLock: + var retryOnThisLockResult = await TryAcquireAsync(existingLock, opportunistic: false).ConfigureAwait(false); + canSafelyDisposeExistingLock = retryOnThisLockResult.CanSafelyDispose; + return retryOnThisLockResult.Handle; + case MultiplexedConnectionLockRetry.Retry: + break; + default: + throw new InvalidOperationException("unexpected retry"); } } - - // normal phase: if we were not able to be opportunistic, ensure that we have a lock - var @lock = new MultiplexedConnectionLock(this.ConnectionFactory(connectionString)); - MultiplexedConnectionLock.Result? result = null; - try - { - result = await TryAcquireAsync(@lock, opportunistic: false).ConfigureAwait(false); - Invariant.Require(result!.Value.Retry == MultiplexedConnectionLockRetry.NoRetry, "Acquire on fresh lock should not recommend a retry"); - } finally { - // if we failed to even acquire a result on a brand new lock, then there's definitely no reason to store it - await this.StoreOrDisposeLockAsync(connectionString, @lock, shouldDispose: result?.CanSafelyDispose ?? true).ConfigureAwait(false); + // since we took this lock from the pool, always return it to the pool + await this.StoreOrDisposeLockAsync(connectionString, existingLock, shouldDispose: canSafelyDisposeExistingLock).ConfigureAwait(false); } - return result.Value.Handle; + } - ValueTask TryAcquireAsync(MultiplexedConnectionLock @lock, bool opportunistic) => - @lock.TryAcquireAsync(name, timeout, strategy, keepaliveCadence, cancellationToken, opportunistic); + // normal phase: if we were not able to be opportunistic, ensure that we have a lock + var @lock = new MultiplexedConnectionLock(this.ConnectionFactory(connectionString)); + MultiplexedConnectionLock.Result? result = null; + try + { + result = await TryAcquireAsync(@lock, opportunistic: false).ConfigureAwait(false); + Invariant.Require(result!.Value.Retry == MultiplexedConnectionLockRetry.NoRetry, "Acquire on fresh lock should not recommend a retry"); + } + finally + { + // if we failed to even acquire a result on a brand new lock, then there's definitely no reason to store it + await this.StoreOrDisposeLockAsync(connectionString, @lock, shouldDispose: result?.CanSafelyDispose ?? true).ConfigureAwait(false); } + return result.Value.Handle; + + ValueTask TryAcquireAsync(MultiplexedConnectionLock @lock, bool opportunistic) => + @lock.TryAcquireAsync(name, timeout, strategy, keepaliveCadence, cancellationToken, opportunistic); + } + + private async ValueTask GetExistingLockOrDefaultAsync(string connectionString) + { + using var _ = await this._lock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); - private async ValueTask GetExistingLockOrDefaultAsync(string connectionString) + if (this._poolsByConnectionString.TryGetValue(connectionString, out var pool) && pool.Count != 0) { - using var _ = await this._lock.AcquireAsync(CancellationToken.None).ConfigureAwait(false); + --this._pooledLockCount; + return pool.Dequeue(); + } - if (this._poolsByConnectionString.TryGetValue(connectionString, out var pool) && pool.Count != 0) - { - --this._pooledLockCount; - return pool.Dequeue(); - } + return null; + } - return null; + private async ValueTask StoreOrDisposeLockAsync(string connectionString, MultiplexedConnectionLock @lock, bool shouldDispose) + { + if (shouldDispose) + { + try { await @lock.DisposeAsync().ConfigureAwait(false); } + catch { /* swallow */ } } - private async ValueTask StoreOrDisposeLockAsync(string connectionString, MultiplexedConnectionLock @lock, bool shouldDispose) + using (await this._lock.AcquireAsync(CancellationToken.None).ConfigureAwait(false)) { + ++this._storeCountSinceLastPrune; + if (shouldDispose) { - try { await @lock.DisposeAsync().ConfigureAwait(false); } - catch { /* swallow */ } + // If we're about to dispose the lock, check if it has an empty pool that can be removed from our dictionary. + // By itself this doesn't guarantee cleanup: after a successful acquire we'll have an empty lock left over that won't + // go away unless we use THAT connection string again. To help with this, we have pruning + if (this._poolsByConnectionString.TryGetValue(connectionString, out var pool) && pool.Count == 0) + { + this._poolsByConnectionString.Remove(connectionString); + } } - - using (await this._lock.AcquireAsync(CancellationToken.None).ConfigureAwait(false)) + else // otherwise, store the lock { - ++this._storeCountSinceLastPrune; + ++this._pooledLockCount; - if (shouldDispose) + if (this._poolsByConnectionString.TryGetValue(connectionString, out var existing)) { - // If we're about to dispose the lock, check if it has an empty pool that can be removed from our dictionary. - // By itself this doesn't guarantee cleanup: after a successful acquire we'll have an empty lock left over that won't - // go away unless we use THAT connection string again. To help with this, we have pruning - if (this._poolsByConnectionString.TryGetValue(connectionString, out var pool) && pool.Count == 0) - { - this._poolsByConnectionString.Remove(connectionString); - } + existing.Enqueue(@lock); } - else // otherwise, store the lock + else { - ++this._pooledLockCount; - - if (this._poolsByConnectionString.TryGetValue(connectionString, out var existing)) - { - existing.Enqueue(@lock); - } - else - { - var newPool = new Queue(); - newPool.Enqueue(@lock); - this._poolsByConnectionString.Add(connectionString, newPool); - } + var newPool = new Queue(); + newPool.Enqueue(@lock); + this._poolsByConnectionString.Add(connectionString, newPool); } + } - if (this.IsDueForPruningNoLock()) - { - await this.PrunePoolsNoLockAsync().ConfigureAwait(false); - } + if (this.IsDueForPruningNoLock()) + { + await this.PrunePoolsNoLockAsync().ConfigureAwait(false); } } + } - private bool IsDueForPruningNoLock() - { - // Since pruning is expensive, we want to amortize its cost across many operations. The idea here is - // that each StoreOrDisposeLockAsync() call gives us one "ticket" that we can cache in later to justify - // some pruning work. The cost to prune is equal to the number of queues to scan plus the total number of - // items in each queue. Therefore we prune when we've built up enough tickets to "pay for" a pruning operation. - // The whole reason to prune is to avoid memory bloat (connection bloat isn't an issue since we only keep connections - // open when needed). So, we don't even consider pruning below a certain storage threshold - - var pruningCost = this._pooledLockCount + this._poolsByConnectionString.Count; - return pruningCost > 64 && this._storeCountSinceLastPrune >= pruningCost; - } + private bool IsDueForPruningNoLock() + { + // Since pruning is expensive, we want to amortize its cost across many operations. The idea here is + // that each StoreOrDisposeLockAsync() call gives us one "ticket" that we can cache in later to justify + // some pruning work. The cost to prune is equal to the number of queues to scan plus the total number of + // items in each queue. Therefore we prune when we've built up enough tickets to "pay for" a pruning operation. + // The whole reason to prune is to avoid memory bloat (connection bloat isn't an issue since we only keep connections + // open when needed). So, we don't even consider pruning below a certain storage threshold + + var pruningCost = this._pooledLockCount + this._poolsByConnectionString.Count; + return pruningCost > 64 && this._storeCountSinceLastPrune >= pruningCost; + } - private async ValueTask PrunePoolsNoLockAsync() - { - this._storeCountSinceLastPrune = 0; // reset + private async ValueTask PrunePoolsNoLockAsync() + { + this._storeCountSinceLastPrune = 0; // reset - List? connectionStringsToRemove = null; - foreach (var kvp in this._poolsByConnectionString) + List? connectionStringsToRemove = null; + foreach (var kvp in this._poolsByConnectionString) + { + var pool = kvp.Value; + MultiplexedConnectionLock? firstRetainedLock = null; + while (pool.Count != 0 && pool.Peek() != firstRetainedLock) { - var pool = kvp.Value; - MultiplexedConnectionLock? firstRetainedLock = null; - while (pool.Count != 0 && pool.Peek() != firstRetainedLock) + var @lock = pool.Dequeue(); + if (await @lock.GetIsInUseAsync().ConfigureAwait(false)) { - var @lock = pool.Dequeue(); - if (await @lock.GetIsInUseAsync().ConfigureAwait(false)) - { - firstRetainedLock ??= @lock; - pool.Enqueue(@lock); - } - else - { - --this._pooledLockCount; - try { await @lock.DisposeAsync().ConfigureAwait(false); } - catch { /* swallow */ } - } + firstRetainedLock ??= @lock; + pool.Enqueue(@lock); } - - if (pool.Count == 0) + else { - (connectionStringsToRemove ??= new List()).Add(kvp.Key); + --this._pooledLockCount; + try { await @lock.DisposeAsync().ConfigureAwait(false); } + catch { /* swallow */ } } } - if (connectionStringsToRemove != null) + if (pool.Count == 0) { - foreach (var connectionStringToRemove in connectionStringsToRemove) - { - this._poolsByConnectionString.Remove(connectionStringToRemove); - } + (connectionStringsToRemove ??= new List()).Add(kvp.Key); + } + } + + if (connectionStringsToRemove != null) + { + foreach (var connectionStringToRemove in connectionStringsToRemove) + { + this._poolsByConnectionString.Remove(connectionStringToRemove); } } } diff --git a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs index f9dee743..4dc35a3e 100644 --- a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs @@ -1,57 +1,56 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal.Data -{ - /// - /// Implements by multiplexing across connections where possible - /// +namespace Medallion.Threading.Internal.Data; + +/// +/// Implements by multiplexing across connections where possible +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class OptimisticConnectionMultiplexingDbDistributedLock : IDbDistributedLock +sealed class OptimisticConnectionMultiplexingDbDistributedLock : IDbDistributedLock +{ + private readonly string _name, _connectionString; + private readonly MultiplexedConnectionLockPool _multiplexedConnectionLockPool; + private readonly TimeoutValue _keepaliveCadence; + private readonly IDbDistributedLock _fallbackLock; + + public OptimisticConnectionMultiplexingDbDistributedLock( + string name, + string connectionString, + MultiplexedConnectionLockPool multiplexedConnectionLockPool, + TimeoutValue keepaliveCadence) { - private readonly string _name, _connectionString; - private readonly MultiplexedConnectionLockPool _multiplexedConnectionLockPool; - private readonly TimeoutValue _keepaliveCadence; - private readonly IDbDistributedLock _fallbackLock; + this._name = name; + this._connectionString = connectionString; + this._multiplexedConnectionLockPool = multiplexedConnectionLockPool; + this._keepaliveCadence = keepaliveCadence; + this._fallbackLock = new DedicatedConnectionOrTransactionDbDistributedLock( + name, + () => this._multiplexedConnectionLockPool.ConnectionFactory(this._connectionString), + useTransaction: false, + keepaliveCadence: keepaliveCadence + ); + } - public OptimisticConnectionMultiplexingDbDistributedLock( - string name, - string connectionString, - MultiplexedConnectionLockPool multiplexedConnectionLockPool, - TimeoutValue keepaliveCadence) + public ValueTask TryAcquireAsync( + TimeoutValue timeout, + IDbSynchronizationStrategy strategy, + CancellationToken cancellationToken, + IDistributedSynchronizationHandle? contextHandle) + where TLockCookie : class + { + // cannot multiplex for updates, since we cannot predict whether or not there will be a request to elevate + // to an exclusive lock which asks for a long timeout + if (!strategy.IsUpgradeable && contextHandle == null) { - this._name = name; - this._connectionString = connectionString; - this._multiplexedConnectionLockPool = multiplexedConnectionLockPool; - this._keepaliveCadence = keepaliveCadence; - this._fallbackLock = new DedicatedConnectionOrTransactionDbDistributedLock( - name, - () => this._multiplexedConnectionLockPool.ConnectionFactory(this._connectionString), - useTransaction: false, - keepaliveCadence: keepaliveCadence - ); + return this._multiplexedConnectionLockPool.TryAcquireAsync(this._connectionString, this._name, timeout, strategy, keepaliveCadence: this._keepaliveCadence, cancellationToken); } - public ValueTask TryAcquireAsync( - TimeoutValue timeout, - IDbSynchronizationStrategy strategy, - CancellationToken cancellationToken, - IDistributedSynchronizationHandle? contextHandle) - where TLockCookie : class - { - // cannot multiplex for updates, since we cannot predict whether or not there will be a request to elevate - // to an exclusive lock which asks for a long timeout - if (!strategy.IsUpgradeable && contextHandle == null) - { - return this._multiplexedConnectionLockPool.TryAcquireAsync(this._connectionString, this._name, timeout, strategy, keepaliveCadence: this._keepaliveCadence, cancellationToken); - } - - // otherwise, fall back to our fallback lock - return this._fallbackLock.TryAcquireAsync(timeout, strategy, cancellationToken, contextHandle); - } + // otherwise, fall back to our fallback lock + return this._fallbackLock.TryAcquireAsync(timeout, strategy, cancellationToken, contextHandle); } } diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 854f8ebb..7e02d501 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -4,146 +4,145 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - static class DistributedLockHelpers +static class DistributedLockHelpers +{ + public static string ToSafeName(string name, int maxNameLength, Func convertToValidName) { - public static string ToSafeName(string name, int maxNameLength, Func convertToValidName) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - var validBaseLockName = convertToValidName(name); - if (validBaseLockName == name && validBaseLockName.Length <= maxNameLength) - { - return name; - } - - using var sha = SHA512.Create(); - var hash = Convert.ToBase64String(sha.ComputeHash(Encoding.UTF8.GetBytes(name))); - - if (hash.Length >= maxNameLength) - { - return hash.Substring(0, length: maxNameLength); - } - - var prefix = validBaseLockName.Substring(0, Math.Min(validBaseLockName.Length, maxNameLength - hash.Length)); - return prefix + hash; - } + if (name == null) { throw new ArgumentNullException(nameof(name)); } - public static async ValueTask Wrap(this ValueTask handleTask, Func factory) - where THandle : class + var validBaseLockName = convertToValidName(name); + if (validBaseLockName == name && validBaseLockName.Length <= maxNameLength) { - var handle = await handleTask.ConfigureAwait(false); - return handle != null ? factory(handle) : null; + return name; } - #region ---- IInternalDistributedLock implementations ---- - public static ValueTask AcquireAsync(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); - - public static THandle Acquire(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - - public static THandle? TryAcquire(IInternalDistributedLock @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - #endregion - - #region ---- IInternalDistributedReaderWriterLock implementations ---- - public static ValueTask AcquireAsync(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedSynchronizationHandle => - @lock.InternalTryAcquireAsync(timeout, cancellationToken, isWrite).ThrowTimeoutIfNull(); - - public static THandle Acquire(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken, state.isWrite), - (@lock, timeout, cancellationToken, isWrite) - ); - - public static THandle? TryAcquire(IInternalDistributedReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken, bool isWrite) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken, state.isWrite), - (@lock, timeout, cancellationToken, isWrite) - ); - #endregion - - #region ---- IInternalDistributedUpgradeableReaderWriterLock implementations ---- - public static ValueTask AcquireUpgradeableReadLockAsync(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle - where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => - @lock.InternalTryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); - - public static TUpgradeableHandle AcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle - where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => - SyncViaAsync.Run( - state => AcquireUpgradeableReadLockAsync(state.@lock, state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - - public static TUpgradeableHandle? TryAcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle - where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => - SyncViaAsync.Run( - state => state.@lock.InternalTryAcquireUpgradeableReadLockAsync(state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - #endregion - - #region ---- IInternalDistributedSemaphore implementations ---- - public static ValueTask AcquireAsync(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(@object: "semaphore"); - - public static THandle Acquire(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - - public static THandle? TryAcquire(IInternalDistributedSemaphore @lock, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class, IDistributedSynchronizationHandle => - SyncViaAsync.Run( - state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), - (@lock, timeout, cancellationToken) - ); - #endregion - - #region ---- IDistributedLockUpgradeableHandle implementations ---- - public static ValueTask UpgradeToWriteLockAsync(IInternalDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => - handle.InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken).ThrowTimeoutIfFalse(); - - public static void UpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => - SyncViaAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); - - public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan timeout, CancellationToken cancellationToken) => - SyncViaAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); - #endregion - - private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); - - public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => - await task.ConfigureAwait(false) ?? throw LockTimeout(@object); - - private static async ValueTask ThrowTimeoutIfFalse(this ValueTask task) + using var sha = SHA512.Create(); + var hash = Convert.ToBase64String(sha.ComputeHash(Encoding.UTF8.GetBytes(name))); + + if (hash.Length >= maxNameLength) { - if (!await task.ConfigureAwait(false)) { throw LockTimeout(); } + return hash.Substring(0, length: maxNameLength); } + + var prefix = validBaseLockName.Substring(0, Math.Min(validBaseLockName.Length, maxNameLength - hash.Length)); + return prefix + hash; + } + + public static async ValueTask Wrap(this ValueTask handleTask, Func factory) + where THandle : class + { + var handle = await handleTask.ConfigureAwait(false); + return handle != null ? factory(handle) : null; + } + + #region ---- IInternalDistributedLock implementations ---- + public static ValueTask AcquireAsync(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); + + public static THandle Acquire(IInternalDistributedLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + + public static THandle? TryAcquire(IInternalDistributedLock @lock, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + #endregion + + #region ---- IInternalDistributedReaderWriterLock implementations ---- + public static ValueTask AcquireAsync(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) + where THandle : class, IDistributedSynchronizationHandle => + @lock.InternalTryAcquireAsync(timeout, cancellationToken, isWrite).ThrowTimeoutIfNull(); + + public static THandle Acquire(IInternalDistributedReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken, bool isWrite) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken, state.isWrite), + (@lock, timeout, cancellationToken, isWrite) + ); + + public static THandle? TryAcquire(IInternalDistributedReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken, bool isWrite) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken, state.isWrite), + (@lock, timeout, cancellationToken, isWrite) + ); + #endregion + + #region ---- IInternalDistributedUpgradeableReaderWriterLock implementations ---- + public static ValueTask AcquireUpgradeableReadLockAsync(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle + where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => + @lock.InternalTryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).ThrowTimeoutIfNull(); + + public static TUpgradeableHandle AcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle + where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => + SyncViaAsync.Run( + state => AcquireUpgradeableReadLockAsync(state.@lock, state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + + public static TUpgradeableHandle? TryAcquireUpgradeableReadLock(IInternalDistributedUpgradeableReaderWriterLock @lock, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle + where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle => + SyncViaAsync.Run( + state => state.@lock.InternalTryAcquireUpgradeableReadLockAsync(state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + #endregion + + #region ---- IInternalDistributedSemaphore implementations ---- + public static ValueTask AcquireAsync(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + @lock.InternalTryAcquireAsync(timeout, cancellationToken).ThrowTimeoutIfNull(@object: "semaphore"); + + public static THandle Acquire(IInternalDistributedSemaphore @lock, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => AcquireAsync(state.@lock, state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + + public static THandle? TryAcquire(IInternalDistributedSemaphore @lock, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class, IDistributedSynchronizationHandle => + SyncViaAsync.Run( + state => state.@lock.InternalTryAcquireAsync(state.timeout, state.cancellationToken), + (@lock, timeout, cancellationToken) + ); + #endregion + + #region ---- IDistributedLockUpgradeableHandle implementations ---- + public static ValueTask UpgradeToWriteLockAsync(IInternalDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => + handle.InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken).ThrowTimeoutIfFalse(); + + public static void UpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan? timeout, CancellationToken cancellationToken) => + SyncViaAsync.Run(t => t.handle.UpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); + + public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handle, TimeSpan timeout, CancellationToken cancellationToken) => + SyncViaAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); + #endregion + + private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); + + public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => + await task.ConfigureAwait(false) ?? throw LockTimeout(@object); + + private static async ValueTask ThrowTimeoutIfFalse(this ValueTask task) + { + if (!await task.ConfigureAwait(false)) { throw LockTimeout(); } } } diff --git a/DistributedLock.Core/Internal/Helpers.cs b/DistributedLock.Core/Internal/Helpers.cs index e84d145e..b2c19d2c 100644 --- a/DistributedLock.Core/Internal/Helpers.cs +++ b/DistributedLock.Core/Internal/Helpers.cs @@ -2,119 +2,118 @@ using System.Runtime.CompilerServices; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - static class Helpers +static class Helpers +{ + /// + /// Performs a type-safe cast + /// + public static T As(this T @this) => @this; + + /// + /// Performs a type-safe "cast" of a + /// + public static async ValueTask Convert(this ValueTask task, To.ValueTaskConversion _) + where TDerived : TBase => + await task.ConfigureAwait(false); + + public readonly struct TaskConversion { - /// - /// Performs a type-safe cast - /// - public static T As(this T @this) => @this; - - /// - /// Performs a type-safe "cast" of a - /// - public static async ValueTask Convert(this ValueTask task, To.ValueTaskConversion _) - where TDerived : TBase => - await task.ConfigureAwait(false); - - public readonly struct TaskConversion - { - public TaskConversion To() => throw new InvalidOperationException(); - } + public TaskConversion To() => throw new InvalidOperationException(); + } - public readonly struct TaskConversion { } + public readonly struct TaskConversion { } - internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); + internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); - public static ValueTask AsValueTask(this Task task) => new ValueTask(task); - public static ValueTask AsValueTask(this Task task) => new ValueTask(task); - public static ValueTask AsValueTask(this T value) => new ValueTask(value); + public static ValueTask AsValueTask(this Task task) => new ValueTask(task); + public static ValueTask AsValueTask(this Task task) => new ValueTask(task); + public static ValueTask AsValueTask(this T value) => new ValueTask(value); - public static Task SafeCreateTask(Func> taskFactory, TState state) => - InternalSafeCreateTask, TResult>(taskFactory, state); + public static Task SafeCreateTask(Func> taskFactory, TState state) => + InternalSafeCreateTask, TResult>(taskFactory, state); - public static Task SafeCreateTask(Func taskFactory, TState state) => - InternalSafeCreateTask(taskFactory, state); + public static Task SafeCreateTask(Func taskFactory, TState state) => + InternalSafeCreateTask(taskFactory, state); - private static TTask InternalSafeCreateTask(Func taskFactory, TState state) - where TTask : Task + private static TTask InternalSafeCreateTask(Func taskFactory, TState state) + where TTask : Task + { + try { return taskFactory(state); } + catch (OperationCanceledException) { - try { return taskFactory(state); } - catch (OperationCanceledException) - { - // don't use Task.FromCanceled here because oce.CancellationToken is not guaranteed to - // have IsCancellationRequested which FromCanceled requires - var canceledTaskBuilder = new TaskCompletionSource(); - canceledTaskBuilder.SetCanceled(); - return (TTask)canceledTaskBuilder.Task.As(); - } - catch (Exception ex) { return (TTask)Task.FromException(ex).As(); } + // don't use Task.FromCanceled here because oce.CancellationToken is not guaranteed to + // have IsCancellationRequested which FromCanceled requires + var canceledTaskBuilder = new TaskCompletionSource(); + canceledTaskBuilder.SetCanceled(); + return (TTask)canceledTaskBuilder.Task.As(); } + catch (Exception ex) { return (TTask)Task.FromException(ex).As(); } + } - public static ObjectDisposedException ObjectDisposed(this T _) where T : IAsyncDisposable => - throw new ObjectDisposedException(typeof(T).ToString()); - - public static NonThrowingAwaitable TryAwait(this TTask task) where TTask : Task => - new NonThrowingAwaitable(task); + public static ObjectDisposedException ObjectDisposed(this T _) where T : IAsyncDisposable => + throw new ObjectDisposedException(typeof(T).ToString()); - /// - /// Throwing exceptions is slow and our workflow has us canceling tasks in the common case. Using this special awaitable - /// allows for us to await those tasks without causing a thrown exception - /// - public readonly struct NonThrowingAwaitable : ICriticalNotifyCompletion - where TTask : Task - { - private readonly TTask _task; - private readonly ConfiguredTaskAwaitable.ConfiguredTaskAwaiter _taskAwaiter; + public static NonThrowingAwaitable TryAwait(this TTask task) where TTask : Task => + new NonThrowingAwaitable(task); - public NonThrowingAwaitable(TTask task) - { - this._task = task; - this._taskAwaiter = task.ConfigureAwait(false).GetAwaiter(); - } + /// + /// Throwing exceptions is slow and our workflow has us canceling tasks in the common case. Using this special awaitable + /// allows for us to await those tasks without causing a thrown exception + /// + public readonly struct NonThrowingAwaitable : ICriticalNotifyCompletion + where TTask : Task + { + private readonly TTask _task; + private readonly ConfiguredTaskAwaitable.ConfiguredTaskAwaiter _taskAwaiter; - public NonThrowingAwaitable GetAwaiter() => this; + public NonThrowingAwaitable(TTask task) + { + this._task = task; + this._taskAwaiter = task.ConfigureAwait(false).GetAwaiter(); + } - public bool IsCompleted => this._taskAwaiter.IsCompleted; + public NonThrowingAwaitable GetAwaiter() => this; - public TTask GetResult() - { - // does NOT call _taskAwaiter.GetResult() since that could throw! + public bool IsCompleted => this._taskAwaiter.IsCompleted; - Invariant.Require(this._task.IsCompleted); - return this._task; - } + public TTask GetResult() + { + // does NOT call _taskAwaiter.GetResult() since that could throw! - public void OnCompleted(Action continuation) => this._taskAwaiter.OnCompleted(continuation); - public void UnsafeOnCompleted(Action continuation) => this._taskAwaiter.UnsafeOnCompleted(continuation); + Invariant.Require(this._task.IsCompleted); + return this._task; } - public static bool TryGetValue(this T? nullable, out T value) - where T : struct - { - value = nullable.GetValueOrDefault(); - return nullable.HasValue; - } + public void OnCompleted(Action continuation) => this._taskAwaiter.OnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) => this._taskAwaiter.UnsafeOnCompleted(continuation); } - /// - /// Assists with type inference for value task conversions - /// + public static bool TryGetValue(this T? nullable, out T value) + where T : struct + { + value = nullable.GetValueOrDefault(); + return nullable.HasValue; + } +} + +/// +/// Assists with type inference for value task conversions +/// #if DEBUG - public +public #else - internal +internal #endif - static class To - { - public static ValueTaskConversion ValueTask => default; +static class To +{ + public static ValueTaskConversion ValueTask => default; - public readonly struct ValueTaskConversion { } - } + public readonly struct ValueTaskConversion { } } diff --git a/DistributedLock.Core/Internal/IInternalDistributedLock.cs b/DistributedLock.Core/Internal/IInternalDistributedLock.cs index 073fa49e..0e823933 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLock.cs @@ -2,22 +2,21 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - interface IInternalDistributedLock : IDistributedLock - where THandle : class, IDistributedSynchronizationHandle - { - new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); +interface IInternalDistributedLock : IDistributedLock + where THandle : class, IDistributedSynchronizationHandle +{ + new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - // internals - ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); - } + // internals + ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); } diff --git a/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs b/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs index 5f544971..603f51c4 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs @@ -1,15 +1,14 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - interface IInternalDistributedLockUpgradeableHandle : IDistributedLockUpgradeableHandle - { - ValueTask InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken); - } +interface IInternalDistributedLockUpgradeableHandle : IDistributedLockUpgradeableHandle +{ + ValueTask InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken); } diff --git a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs index ec6e4566..d13e3c69 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs @@ -2,26 +2,25 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - interface IInternalDistributedReaderWriterLock : IDistributedReaderWriterLock - where THandle : class, IDistributedSynchronizationHandle - { - new THandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new THandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new THandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new THandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); +interface IInternalDistributedReaderWriterLock : IDistributedReaderWriterLock + where THandle : class, IDistributedSynchronizationHandle +{ + new THandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new THandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new THandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new THandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - // internals - ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken, bool isWrite); - } + // internals + ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken, bool isWrite); } diff --git a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs index 04bb2ba2..52cae3da 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs @@ -4,22 +4,21 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - interface IInternalDistributedSemaphore : IDistributedSemaphore - where THandle : class, IDistributedSynchronizationHandle - { - new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + interface IInternalDistributedSemaphore : IDistributedSemaphore + where THandle : class, IDistributedSynchronizationHandle +{ + new THandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new THandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - // internals - ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); - } + // internals + ValueTask InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken); } diff --git a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs index b3b25d7a..f03c6feb 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs @@ -2,23 +2,22 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - interface IInternalDistributedUpgradeableReaderWriterLock : IDistributedUpgradeableReaderWriterLock, IInternalDistributedReaderWriterLock - where THandle : class, IDistributedSynchronizationHandle - where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle - { - new TUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new TUpgradeableHandle AcquireUpgradeableReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - new ValueTask TryAcquireUpgradeableReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); - new ValueTask AcquireUpgradeableReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); +interface IInternalDistributedUpgradeableReaderWriterLock : IDistributedUpgradeableReaderWriterLock, IInternalDistributedReaderWriterLock + where THandle : class, IDistributedSynchronizationHandle + where TUpgradeableHandle : class, IDistributedLockUpgradeableHandle +{ + new TUpgradeableHandle? TryAcquireUpgradeableReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new TUpgradeableHandle AcquireUpgradeableReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default); + new ValueTask TryAcquireUpgradeableReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default); + new ValueTask AcquireUpgradeableReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default); - // internals - ValueTask InternalTryAcquireUpgradeableReadLockAsync(TimeoutValue timeout, CancellationToken cancellationToken); - } + // internals + ValueTask InternalTryAcquireUpgradeableReadLockAsync(TimeoutValue timeout, CancellationToken cancellationToken); } diff --git a/DistributedLock.Core/Internal/Invariant.cs b/DistributedLock.Core/Internal/Invariant.cs index b1769a24..457aaec3 100644 --- a/DistributedLock.Core/Internal/Invariant.cs +++ b/DistributedLock.Core/Internal/Invariant.cs @@ -1,22 +1,21 @@ using System; using System.Diagnostics; -namespace Medallion.Threading.Internal -{ +namespace Medallion.Threading.Internal; + #if DEBUG - public +public #else - internal +internal #endif - static class Invariant +static class Invariant +{ + [Conditional("DEBUG")] + public static void Require(bool condition, string? message = null) { - [Conditional("DEBUG")] - public static void Require(bool condition, string? message = null) + if (!condition) { - if (!condition) - { - throw new InvalidOperationException(message ?? "invariant violated"); - } + throw new InvalidOperationException(message ?? "invariant violated"); } } } diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index eb8c25e3..bf01683a 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -6,153 +6,152 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ - /// - /// Utility for monitoring/renewing a fixed length "lease" lock - /// +namespace Medallion.Threading.Internal; + +/// +/// Utility for monitoring/renewing a fixed length "lease" lock +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class LeaseMonitor : IDisposable, IAsyncDisposable - { - private readonly CancellationTokenSource _disposalSource = new CancellationTokenSource(), - _handleLostSource = new CancellationTokenSource(); + sealed class LeaseMonitor : IDisposable, IAsyncDisposable +{ + private readonly CancellationTokenSource _disposalSource = new CancellationTokenSource(), + _handleLostSource = new CancellationTokenSource(); - private readonly ILeaseHandle _leaseHandle; - private readonly Task _monitoringTask; - private Task? _cancellationTask; + private readonly ILeaseHandle _leaseHandle; + private readonly Task _monitoringTask; + private Task? _cancellationTask; - public LeaseMonitor(ILeaseHandle leaseHandle) - { - Invariant.Require(leaseHandle.LeaseDuration.CompareTo(leaseHandle.MonitoringCadence) >= 0); + public LeaseMonitor(ILeaseHandle leaseHandle) + { + Invariant.Require(leaseHandle.LeaseDuration.CompareTo(leaseHandle.MonitoringCadence) >= 0); - this._leaseHandle = leaseHandle; - this._monitoringTask = CreateMonitoringLoopTask(new WeakReference(this), leaseHandle.MonitoringCadence, this._disposalSource.Token); - } + this._leaseHandle = leaseHandle; + this._monitoringTask = CreateMonitoringLoopTask(new WeakReference(this), leaseHandle.MonitoringCadence, this._disposalSource.Token); + } - public CancellationToken HandleLostToken => this._handleLostSource.Token; + public CancellationToken HandleLostToken => this._handleLostSource.Token; - public void Dispose() => this.DisposeSyncViaAsync(); + public void Dispose() => this.DisposeSyncViaAsync(); - public async ValueTask DisposeAsync() + public async ValueTask DisposeAsync() + { + try { - try + if (!this._disposalSource.IsCancellationRequested) // idempotent { - if (!this._disposalSource.IsCancellationRequested) // idempotent - { - this._disposalSource.Cancel(); - } + this._disposalSource.Cancel(); + } - await this._monitoringTask.AwaitSyncOverAsync().ConfigureAwait(false); + await this._monitoringTask.AwaitSyncOverAsync().ConfigureAwait(false); + } + finally + { + if (this._cancellationTask != null) + { + _ = this._cancellationTask.ContinueWith((_, state) => ((CancellationTokenSource)state).Dispose(), state: this._handleLostSource); } - finally + else { - if (this._cancellationTask != null) - { - _ = this._cancellationTask.ContinueWith((_, state) => ((CancellationTokenSource)state).Dispose(), state: this._handleLostSource); - } - else - { - this._handleLostSource.Dispose(); - } - this._disposalSource.Dispose(); + this._handleLostSource.Dispose(); } + this._disposalSource.Dispose(); } + } - private static Task CreateMonitoringLoopTask(WeakReference weakMonitor, TimeoutValue monitoringCadence, CancellationToken disposalToken) - { - return Task.Run(() => MonitoringLoop()); + private static Task CreateMonitoringLoopTask(WeakReference weakMonitor, TimeoutValue monitoringCadence, CancellationToken disposalToken) + { + return Task.Run(() => MonitoringLoop()); - async Task MonitoringLoop() + async Task MonitoringLoop() + { + var leaseLifetime = Stopwatch.StartNew(); + do { - var leaseLifetime = Stopwatch.StartNew(); - do - { - // wait until the next monitoring check - await Task.Delay(monitoringCadence.InMilliseconds, disposalToken).TryAwait(); - } - while (!disposalToken.IsCancellationRequested && await RunMonitoringLoopIterationAsync(weakMonitor, leaseLifetime).ConfigureAwait(false)); + // wait until the next monitoring check + await Task.Delay(monitoringCadence.InMilliseconds, disposalToken).TryAwait(); } + while (!disposalToken.IsCancellationRequested && await RunMonitoringLoopIterationAsync(weakMonitor, leaseLifetime).ConfigureAwait(false)); } + } - private static async Task RunMonitoringLoopIterationAsync(WeakReference weakMonitor, Stopwatch leaseLifetime) + private static async Task RunMonitoringLoopIterationAsync(WeakReference weakMonitor, Stopwatch leaseLifetime) + { + // if the monitor has been GC'd, just exit + if (!weakMonitor.TryGetTarget(out var monitor)) { return false; } + + // lease expired + if (monitor._leaseHandle.LeaseDuration.CompareTo(leaseLifetime.Elapsed) < 0) { - // if the monitor has been GC'd, just exit - if (!weakMonitor.TryGetTarget(out var monitor)) { return false; } - - // lease expired - if (monitor._leaseHandle.LeaseDuration.CompareTo(leaseLifetime.Elapsed) < 0) - { + OnHandleLost(); + return false; + } + + var leaseState = await monitor.CheckLeaseAsync().ConfigureAwait(false); + switch (leaseState) + { + case LeaseState.Lost: OnHandleLost(); return false; - } - var leaseState = await monitor.CheckLeaseAsync().ConfigureAwait(false); - switch (leaseState) - { - case LeaseState.Lost: - OnHandleLost(); - return false; - - case LeaseState.Renewed: - leaseLifetime.Restart(); - return true; - - // If the lease is held but not renewed or if we don't know (e. g. due to transient failure), - // then just continue. We can't yet say that it is lost but it isn't renewed so we can't reset - // the lifetime either. - case LeaseState.Held: - case LeaseState.Unknown: - return true; - - default: - throw new InvalidOperationException("should never get here"); - } + case LeaseState.Renewed: + leaseLifetime.Restart(); + return true; - // offload cancel to a background thread to avoid hangs or errors - void OnHandleLost() => monitor._cancellationTask = Task.Run(() => monitor._handleLostSource.Cancel()); - } + // If the lease is held but not renewed or if we don't know (e. g. due to transient failure), + // then just continue. We can't yet say that it is lost but it isn't renewed so we can't reset + // the lifetime either. + case LeaseState.Held: + case LeaseState.Unknown: + return true; - private async Task CheckLeaseAsync() - { - var renewOrValidateTask = Helpers.SafeCreateTask(state => state.leaseHandle.RenewOrValidateLeaseAsync(state.Token), (leaseHandle: this._leaseHandle, this._disposalSource.Token)); - await renewOrValidateTask.TryAwait(); - return this._disposalSource.IsCancellationRequested || renewOrValidateTask.Status != TaskStatus.RanToCompletion - ? LeaseState.Unknown - : renewOrValidateTask.Result; + default: + throw new InvalidOperationException("should never get here"); } - public interface ILeaseHandle - { - TimeoutValue LeaseDuration { get; } - TimeoutValue MonitoringCadence { get; } - Task RenewOrValidateLeaseAsync(CancellationToken cancellationToken); - } + // offload cancel to a background thread to avoid hangs or errors + void OnHandleLost() => monitor._cancellationTask = Task.Run(() => monitor._handleLostSource.Cancel()); + } - public enum LeaseState - { - /// - /// The lease is known to be still held but was not renewed - /// - Held, - - /// - /// The lease has been renewed for - /// - Renewed, - - /// - /// The lease is known to no longer be held - /// - Lost, - - /// - /// The lease may or may not be held any longer - /// - Unknown, - } + private async Task CheckLeaseAsync() + { + var renewOrValidateTask = Helpers.SafeCreateTask(state => state.leaseHandle.RenewOrValidateLeaseAsync(state.Token), (leaseHandle: this._leaseHandle, this._disposalSource.Token)); + await renewOrValidateTask.TryAwait(); + return this._disposalSource.IsCancellationRequested || renewOrValidateTask.Status != TaskStatus.RanToCompletion + ? LeaseState.Unknown + : renewOrValidateTask.Result; + } + + public interface ILeaseHandle + { + TimeoutValue LeaseDuration { get; } + TimeoutValue MonitoringCadence { get; } + Task RenewOrValidateLeaseAsync(CancellationToken cancellationToken); + } + + public enum LeaseState + { + /// + /// The lease is known to be still held but was not renewed + /// + Held, + + /// + /// The lease has been renewed for + /// + Renewed, + + /// + /// The lease is known to no longer be held + /// + Lost, + + /// + /// The lease may or may not be held any longer + /// + Unknown, } } diff --git a/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs index 136f000b..7d34bff1 100644 --- a/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs +++ b/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs @@ -6,197 +6,196 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ - /// - /// Similar to finalization, but allows for arbitrary managed code to be run for cleanup - /// +namespace Medallion.Threading.Internal; + +/// +/// Similar to finalization, but allows for arbitrary managed code to be run for cleanup +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class ManagedFinalizerQueue - { - // 99% of the time, the finalizer will do nothing because people will dispose properly. The finalizer also must - // walk the full dictionary which in theory could be large if there is a lot of usage. Therefore, we don't want this to - // run too frequently. On the other hand, when something does go wrong we want to be able to recover in some reasonable period - // of time. 30s feels like is strikes a good balance here - internal static readonly TimeSpan FinalizerCadence = TimeSpan.FromSeconds( +sealed class ManagedFinalizerQueue +{ + // 99% of the time, the finalizer will do nothing because people will dispose properly. The finalizer also must + // walk the full dictionary which in theory could be large if there is a lot of usage. Therefore, we don't want this to + // run too frequently. On the other hand, when something does go wrong we want to be able to recover in some reasonable period + // of time. 30s feels like is strikes a good balance here + internal static readonly TimeSpan FinalizerCadence = TimeSpan.FromSeconds( #if DEBUG - 3 // to keep tests fast, use a much shorter cadence in debug + 3 // to keep tests fast, use a much shorter cadence in debug #else - 30 + 30 #endif - ); - - public static readonly ManagedFinalizerQueue Instance = new ManagedFinalizerQueue(); - - private readonly ConcurrentDictionary _items = new ConcurrentDictionary(); - - // The state of this class can be described by 3 bits: - // _count: >0 or ==0 - // _finalizerTask: has cleared initializing bit or has not cleared it - // _initializing: 1 or 0 - // - // The following shows the possible states we could be in: - // _count | _finalizerTask | _initializing | nodes - // 0 | cleared | 0 | Initial state / finalizer getting ready to exit state. Register() => (>0, cleared, 1) - // 0 | cleared | 1 | If nothing changes, the finalizer will exit => (0, not cleared, 1). If something is registered => (>0, cleared, 1) - // 0 | not cleared | 0 | ERROR should never happen - // 0 | not cleared | 1 | Once our finalizer runs, it will => (0, cleared, 0). If something is registered => (>0, not cleared, 1) - // >0 | cleared | 0 | Finalizer is running. If count drops to zero => (0, cleared, 0) - // >0 | cleared | 1 | Means we dropped to 0 count but came back up before the finalizer exited. We now have a running finalizer and one queued - // >0 | not cleared | 0 | ERROR should never happen - // >0 | not cleared | 1 | Finalizer will run and transition to (>0, cleared, 0). Removal could transfer to (0, not cleared, 1) - - /// - /// Tracked separately from the dictionary since (a) ConcurrentDictionary's count is slow and (b) we need to know exactly when we - /// add one item to empty or remove one item from empty. We use a long to guarantee that we can't ever overflow (if there were really - /// 2^63 items in the queue, we'd be out of memory) - /// - private long _count; - - private Task _finalizerTask = Task.CompletedTask; - private int _finalizerTaskIsInitializing; - - private ManagedFinalizerQueue() { } - - /// - /// If is GC'd, will be run. - /// must be thread-safe. Disposing the returned - /// revokes the registration. Note that, for this to work, must not hold - /// a strong reference to . - /// - public IDisposable Register(object resource, IAsyncDisposable finalizer) - { - Invariant.Require(finalizer != resource); + ); + + public static readonly ManagedFinalizerQueue Instance = new ManagedFinalizerQueue(); + + private readonly ConcurrentDictionary _items = new ConcurrentDictionary(); + + // The state of this class can be described by 3 bits: + // _count: >0 or ==0 + // _finalizerTask: has cleared initializing bit or has not cleared it + // _initializing: 1 or 0 + // + // The following shows the possible states we could be in: + // _count | _finalizerTask | _initializing | nodes + // 0 | cleared | 0 | Initial state / finalizer getting ready to exit state. Register() => (>0, cleared, 1) + // 0 | cleared | 1 | If nothing changes, the finalizer will exit => (0, not cleared, 1). If something is registered => (>0, cleared, 1) + // 0 | not cleared | 0 | ERROR should never happen + // 0 | not cleared | 1 | Once our finalizer runs, it will => (0, cleared, 0). If something is registered => (>0, not cleared, 1) + // >0 | cleared | 0 | Finalizer is running. If count drops to zero => (0, cleared, 0) + // >0 | cleared | 1 | Means we dropped to 0 count but came back up before the finalizer exited. We now have a running finalizer and one queued + // >0 | not cleared | 0 | ERROR should never happen + // >0 | not cleared | 1 | Finalizer will run and transition to (>0, cleared, 0). Removal could transfer to (0, not cleared, 1) - this._items.As>() - .Add(finalizer, new WeakReference(resource)); - - if (Interlocked.Increment(ref this._count) == 1) - { - this.StartFinalizerTask(); - } + /// + /// Tracked separately from the dictionary since (a) ConcurrentDictionary's count is slow and (b) we need to know exactly when we + /// add one item to empty or remove one item from empty. We use a long to guarantee that we can't ever overflow (if there were really + /// 2^63 items in the queue, we'd be out of memory) + /// + private long _count; - return new Registration(this, finalizer); - } + private Task _finalizerTask = Task.CompletedTask; + private int _finalizerTaskIsInitializing; - private void StartFinalizerTask() - { - // If we're frequently adding and then removing a single item (probably a common case - // since most of the time people will dispose things and won't do too much distributed locking), - // we could end up thrashing where we create new finalizer tasks over and over again. To avoid - // this, we set the initializing flag, but in the case that it was already set we know that there - // is a task that is still getting ready; in that case we can just let that task continue to be - // the finalizer task: there's no need to replace it - if (Interlocked.Exchange(ref this._finalizerTaskIsInitializing, 1) != 0) - { - return; - } + private ManagedFinalizerQueue() { } - // This lock is only barely necessary. The race condition this solves for is the continuation task - // starting to run the finalizer loop AND clearing the initialization bit before we've assigned - // to this._finalizerTask. In that case, another thread could continue off the wrong task. The reason - // this is super unlikely is because the loop sleeps before clearing the bit, so things have to go horribly - // awry for this edge-case to occur. - lock (this._items) // lock _items just because it's an object we own - { - // When we get here, the previous finalizer should exit on its next iteration but it hasn't - // necessarily exited yet (and may not for some time). Therefore, we queue a task to run as a - // continuation so that we only have one finalizer loop at a time - this._finalizerTask = this._finalizerTask.ContinueWith( - (_, @this) => ((ManagedFinalizerQueue)@this).FinalizerLoop(), - state: this, - CancellationToken.None - ) - .Unwrap(); - } - } + /// + /// If is GC'd, will be run. + /// must be thread-safe. Disposing the returned + /// revokes the registration. Note that, for this to work, must not hold + /// a strong reference to . + /// + public IDisposable Register(object resource, IAsyncDisposable finalizer) + { + Invariant.Require(finalizer != resource); - private async Task FinalizerLoop() + this._items.As>() + .Add(finalizer, new WeakReference(resource)); + + if (Interlocked.Increment(ref this._count) == 1) { - // Any new finalizer loop delays before doing anything else. We start the loop when we just added - // something, so there's little chance of it having something to do right away - await Task.Delay(FinalizerCadence).ConfigureAwait(false); + this.StartFinalizerTask(); + } - // Clear the initializing flag. By doing this, we allow another task to be queued on top of us - var initializingFlag = Interlocked.Exchange(ref this._finalizerTaskIsInitializing, 0); - Invariant.Require(initializingFlag == 1); + return new Registration(this, finalizer); + } - // Loop until there is nothing more to do - while (Volatile.Read(ref this._count) != 0) - { - // the main finalizer does not wait for item finalization since we don't want that to ever - // block or fault the main loop - await this.FinalizeAsync(waitForItemFinalization: false).ConfigureAwait(false); - await Task.Delay(FinalizerCadence).ConfigureAwait(false); - } + private void StartFinalizerTask() + { + // If we're frequently adding and then removing a single item (probably a common case + // since most of the time people will dispose things and won't do too much distributed locking), + // we could end up thrashing where we create new finalizer tasks over and over again. To avoid + // this, we set the initializing flag, but in the case that it was already set we know that there + // is a task that is still getting ready; in that case we can just let that task continue to be + // the finalizer task: there's no need to replace it + if (Interlocked.Exchange(ref this._finalizerTaskIsInitializing, 1) != 0) + { + return; } - private Task FinalizeAsync(bool waitForItemFinalization) + // This lock is only barely necessary. The race condition this solves for is the continuation task + // starting to run the finalizer loop AND clearing the initialization bit before we've assigned + // to this._finalizerTask. In that case, another thread could continue off the wrong task. The reason + // this is super unlikely is because the loop sleeps before clearing the bit, so things have to go horribly + // awry for this edge-case to occur. + lock (this._items) // lock _items just because it's an object we own { - List? itemFinalizerTasks = null; + // When we get here, the previous finalizer should exit on its next iteration but it hasn't + // necessarily exited yet (and may not for some time). Therefore, we queue a task to run as a + // continuation so that we only have one finalizer loop at a time + this._finalizerTask = this._finalizerTask.ContinueWith( + (_, @this) => ((ManagedFinalizerQueue)@this).FinalizerLoop(), + state: this, + CancellationToken.None + ) + .Unwrap(); + } + } - // ConcurrentDictionary enumerator is safe to use concurrently with writes and is very inexpensive - // (lock-free and does not generate a snapshot copy) - foreach (var kvp in this._items) - { - if (!kvp.Value.IsAlive) - { - var itemFinalizerTask = this.TryRemove(kvp.Key, disposeKey: true); - if (waitForItemFinalization) - { - (itemFinalizerTasks ??= new List()).Add(itemFinalizerTask); - } - } - } + private async Task FinalizerLoop() + { + // Any new finalizer loop delays before doing anything else. We start the loop when we just added + // something, so there's little chance of it having something to do right away + await Task.Delay(FinalizerCadence).ConfigureAwait(false); + + // Clear the initializing flag. By doing this, we allow another task to be queued on top of us + var initializingFlag = Interlocked.Exchange(ref this._finalizerTaskIsInitializing, 0); + Invariant.Require(initializingFlag == 1); - return waitForItemFinalization ? Task.WhenAll(itemFinalizerTasks ?? Enumerable.Empty()) : Task.CompletedTask; + // Loop until there is nothing more to do + while (Volatile.Read(ref this._count) != 0) + { + // the main finalizer does not wait for item finalization since we don't want that to ever + // block or fault the main loop + await this.FinalizeAsync(waitForItemFinalization: false).ConfigureAwait(false); + await Task.Delay(FinalizerCadence).ConfigureAwait(false); } + } - /// - /// Forces finalization of anything that is eligible. Exposed for testing purposes only - /// - internal Task FinalizeAsync() => this.FinalizeAsync(waitForItemFinalization: true); + private Task FinalizeAsync(bool waitForItemFinalization) + { + List? itemFinalizerTasks = null; - private Task TryRemove(IAsyncDisposable key, bool disposeKey) + // ConcurrentDictionary enumerator is safe to use concurrently with writes and is very inexpensive + // (lock-free and does not generate a snapshot copy) + foreach (var kvp in this._items) { - if (this._items.TryRemove(key, out _)) + if (!kvp.Value.IsAlive) { - Interlocked.Decrement(ref this._count); - if (disposeKey) + var itemFinalizerTask = this.TryRemove(kvp.Key, disposeKey: true); + if (waitForItemFinalization) { - // DisposeAsync could throw, hang, etc. This must not block the finalizer thread. - // Therefore, we offload to a background thread and swallow exceptions - return Task.Run(() => key.DisposeAsync().AsTask()); + (itemFinalizerTasks ??= new List()).Add(itemFinalizerTask); } } - - return Task.CompletedTask; } - private sealed class Registration : IDisposable - { - private readonly ManagedFinalizerQueue _queue; - private IAsyncDisposable? _key; + return waitForItemFinalization ? Task.WhenAll(itemFinalizerTasks ?? Enumerable.Empty()) : Task.CompletedTask; + } - public Registration(ManagedFinalizerQueue queue, IAsyncDisposable key) + /// + /// Forces finalization of anything that is eligible. Exposed for testing purposes only + /// + internal Task FinalizeAsync() => this.FinalizeAsync(waitForItemFinalization: true); + + private Task TryRemove(IAsyncDisposable key, bool disposeKey) + { + if (this._items.TryRemove(key, out _)) + { + Interlocked.Decrement(ref this._count); + if (disposeKey) { - this._queue = queue; - this._key = key; + // DisposeAsync could throw, hang, etc. This must not block the finalizer thread. + // Therefore, we offload to a background thread and swallow exceptions + return Task.Run(() => key.DisposeAsync().AsTask()); } + } + + return Task.CompletedTask; + } + + private sealed class Registration : IDisposable + { + private readonly ManagedFinalizerQueue _queue; + private IAsyncDisposable? _key; + + public Registration(ManagedFinalizerQueue queue, IAsyncDisposable key) + { + this._queue = queue; + this._key = key; + } - public void Dispose() + public void Dispose() + { + var key = Interlocked.Exchange(ref this._key, null); + if (key != null) { - var key = Interlocked.Exchange(ref this._key, null); - if (key != null) - { - // If the registration gets disposed, we don't need to dispose the key - // because that means it got disposed normally - this._queue.TryRemove(key, disposeKey: false); - } + // If the registration gets disposed, we don't need to dispose the key + // because that means it got disposed normally + this._queue.TryRemove(key, disposeKey: false); } } } diff --git a/DistributedLock.Core/Internal/RefBox.cs b/DistributedLock.Core/Internal/RefBox.cs index 1b66fa78..106eeab9 100644 --- a/DistributedLock.Core/Internal/RefBox.cs +++ b/DistributedLock.Core/Internal/RefBox.cs @@ -1,56 +1,55 @@ using System; using System.Threading; -namespace Medallion.Threading.Internal -{ - /// - /// Wraps a value tuple to be a read/write reference - /// +namespace Medallion.Threading.Internal; + +/// +/// Wraps a value tuple to be a read/write reference +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class RefBox where T : struct - { - private readonly T _value; - - internal RefBox(T value) - { - this._value = value; - } +sealed class RefBox where T : struct +{ + private readonly T _value; - public ref readonly T Value => ref this._value; + internal RefBox(T value) + { + this._value = value; } - /// - /// Simplifies storing state in certain s. - /// + public ref readonly T Value => ref this._value; +} + +/// +/// Simplifies storing state in certain s. +/// #if DEBUG - public +public #else - internal +internal #endif - sealed class RefBox - { - public static RefBox Create(T value) where T : struct => new RefBox(value); +sealed class RefBox +{ + public static RefBox Create(T value) where T : struct => new RefBox(value); - /// - /// Thread-safely checks if is non-null and if so sets it to null and outputs - /// the value as . - /// - public static bool TryConsume(ref RefBox? boxRef, out T value) - where T : struct + /// + /// Thread-safely checks if is non-null and if so sets it to null and outputs + /// the value as . + /// + public static bool TryConsume(ref RefBox? boxRef, out T value) + where T : struct + { + var box = Interlocked.Exchange(ref boxRef, null); + if (box != null) { - var box = Interlocked.Exchange(ref boxRef, null); - if (box != null) - { - value = box.Value; - return true; - } - - value = default; - return false; + value = box.Value; + return true; } + + value = default; + return false; } } diff --git a/DistributedLock.Core/Internal/SyncViaAsync.cs b/DistributedLock.Core/Internal/SyncViaAsync.cs index 6d29c820..672c973f 100644 --- a/DistributedLock.Core/Internal/SyncViaAsync.cs +++ b/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -2,127 +2,126 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Internal -{ - /// - /// Helps re-use code across sync and async pathways, leveraging the fact that async code will run synchronously - /// unless it actually encounters an async operation. Downstream code should use the - /// to choose between sync and async operations. - /// - /// This class does not incur the overhead of the sync-over-async anti-pattern; the only overhead is using s - /// in a synchronous manner. - /// +namespace Medallion.Threading.Internal; + +/// +/// Helps re-use code across sync and async pathways, leveraging the fact that async code will run synchronously +/// unless it actually encounters an async operation. Downstream code should use the +/// to choose between sync and async operations. +/// +/// This class does not incur the overhead of the sync-over-async anti-pattern; the only overhead is using s +/// in a synchronous manner. +/// #if DEBUG - public +public #else - internal +internal #endif - static class SyncViaAsync +static class SyncViaAsync +{ + [ThreadStatic] + private static bool _isSynchronous; + + public static bool IsSynchronous => _isSynchronous; + + /// + /// Runs synchronously + /// + public static void Run(Func action, TState state) { - [ThreadStatic] - private static bool _isSynchronous; + Run( + async s => + { + await s.action(s.state).ConfigureAwait(false); + return true; + }, + (action, state) + ); + } - public static bool IsSynchronous => _isSynchronous; + /// + /// Runs synchronously + /// + public static TResult Run(Func> action, TState state) + { + Invariant.Require(!_isSynchronous); - /// - /// Runs synchronously - /// - public static void Run(Func action, TState state) + try { - Run( - async s => - { - await s.action(s.state).ConfigureAwait(false); - return true; - }, - (action, state) - ); - } + _isSynchronous = true; - /// - /// Runs synchronously - /// - public static TResult Run(Func> action, TState state) - { - Invariant.Require(!_isSynchronous); + var task = action(state); + Invariant.Require(task.IsCompleted); - try + // this should never happen (and can't in the debug build). However, to make absolutely sure we have this as + // fallback logic for the release build + if (!task.IsCompleted) { - _isSynchronous = true; - - var task = action(state); - Invariant.Require(task.IsCompleted); + // call AsTask(), since https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=netcore-3.1 + // says that we should not call GetAwaiter().GetResult() except on a completed ValueTask + return task.AsTask().GetAwaiter().GetResult(); + } - // this should never happen (and can't in the debug build). However, to make absolutely sure we have this as - // fallback logic for the release build - if (!task.IsCompleted) - { - // call AsTask(), since https://docs.microsoft.com/en-us/dotnet/api/system.threading.tasks.valuetask-1?view=netcore-3.1 - // says that we should not call GetAwaiter().GetResult() except on a completed ValueTask - return task.AsTask().GetAwaiter().GetResult(); - } + return task.GetAwaiter().GetResult(); + } + finally + { + _isSynchronous = false; + } + } - return task.GetAwaiter().GetResult(); - } - finally - { - _isSynchronous = false; - } + /// + /// A -compatible implementation of . + /// + public static ValueTask Delay(TimeoutValue timeout, CancellationToken cancellationToken) + { + if (!IsSynchronous) + { + return Task.Delay(timeout.InMilliseconds, cancellationToken).AsValueTask(); } - /// - /// A -compatible implementation of . - /// - public static ValueTask Delay(TimeoutValue timeout, CancellationToken cancellationToken) + if (cancellationToken.CanBeCanceled) { - if (!IsSynchronous) + if (cancellationToken.WaitHandle.WaitOne(timeout.InMilliseconds)) { - return Task.Delay(timeout.InMilliseconds, cancellationToken).AsValueTask(); + throw new OperationCanceledException("delay was canceled", cancellationToken); } + } + else + { + Thread.Sleep(timeout.InMilliseconds); + } - if (cancellationToken.CanBeCanceled) - { - if (cancellationToken.WaitHandle.WaitOne(timeout.InMilliseconds)) - { - throw new OperationCanceledException("delay was canceled", cancellationToken); - } - } - else - { - Thread.Sleep(timeout.InMilliseconds); - } + return default; + } - return default; - } + /// + /// For a type which implements both and , + /// provides an implementation of using . + /// + public static void DisposeSyncViaAsync(this TDisposable disposable) + where TDisposable : IAsyncDisposable, IDisposable => + Run(@this => @this.DisposeAsync(), disposable); - /// - /// For a type which implements both and , - /// provides an implementation of using . - /// - public static void DisposeSyncViaAsync(this TDisposable disposable) - where TDisposable : IAsyncDisposable, IDisposable => - Run(@this => @this.DisposeAsync(), disposable); - - /// - /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, - /// returns the as a . - /// - public static ValueTask AwaitSyncOverAsync(this Task task) => - IsSynchronous ? task.GetAwaiter().GetResult().AsValueTask() : task.AsValueTask(); - - /// - /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, - /// returns the as a . - /// - public static ValueTask AwaitSyncOverAsync(this Task task) - { - if (IsSynchronous) - { - task.GetAwaiter().GetResult(); - return default; - } + /// + /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, + /// returns the as a . + /// + public static ValueTask AwaitSyncOverAsync(this Task task) => + IsSynchronous ? task.GetAwaiter().GetResult().AsValueTask() : task.AsValueTask(); - return task.AsValueTask(); + /// + /// In synchronous mode, performs a blocking wait on the provided . In asynchronous mode, + /// returns the as a . + /// + public static ValueTask AwaitSyncOverAsync(this Task task) + { + if (IsSynchronous) + { + task.GetAwaiter().GetResult(); + return default; } + + return task.AsValueTask(); } } diff --git a/DistributedLock.Core/Internal/TimeoutValue.cs b/DistributedLock.Core/Internal/TimeoutValue.cs index fc304dc4..b7b23f4a 100644 --- a/DistributedLock.Core/Internal/TimeoutValue.cs +++ b/DistributedLock.Core/Internal/TimeoutValue.cs @@ -1,66 +1,65 @@ using System; using System.Threading; -namespace Medallion.Threading.Internal -{ - /// - /// A type which can only store a valid timeout value - /// +namespace Medallion.Threading.Internal; + +/// +/// A type which can only store a valid timeout value +/// #if DEBUG - public +public #else - internal +internal #endif - readonly struct TimeoutValue : IEquatable, IComparable +readonly struct TimeoutValue : IEquatable, IComparable +{ + public TimeoutValue(TimeSpan? timeout, string paramName = "timeout") { - public TimeoutValue(TimeSpan? timeout, string paramName = "timeout") + if (timeout is { } timeoutValue) { - if (timeout is { } timeoutValue) - { - // based on Task.Wait(TimeSpan) - // https://referencesource.microsoft.com/#mscorlib/system/threading/Tasks/Task.cs,855657030ba22f78 - - var totalMilliseconds = (long)timeoutValue.TotalMilliseconds; - if (totalMilliseconds < -1 || totalMilliseconds > int.MaxValue) - { - throw new ArgumentOutOfRangeException( - paramName: paramName, - actualValue: timeoutValue, - message: $"Must be {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)} ({Timeout.InfiniteTimeSpan}) or a non-negative value <= {TimeSpan.FromMilliseconds(int.MaxValue)})" - ); - } + // based on Task.Wait(TimeSpan) + // https://referencesource.microsoft.com/#mscorlib/system/threading/Tasks/Task.cs,855657030ba22f78 - this.InMilliseconds = (int)totalMilliseconds; - } - else + var totalMilliseconds = (long)timeoutValue.TotalMilliseconds; + if (totalMilliseconds < -1 || totalMilliseconds > int.MaxValue) { - this.InMilliseconds = Timeout.Infinite; + throw new ArgumentOutOfRangeException( + paramName: paramName, + actualValue: timeoutValue, + message: $"Must be {nameof(Timeout)}.{nameof(Timeout.InfiniteTimeSpan)} ({Timeout.InfiniteTimeSpan}) or a non-negative value <= {TimeSpan.FromMilliseconds(int.MaxValue)})" + ); } + + this.InMilliseconds = (int)totalMilliseconds; + } + else + { + this.InMilliseconds = Timeout.Infinite; } + } - public int InMilliseconds { get; } - public int InSeconds => this.IsInfinite ? throw new InvalidOperationException("infinite timeout cannot be converted to seconds") : this.InMilliseconds / 1000; - public bool IsInfinite => this.InMilliseconds == Timeout.Infinite; - public bool IsZero => this.InMilliseconds == 0; - public TimeSpan TimeSpan => TimeSpan.FromMilliseconds(this.InMilliseconds); + public int InMilliseconds { get; } + public int InSeconds => this.IsInfinite ? throw new InvalidOperationException("infinite timeout cannot be converted to seconds") : this.InMilliseconds / 1000; + public bool IsInfinite => this.InMilliseconds == Timeout.Infinite; + public bool IsZero => this.InMilliseconds == 0; + public TimeSpan TimeSpan => TimeSpan.FromMilliseconds(this.InMilliseconds); - public bool Equals(TimeoutValue that) => this.InMilliseconds == that.InMilliseconds; - public override bool Equals(object? obj) => obj is TimeoutValue that && this.Equals(that); - public override int GetHashCode() => this.InMilliseconds; + public bool Equals(TimeoutValue that) => this.InMilliseconds == that.InMilliseconds; + public override bool Equals(object? obj) => obj is TimeoutValue that && this.Equals(that); + public override int GetHashCode() => this.InMilliseconds; - public int CompareTo(TimeoutValue that) => - this.IsInfinite ? (that.IsInfinite ? 0 : 1) - : that.IsInfinite ? -1 - : this.InMilliseconds.CompareTo(that.InMilliseconds); + public int CompareTo(TimeoutValue that) => + this.IsInfinite ? (that.IsInfinite ? 0 : 1) + : that.IsInfinite ? -1 + : this.InMilliseconds.CompareTo(that.InMilliseconds); - public static bool operator ==(TimeoutValue a, TimeoutValue b) => a.Equals(b); - public static bool operator !=(TimeoutValue a, TimeoutValue b) => !(a == b); + public static bool operator ==(TimeoutValue a, TimeoutValue b) => a.Equals(b); + public static bool operator !=(TimeoutValue a, TimeoutValue b) => !(a == b); - public static implicit operator TimeoutValue(TimeSpan? timeout) => new TimeoutValue(timeout); + public static implicit operator TimeoutValue(TimeSpan? timeout) => new TimeoutValue(timeout); - public override string ToString() => - this.IsInfinite ? "∞" - : this.IsZero ? "0" - : this.TimeSpan.ToString(); - } + public override string ToString() => + this.IsInfinite ? "∞" + : this.IsZero ? "0" + : this.TimeSpan.ToString(); } diff --git a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs index b7247bfa..9f0deea6 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.FileSystem +namespace Medallion.Threading.FileSystem; + +public partial class FileDistributedLock { - public partial class FileDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public FileDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public FileDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public FileDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public FileDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index 754086db..7a136dcf 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -6,155 +6,154 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.FileSystem +namespace Medallion.Threading.FileSystem; + +/// +/// A distributed lock based on holding an exclusive handle to a lock file. The file will be deleted when the lock is released. +/// +public sealed partial class FileDistributedLock : IInternalDistributedLock { /// - /// A distributed lock based on holding an exclusive handle to a lock file. The file will be deleted when the lock is released. + /// Since can be thrown EITHER transiently or for permissions issues, we retry up to this many times + /// before we assume that the issue is non-transient. Empirically I've found this value to be reliable both locally and on AppVeyor (if there + /// IS a problem there's little risk to trying more times because we'll eventually be failing hard). + /// + private const int MaxUnauthorizedAccessExceptionRetries = 400; + + // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock + // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks + // to be used in cases where contention is rare + private static readonly TimeoutValue MinBusyWaitSleepTime = TimeSpan.FromMilliseconds(50), + MaxBusyWaitSleepTime = TimeSpan.FromSeconds(1); + + private string? _cachedDirectory; + + /// + /// Constructs a lock which uses the provided as the exact file name. + /// + /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file + /// will similarly be created if it does not already exist, and will be deleted when the lock is released. /// - public sealed partial class FileDistributedLock : IInternalDistributedLock + public FileDistributedLock(FileInfo lockFile) { - /// - /// Since can be thrown EITHER transiently or for permissions issues, we retry up to this many times - /// before we assume that the issue is non-transient. Empirically I've found this value to be reliable both locally and on AppVeyor (if there - /// IS a problem there's little risk to trying more times because we'll eventually be failing hard). - /// - private const int MaxUnauthorizedAccessExceptionRetries = 400; - - // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock - // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks - // to be used in cases where contention is rare - private static readonly TimeoutValue MinBusyWaitSleepTime = TimeSpan.FromMilliseconds(50), - MaxBusyWaitSleepTime = TimeSpan.FromSeconds(1); - - private string? _cachedDirectory; - - /// - /// Constructs a lock which uses the provided as the exact file name. - /// - /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file - /// will similarly be created if it does not already exist, and will be deleted when the lock is released. - /// - public FileDistributedLock(FileInfo lockFile) - { - this.Name = (lockFile ?? throw new ArgumentNullException(nameof(lockFile))).FullName; - if (lockFile.Name.Length == 0) { throw new FormatException($"{nameof(lockFile)}: may not have an empty file name"); } - } + this.Name = (lockFile ?? throw new ArgumentNullException(nameof(lockFile))).FullName; + if (lockFile.Name.Length == 0) { throw new FormatException($"{nameof(lockFile)}: may not have an empty file name"); } + } - /// - /// Constructs a lock which will place a lock file in . The file's name - /// will be based on , but with proper escaping/hashing to ensure that a valid file name is produced. - /// - /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file - /// will similarly be created if it does not already exist, and will be deleted when the lock is released. - /// - public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) - { - this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name); - } + /// + /// Constructs a lock which will place a lock file in . The file's name + /// will be based on , but with proper escaping/hashing to ensure that a valid file name is produced. + /// + /// Upon acquiring the lock, the file's directory will be created automatically if it does not already exist. The file + /// will similarly be created if it does not already exist, and will be deleted when the lock is released. + /// + public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) + { + this.Name = FileNameValidationHelper.GetLockFileName(lockFileDirectory, name); + } - /// - /// Implements - /// - public string Name { get; } + /// + /// Implements + /// + public string Name { get; } - private string Directory => this._cachedDirectory ??= Path.GetDirectoryName(this.Name); + private string Directory => this._cachedDirectory ??= Path.GetDirectoryName(this.Name); - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - BusyWaitHelper.WaitAsync( - state: this, - tryGetValue: (@this, token) => @this.TryAcquire(token).AsValueTask(), - timeout: timeout, - minSleepTime: MinBusyWaitSleepTime, - maxSleepTime: MaxBusyWaitSleepTime, - cancellationToken - ); + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, token) => @this.TryAcquire(token).AsValueTask(), + timeout: timeout, + minSleepTime: MinBusyWaitSleepTime, + maxSleepTime: MaxBusyWaitSleepTime, + cancellationToken + ); - private FileDistributedLockHandle? TryAcquire(CancellationToken cancellationToken) - { - var retryCount = 0; + private FileDistributedLockHandle? TryAcquire(CancellationToken cancellationToken) + { + var retryCount = 0; - while (true) - { - cancellationToken.ThrowIfCancellationRequested(); + while (true) + { + cancellationToken.ThrowIfCancellationRequested(); - this.EnsureDirectoryExists(); + this.EnsureDirectoryExists(); - FileStream lockFileStream; - try - { - // key arguments: - // OpenOrCreate to be robust to the file existing or not - // None to take an exclusive lock - // DeleteOnClose to clean up after ourselves - lockFileStream = new FileStream(this.Name, FileMode.OpenOrCreate, FileAccess.Read, FileShare.None, bufferSize: 1, FileOptions.DeleteOnClose); - } - catch (DirectoryNotFoundException) + FileStream lockFileStream; + try + { + // key arguments: + // OpenOrCreate to be robust to the file existing or not + // None to take an exclusive lock + // DeleteOnClose to clean up after ourselves + lockFileStream = new FileStream(this.Name, FileMode.OpenOrCreate, FileAccess.Read, FileShare.None, bufferSize: 1, FileOptions.DeleteOnClose); + } + catch (DirectoryNotFoundException) + { + // this should almost never happen because we just created the directory but in a race condition it could. Just retry + continue; + } + catch (UnauthorizedAccessException) + { + // This can happen in few cases: + + // The path is already directory, so we'll never be able to open a handle of it as a file + if (System.IO.Directory.Exists(this.Name)) { - // this should almost never happen because we just created the directory but in a race condition it could. Just retry - continue; + throw new InvalidOperationException($"Failed to create lock file '{this.Name}' because it is already the name of a directory"); } - catch (UnauthorizedAccessException) + + // The file exists and is read-only + FileAttributes attributes; + try { attributes = File.GetAttributes(this.Name); } + catch { attributes = FileAttributes.Normal; } // e. g. could fail with FileNotFoundException + if (attributes.HasFlag(FileAttributes.ReadOnly)) { - // This can happen in few cases: - - // The path is already directory, so we'll never be able to open a handle of it as a file - if (System.IO.Directory.Exists(this.Name)) - { - throw new InvalidOperationException($"Failed to create lock file '{this.Name}' because it is already the name of a directory"); - } - - // The file exists and is read-only - FileAttributes attributes; - try { attributes = File.GetAttributes(this.Name); } - catch { attributes = FileAttributes.Normal; } // e. g. could fail with FileNotFoundException - if (attributes.HasFlag(FileAttributes.ReadOnly)) - { - // We could support this by eschewing DeleteOnClose once we detect that a file is read-only, - // but absent interest or a use-case we'll just throw for now - throw new NotSupportedException($"Locking on read-only file '{this.Name}' is not supported"); - } - - // Frustratingly, this error can be thrown transiently due to concurrent creation/deletion. Initially assume - // that it is transient and just retry - if (++retryCount <= MaxUnauthorizedAccessExceptionRetries) - { - continue; - } - - // If we get here, we've exhausted our retries: assume that it is a legitimate permissions issue - throw; + // We could support this by eschewing DeleteOnClose once we detect that a file is read-only, + // but absent interest or a use-case we'll just throw for now + throw new NotSupportedException($"Locking on read-only file '{this.Name}' is not supported"); } - // this should never happen because we validate. However if it does (e. g. due to some system configuration change?), throw so that - // this doesn't end up in the IOException block (PathTooLongException is IOException) - catch (PathTooLongException) { throw; } - catch (IOException) + + // Frustratingly, this error can be thrown transiently due to concurrent creation/deletion. Initially assume + // that it is transient and just retry + if (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { - // the hope is that if we get here the only failure reason would be that the file is locked - return null; + continue; } - return new FileDistributedLockHandle(lockFileStream); + // If we get here, we've exhausted our retries: assume that it is a legitimate permissions issue + throw; + } + // this should never happen because we validate. However if it does (e. g. due to some system configuration change?), throw so that + // this doesn't end up in the IOException block (PathTooLongException is IOException) + catch (PathTooLongException) { throw; } + catch (IOException) + { + // the hope is that if we get here the only failure reason would be that the file is locked + return null; } + + return new FileDistributedLockHandle(lockFileStream); } + } - private void EnsureDirectoryExists() - { - var retryCount = 0; + private void EnsureDirectoryExists() + { + var retryCount = 0; - while (true) + while (true) + { + try { - try - { - System.IO.Directory.CreateDirectory(this.Directory); - return; - } - // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. - // If we encounter it, assume it is transient unless it persists. - catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } - catch (Exception ex) - { - throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); - } + System.IO.Directory.CreateDirectory(this.Directory); + return; + } + // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. + // If we encounter it, assume it is transient unless it persists. + catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } + catch (Exception ex) + { + throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); } } } diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/DistributedLock.FileSystem/FileDistributedLockHandle.cs index 7d71fbfa..44996b77 100644 --- a/DistributedLock.FileSystem/FileDistributedLockHandle.cs +++ b/DistributedLock.FileSystem/FileDistributedLockHandle.cs @@ -6,35 +6,34 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.FileSystem +namespace Medallion.Threading.FileSystem; + +/// +/// Implements +/// +public sealed class FileDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class FileDistributedLockHandle : IDistributedSynchronizationHandle - { - private FileStream? _fileStream; + private FileStream? _fileStream; - internal FileDistributedLockHandle(FileStream fileStream) - { - this._fileStream = fileStream; - } + internal FileDistributedLockHandle(FileStream fileStream) + { + this._fileStream = fileStream; + } - CancellationToken IDistributedSynchronizationHandle.HandleLostToken => - Volatile.Read(ref this._fileStream) != null ? CancellationToken.None : throw this.ObjectDisposed(); + CancellationToken IDistributedSynchronizationHandle.HandleLostToken => + Volatile.Read(ref this._fileStream) != null ? CancellationToken.None : throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._fileStream, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._fileStream, null)?.Dispose(); - /// - /// Releases the lock - /// - public ValueTask DisposeAsync() - { - this.Dispose(); - return default; - } + /// + /// Releases the lock + /// + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; } } diff --git a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs index d4682382..4f215039 100644 --- a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs +++ b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs @@ -5,28 +5,27 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.FileSystem +namespace Medallion.Threading.FileSystem; + +/// +/// Implements for +/// +public sealed class FileDistributedSynchronizationProvider : IDistributedLockProvider { + private readonly DirectoryInfo _lockFileDirectory; + /// - /// Implements for + /// Constructs a provider that scopes lock files within the provided . /// - public sealed class FileDistributedSynchronizationProvider : IDistributedLockProvider + public FileDistributedSynchronizationProvider(DirectoryInfo lockFileDirectory) { - private readonly DirectoryInfo _lockFileDirectory; - - /// - /// Constructs a provider that scopes lock files within the provided . - /// - public FileDistributedSynchronizationProvider(DirectoryInfo lockFileDirectory) - { - this._lockFileDirectory = lockFileDirectory ?? throw new ArgumentNullException(nameof(lockFileDirectory)); - } + this._lockFileDirectory = lockFileDirectory ?? throw new ArgumentNullException(nameof(lockFileDirectory)); + } - /// - /// Constructs a with the given . - /// - public FileDistributedLock CreateLock(string name) => new FileDistributedLock(this._lockFileDirectory, name); + /// + /// Constructs a with the given . + /// + public FileDistributedLock CreateLock(string name) => new FileDistributedLock(this._lockFileDirectory, name); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - } + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/DistributedLock.FileSystem/FileNameValidationHelper.cs index 209fdb2e..e978e61a 100644 --- a/DistributedLock.FileSystem/FileNameValidationHelper.cs +++ b/DistributedLock.FileSystem/FileNameValidationHelper.cs @@ -3,150 +3,149 @@ using System.Security.Cryptography; using System.Text; -namespace Medallion.Threading.FileSystem +namespace Medallion.Threading.FileSystem; + +/// +/// Helper class for validating file names and converting lock names to valid file names. +/// +internal static class FileNameValidationHelper { - /// - /// Helper class for validating file names and converting lock names to valid file names. - /// - internal static class FileNameValidationHelper + // NOTE: our goal here is to ensure consistent behavior across platforms where possible, in case someone is locking a networked file system + // file. + // + // That means we limit ourselves to just letters, digits and underscores in the name, and we always incorporate a hash component + // (which avoids the various Windows "special" file names. + // + // Length is another thing we have to consider; on Windows we are dealing with max file name lengths on 255 chars and max path lengths of + // either 259 chars or 32000 chars, depending on whether long paths are enabled and whether we're on .NET Core or .NET framework. On unix + // we expect limits of 255 bytes for file names and 4096 bytes for paths. + // + // Another difference is case-sensitivity: on Windows file names are case-insensitive but we want lock names to be case sensitive. + // + // For portability, we prefer to use a fixed name length of 64 chars of the form [clean base name prefix][hash].lock. "clean base name prefix" + // is a prefix of the orginal name with non letter/digit/underscore chars replaced with underscores. The prefix is as long as possible without going + // over the overall name limit. "hash" is a Base 32 hash of the UTF8 bytes of the provided name. This gives us case-sensitivity and a minimal chance + // of collision if the name got truncated or mutated during "cleaning". Finally, the ".lock" extension is a helpful indicator; both this and the name + // prefix are intended to help with debugging. + // + // Sometimes, our base directory will be so long that we can't use this full portable name format. In that case, we fall back to JUST the hash component. + // If that is still too long, we fall back to just the first 12 chars of the hash. If that is still too long, we give up. + + // Chosen because below this the risk of collisions just seems too high. If someone is picking a base directory so long + // that names are limited to < 12 chars, it feels like a mistake + internal const int MinFileNameLength = 12; + + // Chosen because this is both less than the 255 chars allowed by Windows and (because we always incorporate a Base 32 hash) less + // than the 255 bytes allowed by Unix. This is hopefully also short enough to rarely overflow MAX_PATH, even on Windows + private const int PortableFileNameLength = 64; + + public static string GetLockFileName(DirectoryInfo lockFileDirectory, string name) { - // NOTE: our goal here is to ensure consistent behavior across platforms where possible, in case someone is locking a networked file system - // file. - // - // That means we limit ourselves to just letters, digits and underscores in the name, and we always incorporate a hash component - // (which avoids the various Windows "special" file names. - // - // Length is another thing we have to consider; on Windows we are dealing with max file name lengths on 255 chars and max path lengths of - // either 259 chars or 32000 chars, depending on whether long paths are enabled and whether we're on .NET Core or .NET framework. On unix - // we expect limits of 255 bytes for file names and 4096 bytes for paths. - // - // Another difference is case-sensitivity: on Windows file names are case-insensitive but we want lock names to be case sensitive. - // - // For portability, we prefer to use a fixed name length of 64 chars of the form [clean base name prefix][hash].lock. "clean base name prefix" - // is a prefix of the orginal name with non letter/digit/underscore chars replaced with underscores. The prefix is as long as possible without going - // over the overall name limit. "hash" is a Base 32 hash of the UTF8 bytes of the provided name. This gives us case-sensitivity and a minimal chance - // of collision if the name got truncated or mutated during "cleaning". Finally, the ".lock" extension is a helpful indicator; both this and the name - // prefix are intended to help with debugging. - // - // Sometimes, our base directory will be so long that we can't use this full portable name format. In that case, we fall back to JUST the hash component. - // If that is still too long, we fall back to just the first 12 chars of the hash. If that is still too long, we give up. - - // Chosen because below this the risk of collisions just seems too high. If someone is picking a base directory so long - // that names are limited to < 12 chars, it feels like a mistake - internal const int MinFileNameLength = 12; - - // Chosen because this is both less than the 255 chars allowed by Windows and (because we always incorporate a Base 32 hash) less - // than the 255 bytes allowed by Unix. This is hopefully also short enough to rarely overflow MAX_PATH, even on Windows - private const int PortableFileNameLength = 64; - - public static string GetLockFileName(DirectoryInfo lockFileDirectory, string name) + if (lockFileDirectory == null) { throw new ArgumentNullException(nameof(lockFileDirectory)); } + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + var directoryPath = lockFileDirectory.FullName; + var directoryPathWithTrailingSeparator = directoryPath[directoryPath.Length - 1] == Path.DirectorySeparatorChar + ? directoryPath + : directoryPath + Path.DirectorySeparatorChar; + + var baseName = ConvertToValidBaseName(name); + var nameHash = ComputeHash(Encoding.UTF8.GetBytes(name)); + const string Extension = ".lock"; + + // first, try the full portable name format + var portableLockFileName = directoryPathWithTrailingSeparator + + baseName.Substring(0, Math.Min(PortableFileNameLength - nameHash.Length - Extension.Length, baseName.Length)) + + nameHash + + Extension; + if (!IsTooLong(portableLockFileName)) { - if (lockFileDirectory == null) { throw new ArgumentNullException(nameof(lockFileDirectory)); } - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - var directoryPath = lockFileDirectory.FullName; - var directoryPathWithTrailingSeparator = directoryPath[directoryPath.Length - 1] == Path.DirectorySeparatorChar - ? directoryPath - : directoryPath + Path.DirectorySeparatorChar; - - var baseName = ConvertToValidBaseName(name); - var nameHash = ComputeHash(Encoding.UTF8.GetBytes(name)); - const string Extension = ".lock"; - - // first, try the full portable name format - var portableLockFileName = directoryPathWithTrailingSeparator - + baseName.Substring(0, Math.Min(PortableFileNameLength - nameHash.Length - Extension.Length, baseName.Length)) - + nameHash - + Extension; - if (!IsTooLong(portableLockFileName)) - { - return portableLockFileName; - } + return portableLockFileName; + } - // next, try using just the hash as the name - var hashOnlyFileName = directoryPathWithTrailingSeparator + nameHash; - if (!IsTooLong(hashOnlyFileName)) - { - return hashOnlyFileName; - } + // next, try using just the hash as the name + var hashOnlyFileName = directoryPathWithTrailingSeparator + nameHash; + if (!IsTooLong(hashOnlyFileName)) + { + return hashOnlyFileName; + } - // finally, try using just a portion of the hash - var minimumLengthFileName = directoryPathWithTrailingSeparator + nameHash.Substring(0, MinFileNameLength); - if (!IsTooLong(minimumLengthFileName)) - { - return minimumLengthFileName; - } + // finally, try using just a portion of the hash + var minimumLengthFileName = directoryPathWithTrailingSeparator + nameHash.Substring(0, MinFileNameLength); + if (!IsTooLong(minimumLengthFileName)) + { + return minimumLengthFileName; + } - throw new PathTooLongException($"Unable to construct lock file name because the base directory (length = {directoryPathWithTrailingSeparator.Length}) does not leave enough room for a {MinFileNameLength} lock name"); + throw new PathTooLongException($"Unable to construct lock file name because the base directory (length = {directoryPathWithTrailingSeparator.Length}) does not leave enough room for a {MinFileNameLength} lock name"); + } + + private static bool IsTooLong(string name) + { + try + { + Path.GetFullPath(name); + return false; } + catch (PathTooLongException) + { + return true; + } + } + + private static string ConvertToValidBaseName(string name) + { + const char ReplacementChar = '_'; - private static bool IsTooLong(string name) + StringBuilder? builder = null; + for (var i = 0; i < name.Length; ++i) { - try + var @char = name[i]; + if (!char.IsLetterOrDigit(@char) && @char != ReplacementChar) { - Path.GetFullPath(name); - return false; + builder ??= new StringBuilder(name.Length).Append(name, startIndex: 0, count: i); + builder.Append(ReplacementChar); } - catch (PathTooLongException) + else if (builder != null) { - return true; + builder.Append(@char); } } - private static string ConvertToValidBaseName(string name) - { - const char ReplacementChar = '_'; - - StringBuilder? builder = null; - for (var i = 0; i < name.Length; ++i) - { - var @char = name[i]; - if (!char.IsLetterOrDigit(@char) && @char != ReplacementChar) - { - builder ??= new StringBuilder(name.Length).Append(name, startIndex: 0, count: i); - builder.Append(ReplacementChar); - } - else if (builder != null) - { - builder.Append(@char); - } - } - - return builder?.ToString() ?? name; - } + return builder?.ToString() ?? name; + } - // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char - // name to include a good portion of the original provided name, which is good for debugging. See - // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big - private const int Base32CharBits = 5; - internal const int HashLengthInChars = 160 / Base32CharBits; + // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char + // name to include a good portion of the original provided name, which is good for debugging. See + // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big + private const int Base32CharBits = 5; + internal const int HashLengthInChars = 160 / Base32CharBits; - private static string ComputeHash(byte[] bytes) + private static string ComputeHash(byte[] bytes) + { + using var sha = SHA512.Create(); + var hashBytes = sha.ComputeHash(bytes); + + // we use Base32 because it is case-insensitive (important for windows files) and a bit more compact than Base16 + // RFC 4648 from https://en.wikipedia.org/wiki/Base32 + const string Base32Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; + + var chars = new char[HashLengthInChars]; + var byteIndex = 0; + var bitBuffer = 0; + var bitsRemaining = 0; + for (var charIndex = 0; charIndex < chars.Length; ++charIndex) { - using var sha = SHA512.Create(); - var hashBytes = sha.ComputeHash(bytes); - - // we use Base32 because it is case-insensitive (important for windows files) and a bit more compact than Base16 - // RFC 4648 from https://en.wikipedia.org/wiki/Base32 - const string Base32Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; - - var chars = new char[HashLengthInChars]; - var byteIndex = 0; - var bitBuffer = 0; - var bitsRemaining = 0; - for (var charIndex = 0; charIndex < chars.Length; ++charIndex) + if (bitsRemaining < Base32CharBits) { - if (bitsRemaining < Base32CharBits) - { - bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; - bitsRemaining += 8; - } - chars[charIndex] = Base32Alphabet[bitBuffer & 31]; - bitBuffer >>= Base32CharBits; - bitsRemaining -= Base32CharBits; + bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; + bitsRemaining += 8; } - - return new string(chars); + chars[charIndex] = Base32Alphabet[bitBuffer & 31]; + bitBuffer >>= Base32CharBits; + bitsRemaining -= Base32CharBits; } + + return new string(chars); } } diff --git a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs index 38c11a66..7dd2ab87 100644 --- a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs +++ b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs @@ -4,73 +4,72 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +/// +/// Specifies options for connecting to and locking against a MySQL database +/// +public sealed class MySqlConnectionOptionsBuilder { + private TimeoutValue? _keepaliveCadence; + private bool? _useMultiplexing; + + internal MySqlConnectionOptionsBuilder() { } + /// - /// Specifies options for connecting to and locking against a MySQL database + /// MySQL's wait_timeout system variable determines how long the server will allow a connection to be idle before killing it. + /// For more information, see https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout. + /// + /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. + /// + /// Because MySQL's default for this setting is 8 hours, the default is 3.5 hours. + /// + /// Setting a value of disables keepalive. /// - public sealed class MySqlConnectionOptionsBuilder + public MySqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) { - private TimeoutValue? _keepaliveCadence; - private bool? _useMultiplexing; + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } - internal MySqlConnectionOptionsBuilder() { } + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public MySqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } - /// - /// MySQL's wait_timeout system variable determines how long the server will allow a connection to be idle before killing it. - /// For more information, see https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout. - /// - /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. - /// - /// Because MySQL's default for this setting is 8 hours, the default is 3.5 hours. - /// - /// Setting a value of disables keepalive. - /// - public MySqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) + internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + MySqlConnectionOptionsBuilder? options; + if (optionsBuilder != null) { - this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); - return this; + options = new MySqlConnectionOptionsBuilder(); + optionsBuilder(options); } - - /// - /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) - /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is - /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. - /// - /// Multiplexing is on by default. - /// - /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an - /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing - /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) - /// connection will be allocated. - /// - /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also - /// particularly applicable to cases where - /// semantics are used with a zero-length timeout. - /// - public MySqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + else { - this._useMultiplexing = useMultiplexing; - return this; + options = null; } - internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) - { - MySqlConnectionOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new MySqlConnectionOptionsBuilder(); - optionsBuilder(options); - } - else - { - options = null; - } - - var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromHours(3.5); - var useMultiplexing = options?._useMultiplexing ?? true; + var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromHours(3.5); + var useMultiplexing = options?._useMultiplexing ?? true; - return (keepaliveCadence, useMultiplexing); - } + return (keepaliveCadence, useMultiplexing); } } diff --git a/DistributedLock.MySql/MySqlDatabaseConnection.cs b/DistributedLock.MySql/MySqlDatabaseConnection.cs index 6de275b4..66554c00 100644 --- a/DistributedLock.MySql/MySqlDatabaseConnection.cs +++ b/DistributedLock.MySql/MySqlDatabaseConnection.cs @@ -7,43 +7,42 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +internal class MySqlDatabaseConnection : DatabaseConnection { - internal class MySqlDatabaseConnection : DatabaseConnection + public MySqlDatabaseConnection(IDbConnection connection) + : base(connection, isExternallyOwned: true) + { + } + + public MySqlDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) { - public MySqlDatabaseConnection(IDbConnection connection) - : base(connection, isExternallyOwned: true) - { - } - - public MySqlDatabaseConnection(IDbTransaction transaction) - : base(transaction, isExternallyOwned: true) - { - } - - public MySqlDatabaseConnection(string connectionString) - : base(new MySqlConnection(connectionString), isExternallyOwned: false) - { - } - - // Seems like this only helps when executing a statement multiple times on the - // same connection (unclear since there's limited documentation) - public override bool ShouldPrepareCommands => false; - - public override bool IsCommandCancellationException(Exception exception) - { - // see https://mysqlconnector.net/overview/command-cancellation/ - return exception is MySqlException ex && ex.ErrorCode == MySqlErrorCode.QueryInterrupted; - } - - public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) - { - using var sleepCommand = this.CreateCommand(); - sleepCommand.SetCommandText("SELECT SLEEP(@durationSeconds)"); - sleepCommand.AddParameter("durationSeconds", sleepTime.TotalSeconds); - sleepCommand.SetTimeout(sleepTime); - - await executor(sleepCommand, cancellationToken).ConfigureAwait(false); - } + } + + public MySqlDatabaseConnection(string connectionString) + : base(new MySqlConnection(connectionString), isExternallyOwned: false) + { + } + + // Seems like this only helps when executing a statement multiple times on the + // same connection (unclear since there's limited documentation) + public override bool ShouldPrepareCommands => false; + + public override bool IsCommandCancellationException(Exception exception) + { + // see https://mysqlconnector.net/overview/command-cancellation/ + return exception is MySqlException ex && ex.ErrorCode == MySqlErrorCode.QueryInterrupted; + } + + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + using var sleepCommand = this.CreateCommand(); + sleepCommand.SetCommandText("SELECT SLEEP(@durationSeconds)"); + sleepCommand.AddParameter("durationSeconds", sleepTime.TotalSeconds); + sleepCommand.SetTimeout(sleepTime); + + await executor(sleepCommand, cancellationToken).ConfigureAwait(false); } } diff --git a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs index c9973013..327fb695 100644 --- a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs +++ b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +public partial class MySqlDistributedLock { - public partial class MySqlDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public MySqlDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public MySqlDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public MySqlDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public MySqlDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.MySql/MySqlDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.cs index 1c829a76..e5ab9025 100644 --- a/DistributedLock.MySql/MySqlDistributedLock.cs +++ b/DistributedLock.MySql/MySqlDistributedLock.cs @@ -8,176 +8,175 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +/// +/// Implements a distributed lock for MySQL or MariaDB based on the GET_LOCK family of functions +/// +public sealed partial class MySqlDistributedLock : IInternalDistributedLock { /// - /// Implements a distributed lock for MySQL or MariaDB based on the GET_LOCK family of functions + /// From https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html + /// + internal const int MaxNameLength = 64; + + private readonly IDbDistributedLock _internalLock; + + /// + /// Constructs a lock with the given that connects using the provided and + /// . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class MySqlDistributedLock : IInternalDistributedLock + public MySqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) { - /// - /// From https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html - /// - internal const int MaxNameLength = 64; - - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a lock with the given that connects using the provided and - /// . - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public MySqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) - { - } + } - /// - /// Constructs a lock with the given that connects using the provided . - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public MySqlDistributedLock(string name, IDbConnection connection, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connection)) - { - } + /// + /// Constructs a lock with the given that connects using the provided . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public MySqlDistributedLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connection)) + { + } + + /// + /// Constructs a lock with the given that connects using the connection from the provided . + /// + /// NOTE that the lock will not be scoped to the and must still be explicitly released before the transaction ends. + /// However, this constructor allows the lock to PARTICIPATE in an ongoing transaction on a connection. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public MySqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, transaction)) + { + } - /// - /// Constructs a lock with the given that connects using the connection from the provided . - /// - /// NOTE that the lock will not be scoped to the and must still be explicitly released before the transaction ends. - /// However, this constructor allows the lock to PARTICIPATE in an ongoing transaction on a connection. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public MySqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, transaction)) + private MySqlDistributedLock(string name, bool exactName, Func internalLockFactory) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + if (exactName) { + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + if (name.Length == 0) { throw new FormatException($"{nameof(name)}: must not be empty"); } + if (name.ToLowerInvariant() != name) { throw new FormatException($"{nameof(name)}: must not container uppercase letters"); } + this.Name = name; } - - private MySqlDistributedLock(string name, bool exactName, Func internalLockFactory) + else { - if (name == null) { throw new ArgumentNullException(nameof(name)); } + this.Name = GetSafeName(name); + } - if (exactName) - { - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - if (name.Length == 0) { throw new FormatException($"{nameof(name)}: must not be empty"); } - if (name.ToLowerInvariant() != name) { throw new FormatException($"{nameof(name)}: must not container uppercase letters"); } - this.Name = name; - } - else - { - this.Name = GetSafeName(name); - } + this._internalLock = internalLockFactory(this.Name); + } - this._internalLock = internalLockFactory(this.Name); - } + /// + /// Implements + /// + public string Name { get; } - /// - /// Implements - /// - public string Name { get; } - - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - this._internalLock.TryAcquireAsync(timeout, new MySqlUserLock(), cancellationToken, contextHandle: null).Wrap(h => new MySqlDistributedLockHandle(h)); - - private static string GetSafeName(string name) => - ToSafeName( - name, - MaxNameLength, - convertToValidName: s => - { - if (s.Length == 0) { return "__empty__"; } - return s.ToLowerInvariant(); - }, - hash: ComputeHash - ); - - private static string ToSafeName(string name, int maxNameLength, Func convertToValidName, Func hash) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, new MySqlUserLock(), cancellationToken, contextHandle: null).Wrap(h => new MySqlDistributedLockHandle(h)); - var validBaseLockName = convertToValidName(name); - if (validBaseLockName == name && validBaseLockName.Length <= maxNameLength) + private static string GetSafeName(string name) => + ToSafeName( + name, + MaxNameLength, + convertToValidName: s => { - return name; - } + if (s.Length == 0) { return "__empty__"; } + return s.ToLowerInvariant(); + }, + hash: ComputeHash + ); - var nameHash = hash(Encoding.UTF8.GetBytes(name)); + private static string ToSafeName(string name, int maxNameLength, Func convertToValidName, Func hash) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } - if (nameHash.Length >= maxNameLength) - { - return nameHash.Substring(0, length: maxNameLength); - } + var validBaseLockName = convertToValidName(name); + if (validBaseLockName == name && validBaseLockName.Length <= maxNameLength) + { + return name; + } - var prefix = validBaseLockName.Substring(0, Math.Min(validBaseLockName.Length, maxNameLength - nameHash.Length)); - return prefix + nameHash; + var nameHash = hash(Encoding.UTF8.GetBytes(name)); + + if (nameHash.Length >= maxNameLength) + { + return nameHash.Substring(0, length: maxNameLength); } - private static string ComputeHash(byte[] bytes) + var prefix = validBaseLockName.Substring(0, Math.Min(validBaseLockName.Length, maxNameLength - nameHash.Length)); + return prefix + nameHash; + } + + private static string ComputeHash(byte[] bytes) + { + using var sha = SHA512.Create(); + var hashBytes = sha.ComputeHash(bytes); + + // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char + // name to include a good portion of the original provided name, which is good for debugging. See + // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big + const int Base32CharBits = 5; + const int HashLengthInChars = 160 / Base32CharBits; + + // we use Base32 because it is case-insensitive (like MySQL) and a bit more compact than Base16 + // RFC 4648 from https://en.wikipedia.org/wiki/Base32 + const string Base32Alphabet = "abcdefghijklmnopqrstuvwxyz234567"; + + var chars = new char[HashLengthInChars]; + var byteIndex = 0; + var bitBuffer = 0; + var bitsRemaining = 0; + for (var charIndex = 0; charIndex < chars.Length; ++charIndex) { - using var sha = SHA512.Create(); - var hashBytes = sha.ComputeHash(bytes); - - // We truncate to 160 bits, which is 32 chars of Base32. This should still give us good collision resistance but allows for a 64-char - // name to include a good portion of the original provided name, which is good for debugging. See - // https://crypto.stackexchange.com/questions/9435/is-truncating-a-sha512-hash-to-the-first-160-bits-as-secure-as-using-sha1#:~:text=Yes.,time%20is%20still%20pretty%20big - const int Base32CharBits = 5; - const int HashLengthInChars = 160 / Base32CharBits; - - // we use Base32 because it is case-insensitive (like MySQL) and a bit more compact than Base16 - // RFC 4648 from https://en.wikipedia.org/wiki/Base32 - const string Base32Alphabet = "abcdefghijklmnopqrstuvwxyz234567"; - - var chars = new char[HashLengthInChars]; - var byteIndex = 0; - var bitBuffer = 0; - var bitsRemaining = 0; - for (var charIndex = 0; charIndex < chars.Length; ++charIndex) + if (bitsRemaining < Base32CharBits) { - if (bitsRemaining < Base32CharBits) - { - bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; - bitsRemaining += 8; - } - chars[charIndex] = Base32Alphabet[bitBuffer & 31]; - bitBuffer >>= Base32CharBits; - bitsRemaining -= Base32CharBits; + bitBuffer |= hashBytes[byteIndex++] << bitsRemaining; + bitsRemaining += 8; } - - return new string(chars); + chars[charIndex] = Base32Alphabet[bitBuffer & 31]; + bitBuffer >>= Base32CharBits; + bitsRemaining -= Base32CharBits; } - private static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + return new string(chars); + } - var (keepaliveCadence, useMultiplexing) = MySqlConnectionOptionsBuilder.GetOptions(options); + private static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - if (useMultiplexing) - { - return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, MySqlMultiplexedConnectionLockPool.Instance, keepaliveCadence); - } + var (keepaliveCadence, useMultiplexing) = MySqlConnectionOptionsBuilder.GetOptions(options); - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + if (useMultiplexing) + { + return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, MySqlMultiplexedConnectionLockPool.Instance, keepaliveCadence); } - private static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + } - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connection)); - } + private static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - private static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(connection)); + } - // Note: we pass useTransaction:false here because MYSQL locks are always session-scoped; we only support locking against a transaction - // so that your lock can participate in the connection. - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); - } + private static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + // Note: we pass useTransaction:false here because MYSQL locks are always session-scoped; we only support locking against a transaction + // so that your lock can participate in the connection. + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new MySqlDatabaseConnection(transaction), useTransaction: false, keepaliveCadence: Timeout.InfiniteTimeSpan); } } diff --git a/DistributedLock.MySql/MySqlDistributedLockHandle.cs b/DistributedLock.MySql/MySqlDistributedLockHandle.cs index 646f4a9b..34710fba 100644 --- a/DistributedLock.MySql/MySqlDistributedLockHandle.cs +++ b/DistributedLock.MySql/MySqlDistributedLockHandle.cs @@ -5,33 +5,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +/// +/// Implements +/// +public sealed class MySqlDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class MySqlDistributedLockHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal MySqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal MySqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs index 00b3388f..98c89947 100644 --- a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs +++ b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs @@ -3,51 +3,50 @@ using System.Data; using System.Text; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +/// +/// Implements for +/// +public sealed class MySqlDistributedSynchronizationProvider : IDistributedLockProvider { + private readonly Func _lockFactory; + + /// + /// Constructs a provider that connects with and . + /// + public MySqlDistributedSynchronizationProvider(string connectionString, Action? options = null) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connectionString, options, exactName); + } + + /// + /// Constructs a provider that connects with . + /// + public MySqlDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connection, exactName); + } + /// - /// Implements for + /// Constructs a provider that connects with . /// - public sealed class MySqlDistributedSynchronizationProvider : IDistributedLockProvider + public MySqlDistributedSynchronizationProvider(IDbTransaction transaction) { - private readonly Func _lockFactory; - - /// - /// Constructs a provider that connects with and . - /// - public MySqlDistributedSynchronizationProvider(string connectionString, Action? options = null) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - - this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connectionString, options, exactName); - } - - /// - /// Constructs a provider that connects with . - /// - public MySqlDistributedSynchronizationProvider(IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - - this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, connection, exactName); - } - - /// - /// Constructs a provider that connects with . - /// - public MySqlDistributedSynchronizationProvider(IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - - this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, transaction, exactName); - } - - /// - /// Creates a with the provided . Unless - /// is specified, invalid names will be escaped/hashed. - /// - public MySqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); - - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + this._lockFactory = (name, exactName) => new MySqlDistributedLock(name, transaction, exactName); } + + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// + public MySqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } diff --git a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs index 4ba0303a..6c66a846 100644 --- a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs +++ b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +internal static class MySqlMultiplexedConnectionLockPool { - internal static class MySqlMultiplexedConnectionLockPool - { - public static readonly MultiplexedConnectionLockPool Instance = new(s => new MySqlDatabaseConnection(s)); - } + public static readonly MultiplexedConnectionLockPool Instance = new(s => new MySqlDatabaseConnection(s)); } diff --git a/DistributedLock.MySql/MySqlUserLock.cs b/DistributedLock.MySql/MySqlUserLock.cs index 0e4aa551..7e5274d9 100644 --- a/DistributedLock.MySql/MySqlUserLock.cs +++ b/DistributedLock.MySql/MySqlUserLock.cs @@ -8,76 +8,75 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.MySql +namespace Medallion.Threading.MySql; + +/// +/// Implements using user-level locking functions. See +/// https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html +/// +internal class MySqlUserLock : IDbSynchronizationStrategy { - /// - /// Implements using user-level locking functions. See - /// https://dev.mysql.com/doc/refman/8.0/en/locking-functions.html - /// - internal class MySqlUserLock : IDbSynchronizationStrategy - { - // matches SqlApplicationLock - private const int AlreadyHeldReturnCode = 103; - // see behavior documented at https://mariadb.com/kb/en/get_lock/ for when GET_LOCK returns NULL - private const int GetLockErrorReturnCode = 104; + // matches SqlApplicationLock + private const int AlreadyHeldReturnCode = 103; + // see behavior documented at https://mariadb.com/kb/en/get_lock/ for when GET_LOCK returns NULL + private const int GetLockErrorReturnCode = 104; + + private static readonly object Cookie = new(); - private static readonly object Cookie = new(); + public bool IsUpgradeable => false; - public bool IsUpgradeable => false; + public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) + { + using var command = connection.CreateCommand(); + command.SetCommandText("DO RELEASE_LOCK(@name)"); + command.AddParameter("name", resourceName); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + } - public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + { + try { using var command = connection.CreateCommand(); - command.SetCommandText("DO RELEASE_LOCK(@name)"); + command.SetCommandText($"SELECT CASE WHEN IS_USED_LOCK(@name) = CONNECTION_ID() THEN {AlreadyHeldReturnCode} ELSE IFNULL(GET_LOCK(@name, @timeoutSeconds), {GetLockErrorReturnCode}) END"); command.AddParameter("name", resourceName); - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - } + // Note: -1 works for MySQL but not for MariaDB (https://stackoverflow.com/questions/49792089/set-infinite-timeout-get-lock-in-mariadb/49809919) + command.AddParameter("timeoutSeconds", timeout.IsInfinite ? 0xFFFFFFFF : timeout.InSeconds); - public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) - { - try + // Convert required because the value comes back as int on MariaDB and long on MySQL + var acquireCommandResult = Convert.ToInt64(await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false)); + switch (acquireCommandResult) { - using var command = connection.CreateCommand(); - command.SetCommandText($"SELECT CASE WHEN IS_USED_LOCK(@name) = CONNECTION_ID() THEN {AlreadyHeldReturnCode} ELSE IFNULL(GET_LOCK(@name, @timeoutSeconds), {GetLockErrorReturnCode}) END"); - command.AddParameter("name", resourceName); - // Note: -1 works for MySQL but not for MariaDB (https://stackoverflow.com/questions/49792089/set-infinite-timeout-get-lock-in-mariadb/49809919) - command.AddParameter("timeoutSeconds", timeout.IsInfinite ? 0xFFFFFFFF : timeout.InSeconds); - - // Convert required because the value comes back as int on MariaDB and long on MySQL - var acquireCommandResult = Convert.ToInt64(await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false)); - switch (acquireCommandResult) - { - case 0: // timeout - return null; - case 1: // success - return Cookie; - case AlreadyHeldReturnCode: - if (timeout.IsZero) { return null; } - if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return null; - case GetLockErrorReturnCode: - cancellationToken.ThrowIfCancellationRequested(); // this error can also indicate cancellation in MariaDB - throw new InvalidOperationException("An error occurred such as running out of memory on the thread or a mysqladmin kill when trying to acquire the lock"); - default: - throw new InvalidOperationException($"Unexpected return code {acquireCommandResult}"); - } - } - catch (MySqlException ex) - // from https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_user_lock_deadlock - when ((ex.Number == 3058 && ex.SqlState == "HY000") - // from https://mariadb.com/kb/en/mariadb-error-codes/ - || (ex.Number == 1213 && ex.SqlState == "40001")) - { - throw new DeadlockException($"The request for the distributed lock failed with deadlock exit code {ex.Number}", ex); - } - catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) - { - // If the command is canceled, I believe there's a slim chance that acquisition just completed before the cancellation went through. - // In that case, I'm pretty sure it won't be rolled back. Therefore, to be safe we issue a release - await this.ReleaseAsync(connection, resourceName, Cookie).ConfigureAwait(false); - throw; + case 0: // timeout + return null; + case 1: // success + return Cookie; + case AlreadyHeldReturnCode: + if (timeout.IsZero) { return null; } + if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; + case GetLockErrorReturnCode: + cancellationToken.ThrowIfCancellationRequested(); // this error can also indicate cancellation in MariaDB + throw new InvalidOperationException("An error occurred such as running out of memory on the thread or a mysqladmin kill when trying to acquire the lock"); + default: + throw new InvalidOperationException($"Unexpected return code {acquireCommandResult}"); } } + catch (MySqlException ex) + // from https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html#error_er_user_lock_deadlock + when ((ex.Number == 3058 && ex.SqlState == "HY000") + // from https://mariadb.com/kb/en/mariadb-error-codes/ + || (ex.Number == 1213 && ex.SqlState == "40001")) + { + throw new DeadlockException($"The request for the distributed lock failed with deadlock exit code {ex.Number}", ex); + } + catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) + { + // If the command is canceled, I believe there's a slim chance that acquisition just completed before the cancellation went through. + // In that case, I'm pretty sure it won't be rolled back. Therefore, to be safe we issue a release + await this.ReleaseAsync(connection, resourceName, Cookie).ConfigureAwait(false); + throw; + } } } diff --git a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs index f11cafc1..4b12495b 100644 --- a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs +++ b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs @@ -4,71 +4,70 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Specifies options for connecting to and locking against an Oracle database +/// +public sealed class OracleConnectionOptionsBuilder { + private TimeoutValue? _keepaliveCadence; + private bool? _useMultiplexing; + + internal OracleConnectionOptionsBuilder() { } + /// - /// Specifies options for connecting to and locking against an Oracle database + /// Oracle does not kill idle connections by default, so by default keepalive is disabled (set to ). + /// + /// However, if you are using the IDLE_TIME setting in Oracle or if your network is dropping connections that are idle holding locks for + /// a long time, you can set a value for keepalive to prevent this from happening. + /// + /// See https://stackoverflow.com/questions/1966247/idle-timeout-parameter-in-oracle. /// - public sealed class OracleConnectionOptionsBuilder + public OracleConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) { - private TimeoutValue? _keepaliveCadence; - private bool? _useMultiplexing; + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } - internal OracleConnectionOptionsBuilder() { } + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public OracleConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } - /// - /// Oracle does not kill idle connections by default, so by default keepalive is disabled (set to ). - /// - /// However, if you are using the IDLE_TIME setting in Oracle or if your network is dropping connections that are idle holding locks for - /// a long time, you can set a value for keepalive to prevent this from happening. - /// - /// See https://stackoverflow.com/questions/1966247/idle-timeout-parameter-in-oracle. - /// - public OracleConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) + internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + OracleConnectionOptionsBuilder? options; + if (optionsBuilder != null) { - this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); - return this; + options = new OracleConnectionOptionsBuilder(); + optionsBuilder(options); } - - /// - /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) - /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is - /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. - /// - /// Multiplexing is on by default. - /// - /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an - /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing - /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) - /// connection will be allocated. - /// - /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also - /// particularly applicable to cases where - /// semantics are used with a zero-length timeout. - /// - public OracleConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + else { - this._useMultiplexing = useMultiplexing; - return this; + options = null; } - internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) - { - OracleConnectionOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new OracleConnectionOptionsBuilder(); - optionsBuilder(options); - } - else - { - options = null; - } - - var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; - var useMultiplexing = options?._useMultiplexing ?? true; + var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; + var useMultiplexing = options?._useMultiplexing ?? true; - return (keepaliveCadence, useMultiplexing); - } + return (keepaliveCadence, useMultiplexing); } } diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/DistributedLock.Oracle/OracleDatabaseConnection.cs index 21cbd4a2..cd5b3a64 100644 --- a/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -8,82 +8,81 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +internal class OracleDatabaseConnection : DatabaseConnection { - internal class OracleDatabaseConnection : DatabaseConnection - { - public const string ApplicationNameIndicatorPrefix = "__DistributedLock.ApplicationName="; + public const string ApplicationNameIndicatorPrefix = "__DistributedLock.ApplicationName="; - // see SleepAsync() for why we need this - private readonly IDbConnection _innerConnection; + // see SleepAsync() for why we need this + private readonly IDbConnection _innerConnection; - public OracleDatabaseConnection(IDbConnection connection) - : this(connection, isExternallyOwned: true) - { - } + public OracleDatabaseConnection(IDbConnection connection) + : this(connection, isExternallyOwned: true) + { + } - public OracleDatabaseConnection(IDbTransaction transaction) - : base(transaction, isExternallyOwned: true) - { - this._innerConnection = transaction.Connection; - } + public OracleDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) + { + this._innerConnection = transaction.Connection; + } - public OracleDatabaseConnection(string connectionString) - : this(CreateConnection(connectionString), isExternallyOwned: false) - { - } + public OracleDatabaseConnection(string connectionString) + : this(CreateConnection(connectionString), isExternallyOwned: false) + { + } - private OracleDatabaseConnection(IDbConnection connection, bool isExternallyOwned) - : base(connection, isExternallyOwned) - { - this._innerConnection = connection; - } + private OracleDatabaseConnection(IDbConnection connection, bool isExternallyOwned) + : base(connection, isExternallyOwned) + { + this._innerConnection = connection; + } - // from https://docs.oracle.com/html/E10927_01/OracleCommandClass.htm "this method is a no-op" wrt "Prepare()" - public override bool ShouldPrepareCommands => false; + // from https://docs.oracle.com/html/E10927_01/OracleCommandClass.htm "this method is a no-op" wrt "Prepare()" + public override bool ShouldPrepareCommands => false; - public override bool IsCommandCancellationException(Exception exception) => - exception is OracleException oracleException - // based on https://docs.oracle.com/cd/E85694_01/ODPNT/CommandCancel.htm - && (oracleException.Number == 01013 || oracleException.Number == 00936 || oracleException.Number == 00604); + public override bool IsCommandCancellationException(Exception exception) => + exception is OracleException oracleException + // based on https://docs.oracle.com/cd/E85694_01/ODPNT/CommandCancel.htm + && (oracleException.Number == 01013 || oracleException.Number == 00936 || oracleException.Number == 00604); - public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) - { - using var sleepCommand = this.CreateCommand(); - sleepCommand.SetCommandText("BEGIN sys.DBMS_SESSION.SLEEP(:seconds) END;"); - sleepCommand.AddParameter("seconds", sleepTime.TotalSeconds); + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + using var sleepCommand = this.CreateCommand(); + sleepCommand.SetCommandText("BEGIN sys.DBMS_SESSION.SLEEP(:seconds) END;"); + sleepCommand.AddParameter("seconds", sleepTime.TotalSeconds); - try - { - await executor(sleepCommand, cancellationToken).ConfigureAwait(false); - } - catch when (!cancellationToken.IsCancellationRequested) - { - // Oracle doesn't fire StateChange unless the State is observed or the connection is explicitly opened/closed. Therefore, we observe - // the state on seeing any exception in order to for the event to fire. See https://github.com/oracle/dotnet-db-samples/issues/226 - _ = this._innerConnection.State; - throw; - } + try + { + await executor(sleepCommand, cancellationToken).ConfigureAwait(false); } - - public static OracleConnection CreateConnection(string connectionString) + catch when (!cancellationToken.IsCancellationRequested) { - if (connectionString == null) { throw new ArgumentNullException(connectionString, nameof(connectionString)); } + // Oracle doesn't fire StateChange unless the State is observed or the connection is explicitly opened/closed. Therefore, we observe + // the state on seeing any exception in order to for the event to fire. See https://github.com/oracle/dotnet-db-samples/issues/226 + _ = this._innerConnection.State; + throw; + } + } - // The .NET Oracle provider does not currently support ApplicationName natively as a connection string property. - // However, that functionality is relied on by many of our tests. As a workaround, we permit the application name - // to be included in the connection string using a custom encoding scheme. This is only intended to work in tests! - // See https://github.com/oracle/dotnet-db-samples/issues/216 for more context. - if (connectionString.StartsWith(ApplicationNameIndicatorPrefix, StringComparison.Ordinal)) - { - var firstSeparatorIndex = connectionString.IndexOf(';'); - var applicationName = connectionString.Substring(startIndex: ApplicationNameIndicatorPrefix.Length, length: firstSeparatorIndex - ApplicationNameIndicatorPrefix.Length); - var connection = new OracleConnection(connectionString.Substring(startIndex: firstSeparatorIndex + 1)); - connection.ConnectionOpen += _ => connection.ClientInfo = applicationName; - return connection; - } + public static OracleConnection CreateConnection(string connectionString) + { + if (connectionString == null) { throw new ArgumentNullException(connectionString, nameof(connectionString)); } - return new OracleConnection(connectionString); + // The .NET Oracle provider does not currently support ApplicationName natively as a connection string property. + // However, that functionality is relied on by many of our tests. As a workaround, we permit the application name + // to be included in the connection string using a custom encoding scheme. This is only intended to work in tests! + // See https://github.com/oracle/dotnet-db-samples/issues/216 for more context. + if (connectionString.StartsWith(ApplicationNameIndicatorPrefix, StringComparison.Ordinal)) + { + var firstSeparatorIndex = connectionString.IndexOf(';'); + var applicationName = connectionString.Substring(startIndex: ApplicationNameIndicatorPrefix.Length, length: firstSeparatorIndex - ApplicationNameIndicatorPrefix.Length); + var connection = new OracleConnection(connectionString.Substring(startIndex: firstSeparatorIndex + 1)); + connection.ConnectionOpen += _ => connection.ClientInfo = applicationName; + return connection; } + + return new OracleConnection(connectionString); } } diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index 7b301c1f..f6d44726 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -7,134 +7,133 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements using Oracle's DBMS_LOCK package +/// +internal class OracleDbmsLock : IDbSynchronizationStrategy { - /// - /// Implements using Oracle's DBMS_LOCK package - /// - internal class OracleDbmsLock : IDbSynchronizationStrategy - { - // https://docs.oracle.com/cd/B19306_01/appdev.102/b14258/d_lock.htm#i1002309 - private const int MaxWaitSeconds = 32767; - private const int MaxTimeoutSeconds = MaxWaitSeconds - 1; + // https://docs.oracle.com/cd/B19306_01/appdev.102/b14258/d_lock.htm#i1002309 + private const int MaxWaitSeconds = 32767; + private const int MaxTimeoutSeconds = MaxWaitSeconds - 1; - public static readonly OracleDbmsLock SharedLock = new OracleDbmsLock(Mode.Shared), - UpdateLock = new OracleDbmsLock(Mode.Update), - ExclusiveLock = new OracleDbmsLock(Mode.Exclusive), - UpgradeLock = new OracleDbmsLock(Mode.Exclusive, isUpgrade: true); + public static readonly OracleDbmsLock SharedLock = new OracleDbmsLock(Mode.Shared), + UpdateLock = new OracleDbmsLock(Mode.Update), + ExclusiveLock = new OracleDbmsLock(Mode.Exclusive), + UpgradeLock = new OracleDbmsLock(Mode.Exclusive, isUpgrade: true); - private static readonly object Cookie = new(); + private static readonly object Cookie = new(); - private readonly Mode _mode; - private readonly bool _isUpgrade; + private readonly Mode _mode; + private readonly bool _isUpgrade; - private OracleDbmsLock(Mode mode, bool isUpgrade = false) - { - Invariant.Require(!isUpgrade || mode == Mode.Exclusive); + private OracleDbmsLock(Mode mode, bool isUpgrade = false) + { + Invariant.Require(!isUpgrade || mode == Mode.Exclusive); - this._mode = mode; - this._isUpgrade = isUpgrade; - } + this._mode = mode; + this._isUpgrade = isUpgrade; + } - public bool IsUpgradeable => this._mode == Mode.Update; + public bool IsUpgradeable => this._mode == Mode.Update; - private string ModeSqlConstant + private string ModeSqlConstant + { + get { - get + var modeCode = this._mode switch { - var modeCode = this._mode switch - { - Mode.Shared => "SS", - Mode.Update => "SSX", - Mode.Exclusive => "X", - _ => throw new InvalidOperationException(), - }; - return $"SYS.DBMS_LOCK.{modeCode}_MODE"; - } + Mode.Shared => "SS", + Mode.Update => "SSX", + Mode.Exclusive => "X", + _ => throw new InvalidOperationException(), + }; + return $"SYS.DBMS_LOCK.{modeCode}_MODE"; } + } - public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) - { - // Since we we don't allow downgrading and therefore "releasing" an upgrade only happens on disposal of the - // original handle, this can safely be a noop. - if (this._isUpgrade) { return; } + public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) + { + // Since we we don't allow downgrading and therefore "releasing" an upgrade only happens on disposal of the + // original handle, this can safely be a noop. + if (this._isUpgrade) { return; } - using var command = connection.CreateCommand(); - command.SetCommandText(@" + using var command = connection.CreateCommand(); + command.SetCommandText(@" DECLARE lockHandle VARCHAR2(128); BEGIN SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); :returnValue := SYS.DBMS_LOCK.RELEASE(lockHandle); END;" - ); - // note: parameters bind by position by default! - command.AddParameter("lockName", resourceName); - var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - - var returnValue = (int)returnValueParameter.Value; - if (returnValue != 0) - { - // we don't enumerate the error codes here because release shouldn't ever fail unless the user really messes things up - throw new InvalidOperationException($"SYS.DBMS_LOCK.RELEASE returned error code {returnValue}"); - } + ); + // note: parameters bind by position by default! + command.AddParameter("lockName", resourceName); + var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + + var returnValue = (int)returnValueParameter.Value; + if (returnValue != 0) + { + // we don't enumerate the error codes here because release shouldn't ever fail unless the user really messes things up + throw new InvalidOperationException($"SYS.DBMS_LOCK.RELEASE returned error code {returnValue}"); } + } - public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) - { - var acquireFunction = this._isUpgrade ? "CONVERT" : "REQUEST"; - using var command = connection.CreateCommand(); - command.SetCommandText($@" + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + { + var acquireFunction = this._isUpgrade ? "CONVERT" : "REQUEST"; + using var command = connection.CreateCommand(); + command.SetCommandText($@" DECLARE lockHandle VARCHAR2(128); BEGIN SYS.DBMS_LOCK.ALLOCATE_UNIQUE(:lockName, lockHandle); :returnValue := SYS.DBMS_LOCK.{acquireFunction}(lockhandle => lockHandle, lockmode => {this.ModeSqlConstant}, timeout => :timeout); END;" - ); - // note: parameters bind by position by default! - command.AddParameter("lockName", resourceName); - var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); - command.AddParameter( - "timeout", - timeout.IsInfinite ? MaxWaitSeconds - // we could support longer timeouts via looping lock requests, but this doesn't feel particularly valuable and isn't a true longer wait - // since by looping you fall out of the wait queue - : timeout.TimeSpan.TotalSeconds > MaxTimeoutSeconds ? throw new ArgumentOutOfRangeException($"Requested non-infinite timeout value '{timeout}' is longer than Oracle's allowed max of '{TimeSpan.FromSeconds(MaxTimeoutSeconds)}'") - : timeout.TimeSpan.TotalSeconds - ); - await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); - - var returnValue = (int)returnValueParameter.Value; - return returnValue switch - { - 0 => Cookie, // success - 1 => null, // timeout - 2 => throw new DeadlockException(GetErrorMessage("deadlock")), - 3 => throw new InvalidOperationException(GetErrorMessage("parameter error")), - 4 => timeout.IsZero ? null - : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") - : await WaitThenReturnNullAsync().ConfigureAwait(false), - 5 => throw new InvalidOperationException(GetErrorMessage("illegal lock handle")), - _ => throw new InvalidOperationException(GetErrorMessage("unknown error code")), - }; - - string GetErrorMessage(string description) => - $"SYS.DBMS_LOCK.{acquireFunction} returned error code {returnValue} ({description})"; - - async ValueTask WaitThenReturnNullAsync() - { - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return null; - } - } - - private enum Mode + ); + // note: parameters bind by position by default! + command.AddParameter("lockName", resourceName); + var returnValueParameter = command.AddParameter("returnValue", type: DbType.Int32, direction: ParameterDirection.Output); + command.AddParameter( + "timeout", + timeout.IsInfinite ? MaxWaitSeconds + // we could support longer timeouts via looping lock requests, but this doesn't feel particularly valuable and isn't a true longer wait + // since by looping you fall out of the wait queue + : timeout.TimeSpan.TotalSeconds > MaxTimeoutSeconds ? throw new ArgumentOutOfRangeException($"Requested non-infinite timeout value '{timeout}' is longer than Oracle's allowed max of '{TimeSpan.FromSeconds(MaxTimeoutSeconds)}'") + : timeout.TimeSpan.TotalSeconds + ); + await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); + + var returnValue = (int)returnValueParameter.Value; + return returnValue switch + { + 0 => Cookie, // success + 1 => null, // timeout + 2 => throw new DeadlockException(GetErrorMessage("deadlock")), + 3 => throw new InvalidOperationException(GetErrorMessage("parameter error")), + 4 => timeout.IsZero ? null + : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") + : await WaitThenReturnNullAsync().ConfigureAwait(false), + 5 => throw new InvalidOperationException(GetErrorMessage("illegal lock handle")), + _ => throw new InvalidOperationException(GetErrorMessage("unknown error code")), + }; + + string GetErrorMessage(string description) => + $"SYS.DBMS_LOCK.{acquireFunction} returned error code {returnValue} ({description})"; + + async ValueTask WaitThenReturnNullAsync() { - Shared, - Update, - Exclusive, + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; } } + + private enum Mode + { + Shared, + Update, + Exclusive, + } } diff --git a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs index a1a3e2bd..4e557461 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +public partial class OracleDistributedLock { - public partial class OracleDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public OracleDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public OracleDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public OracleDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public OracleDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 49549ed9..22c694c3 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -8,86 +8,85 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements a distributed lock for Oracle databse based on the DBMS_LOCK package +/// +public sealed partial class OracleDistributedLock : IInternalDistributedLock { + internal const int MaxNameLength = 128; + + private readonly IDbDistributedLock _internalLock; + /// - /// Implements a distributed lock for Oracle databse based on the DBMS_LOCK package + /// Constructs a lock with the given that connects using the provided and + /// . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class OracleDistributedLock : IInternalDistributedLock + public OracleDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) { - internal const int MaxNameLength = 128; - - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a lock with the given that connects using the provided and - /// . - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public OracleDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) - { - } + } - /// - /// Constructs a lock with the given that connects using the provided . - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public OracleDistributedLock(string name, IDbConnection connection, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connection)) - { - } + /// + /// Constructs a lock with the given that connects using the provided . + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connection)) + { + } - private OracleDistributedLock(string name, bool exactName, Func internalLockFactory) - { - this.Name = GetName(name, exactName); - this._internalLock = internalLockFactory(this.Name); - } + private OracleDistributedLock(string name, bool exactName, Func internalLockFactory) + { + this.Name = GetName(name, exactName); + this._internalLock = internalLockFactory(this.Name); + } + + internal static string GetName(string name, bool exactName) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } - internal static string GetName(string name, bool exactName) + if (exactName) { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - if (exactName) - { - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - // Oracle treats NULL as the empty string. See https://stackoverflow.com/questions/13278773/null-vs-empty-string-in-oracle - if (name.Length == 0) { throw new FormatException($"{nameof(name)} must not be empty"); } - return name; - } - - return DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s.Length == 0 ? "EMPTY" : s); + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + // Oracle treats NULL as the empty string. See https://stackoverflow.com/questions/13278773/null-vs-empty-string-in-oracle + if (name.Length == 0) { throw new FormatException($"{nameof(name)} must not be empty"); } + return name; } + + return DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s.Length == 0 ? "EMPTY" : s); + } - /// - /// Implements - /// - public string Name { get; } - - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - this._internalLock.TryAcquireAsync(timeout, OracleDbmsLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new OracleDistributedLockHandle(h)); + /// + /// Implements + /// + public string Name { get; } - internal static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, OracleDbmsLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new OracleDistributedLockHandle(h)); - var (keepaliveCadence, useMultiplexing) = OracleConnectionOptionsBuilder.GetOptions(options); + internal static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? options) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - if (useMultiplexing) - { - return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, OracleMultiplexedConnectionLockPool.Instance, keepaliveCadence); - } + var (keepaliveCadence, useMultiplexing) = OracleConnectionOptionsBuilder.GetOptions(options); - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + if (useMultiplexing) + { + return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, OracleMultiplexedConnectionLockPool.Instance, keepaliveCadence); } - internal static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + } - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connection)); - } + internal static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new OracleDatabaseConnection(connection)); } } diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/DistributedLock.Oracle/OracleDistributedLockHandle.cs index 0b3b1127..78d59ea4 100644 --- a/DistributedLock.Oracle/OracleDistributedLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedLockHandle.cs @@ -5,33 +5,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements +/// +public sealed class OracleDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class OracleDistributedLockHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal OracleDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal OracleDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs index 65fe1d67..a561de64 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -3,36 +3,36 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +public partial class OracleDistributedReaderWriterLock { - public partial class OracleDistributedReaderWriterLock - { - // AUTO-GENERATED - - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); - IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireUpgradeableReadLock(timeout, cancellationToken); - ValueTask IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); + IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLock(timeout, cancellationToken); + ValueTask IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -226,5 +226,4 @@ public OracleDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? timeou public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); - } } \ No newline at end of file diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs index 57cd5dd9..f49d077d 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs @@ -3,75 +3,71 @@ using System; using System.Collections.Generic; using System.Data; -using System.Diagnostics.CodeAnalysis; using System.Text; using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements an upgradeable distributed reader-writer lock for the Oracle database using the DBMS_LOCK package. +/// +public sealed partial class OracleDistributedReaderWriterLock : IInternalDistributedUpgradeableReaderWriterLock { + private readonly IDbDistributedLock _internalLock; + /// - /// Implements an upgradeable distributed reader-writer lock for the Oracle database using the DBMS_LOCK package. + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class OracleDistributedReaderWriterLock : IInternalDistributedUpgradeableReaderWriterLock + public OracleDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connectionString, options)) { - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - [SuppressMessage("", "RS0026", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/6264")] - public OracleDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) - : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connectionString, options)) - { - } + } - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be opened or closed. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - [SuppressMessage("", "RS0026", Justification = "https://github.com/dotnet/roslyn-analyzers/issues/6264")] - public OracleDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) - : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connection)) - { - } + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be opened or closed. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public OracleDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => OracleDistributedLock.CreateInternalLock(n, connection)) + { + } - private OracleDistributedReaderWriterLock(string name, bool exactName, Func internalLockFactory) - { - this.Name = OracleDistributedLock.GetName(name, exactName); - this._internalLock = internalLockFactory(this.Name); - } + private OracleDistributedReaderWriterLock(string name, bool exactName, Func internalLockFactory) + { + this.Name = OracleDistributedLock.GetName(name, exactName); + this._internalLock = internalLockFactory(this.Name); + } - /// - /// Implements - /// - public string Name { get; } + /// + /// Implements + /// + public string Name { get; } - async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( - TimeoutValue timeout, - CancellationToken cancellationToken) - { - var innerHandle = await this._internalLock - .TryAcquireAsync(timeout, OracleDbmsLock.UpdateLock, cancellationToken, contextHandle: null).ConfigureAwait(false); - return innerHandle != null ? new OracleDistributedReaderWriterLockUpgradeableHandle(innerHandle, this._internalLock) : null; - } + async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( + TimeoutValue timeout, + CancellationToken cancellationToken) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, OracleDbmsLock.UpdateLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new OracleDistributedReaderWriterLockUpgradeableHandle(innerHandle, this._internalLock) : null; + } - async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( - TimeoutValue timeout, - CancellationToken cancellationToken, - bool isWrite) - { - var innerHandle = await this._internalLock - .TryAcquireAsync(timeout, isWrite ? OracleDbmsLock.ExclusiveLock : OracleDbmsLock.SharedLock, cancellationToken, contextHandle: null).ConfigureAwait(false); - return innerHandle != null ? new OracleDistributedReaderWriterLockNonUpgradeableHandle(innerHandle) : null; - } + async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, isWrite ? OracleDbmsLock.ExclusiveLock : OracleDbmsLock.SharedLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new OracleDistributedReaderWriterLockNonUpgradeableHandle(innerHandle) : null; } } diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs index e671129b..1444fabf 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs @@ -6,124 +6,123 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements +/// +public abstract class OracleDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { + // forbid external inheritors + internal OracleDistributedReaderWriterLockHandle() { } + + /// + /// Implements + /// + public abstract CancellationToken HandleLostToken { get; } + /// - /// Implements + /// Releases the lock /// - public abstract class OracleDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle + public void Dispose() => this.DisposeSyncViaAsync(); + + /// + /// Releases the lock asynchronously + /// + public abstract ValueTask DisposeAsync(); +} + +internal sealed class OracleDistributedReaderWriterLockNonUpgradeableHandle : OracleDistributedReaderWriterLockHandle +{ + private IDistributedSynchronizationHandle? _innerHandle; + + internal OracleDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) { - // forbid external inheritors - internal OracleDistributedReaderWriterLockHandle() { } - - /// - /// Implements - /// - public abstract CancellationToken HandleLostToken { get; } - - /// - /// Releases the lock - /// - public void Dispose() => this.DisposeSyncViaAsync(); - - /// - /// Releases the lock asynchronously - /// - public abstract ValueTask DisposeAsync(); + this._innerHandle = handle; } - internal sealed class OracleDistributedReaderWriterLockNonUpgradeableHandle : OracleDistributedReaderWriterLockHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + public override CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - internal OracleDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) - { - this._innerHandle = handle; - } + public override ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; +} - public override CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); +/// +/// Implements +/// +public sealed class OracleDistributedReaderWriterLockUpgradeableHandle : OracleDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle +{ + private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; - public override ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + internal OracleDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) + { + this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); } /// - /// Implements + /// Implements /// - public sealed class OracleDistributedReaderWriterLockUpgradeableHandle : OracleDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle - { - private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; + public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; - internal OracleDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) + /// + /// Releases the lock asynchronously + /// + public override async ValueTask DisposeAsync() + { + if (RefBox.TryConsume(ref this._box, out var contents)) { - this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); + try { await (contents.upgradedHandle?.DisposeAsync() ?? default).ConfigureAwait(false); } + finally { await contents.innerHandle.DisposeAsync().ConfigureAwait(false); } } + } + + /// + /// Implements + /// + public bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryUpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As().InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken); + + /// + /// Implements + /// + public void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLockAsync(this, timeout, cancellationToken); - /// - /// Implements - /// - public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; + ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var box = this._box ?? throw this.ObjectDisposed(); + var contents = box.Value; + if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } + return TryPerformUpgradeAsync(); - /// - /// Releases the lock asynchronously - /// - public override async ValueTask DisposeAsync() + async ValueTask TryPerformUpgradeAsync() { - if (RefBox.TryConsume(ref this._box, out var contents)) + var upgradedHandle = + await contents.@lock.TryAcquireAsync(timeout, OracleDbmsLock.UpgradeLock, cancellationToken, contextHandle: contents.innerHandle).ConfigureAwait(false); + if (upgradedHandle == null) { - try { await (contents.upgradedHandle?.DisposeAsync() ?? default).ConfigureAwait(false); } - finally { await contents.innerHandle.DisposeAsync().ConfigureAwait(false); } + return false; } - } - /// - /// Implements - /// - public bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryUpgradeToWriteLock(this, timeout, cancellationToken); - - /// - /// Implements - /// - public ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As().InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken); - - /// - /// Implements - /// - public void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.UpgradeToWriteLock(this, timeout, cancellationToken); - - /// - /// Implements - /// - public ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.UpgradeToWriteLockAsync(this, timeout, cancellationToken); - - ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var box = this._box ?? throw this.ObjectDisposed(); - var contents = box.Value; - if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } - return TryPerformUpgradeAsync(); - - async ValueTask TryPerformUpgradeAsync() + contents.upgradedHandle = upgradedHandle; + var newBox = RefBox.Create(contents); + if (Interlocked.CompareExchange(ref this._box, newBox, comparand: box) != box) { - var upgradedHandle = - await contents.@lock.TryAcquireAsync(timeout, OracleDbmsLock.UpgradeLock, cancellationToken, contextHandle: contents.innerHandle).ConfigureAwait(false); - if (upgradedHandle == null) - { - return false; - } - - contents.upgradedHandle = upgradedHandle; - var newBox = RefBox.Create(contents); - if (Interlocked.CompareExchange(ref this._box, newBox, comparand: box) != box) - { - await upgradedHandle.DisposeAsync().ConfigureAwait(false); - } - - return true; + await upgradedHandle.DisposeAsync().ConfigureAwait(false); } + + return true; } } } diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs index a747202c..4fdf98ff 100644 --- a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -3,57 +3,56 @@ using System.Data; using System.Text; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +/// +/// Implements for +/// and for +/// +public sealed class OracleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider { + private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; + /// - /// Implements for - /// and for + /// Constructs a provider that connects with and . /// - public sealed class OracleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider + public OracleDistributedSynchronizationProvider(string connectionString, Action? options = null) { - private readonly Func _lockFactory; - private readonly Func _readerWriterLockFactory; - - /// - /// Constructs a provider that connects with and . - /// - public OracleDistributedSynchronizationProvider(string connectionString, Action? options = null) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - - this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connectionString, options, exactName); - this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connectionString, options, exactName); - } - - /// - /// Constructs a provider that connects with . - /// - public OracleDistributedSynchronizationProvider(IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - - this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connection, exactName); - this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connection, exactName); - } - - /// - /// Creates a with the provided . Unless - /// is specified, invalid names will be escaped/hashed. - /// - public OracleDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); - - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - - /// - /// Creates a with the provided . Unless - /// is specified, invalid names will be escaped/hashed. - /// - public OracleDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); - - IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => - this.CreateReaderWriterLock(name); - - IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => - this.CreateReaderWriterLock(name); + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connectionString, options, exactName); + this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connectionString, options, exactName); + } + + /// + /// Constructs a provider that connects with . + /// + public OracleDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = (name, exactName) => new OracleDistributedLock(name, connection, exactName); + this._readerWriterLockFactory = (name, exactName) => new OracleDistributedReaderWriterLock(name, connection, exactName); } + + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// + public OracleDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Creates a with the provided . Unless + /// is specified, invalid names will be escaped/hashed. + /// + public OracleDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); + + IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); } diff --git a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs index 2e9f6ffd..2b73590f 100644 --- a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs +++ b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs @@ -3,10 +3,9 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Oracle +namespace Medallion.Threading.Oracle; + +internal static class OracleMultiplexedConnectionLockPool { - internal static class OracleMultiplexedConnectionLockPool - { - public static readonly MultiplexedConnectionLockPool Instance = new(s => new OracleDatabaseConnection(s)); - } + public static readonly MultiplexedConnectionLockPool Instance = new(s => new OracleDatabaseConnection(s)); } diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 6d83dcf2..d8ec45fe 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -8,126 +8,126 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements using advisory locking functions +/// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) +/// +internal class PostgresAdvisoryLock : IDbSynchronizationStrategy { + private static readonly object Cookie = new(); + + public static readonly PostgresAdvisoryLock ExclusiveLock = new(isShared: false), + SharedLock = new(isShared: true); + + private readonly bool _isShared; + + private PostgresAdvisoryLock(bool isShared) + { + this._isShared = isShared; + } + /// - /// Implements using advisory locking functions - /// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) + /// Advisory locks don't natively support upgradeable /// - internal class PostgresAdvisoryLock : IDbSynchronizationStrategy - { - private static readonly object Cookie = new(); + public bool IsUpgradeable => false; - public static readonly PostgresAdvisoryLock ExclusiveLock = new(isShared: false), - SharedLock = new(isShared: true); + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + { + const string SavePointName = "medallion_threading_postgres_advisory_lock_acquire"; - private readonly bool _isShared; + PostgresAdvisoryLockKey key = new(resourceName); - private PostgresAdvisoryLock(bool isShared) + if (connection.IsExernallyOwned + && await this.IsHoldingLockAsync(connection, key, cancellationToken).ConfigureAwait(false)) { - this._isShared = isShared; + if (timeout.IsZero) { return null; } + if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return null; } - /// - /// Advisory locks don't natively support upgradeable - /// - public bool IsUpgradeable => false; - - public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + var hasTransaction = await HasTransactionAsync(connection).ConfigureAwait(false); + if (hasTransaction) { - const string SavePointName = "medallion_threading_postgres_advisory_lock_acquire"; + // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end + // of the current transaction instead of just the current batch if we're in a transaction. To make sure + // we don't leak those settings, in the case of a transaction we first set up a save point which we can + // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently + // roll back a save point without knowing that it has been set up, we start the save point in its own + // query before we try-catch + using var setSavePointCommand = connection.CreateCommand(); + setSavePointCommand.SetCommandText("SAVEPOINT " + SavePointName); + await setSavePointCommand.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); + } - PostgresAdvisoryLockKey key = new(resourceName); + using var acquireCommand = this.CreateAcquireCommand(connection, key, timeout); - if (connection.IsExernallyOwned - && await this.IsHoldingLockAsync(connection, key, cancellationToken).ConfigureAwait(false)) - { - if (timeout.IsZero) { return null; } - if (timeout.IsInfinite) { throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection"); } - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return null; - } + object acquireCommandResult; + try + { + acquireCommandResult = await acquireCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + { + await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); - var hasTransaction = await HasTransactionAsync(connection).ConfigureAwait(false); - if (hasTransaction) + if (ex is PostgresException postgresException) { - // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end - // of the current transaction instead of just the current batch if we're in a transaction. To make sure - // we don't leak those settings, in the case of a transaction we first set up a save point which we can - // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently - // roll back a save point without knowing that it has been set up, we start the save point in its own - // query before we try-catch - using var setSavePointCommand = connection.CreateCommand(); - setSavePointCommand.SetCommandText("SAVEPOINT " + SavePointName); - await setSavePointCommand.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); + switch (postgresException.SqlState) + { + // lock_timeout error code from https://www.postgresql.org/docs/10/errcodes-appendix.html + case "55P03": + // Even though we hit a lock timeout, an underlying race condition in Postgres means that we might actually + // have acquired the lock right before timing out. To account for this, we simply re-check whether we are + // holding the lock to determine the final return value. See https://github.com/madelson/DistributedLock/issues/147 + // and https://www.postgresql.org/message-id/63573.1668271677%40sss.pgh.pa.us for more details. + // NOTE: we use CancellationToken.None for this check because if we ARE holding the lock it would be invalid to abort. + return await this.IsHoldingLockAsync(connection, key, CancellationToken.None).ConfigureAwait(false) + ? Cookie + : null; + // deadlock_detected error code from https://www.postgresql.org/docs/10/errcodes-appendix.html + case "40P01": + throw new DeadlockException($"The request for the distributed lock failed with exit code '{postgresException.SqlState}' (deadlock_detected)", ex); + } } - using var acquireCommand = this.CreateAcquireCommand(connection, key, timeout); - - object acquireCommandResult; - try + if (ex is OperationCanceledException && cancellationToken.IsCancellationRequested) { - acquireCommandResult = await acquireCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + // if we bailed in the middle of an acquire, make sure we didn't leave a lock behind + await this.ReleaseAsync(connection, key, isTry: true).ConfigureAwait(false); } - catch (Exception ex) - { - await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); - - if (ex is PostgresException postgresException) - { - switch (postgresException.SqlState) - { - // lock_timeout error code from https://www.postgresql.org/docs/10/errcodes-appendix.html - case "55P03": - // Even though we hit a lock timeout, an underlying race condition in Postgres means that we might actually - // have acquired the lock right before timing out. To account for this, we simply re-check whether we are - // holding the lock to determine the final return value. See https://github.com/madelson/DistributedLock/issues/147 - // and https://www.postgresql.org/message-id/63573.1668271677%40sss.pgh.pa.us for more details. - // NOTE: we use CancellationToken.None for this check because if we ARE holding the lock it would be invalid to abort. - return await this.IsHoldingLockAsync(connection, key, CancellationToken.None).ConfigureAwait(false) - ? Cookie - : null; - // deadlock_detected error code from https://www.postgresql.org/docs/10/errcodes-appendix.html - case "40P01": - throw new DeadlockException($"The request for the distributed lock failed with exit code '{postgresException.SqlState}' (deadlock_detected)", ex); - } - } - if (ex is OperationCanceledException && cancellationToken.IsCancellationRequested) - { - // if we bailed in the middle of an acquire, make sure we didn't leave a lock behind - await this.ReleaseAsync(connection, key, isTry: true).ConfigureAwait(false); - } - - throw; - } + throw; + } - await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); + await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); - return acquireCommandResult switch - { - DBNull _ => Cookie, // indicates we called pg_advisory_lock and not pg_try_advisory_lock - false => null, - true => Cookie, - _ => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") - }; + return acquireCommandResult switch + { + DBNull _ => Cookie, // indicates we called pg_advisory_lock and not pg_try_advisory_lock + false => null, + true => Cookie, + _ => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") + }; - async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync() + async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync() + { + if (hasTransaction) { - if (hasTransaction) - { - // attempt to clear the timeout variables we set - using var rollBackSavePointCommand = connection.CreateCommand(); - rollBackSavePointCommand.SetCommandText("ROLLBACK TO SAVEPOINT " + SavePointName); - await rollBackSavePointCommand.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - } + // attempt to clear the timeout variables we set + using var rollBackSavePointCommand = connection.CreateCommand(); + rollBackSavePointCommand.SetCommandText("ROLLBACK TO SAVEPOINT " + SavePointName); + await rollBackSavePointCommand.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); } } + } - private async Task IsHoldingLockAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, CancellationToken cancellationToken) - { - using var command = connection.CreateCommand(); - command.SetCommandText($@" + private async Task IsHoldingLockAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, CancellationToken cancellationToken) + { + using var command = connection.CreateCommand(); + command.SetCommandText($@" SELECT COUNT(*) FROM pg_catalog.pg_locks l JOIN pg_catalog.pg_database d @@ -136,114 +136,113 @@ JOIN pg_catalog.pg_database d AND {AddPGLocksFilterParametersAndGetFilterExpression(command, key)} AND l.pid = pg_catalog.pg_backend_pid() AND d.datname = pg_catalog.current_database()" - ); - return (long)await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) != 0; - } - - private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, PostgresAdvisoryLockKey key, TimeoutValue timeout) - { - var command = connection.CreateCommand(); + ); + return (long)await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) != 0; + } - var commandText = new StringBuilder(); + private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, PostgresAdvisoryLockKey key, TimeoutValue timeout) + { + var command = connection.CreateCommand(); - // We set the statement_timeout to 0 (inf) because we want everything to be driven by the lock_timeout. - commandText.AppendLine("SET LOCAL statement_timeout = 0;"); - // We set the lock timeout to our timeout, with the exception that if our timeout is zero we set it to inf because - // we'll be using the pg_try_advisory_lock function which doesn't block in that case. - commandText.AppendLine($"SET LOCAL lock_timeout = {(timeout.IsZero || timeout.IsInfinite ? 0 : timeout.InMilliseconds)};"); + var commandText = new StringBuilder(); - commandText.Append("SELECT "); - var isTry = timeout.IsZero; - commandText.Append("pg_catalog.pg"); - if (isTry) { commandText.Append("_try"); } - commandText.Append("_advisory_lock"); - if (this._isShared) { commandText.Append("_shared"); } - commandText.Append('(').Append(AddKeyParametersAndGetKeyArguments(command, key)).Append(')') - .Append(" AS result"); + // We set the statement_timeout to 0 (inf) because we want everything to be driven by the lock_timeout. + commandText.AppendLine("SET LOCAL statement_timeout = 0;"); + // We set the lock timeout to our timeout, with the exception that if our timeout is zero we set it to inf because + // we'll be using the pg_try_advisory_lock function which doesn't block in that case. + commandText.AppendLine($"SET LOCAL lock_timeout = {(timeout.IsZero || timeout.IsInfinite ? 0 : timeout.InMilliseconds)};"); - command.SetCommandText(commandText.ToString()); - command.SetTimeout(timeout); + commandText.Append("SELECT "); + var isTry = timeout.IsZero; + commandText.Append("pg_catalog.pg"); + if (isTry) { commandText.Append("_try"); } + commandText.Append("_advisory_lock"); + if (this._isShared) { commandText.Append("_shared"); } + commandText.Append('(').Append(AddKeyParametersAndGetKeyArguments(command, key)).Append(')') + .Append(" AS result"); - return command; - } + command.SetCommandText(commandText.ToString()); + command.SetTimeout(timeout); - private static async ValueTask HasTransactionAsync(DatabaseConnection connection) - { - if (connection.HasTransaction) { return true; } - if (!connection.IsExernallyOwned) { return false; } + return command; + } - // If the connection is externally owned, then it might be part of a transaction that we can't - // see. In that case, the only real way to detect it is to begin a new one - try - { - await connection.BeginTransactionAsync().ConfigureAwait(false); - } - catch (InvalidOperationException) - { - return true; - } + private static async ValueTask HasTransactionAsync(DatabaseConnection connection) + { + if (connection.HasTransaction) { return true; } + if (!connection.IsExernallyOwned) { return false; } - await connection.DisposeTransactionAsync().ConfigureAwait(false); - return false; + // If the connection is externally owned, then it might be part of a transaction that we can't + // see. In that case, the only real way to detect it is to begin a new one + try + { + await connection.BeginTransactionAsync().ConfigureAwait(false); + } + catch (InvalidOperationException) + { + return true; } - public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) => - this.ReleaseAsync(connection, new PostgresAdvisoryLockKey(resourceName), isTry: false); + await connection.DisposeTransactionAsync().ConfigureAwait(false); + return false; + } + + public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) => + this.ReleaseAsync(connection, new PostgresAdvisoryLockKey(resourceName), isTry: false); - private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, bool isTry) + private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, bool isTry) + { + using var command = connection.CreateCommand(); + command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); + var result = (bool)await command.ExecuteScalarAsync(CancellationToken.None).ConfigureAwait(false); + if (!isTry && !result) { - using var command = connection.CreateCommand(); - command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); - var result = (bool)await command.ExecuteScalarAsync(CancellationToken.None).ConfigureAwait(false); - if (!isTry && !result) - { - throw new InvalidOperationException("Attempted to release a lock that was not held"); - } + throw new InvalidOperationException("Attempted to release a lock that was not held"); } + } - private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command, PostgresAdvisoryLockKey key) + private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command, PostgresAdvisoryLockKey key) + { + if (key.HasSingleKey) { - if (key.HasSingleKey) - { - command.AddParameter("key", key.Key, DbType.Int64); - return "@key"; - } - else - { - var (key1, key2) = key.Keys; - command.AddParameter("key1", key1, DbType.Int32); - command.AddParameter("key2", key2, DbType.Int32); - return "@key1, @key2"; - } + command.AddParameter("key", key.Key, DbType.Int64); + return "@key"; } - - private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) + else { - // From https://www.postgresql.org/docs/12/view-pg-locks.html - // Advisory locks can be acquired on keys consisting of either a single bigint value or two integer values. - // A bigint key is displayed with its high-order half in the classid column, its low-order half in the objid column, - // and objsubid equal to 1. The original bigint value can be reassembled with the expression (classid::bigint << 32) | objid::bigint. - // Integer keys are displayed with the first key in the classid column, the second key in the objid column, and objsubid equal to 2. - - string classIdParameter, objIdParameter, objSubId; - if (key.HasSingleKey) - { - // since Postgres seems to lack unchecked int conversions, it is simpler to just generate extra - // parameters to carry the split key info in this case - var (keyUpper32, keyLower32) = key.Keys; - command.AddParameter(classIdParameter = "keyUpper32", keyUpper32, DbType.Int32); - command.AddParameter(objIdParameter = "keyLower32", keyLower32, DbType.Int32); - objSubId = "1"; - } - else - { - AddKeyParametersAndGetKeyArguments(command, key); - classIdParameter = "key1"; - objIdParameter = "key2"; - objSubId = "2"; - } + var (key1, key2) = key.Keys; + command.AddParameter("key1", key1, DbType.Int32); + command.AddParameter("key2", key2, DbType.Int32); + return "@key1, @key2"; + } + } - return $"(l.classid = @{classIdParameter} AND l.objid = @{objIdParameter} AND l.objsubid = {objSubId})"; + private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) + { + // From https://www.postgresql.org/docs/12/view-pg-locks.html + // Advisory locks can be acquired on keys consisting of either a single bigint value or two integer values. + // A bigint key is displayed with its high-order half in the classid column, its low-order half in the objid column, + // and objsubid equal to 1. The original bigint value can be reassembled with the expression (classid::bigint << 32) | objid::bigint. + // Integer keys are displayed with the first key in the classid column, the second key in the objid column, and objsubid equal to 2. + + string classIdParameter, objIdParameter, objSubId; + if (key.HasSingleKey) + { + // since Postgres seems to lack unchecked int conversions, it is simpler to just generate extra + // parameters to carry the split key info in this case + var (keyUpper32, keyLower32) = key.Keys; + command.AddParameter(classIdParameter = "keyUpper32", keyUpper32, DbType.Int32); + command.AddParameter(objIdParameter = "keyLower32", keyLower32, DbType.Int32); + objSubId = "1"; + } + else + { + AddKeyParametersAndGetKeyArguments(command, key); + classIdParameter = "key1"; + objIdParameter = "key2"; + objSubId = "2"; } + + return $"(l.classid = @{classIdParameter} AND l.objid = @{objIdParameter} AND l.objsubid = {objSubId})"; } } diff --git a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs index 1fe8364c..0311174c 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs @@ -4,272 +4,271 @@ using System.Security.Cryptography; using System.Text; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Acts as the "name" of a distributed lock in Postgres. Consists of one 64-bit value or two 32-bit values (the spaces do not overlap). +/// See https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS +/// +public readonly struct PostgresAdvisoryLockKey : IEquatable { + private readonly long _key; + private readonly KeyEncoding _keyEncoding; + + /// + /// Constructs a key from a single 64-bit value. This is a separate key space + /// than . + /// + public PostgresAdvisoryLockKey(long key) + { + this._key = key; + this._keyEncoding = KeyEncoding.Int64; + } + + /// + /// Constructs a key from a pair of 32-bit values. This is a separate key space + /// than . + /// + public PostgresAdvisoryLockKey(int key1, int key2) + { + this._key = CombineKeys(key1, key2); + this._keyEncoding = KeyEncoding.Int32Pair; + } + /// - /// Acts as the "name" of a distributed lock in Postgres. Consists of one 64-bit value or two 32-bit values (the spaces do not overlap). - /// See https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS + /// Constructs a key based on a string . + /// + /// If the string is of the form "{16-digit hex}" or "{8-digit hex},{8-digit hex}", this will be parsed into numeric keys. + /// + /// If the string is an ascii string with 9 or fewer characters, it will be mapped to a key that does not collide with + /// any other key based on such a string or based on a 32-bit value. + /// + /// Other string names will be rejected unless is specified, in which case it will be hashed to + /// a 64-bit key value. /// - public readonly struct PostgresAdvisoryLockKey : IEquatable + public PostgresAdvisoryLockKey(string name, bool allowHashing = false) { - private readonly long _key; - private readonly KeyEncoding _keyEncoding; - - /// - /// Constructs a key from a single 64-bit value. This is a separate key space - /// than . - /// - public PostgresAdvisoryLockKey(long key) + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + if (TryEncodeAscii(name, out this._key)) + { + this._keyEncoding = KeyEncoding.Ascii; + } + else if (TryEncodeHashString(name, out this._key, out var hasSeparator)) { - this._key = key; + this._keyEncoding = hasSeparator ? KeyEncoding.Int32Pair : KeyEncoding.Int64; + } + else if (allowHashing) + { + this._key = HashString(name); this._keyEncoding = KeyEncoding.Int64; } - - /// - /// Constructs a key from a pair of 32-bit values. This is a separate key space - /// than . - /// - public PostgresAdvisoryLockKey(int key1, int key2) + else { - this._key = CombineKeys(key1, key2); - this._keyEncoding = KeyEncoding.Int32Pair; + throw new FormatException($"Name '{name}' could not be encoded as a {nameof(PostgresAdvisoryLockKey)}. Please specify {nameof(allowHashing)} or use one of the following formats:" + + $" or (1) a 0-{MaxAsciiLength} character string using only ASCII characters" + + $", (2) a {HashStringLength} character hex string, such as the result of Int64.MaxValue.ToString(\"x{HashStringLength}\")" + + $", or (3) a 2-part, {SeparatedHashStringLength} character string of the form XXXXXXXX{HashStringSeparator}XXXXXXXX, where the X's are {HashPartLength} hex strings" + + $" such as the result of Int32.MaxValue.ToString(\"x{HashPartLength}\")." + + " Note that each unique string provided for formats 1 and 2 will map to a unique hash value, with no collisions across formats. Format 3 strings use the same key space as 2."); } + } - /// - /// Constructs a key based on a string . - /// - /// If the string is of the form "{16-digit hex}" or "{8-digit hex},{8-digit hex}", this will be parsed into numeric keys. - /// - /// If the string is an ascii string with 9 or fewer characters, it will be mapped to a key that does not collide with - /// any other key based on such a string or based on a 32-bit value. - /// - /// Other string names will be rejected unless is specified, in which case it will be hashed to - /// a 64-bit key value. - /// - public PostgresAdvisoryLockKey(string name, bool allowHashing = false) + internal bool HasSingleKey => this._keyEncoding == KeyEncoding.Int64; + + internal long Key + { + get { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - if (TryEncodeAscii(name, out this._key)) - { - this._keyEncoding = KeyEncoding.Ascii; - } - else if (TryEncodeHashString(name, out this._key, out var hasSeparator)) - { - this._keyEncoding = hasSeparator ? KeyEncoding.Int32Pair : KeyEncoding.Int64; - } - else if (allowHashing) - { - this._key = HashString(name); - this._keyEncoding = KeyEncoding.Int64; - } - else - { - throw new FormatException($"Name '{name}' could not be encoded as a {nameof(PostgresAdvisoryLockKey)}. Please specify {nameof(allowHashing)} or use one of the following formats:" - + $" or (1) a 0-{MaxAsciiLength} character string using only ASCII characters" - + $", (2) a {HashStringLength} character hex string, such as the result of Int64.MaxValue.ToString(\"x{HashStringLength}\")" - + $", or (3) a 2-part, {SeparatedHashStringLength} character string of the form XXXXXXXX{HashStringSeparator}XXXXXXXX, where the X's are {HashPartLength} hex strings" - + $" such as the result of Int32.MaxValue.ToString(\"x{HashPartLength}\")." - + " Note that each unique string provided for formats 1 and 2 will map to a unique hash value, with no collisions across formats. Format 3 strings use the same key space as 2."); - } + Invariant.Require(this.HasSingleKey); + return this._key; } + } + + // note: we allow calling this even with a single key, since for + // pg_locks lookups we have to split the key anyway + internal (int key1, int key2) Keys => SplitKeys(this._key); + + /// + /// Implements + /// + public bool Equals(PostgresAdvisoryLockKey that) => this.ToTuple().Equals(that.ToTuple()); + + /// + /// Implements + /// + public override bool Equals(object obj) => obj is PostgresAdvisoryLockKey that && this.Equals(that); + + /// + /// Implements + /// + public override int GetHashCode() => this.ToTuple().GetHashCode(); + + /// + /// Provides equality based on + /// + public static bool operator ==(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) => a.Equals(b); + /// + /// Provides inequality based on + /// + public static bool operator !=(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) => !(a == b); + + private (long, bool) ToTuple() => (this._key, this.HasSingleKey); - internal bool HasSingleKey => this._keyEncoding == KeyEncoding.Int64; - - internal long Key + /// + /// Returns a string representation of the key that can be round-tripped through + /// + /// + public override string ToString() => this._keyEncoding switch + { + KeyEncoding.Int64 => ToHashString(this._key), + KeyEncoding.Int32Pair => ToHashString(SplitKeys(this._key)), + KeyEncoding.Ascii => ToAsciiString(this._key), + _ => throw new InvalidOperationException() + }; + + private static long CombineKeys(int key1, int key2) => unchecked(((long)key1 << (8 * sizeof(int))) | (uint)key2); + private static (int key1, int key2) SplitKeys(long key) => ((int)(key >> (8 * sizeof(int))), unchecked((int)(key & uint.MaxValue))); + + #region ---- Ascii ---- + // The ASCII encoding works as follows: + // Each ASCII char is 7 bits allowing for 9 chars = 63 bits in total. + // In order to differentiate between different-length strings with leading '\0', + // we additionally fill the next bit after the string ends with 0. We then fill any + // remaining bits with 1. Therefore the final 64 bit value is 0-9 7-bit characters followed + // by 0, followed by N=63-(7*length) 1s + + private const int AsciiCharBits = 7; + private const int MaxAsciiValue = (1 << AsciiCharBits) - 1; + internal const int MaxAsciiLength = (8 * sizeof(long)) / AsciiCharBits; + + private static bool TryEncodeAscii(string name, out long key) + { + if (name.Length > MaxAsciiLength) { - get - { - Invariant.Require(this.HasSingleKey); - return this._key; - } + key = default; + return false; } - // note: we allow calling this even with a single key, since for - // pg_locks lookups we have to split the key anyway - internal (int key1, int key2) Keys => SplitKeys(this._key); - - /// - /// Implements - /// - public bool Equals(PostgresAdvisoryLockKey that) => this.ToTuple().Equals(that.ToTuple()); - - /// - /// Implements - /// - public override bool Equals(object obj) => obj is PostgresAdvisoryLockKey that && this.Equals(that); - - /// - /// Implements - /// - public override int GetHashCode() => this.ToTuple().GetHashCode(); - - /// - /// Provides equality based on - /// - public static bool operator ==(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) => a.Equals(b); - /// - /// Provides inequality based on - /// - public static bool operator !=(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) => !(a == b); - - private (long, bool) ToTuple() => (this._key, this.HasSingleKey); - - /// - /// Returns a string representation of the key that can be round-tripped through - /// - /// - public override string ToString() => this._keyEncoding switch + // load the chars into result + var result = 0L; + foreach (var @char in name) { - KeyEncoding.Int64 => ToHashString(this._key), - KeyEncoding.Int32Pair => ToHashString(SplitKeys(this._key)), - KeyEncoding.Ascii => ToAsciiString(this._key), - _ => throw new InvalidOperationException() - }; - - private static long CombineKeys(int key1, int key2) => unchecked(((long)key1 << (8 * sizeof(int))) | (uint)key2); - private static (int key1, int key2) SplitKeys(long key) => ((int)(key >> (8 * sizeof(int))), unchecked((int)(key & uint.MaxValue))); - - #region ---- Ascii ---- - // The ASCII encoding works as follows: - // Each ASCII char is 7 bits allowing for 9 chars = 63 bits in total. - // In order to differentiate between different-length strings with leading '\0', - // we additionally fill the next bit after the string ends with 0. We then fill any - // remaining bits with 1. Therefore the final 64 bit value is 0-9 7-bit characters followed - // by 0, followed by N=63-(7*length) 1s - - private const int AsciiCharBits = 7; - private const int MaxAsciiValue = (1 << AsciiCharBits) - 1; - internal const int MaxAsciiLength = (8 * sizeof(long)) / AsciiCharBits; - - private static bool TryEncodeAscii(string name, out long key) - { - if (name.Length > MaxAsciiLength) + if (@char > MaxAsciiValue) { key = default; return false; } - // load the chars into result - var result = 0L; - foreach (var @char in name) - { - if (@char > MaxAsciiValue) - { - key = default; - return false; - } - - result = (result << AsciiCharBits) | @char; - } - - // add padding - result <<= 1; // load zero - for (var i = name.Length; i < MaxAsciiLength; ++i) - { - result = (result << AsciiCharBits) | MaxAsciiValue; // load 1s - } - - key = result; - return true; + result = (result << AsciiCharBits) | @char; } - private static string ToAsciiString(long key) + // add padding + result <<= 1; // load zero + for (var i = name.Length; i < MaxAsciiLength; ++i) { - // use unsigned to avoid signed shifts - var remainingKeyBits = unchecked((ulong)key); + result = (result << AsciiCharBits) | MaxAsciiValue; // load 1s + } - // unload padding 1s to determine length - var length = MaxAsciiLength; - while ((remainingKeyBits & MaxAsciiValue) == MaxAsciiValue) - { - --length; - remainingKeyBits >>= AsciiCharBits; - } - Invariant.Require((remainingKeyBits & 1) == 0, "last padding bit should be zero"); - remainingKeyBits >>= 1; // unload padding 0 + key = result; + return true; + } - var chars = new char[length]; - for (var i = length - 1; i >= 0; --i) - { - chars[i] = (char)(remainingKeyBits & MaxAsciiValue); - remainingKeyBits >>= AsciiCharBits; - } + private static string ToAsciiString(long key) + { + // use unsigned to avoid signed shifts + var remainingKeyBits = unchecked((ulong)key); - return new string(chars, startIndex: 0, length); + // unload padding 1s to determine length + var length = MaxAsciiLength; + while ((remainingKeyBits & MaxAsciiValue) == MaxAsciiValue) + { + --length; + remainingKeyBits >>= AsciiCharBits; } - #endregion + Invariant.Require((remainingKeyBits & 1) == 0, "last padding bit should be zero"); + remainingKeyBits >>= 1; // unload padding 0 - #region ---- Hashing ---- - private const char HashStringSeparator = ','; - internal const int HashPartLength = 8, // 8-byte hex numbers - HashStringLength = 16, // 2 hashes - SeparatedHashStringLength = HashStringLength + 1; // separated by comma + var chars = new char[length]; + for (var i = length - 1; i >= 0; --i) + { + chars[i] = (char)(remainingKeyBits & MaxAsciiValue); + remainingKeyBits >>= AsciiCharBits; + } - private static bool TryEncodeHashString(string name, out long key, out bool hasSeparator) - { - if (name.Length == SeparatedHashStringLength && name[HashPartLength] == HashStringSeparator) - { - hasSeparator = true; - } - else - { - hasSeparator = false; + return new string(chars, startIndex: 0, length); + } + #endregion - if (name.Length != HashStringLength) - { - key = default; - return false; - } - } + #region ---- Hashing ---- + private const char HashStringSeparator = ','; + internal const int HashPartLength = 8, // 8-byte hex numbers + HashStringLength = 16, // 2 hashes + SeparatedHashStringLength = HashStringLength + 1; // separated by comma - return TryParseHashKeys(name, out key); + private static bool TryEncodeHashString(string name, out long key, out bool hasSeparator) + { + if (name.Length == SeparatedHashStringLength && name[HashPartLength] == HashStringSeparator) + { + hasSeparator = true; + } + else + { + hasSeparator = false; - static bool TryParseHashKeys(string text, out long key) + if (name.Length != HashStringLength) { - if (TryParseHashKey(text.Substring(0, HashPartLength), out var key1) - && TryParseHashKey(text.Substring(text.Length - HashPartLength), out var key2)) - { - key = CombineKeys(key1, key2); - return true; - } - key = default; return false; } - - static bool TryParseHashKey(string text, out int key) => - int.TryParse(text, NumberStyles.AllowHexSpecifier, NumberFormatInfo.InvariantInfo, out key); } - private static long HashString(string name) - { - // The hash result from SHA1 is too large, so we have to truncate (recommended practice and does not - // weaken the hash other than due to using fewer bytes) + return TryParseHashKeys(name, out key); - using var sha1 = SHA1.Create(); - var hashBytes = sha1.ComputeHash(Encoding.UTF8.GetBytes(name)); - - // We don't use BitConverter here because we want to be endianess-agnostic. - // However, this code replicates that result on little-endian - var result = 0L; - for (var i = sizeof(long) - 1; i >= 0; --i) + static bool TryParseHashKeys(string text, out long key) + { + if (TryParseHashKey(text.Substring(0, HashPartLength), out var key1) + && TryParseHashKey(text.Substring(text.Length - HashPartLength), out var key2)) { - result = (result << 8) | hashBytes[i]; + key = CombineKeys(key1, key2); + return true; } - return result; + + key = default; + return false; } - private static string ToHashString((int key1, int key2) keys) => FormattableString.Invariant($"{keys.key1:x8}{HashStringSeparator}{keys.key2:x8}"); + static bool TryParseHashKey(string text, out int key) => + int.TryParse(text, NumberStyles.AllowHexSpecifier, NumberFormatInfo.InvariantInfo, out key); + } + + private static long HashString(string name) + { + // The hash result from SHA1 is too large, so we have to truncate (recommended practice and does not + // weaken the hash other than due to using fewer bytes) - private static string ToHashString(long key) => key.ToString("x16", NumberFormatInfo.InvariantInfo); - #endregion + using var sha1 = SHA1.Create(); + var hashBytes = sha1.ComputeHash(Encoding.UTF8.GetBytes(name)); - private enum KeyEncoding + // We don't use BitConverter here because we want to be endianess-agnostic. + // However, this code replicates that result on little-endian + var result = 0L; + for (var i = sizeof(long) - 1; i >= 0; --i) { - Int64 = 0, - Int32Pair, - Ascii, + result = (result << 8) | hashBytes[i]; } + return result; + } + + private static string ToHashString((int key1, int key2) keys) => FormattableString.Invariant($"{keys.key1:x8}{HashStringSeparator}{keys.key2:x8}"); + + private static string ToHashString(long key) => key.ToString("x16", NumberFormatInfo.InvariantInfo); + #endregion + + private enum KeyEncoding + { + Int64 = 0, + Int32Pair, + Ascii, } } diff --git a/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs index 0cef19cf..4005cc0f 100644 --- a/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs +++ b/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs @@ -4,71 +4,70 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Specifies options for connecting to and locking against a Postgres database +/// +public sealed class PostgresConnectionOptionsBuilder { + private TimeoutValue? _keepaliveCadence; + private bool? _useMultiplexing; + + internal PostgresConnectionOptionsBuilder() { } + /// - /// Specifies options for connecting to and locking against a Postgres database + /// Some Postgres setups have automation in place which aggressively kills idle connections. + /// + /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. + /// Note that this still does not guarantee protection for the connection from all conditions where the governor might kill it. + /// + /// Defaults to , which disables keepalive. /// - public sealed class PostgresConnectionOptionsBuilder + public PostgresConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) { - private TimeoutValue? _keepaliveCadence; - private bool? _useMultiplexing; + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } - internal PostgresConnectionOptionsBuilder() { } + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public PostgresConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } - /// - /// Some Postgres setups have automation in place which aggressively kills idle connections. - /// - /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. - /// Note that this still does not guarantee protection for the connection from all conditions where the governor might kill it. - /// - /// Defaults to , which disables keepalive. - /// - public PostgresConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) + internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + PostgresConnectionOptionsBuilder? options; + if (optionsBuilder != null) { - this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); - return this; + options = new PostgresConnectionOptionsBuilder(); + optionsBuilder(options); } - - /// - /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) - /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is - /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. - /// - /// Multiplexing is on by default. - /// - /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an - /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing - /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) - /// connection will be allocated. - /// - /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also - /// particularly applicable to cases where - /// semantics are used with a zero-length timeout. - /// - public PostgresConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + else { - this._useMultiplexing = useMultiplexing; - return this; + options = null; } - internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) - { - PostgresConnectionOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new PostgresConnectionOptionsBuilder(); - optionsBuilder(options); - } - else - { - options = null; - } - - var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; - var useMultiplexing = options?._useMultiplexing ?? true; + var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; + var useMultiplexing = options?._useMultiplexing ?? true; - return (keepaliveCadence, useMultiplexing); - } + return (keepaliveCadence, useMultiplexing); } } diff --git a/DistributedLock.Postgres/PostgresDatabaseConnection.cs b/DistributedLock.Postgres/PostgresDatabaseConnection.cs index 4d70c595..9136f069 100644 --- a/DistributedLock.Postgres/PostgresDatabaseConnection.cs +++ b/DistributedLock.Postgres/PostgresDatabaseConnection.cs @@ -8,65 +8,64 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +internal sealed class PostgresDatabaseConnection : DatabaseConnection { - internal sealed class PostgresDatabaseConnection : DatabaseConnection + public PostgresDatabaseConnection(IDbConnection connection) + : base(connection, isExternallyOwned: true) { - public PostgresDatabaseConnection(IDbConnection connection) - : base(connection, isExternallyOwned: true) - { - } + } - public PostgresDatabaseConnection(IDbTransaction transaction) - : base(transaction, isExternallyOwned: true) - { - } + public PostgresDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) + { + } - public PostgresDatabaseConnection(string connectionString) - : base(new NpgsqlConnection(connectionString), isExternallyOwned: false) - { - } + public PostgresDatabaseConnection(string connectionString) + : base(new NpgsqlConnection(connectionString), isExternallyOwned: false) + { + } - // see https://www.npgsql.org/doc/prepare.html - public override bool ShouldPrepareCommands => true; + // see https://www.npgsql.org/doc/prepare.html + public override bool ShouldPrepareCommands => true; - public override bool IsCommandCancellationException(Exception exception) => - exception is PostgresException postgresException - // cancellation error code from https://www.postgresql.org/docs/10/errcodes-appendix.html - && postgresException.SqlState == "57014"; + public override bool IsCommandCancellationException(Exception exception) => + exception is PostgresException postgresException + // cancellation error code from https://www.postgresql.org/docs/10/errcodes-appendix.html + && postgresException.SqlState == "57014"; - public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) - { - Invariant.Require(sleepTime >= TimeSpan.Zero); + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + Invariant.Require(sleepTime >= TimeSpan.Zero); - // if we're in a transaction, we need to establish a savepoint so that we can roll back if we - // get canceled without the whole transaction being aborted - const string SavePointName = "medallion_threading_postgres_database_connection_sleep"; + // if we're in a transaction, we need to establish a savepoint so that we can roll back if we + // get canceled without the whole transaction being aborted + const string SavePointName = "medallion_threading_postgres_database_connection_sleep"; - var hasTransaction = this.HasTransaction; - if (hasTransaction) - { - using var setSavePointCommand = this.CreateCommand(); - setSavePointCommand.SetCommandText("SAVEPOINT " + SavePointName); - await executor(setSavePointCommand, CancellationToken.None).ConfigureAwait(false); - } + var hasTransaction = this.HasTransaction; + if (hasTransaction) + { + using var setSavePointCommand = this.CreateCommand(); + setSavePointCommand.SetCommandText("SAVEPOINT " + SavePointName); + await executor(setSavePointCommand, CancellationToken.None).ConfigureAwait(false); + } - try - { - using var sleepCommand = this.CreateCommand(); - sleepCommand.SetCommandText("SELECT pg_catalog.pg_sleep(@sleepTimeSeconds)"); - sleepCommand.AddParameter("sleepTimeSeconds", sleepTime.TotalSeconds, DbType.Double); - sleepCommand.SetTimeout(sleepTime); - await executor(sleepCommand, cancellationToken).ConfigureAwait(false); - } - finally + try + { + using var sleepCommand = this.CreateCommand(); + sleepCommand.SetCommandText("SELECT pg_catalog.pg_sleep(@sleepTimeSeconds)"); + sleepCommand.AddParameter("sleepTimeSeconds", sleepTime.TotalSeconds, DbType.Double); + sleepCommand.SetTimeout(sleepTime); + await executor(sleepCommand, cancellationToken).ConfigureAwait(false); + } + finally + { + if (hasTransaction) { - if (hasTransaction) - { - using var rollBackSavePointCommand = this.CreateCommand(); - rollBackSavePointCommand.SetCommandText("ROLLBACK TO SAVEPOINT " + SavePointName); - await executor(rollBackSavePointCommand, CancellationToken.None).ConfigureAwait(false); - } + using var rollBackSavePointCommand = this.CreateCommand(); + rollBackSavePointCommand.SetCommandText("ROLLBACK TO SAVEPOINT " + SavePointName); + await executor(rollBackSavePointCommand, CancellationToken.None).ConfigureAwait(false); } } } diff --git a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs index 1d72d8d1..de050f21 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +public partial class PostgresDistributedLock { - public partial class PostgresDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public PostgresDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public PostgresDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public PostgresDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public PostgresDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index 02eac64b..86a58f30 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -7,67 +7,66 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements a distributed lock using Postgres advisory locks +/// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) +/// +public sealed partial class PostgresDistributedLock : IInternalDistributedLock { + private readonly IDbDistributedLock _internalLock; + /// - /// Implements a distributed lock using Postgres advisory locks - /// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) + /// Constructs a lock with the given (effectively the lock name), , + /// and /// - public sealed partial class PostgresDistributedLock : IInternalDistributedLock + public PostgresDistributedLock(PostgresAdvisoryLockKey key, string connectionString, Action? options = null) + : this(key, CreateInternalLock(key, connectionString, options)) { - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a lock with the given (effectively the lock name), , - /// and - /// - public PostgresDistributedLock(PostgresAdvisoryLockKey key, string connectionString, Action? options = null) - : this(key, CreateInternalLock(key, connectionString, options)) - { - } - - /// - /// Constructs a lock with the given (effectively the lock name) and . - /// - public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connection) - : this(key, CreateInternalLock(key, connection)) - { - } - - private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) - { - this.Key = key; - this._internalLock = internalLock; - } + } - /// - /// The that uniquely identifies the lock on the database - /// - public PostgresAdvisoryLockKey Key { get; } + /// + /// Constructs a lock with the given (effectively the lock name) and . + /// + public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connection) + : this(key, CreateInternalLock(key, connection)) + { + } - string IDistributedLock.Name => this.Key.ToString(); + private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) + { + this.Key = key; + this._internalLock = internalLock; + } - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - this._internalLock.TryAcquireAsync(timeout, PostgresAdvisoryLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new PostgresDistributedLockHandle(h)); + /// + /// The that uniquely identifies the lock on the database + /// + public PostgresAdvisoryLockKey Key { get; } - internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, string connectionString, Action? options) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + string IDistributedLock.Name => this.Key.ToString(); - var (keepaliveCadence, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options); + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, PostgresAdvisoryLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new PostgresDistributedLockHandle(h)); - if (useMultiplexing) - { - return new OptimisticConnectionMultiplexingDbDistributedLock(key.ToString(), connectionString, PostgresMultiplexedConnectionLockPool.Instance, keepaliveCadence); - } + internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, string connectionString, Action? options) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); - } + var (keepaliveCadence, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options); - internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, IDbConnection connection) + if (useMultiplexing) { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); + return new OptimisticConnectionMultiplexingDbDistributedLock(key.ToString(), connectionString, PostgresMultiplexedConnectionLockPool.Instance, keepaliveCadence); } + + return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + } + + internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); } } diff --git a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs index 4ba64e68..b9a2c7b7 100644 --- a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs @@ -5,33 +5,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements +/// +public sealed class PostgresDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class PostgresDistributedLockHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal PostgresDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal PostgresDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index 832f4a71..8e89209a 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -3,28 +3,28 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +public partial class PostgresDistributedReaderWriterLock { - public partial class PostgresDistributedReaderWriterLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -154,5 +154,4 @@ public PostgresDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? time public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); - } } \ No newline at end of file diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 592e614f..73bad696 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -7,51 +7,50 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements a distributed lock using Postgres advisory locks +/// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) +/// +public sealed partial class PostgresDistributedReaderWriterLock : IInternalDistributedReaderWriterLock { + private readonly IDbDistributedLock _internalLock; + + /// + /// Constructs a lock with the given (effectively the lock name), , + /// and + /// + public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, string connectionString, Action? options = null) + : this(key, PostgresDistributedLock.CreateInternalLock(key, connectionString, options)) + { + } + /// - /// Implements a distributed lock using Postgres advisory locks - /// (see https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS) + /// Constructs a lock with the given (effectively the lock name) and . /// - public sealed partial class PostgresDistributedReaderWriterLock : IInternalDistributedReaderWriterLock + public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConnection connection) + : this(key, PostgresDistributedLock.CreateInternalLock(key, connection)) { - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a lock with the given (effectively the lock name), , - /// and - /// - public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, string connectionString, Action? options = null) - : this(key, PostgresDistributedLock.CreateInternalLock(key, connectionString, options)) - { - } - - /// - /// Constructs a lock with the given (effectively the lock name) and . - /// - public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConnection connection) - : this(key, PostgresDistributedLock.CreateInternalLock(key, connection)) - { - } - - private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) - { - this.Key = key; - this._internalLock = internalLock; - } - - /// - /// The that uniquely identifies the lock on the database - /// - public PostgresAdvisoryLockKey Key { get; } - - string IDistributedReaderWriterLock.Name => this.Key.ToString(); - - ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( - TimeoutValue timeout, - CancellationToken cancellationToken, - bool isWrite) => - this._internalLock.TryAcquireAsync(timeout, isWrite ? PostgresAdvisoryLock.ExclusiveLock : PostgresAdvisoryLock.SharedLock, cancellationToken, contextHandle: null) - .Wrap(h => new PostgresDistributedReaderWriterLockHandle(h)); } + + private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) + { + this.Key = key; + this._internalLock = internalLock; + } + + /// + /// The that uniquely identifies the lock on the database + /// + public PostgresAdvisoryLockKey Key { get; } + + string IDistributedReaderWriterLock.Name => this.Key.ToString(); + + ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) => + this._internalLock.TryAcquireAsync(timeout, isWrite ? PostgresAdvisoryLock.ExclusiveLock : PostgresAdvisoryLock.SharedLock, cancellationToken, contextHandle: null) + .Wrap(h => new PostgresDistributedReaderWriterLockHandle(h)); } diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs index 29ecad03..17455899 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs @@ -5,33 +5,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements +/// +public sealed class PostgresDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class PostgresDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal PostgresDistributedReaderWriterLockHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal PostgresDistributedReaderWriterLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index ca127640..b134c13f 100644 --- a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -3,53 +3,52 @@ using System.Data; using System.Text; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +/// +/// Implements for and +/// for . +/// +public sealed class PostgresDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider { + private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; + /// - /// Implements for and - /// for . + /// Constructs a provider which connects to Postgres using the provided and . /// - public sealed class PostgresDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider + public PostgresDistributedSynchronizationProvider(string connectionString, Action? options = null) { - private readonly Func _lockFactory; - private readonly Func _readerWriterLockFactory; - - /// - /// Constructs a provider which connects to Postgres using the provided and . - /// - public PostgresDistributedSynchronizationProvider(string connectionString, Action? options = null) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - - this._lockFactory = key => new PostgresDistributedLock(key, connectionString, options); - this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connectionString, options); - } - - /// - /// Constructs a provider which connects to Postgres using the provided . - /// - public PostgresDistributedSynchronizationProvider(IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - - this._lockFactory = key => new PostgresDistributedLock(key, connection); - this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); - } - - /// - /// Creates a with the provided . - /// - public PostgresDistributedLock CreateLock(PostgresAdvisoryLockKey key) => this._lockFactory(key); - - IDistributedLock IDistributedLockProvider.CreateLock(string name) => - this.CreateLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); - - /// - /// Creates a with the provided . - /// - public PostgresDistributedReaderWriterLock CreateReaderWriterLock(PostgresAdvisoryLockKey key) => this._readerWriterLockFactory(key); - - IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => - this.CreateReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + + this._lockFactory = key => new PostgresDistributedLock(key, connectionString, options); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connectionString, options); + } + + /// + /// Constructs a provider which connects to Postgres using the provided . + /// + public PostgresDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + + this._lockFactory = key => new PostgresDistributedLock(key, connection); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); } + + /// + /// Creates a with the provided . + /// + public PostgresDistributedLock CreateLock(PostgresAdvisoryLockKey key) => this._lockFactory(key); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => + this.CreateLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); + + /// + /// Creates a with the provided . + /// + public PostgresDistributedReaderWriterLock CreateReaderWriterLock(PostgresAdvisoryLockKey key) => this._readerWriterLockFactory(key); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); } diff --git a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs index a2d0c631..494aede0 100644 --- a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs +++ b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs @@ -4,10 +4,9 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Postgres +namespace Medallion.Threading.Postgres; + +internal static class PostgresMultiplexedConnectionLockPool { - internal static class PostgresMultiplexedConnectionLockPool - { - public static readonly MultiplexedConnectionLockPool Instance = new(s => new PostgresDatabaseConnection(s)); - } + public static readonly MultiplexedConnectionLockPool Instance = new(s => new PostgresDatabaseConnection(s)); } diff --git a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs index 8d5f6cef..37df5541 100644 --- a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs +++ b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs @@ -7,47 +7,46 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.Primitives +namespace Medallion.Threading.Redis.Primitives; + +internal class RedisMutexPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { - internal class RedisMutexPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive - { - private readonly RedisKey _key; - private readonly RedisValue _lockId; - private readonly RedLockTimeouts _timeouts; + private readonly RedisKey _key; + private readonly RedisValue _lockId; + private readonly RedLockTimeouts _timeouts; - public RedisMutexPrimitive(RedisKey key, RedisValue lockId, RedLockTimeouts timeouts) - { - this._key = key; - this._lockId = lockId; - this._timeouts = timeouts; - } + public RedisMutexPrimitive(RedisKey key, RedisValue lockId, RedLockTimeouts timeouts) + { + this._key = key; + this._lockId = lockId; + this._timeouts = timeouts; + } - public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - private static readonly RedisScript ReleaseScript = new RedisScript(@" + private static readonly RedisScript ReleaseScript = new RedisScript(@" if redis.call('get', @key) == @lockId then return redis.call('del', @key) end return 0", - p => new { key = p._key, lockId = p._lockId } - ); + p => new { key = p._key, lockId = p._lockId } + ); - public void Release(IDatabase database, bool fireAndForget) => ReleaseScript.Execute(database, this, fireAndForget); - public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseScript.ExecuteAsync(database, this, fireAndForget); + public void Release(IDatabase database, bool fireAndForget) => ReleaseScript.Execute(database, this, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseScript.ExecuteAsync(database, this, fireAndForget); - public bool TryAcquire(IDatabase database) => - database.StringSet(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - public Task TryAcquireAsync(IDatabaseAsync database) => - database.StringSetAsync(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + public bool TryAcquire(IDatabase database) => + database.StringSet(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); + public Task TryAcquireAsync(IDatabaseAsync database) => + database.StringSetAsync(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - private static readonly RedisScript ExtendScript = new RedisScript(@" + private static readonly RedisScript ExtendScript = new RedisScript(@" if redis.call('get', @key) == @lockId then return redis.call('pexpire', @key, @expiryMillis) end return 0", - p => new { key = p._key, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); + p => new { key = p._key, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); - public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); - } + public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); } diff --git a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs index 004a0bb9..4685fd60 100644 --- a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs +++ b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -7,44 +7,44 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.Primitives +namespace Medallion.Threading.Redis.Primitives; + +internal class RedisReadLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { - internal class RedisReadLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); + private readonly RedisKey _readerKey, _writerKey; + private readonly RedLockTimeouts _timeouts; + + public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTimeouts timeouts) { - private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); - private readonly RedisKey _readerKey, _writerKey; - private readonly RedLockTimeouts _timeouts; - - public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTimeouts timeouts) - { - this._readerKey = readerKey; - this._writerKey = writerKey; - this._timeouts = timeouts; - } - - public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - - /// - /// RELEASE READ - /// - /// Just remove our ID from the reader set (noop if it wasn't there or the set DNE) - /// - private static readonly RedisScript ReleaseReadScript = new RedisScript( - @"redis.call('srem', @readerKey, @lockId)", - p => new { readerKey = p._readerKey, lockId = p._lockId } - ); - - public void Release(IDatabase database, bool fireAndForget) => ReleaseReadScript.Execute(database, this, fireAndForget); - public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseReadScript.ExecuteAsync(database, this, fireAndForget); - - /// - /// TRY EXTEND READ - /// - /// First, check if the reader set exists and our ID is still a member. If not, we fail. - /// - /// Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) - /// - private static readonly RedisScript TryExtendReadScript = new RedisScript(@" + this._readerKey = readerKey; + this._writerKey = writerKey; + this._timeouts = timeouts; + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + /// + /// RELEASE READ + /// + /// Just remove our ID from the reader set (noop if it wasn't there or the set DNE) + /// + private static readonly RedisScript ReleaseReadScript = new RedisScript( + @"redis.call('srem', @readerKey, @lockId)", + p => new { readerKey = p._readerKey, lockId = p._lockId } + ); + + public void Release(IDatabase database, bool fireAndForget) => ReleaseReadScript.Execute(database, this, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseReadScript.ExecuteAsync(database, this, fireAndForget); + + /// + /// TRY EXTEND READ + /// + /// First, check if the reader set exists and our ID is still a member. If not, we fail. + /// + /// Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) + /// + private static readonly RedisScript TryExtendReadScript = new RedisScript(@" if redis.call('sismember', @readerKey, @lockId) == 0 then return 0 end @@ -52,20 +52,20 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim redis.call('pexpire', @readerKey, @expiryMillis) end return 1", - p => new { readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); - - public Task TryExtendAsync(IDatabaseAsync database) => TryExtendReadScript.ExecuteAsync(database, this).AsBooleanTask(); - - /// - /// TRY ACQUIRE READ - /// - /// First, check the writer lock value: if it exists then we fail. - /// - /// Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL - /// of the reader set to be at least our expiry. Return success. - /// - private static readonly RedisScript TryAcquireReadScript = new RedisScript($@" + p => new { readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); + + public Task TryExtendAsync(IDatabaseAsync database) => TryExtendReadScript.ExecuteAsync(database, this).AsBooleanTask(); + + /// + /// TRY ACQUIRE READ + /// + /// First, check the writer lock value: if it exists then we fail. + /// + /// Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL + /// of the reader set to be at least our expiry. Return success. + /// + private static readonly RedisScript TryAcquireReadScript = new RedisScript($@" if redis.call('exists', @writerKey) == 1 then return 0 end @@ -75,59 +75,59 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim redis.call('pexpire', @readerKey, @expiryMillis) end return 1", - p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); + p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); - public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireReadScript.ExecuteAsync(database, this).AsBooleanTask(); - public bool TryAcquire(IDatabase database) => (bool)TryAcquireReadScript.Execute(database, this); - } + public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireReadScript.ExecuteAsync(database, this).AsBooleanTask(); + public bool TryAcquire(IDatabase database) => (bool)TryAcquireReadScript.Execute(database, this); +} - internal class RedisWriterWaitingPrimitive : RedisMutexPrimitive - { - public const string LockIdSuffix = "_WRITERWAITING"; +internal class RedisWriterWaitingPrimitive : RedisMutexPrimitive +{ + public const string LockIdSuffix = "_WRITERWAITING"; - public RedisWriterWaitingPrimitive(RedisKey writerKey, RedisValue baseLockId, RedLockTimeouts timeouts) - : base(writerKey, baseLockId + LockIdSuffix, timeouts) - { - } + public RedisWriterWaitingPrimitive(RedisKey writerKey, RedisValue baseLockId, RedLockTimeouts timeouts) + : base(writerKey, baseLockId + LockIdSuffix, timeouts) + { } +} - internal class RedisWriteLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive +internal class RedisWriteLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive +{ + private readonly RedisKey _readerKey, _writerKey; + private readonly RedisValue _lockId; + private readonly RedLockTimeouts _timeouts; + private readonly RedisMutexPrimitive _mutexPrimitive; + + public RedisWriteLockPrimitive( + RedisKey readerKey, + RedisKey writerKey, + RedisValue lockId, + RedLockTimeouts timeouts) { - private readonly RedisKey _readerKey, _writerKey; - private readonly RedisValue _lockId; - private readonly RedLockTimeouts _timeouts; - private readonly RedisMutexPrimitive _mutexPrimitive; - - public RedisWriteLockPrimitive( - RedisKey readerKey, - RedisKey writerKey, - RedisValue lockId, - RedLockTimeouts timeouts) - { - this._readerKey = readerKey; - this._writerKey = writerKey; - this._lockId = lockId; - this._timeouts = timeouts; - this._mutexPrimitive = new RedisMutexPrimitive(this._writerKey, this._lockId, this._timeouts); - } - - public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - - public void Release(IDatabase database, bool fireAndForget) => this._mutexPrimitive.Release(database, fireAndForget); - public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => this._mutexPrimitive.ReleaseAsync(database, fireAndForget); - - /// - /// TRY ACQUIRE WRITE - /// - /// First, check if writerValue exists. If so, fail unless it's our waiting ID. - /// - /// Then, check if there are no readers. If so, then set writerValue to our ID and return success. If not, then if the lock - /// has our waiting ID re-up the expiry (avoids the need to extend the writer waiting lock). - /// - /// Finally, return failure. - /// - private static readonly RedisScript TryAcquireWriteScript = new RedisScript($@" + this._readerKey = readerKey; + this._writerKey = writerKey; + this._lockId = lockId; + this._timeouts = timeouts; + this._mutexPrimitive = new RedisMutexPrimitive(this._writerKey, this._lockId, this._timeouts); + } + + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + + public void Release(IDatabase database, bool fireAndForget) => this._mutexPrimitive.Release(database, fireAndForget); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => this._mutexPrimitive.ReleaseAsync(database, fireAndForget); + + /// + /// TRY ACQUIRE WRITE + /// + /// First, check if writerValue exists. If so, fail unless it's our waiting ID. + /// + /// Then, check if there are no readers. If so, then set writerValue to our ID and return success. If not, then if the lock + /// has our waiting ID re-up the expiry (avoids the need to extend the writer waiting lock). + /// + /// Finally, return failure. + /// + private static readonly RedisScript TryAcquireWriteScript = new RedisScript($@" local writerValue = redis.call('get', @writerKey) if writerValue == false or writerValue == @lockId .. '{RedisWriterWaitingPrimitive.LockIdSuffix}' then if redis.call('scard', @readerKey) == 0 then @@ -139,12 +139,11 @@ public RedisWriteLockPrimitive( end end return 0", - p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); + p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } + ); - public bool TryAcquire(IDatabase database) => (bool)TryAcquireWriteScript.Execute(database, this); - public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireWriteScript.ExecuteAsync(database, this).AsBooleanTask(); + public bool TryAcquire(IDatabase database) => (bool)TryAcquireWriteScript.Execute(database, this); + public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireWriteScript.ExecuteAsync(database, this).AsBooleanTask(); - public Task TryExtendAsync(IDatabaseAsync database) => this._mutexPrimitive.TryExtendAsync(database); - } + public Task TryExtendAsync(IDatabaseAsync database) => this._mutexPrimitive.TryExtendAsync(database); } diff --git a/DistributedLock.Redis/Primitives/RedisScript.cs b/DistributedLock.Redis/Primitives/RedisScript.cs index 20e98ee6..632da485 100644 --- a/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/DistributedLock.Redis/Primitives/RedisScript.cs @@ -7,28 +7,27 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.Primitives +namespace Medallion.Threading.Redis.Primitives; + +internal class RedisScript { - internal class RedisScript - { - private readonly LuaScript _script; - private readonly Func _parameters; + private readonly LuaScript _script; + private readonly Func _parameters; - public RedisScript(string script, Func parameters) - { - this._script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); - this._parameters = parameters; - } + public RedisScript(string script, Func parameters) + { + this._script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); + this._parameters = parameters; + } - public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluate(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluate(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); - public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluateAsync(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluateAsync(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); - // send the smallest possible script to the server - private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); - } + // send the smallest possible script to the server + private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); } diff --git a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 8a1c7717..49eb396b 100644 --- a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -7,56 +7,56 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.Primitives +namespace Medallion.Threading.Redis.Primitives; + +/// +/// The semaphore algorithm looks similar to the mutex implementation except that the value stored at the key is a +/// sorted set (sorted by timeout). Because elements aren't automatically removed from the set when they time out, +/// would-be acquirers must first purge the set of any expired values before they check whether the set has space +/// for them. +/// +internal class RedisSemaphorePrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { - /// - /// The semaphore algorithm looks similar to the mutex implementation except that the value stored at the key is a - /// sorted set (sorted by timeout). Because elements aren't automatically removed from the set when they time out, - /// would-be acquirers must first purge the set of any expired values before they check whether the set has space - /// for them. - /// - internal class RedisSemaphorePrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive - { - // replicate_commands is necessary to call before calling non-deterministic functions - private const string GetNowMillisScriptFragment = @" + // replicate_commands is necessary to call before calling non-deterministic functions + private const string GetNowMillisScriptFragment = @" redis.replicate_commands() local nowResult = redis.call('time') local nowMillis = (tonumber(nowResult[1]) * 1000.0) + (tonumber(nowResult[2]) / 1000.0)"; - private const string RenewSetScriptFragment = @" + private const string RenewSetScriptFragment = @" local keyTtl = redis.call('pttl', @key) if keyTtl < tonumber(@setExpiryMillis) then redis.call('pexpire', @key, @setExpiryMillis) end"; - private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); - private readonly RedisKey _key; - private readonly int _maxCount; - private readonly RedLockTimeouts _timeouts; + private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); + private readonly RedisKey _key; + private readonly int _maxCount; + private readonly RedLockTimeouts _timeouts; - public RedisSemaphorePrimitive(RedisKey key, int maxCount, RedLockTimeouts timeouts) - { - this._key = key; - this._maxCount = maxCount; - this._timeouts = timeouts; - } + public RedisSemaphorePrimitive(RedisKey key, int maxCount, RedLockTimeouts timeouts) + { + this._key = key; + this._maxCount = maxCount; + this._timeouts = timeouts; + } - public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; + public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - /// - /// The actual expiry is determined by the entry in the timeouts set. However, we also don't want to pollute the db by leaving - /// the sets around forever. Therefore, we give the sets an expiry of 3x the individual entry expiry. The reason to be extra - /// conservative with sets is that there is more disruption from losing them then from having one key time out. - /// - private TimeoutValue SetExpiry => TimeSpan.FromMilliseconds((int)Math.Min(int.MaxValue, 3L * this._timeouts.Expiry.InMilliseconds)); + /// + /// The actual expiry is determined by the entry in the timeouts set. However, we also don't want to pollute the db by leaving + /// the sets around forever. Therefore, we give the sets an expiry of 3x the individual entry expiry. The reason to be extra + /// conservative with sets is that there is more disruption from losing them then from having one key time out. + /// + private TimeoutValue SetExpiry => TimeSpan.FromMilliseconds((int)Math.Min(int.MaxValue, 3L * this._timeouts.Expiry.InMilliseconds)); - public void Release(IDatabase database, bool fireAndForget) => - database.SortedSetRemove(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); + public void Release(IDatabase database, bool fireAndForget) => + database.SortedSetRemove(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); - public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => - database.SortedSetRemoveAsync(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); + public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => + database.SortedSetRemoveAsync(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); - private static readonly RedisScript AcquireScript = new RedisScript($@" + private static readonly RedisScript AcquireScript = new RedisScript($@" {GetNowMillisScriptFragment} redis.call('zremrangebyscore', @key, '-inf', nowMillis) if redis.call('zcard', @key) < tonumber(@maxCount) then @@ -65,21 +65,20 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => return 1 end return 0", - p => new { key = p._key, maxCount = p._maxCount, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } - ); + p => new { key = p._key, maxCount = p._maxCount, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } + ); - public bool TryAcquire(IDatabase database) => (bool)AcquireScript.Execute(database, this); + public bool TryAcquire(IDatabase database) => (bool)AcquireScript.Execute(database, this); - public Task TryAcquireAsync(IDatabaseAsync database) => AcquireScript.ExecuteAsync(database, this).AsBooleanTask(); + public Task TryAcquireAsync(IDatabaseAsync database) => AcquireScript.ExecuteAsync(database, this).AsBooleanTask(); - private static readonly RedisScript ExtendScript = new RedisScript($@" + private static readonly RedisScript ExtendScript = new RedisScript($@" {GetNowMillisScriptFragment} local result = redis.call('zadd', @key, 'XX', 'CH', nowMillis + tonumber(@expiryMillis), @lockId) {RenewSetScriptFragment} return result", - p => new { key = p._key, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } - ); + p => new { key = p._key, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } + ); - public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); - } + public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); } diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index 217bfb06..fdcd6388 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -8,188 +8,187 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal interface IRedLockAcquirableSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive +{ + TimeoutValue AcquireTimeout { get; } + Task TryAcquireAsync(IDatabaseAsync database); + bool TryAcquire(IDatabase database); +} + +/// +/// Implements the acquire operation in the RedLock algorithm. See https://redis.io/topics/distlock +/// +internal readonly struct RedLockAcquire { - internal interface IRedLockAcquirableSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive + private readonly IRedLockAcquirableSynchronizationPrimitive _primitive; + private readonly IReadOnlyList _databases; + private readonly CancellationToken _cancellationToken; + + public RedLockAcquire( + IRedLockAcquirableSynchronizationPrimitive primitive, + IReadOnlyList databases, + CancellationToken cancellationToken) { - TimeoutValue AcquireTimeout { get; } - Task TryAcquireAsync(IDatabaseAsync database); - bool TryAcquire(IDatabase database); + this._primitive = primitive; + this._databases = databases; + this._cancellationToken = cancellationToken; } - /// - /// Implements the acquire operation in the RedLock algorithm. See https://redis.io/topics/distlock - /// - internal readonly struct RedLockAcquire + public async ValueTask>?> TryAcquireAsync() { - private readonly IRedLockAcquirableSynchronizationPrimitive _primitive; - private readonly IReadOnlyList _databases; - private readonly CancellationToken _cancellationToken; - - public RedLockAcquire( - IRedLockAcquirableSynchronizationPrimitive primitive, - IReadOnlyList databases, - CancellationToken cancellationToken) - { - this._primitive = primitive; - this._databases = databases; - this._cancellationToken = cancellationToken; - } + this._cancellationToken.ThrowIfCancellationRequested(); - public async ValueTask>?> TryAcquireAsync() + var isSynchronous = SyncViaAsync.IsSynchronous; + if (isSynchronous && this._databases.Count == 1) { - this._cancellationToken.ThrowIfCancellationRequested(); - - var isSynchronous = SyncViaAsync.IsSynchronous; - if (isSynchronous && this._databases.Count == 1) - { - return this.TrySingleFullySynchronousAcquire(); - } + return this.TrySingleFullySynchronousAcquire(); + } - var primitive = this._primitive; - var tryAcquireTasks = this._databases.ToDictionary( - db => db, - db => Helpers.SafeCreateTask(state => state.primitive.TryAcquireAsync(state.db), (primitive, db)) - ); + var primitive = this._primitive; + var tryAcquireTasks = this._databases.ToDictionary( + db => db, + db => Helpers.SafeCreateTask(state => state.primitive.TryAcquireAsync(state.db), (primitive, db)) + ); - var waitForAcquireTask = this.WaitForAcquireAsync(tryAcquireTasks); + var waitForAcquireTask = this.WaitForAcquireAsync(tryAcquireTasks); - var succeeded = false; - try - { - succeeded = await waitForAcquireTask.AwaitSyncOverAsync().ConfigureAwait(false); - } - finally + var succeeded = false; + try + { + succeeded = await waitForAcquireTask.AwaitSyncOverAsync().ConfigureAwait(false); + } + finally + { + // clean up + if (!succeeded) { - // clean up - if (!succeeded) + List? releaseTasks = null; + foreach (var kvp in tryAcquireTasks) { - List? releaseTasks = null; - foreach (var kvp in tryAcquireTasks) + // if the task hasn't finished yet, we don't want to do any releasing now; just + // queue a release command to run when the task eventually completes + if (!kvp.Value.IsCompleted) + { + RedLockHelper.FireAndForgetReleaseUponCompletion(primitive, kvp.Key, kvp.Value); + } + // otherwise, unless we know we failed to acquire, do a release + else if (!RedLockHelper.ReturnedFalse(kvp.Value)) { - // if the task hasn't finished yet, we don't want to do any releasing now; just - // queue a release command to run when the task eventually completes - if (!kvp.Value.IsCompleted) + if (isSynchronous) { - RedLockHelper.FireAndForgetReleaseUponCompletion(primitive, kvp.Key, kvp.Value); + try { primitive.Release(kvp.Key, fireAndForget: true); } + catch { } } - // otherwise, unless we know we failed to acquire, do a release - else if (!RedLockHelper.ReturnedFalse(kvp.Value)) + else { - if (isSynchronous) - { - try { primitive.Release(kvp.Key, fireAndForget: true); } - catch { } - } - else - { - (releaseTasks ??= new List()) - .Add(Helpers.SafeCreateTask(state => state.primitive.ReleaseAsync(state.Key, fireAndForget: true), (primitive, kvp.Key))); - } + (releaseTasks ??= new List()) + .Add(Helpers.SafeCreateTask(state => state.primitive.ReleaseAsync(state.Key, fireAndForget: true), (primitive, kvp.Key))); } } + } - if (releaseTasks != null) - { - await Task.WhenAll(releaseTasks).ConfigureAwait(false); - } + if (releaseTasks != null) + { + await Task.WhenAll(releaseTasks).ConfigureAwait(false); } } - - return succeeded ? tryAcquireTasks : null; } - private async Task WaitForAcquireAsync(IReadOnlyDictionary> tryAcquireTasks) + return succeeded ? tryAcquireTasks : null; + } + + private async Task WaitForAcquireAsync(IReadOnlyDictionary> tryAcquireTasks) + { + using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); + var incompleteTasks = new HashSet(tryAcquireTasks.Values) { timeout.Task }; + + var successCount = 0; + var failCount = 0; + var faultCount = 0; + while (true) { - using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); - var incompleteTasks = new HashSet(tryAcquireTasks.Values) { timeout.Task }; + var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); - var successCount = 0; - var failCount = 0; - var faultCount = 0; - while (true) + if (completed == timeout.Task) { - var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); + await completed.ConfigureAwait(false); // propagates cancellation + return false; // true timeout + } - if (completed == timeout.Task) + if (completed.Status == TaskStatus.RanToCompletion) + { + var result = await ((Task)completed).ConfigureAwait(false); + if (result) { - await completed.ConfigureAwait(false); // propagates cancellation - return false; // true timeout + ++successCount; + if (RedLockHelper.HasSufficientSuccesses(successCount, this._databases.Count)) { return true; } } - - if (completed.Status == TaskStatus.RanToCompletion) + else { - var result = await ((Task)completed).ConfigureAwait(false); - if (result) - { - ++successCount; - if (RedLockHelper.HasSufficientSuccesses(successCount, this._databases.Count)) { return true; } - } - else - { - ++failCount; - if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } - } + ++failCount; + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } } - else // faulted or canceled + } + else // faulted or canceled + { + // if we get too many faults, the lock is not possible to acquire, so we should throw + ++faultCount; + if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, this._databases.Count)) { - // if we get too many faults, the lock is not possible to acquire, so we should throw - ++faultCount; - if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, this._databases.Count)) + var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) + .ToArray(); + if (faultingTasks.Length == 1) { - var faultingTasks = tryAcquireTasks.Values.Where(t => t.IsCanceled || t.IsFaulted) - .ToArray(); - if (faultingTasks.Length == 1) - { - await faultingTasks[0].ConfigureAwait(false); // propagate the error - } - - throw new AggregateException(faultingTasks.Select(t => t.Exception ?? new TaskCanceledException(t).As())) - .Flatten(); + await faultingTasks[0].ConfigureAwait(false); // propagate the error } - ++failCount; - if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } + throw new AggregateException(faultingTasks.Select(t => t.Exception ?? new TaskCanceledException(t).As())) + .Flatten(); } - incompleteTasks.Remove(completed); - Invariant.Require(incompleteTasks.Count > 1, "should be more than just timeout left"); + ++failCount; + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, this._databases.Count)) { return false; } } + + incompleteTasks.Remove(completed); + Invariant.Require(incompleteTasks.Count > 1, "should be more than just timeout left"); } + } - /// - /// We only allow synchronous acquire for a single db because StackExchange.Redis does not currently allow for - /// single-operation timeouts/cancellations. Therefore, one slow response would jeopardize our ability to claim the - /// lock in time. With a single db, the one operation is all that matters so it is fine if we need to wait for it. - /// - private Dictionary>? TrySingleFullySynchronousAcquire() - { - var database = this._databases.Single(); + /// + /// We only allow synchronous acquire for a single db because StackExchange.Redis does not currently allow for + /// single-operation timeouts/cancellations. Therefore, one slow response would jeopardize our ability to claim the + /// lock in time. With a single db, the one operation is all that matters so it is fine if we need to wait for it. + /// + private Dictionary>? TrySingleFullySynchronousAcquire() + { + var database = this._databases.Single(); - bool success; - var stopwatch = Stopwatch.StartNew(); - try { success = this._primitive.TryAcquire(database); } - catch - { - // on failure, still attempt a release just in case - try { this._primitive.Release(database, fireAndForget: true); } - catch { } // do nothing; we're going to throw anyway and the cause of failure is probably the same + bool success; + var stopwatch = Stopwatch.StartNew(); + try { success = this._primitive.TryAcquire(database); } + catch + { + // on failure, still attempt a release just in case + try { this._primitive.Release(database, fireAndForget: true); } + catch { } // do nothing; we're going to throw anyway and the cause of failure is probably the same - throw; - } + throw; + } - if (success) + if (success) + { + // make sure we didn't time out + if (this._primitive.AcquireTimeout.CompareTo(stopwatch.Elapsed) >= 0) { - // make sure we didn't time out - if (this._primitive.AcquireTimeout.CompareTo(stopwatch.Elapsed) >= 0) - { - return new Dictionary> { [database] = Task.FromResult(success) }; - } - - this._primitive.Release(database, fireAndForget: true); // timed out, so release + return new Dictionary> { [database] = Task.FromResult(success) }; } - return null; + this._primitive.Release(database, fireAndForget: true); // timed out, so release } + + return null; } } diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs index 10d681b6..323569f2 100644 --- a/DistributedLock.Redis/RedLock/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -7,90 +7,89 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal interface IRedLockExtensibleSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive { - internal interface IRedLockExtensibleSynchronizationPrimitive : IRedLockReleasableSynchronizationPrimitive + TimeoutValue AcquireTimeout { get; } + Task TryExtendAsync(IDatabaseAsync database); +} + +/// +/// Implements the extend operation in the RedLock algorithm. See https://redis.io/topics/distlock +/// +internal readonly struct RedLockExtend +{ + private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; + private readonly Dictionary> _tryAcquireOrRenewTasks; + private readonly CancellationToken _cancellationToken; + + public RedLockExtend( + IRedLockExtensibleSynchronizationPrimitive primitive, + Dictionary> tryAcquireOrRenewTasks, + CancellationToken cancellationToken) { - TimeoutValue AcquireTimeout { get; } - Task TryExtendAsync(IDatabaseAsync database); + this._primitive = primitive; + this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; + this._cancellationToken = cancellationToken; } - /// - /// Implements the extend operation in the RedLock algorithm. See https://redis.io/topics/distlock - /// - internal readonly struct RedLockExtend + public async Task TryExtendAsync() { - private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; - private readonly Dictionary> _tryAcquireOrRenewTasks; - private readonly CancellationToken _cancellationToken; + Invariant.Require(!SyncViaAsync.IsSynchronous, "should only be called from a background renewal thread which is async"); - public RedLockExtend( - IRedLockExtensibleSynchronizationPrimitive primitive, - Dictionary> tryAcquireOrRenewTasks, - CancellationToken cancellationToken) + var incompleteTasks = new HashSet(); + foreach (var kvp in this._tryAcquireOrRenewTasks.ToArray()) { - this._primitive = primitive; - this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; - this._cancellationToken = cancellationToken; + if (kvp.Value.IsCompleted) + { + incompleteTasks.Add( + this._tryAcquireOrRenewTasks[kvp.Key] = Helpers.SafeCreateTask( + state => state.primitive.TryExtendAsync(state.database), + (primitive: this._primitive, database: kvp.Key) + ) + ); + } + else + { + // if the previous acquire/renew is still going, just keep waiting for that + incompleteTasks.Add(kvp.Value); + } } - public async Task TryExtendAsync() + // For extension we use the same timeout as acquire. This ensures the same min validity time which should be + // sufficient to keep extending + using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); + incompleteTasks.Add(timeout.Task); + + var databaseCount = this._tryAcquireOrRenewTasks.Count; + var successCount = 0; + var failCount = 0; + while (true) { - Invariant.Require(!SyncViaAsync.IsSynchronous, "should only be called from a background renewal thread which is async"); + var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); - var incompleteTasks = new HashSet(); - foreach (var kvp in this._tryAcquireOrRenewTasks.ToArray()) + if (completed == timeout.Task) { - if (kvp.Value.IsCompleted) - { - incompleteTasks.Add( - this._tryAcquireOrRenewTasks[kvp.Key] = Helpers.SafeCreateTask( - state => state.primitive.TryExtendAsync(state.database), - (primitive: this._primitive, database: kvp.Key) - ) - ); - } - else - { - // if the previous acquire/renew is still going, just keep waiting for that - incompleteTasks.Add(kvp.Value); - } + await completed.ConfigureAwait(false); // propagate cancellation + return null; // inconclusive } - // For extension we use the same timeout as acquire. This ensures the same min validity time which should be - // sufficient to keep extending - using var timeout = new TimeoutTask(this._primitive.AcquireTimeout, this._cancellationToken); - incompleteTasks.Add(timeout.Task); - - var databaseCount = this._tryAcquireOrRenewTasks.Count; - var successCount = 0; - var failCount = 0; - while (true) + if (completed.Status == TaskStatus.RanToCompletion && ((Task)completed).Result) { - var completed = await Task.WhenAny(incompleteTasks).ConfigureAwait(false); - - if (completed == timeout.Task) - { - await completed.ConfigureAwait(false); // propagate cancellation - return null; // inconclusive - } - - if (completed.Status == TaskStatus.RanToCompletion && ((Task)completed).Result) - { - ++successCount; - if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) { return true; } - } - else - { - // note that we treat faulted and failed the same in extend. There's no reason to throw, since - // this is just called by the extend loop. While in theory a fault could indicate some kind of post-success - // failure, most likely it means the db is unreachable and so it is safest to consider it a failure - ++failCount; - if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, databaseCount)) { return false; } - } - - incompleteTasks.Remove(completed); + ++successCount; + if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) { return true; } + } + else + { + // note that we treat faulted and failed the same in extend. There's no reason to throw, since + // this is just called by the extend loop. While in theory a fault could indicate some kind of post-success + // failure, most likely it means the db is unreachable and so it is safest to consider it a failure + ++failCount; + if (RedLockHelper.HasTooManyFailuresOrFaults(failCount, databaseCount)) { return false; } } + + incompleteTasks.Remove(completed); } } } diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/DistributedLock.Redis/RedLock/RedLockHandle.cs index ab38ea5e..73e58e21 100644 --- a/DistributedLock.Redis/RedLock/RedLockHandle.cs +++ b/DistributedLock.Redis/RedLock/RedLockHandle.cs @@ -7,65 +7,64 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal sealed class RedLockHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle { - internal sealed class RedLockHandle : IDistributedSynchronizationHandle, LeaseMonitor.ILeaseHandle - { - private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; - private Dictionary>? _tryAcquireTasks; - private readonly TimeoutValue _extensionCadence, _expiry; - private readonly LeaseMonitor _monitor; + private readonly IRedLockExtensibleSynchronizationPrimitive _primitive; + private Dictionary>? _tryAcquireTasks; + private readonly TimeoutValue _extensionCadence, _expiry; + private readonly LeaseMonitor _monitor; - public RedLockHandle( - IRedLockExtensibleSynchronizationPrimitive primitive, - Dictionary> tryAcquireTasks, - TimeoutValue extensionCadence, - TimeoutValue expiry) - { - this._primitive = primitive; - this._tryAcquireTasks = tryAcquireTasks; - this._extensionCadence = extensionCadence; - this._expiry = expiry; - // important to set this last, since the monitor constructor will read other fields of this - this._monitor = new LeaseMonitor(this); - } + public RedLockHandle( + IRedLockExtensibleSynchronizationPrimitive primitive, + Dictionary> tryAcquireTasks, + TimeoutValue extensionCadence, + TimeoutValue expiry) + { + this._primitive = primitive; + this._tryAcquireTasks = tryAcquireTasks; + this._extensionCadence = extensionCadence; + this._expiry = expiry; + // important to set this last, since the monitor constructor will read other fields of this + this._monitor = new LeaseMonitor(this); + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._monitor.HandleLostToken; + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._monitor.HandleLostToken; - /// - /// Releases the lock - /// - public void Dispose() => this.DisposeSyncViaAsync(); + /// + /// Releases the lock + /// + public void Dispose() => this.DisposeSyncViaAsync(); - /// - /// Releases the lock asynchronously - /// - public async ValueTask DisposeAsync() + /// + /// Releases the lock asynchronously + /// + public async ValueTask DisposeAsync() + { + await this._monitor.DisposeAsync().ConfigureAwait(false); + var tryAcquireTasks = Interlocked.Exchange(ref this._tryAcquireTasks, null); + if (tryAcquireTasks != null) { - await this._monitor.DisposeAsync().ConfigureAwait(false); - var tryAcquireTasks = Interlocked.Exchange(ref this._tryAcquireTasks, null); - if (tryAcquireTasks != null) - { - await new RedLockRelease(this._primitive, tryAcquireTasks).ReleaseAsync().ConfigureAwait(false); - } + await new RedLockRelease(this._primitive, tryAcquireTasks).ReleaseAsync().ConfigureAwait(false); } + } - TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._expiry; + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._expiry; - TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._extensionCadence; + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._extensionCadence; - async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + { + var extendResult = await new RedLockExtend(this._primitive, this._tryAcquireTasks!, cancellationToken).TryExtendAsync().ConfigureAwait(false); + return extendResult switch { - var extendResult = await new RedLockExtend(this._primitive, this._tryAcquireTasks!, cancellationToken).TryExtendAsync().ConfigureAwait(false); - return extendResult switch - { - null => LeaseMonitor.LeaseState.Unknown, - false => LeaseMonitor.LeaseState.Lost, - true => LeaseMonitor.LeaseState.Renewed, - }; - } + null => LeaseMonitor.LeaseState.Unknown, + false => LeaseMonitor.LeaseState.Lost, + true => LeaseMonitor.LeaseState.Renewed, + }; } } diff --git a/DistributedLock.Redis/RedLock/RedLockHelper.cs b/DistributedLock.Redis/RedLock/RedLockHelper.cs index 89fc1357..0cbbf3ff 100644 --- a/DistributedLock.Redis/RedLock/RedLockHelper.cs +++ b/DistributedLock.Redis/RedLock/RedLockHelper.cs @@ -7,63 +7,62 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal static class RedLockHelper { - internal static class RedLockHelper - { - private static readonly string LockIdPrefix; + private static readonly string LockIdPrefix; - static RedLockHelper() - { - using var currentProcess = Process.GetCurrentProcess(); - LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; - } + static RedLockHelper() + { + using var currentProcess = Process.GetCurrentProcess(); + LockIdPrefix = $"{Environment.MachineName}_{currentProcess.Id}_"; + } - public static bool HasSufficientSuccesses(int successCount, int databaseCount) - { - // a majority is required - var threshold = (databaseCount / 2) + 1; - // While in theory this should return true if we have more than enough, we never expect this to be - // called except with just enough or not enough due to how we've implemented our approaches. - Invariant.Require(successCount <= threshold); - return successCount >= threshold; - } + public static bool HasSufficientSuccesses(int successCount, int databaseCount) + { + // a majority is required + var threshold = (databaseCount / 2) + 1; + // While in theory this should return true if we have more than enough, we never expect this to be + // called except with just enough or not enough due to how we've implemented our approaches. + Invariant.Require(successCount <= threshold); + return successCount >= threshold; + } - public static bool HasTooManyFailuresOrFaults(int failureOrFaultCount, int databaseCount) - { - // For an odd number of databases, we need a majority to make success impossible. For an - // even number, however, getting to 50% failures/faults is sufficient to rule out getting - // a majority of successes. - var threshold = (databaseCount / 2) + (databaseCount % 2); - // While in theory this should return true if we have more than enough, we never expect this to be - // called except with just enough or not enough due to how we've implemented our approaches. - Invariant.Require(failureOrFaultCount <= threshold); - return failureOrFaultCount >= threshold; - } + public static bool HasTooManyFailuresOrFaults(int failureOrFaultCount, int databaseCount) + { + // For an odd number of databases, we need a majority to make success impossible. For an + // even number, however, getting to 50% failures/faults is sufficient to rule out getting + // a majority of successes. + var threshold = (databaseCount / 2) + (databaseCount % 2); + // While in theory this should return true if we have more than enough, we never expect this to be + // called except with just enough or not enough due to how we've implemented our approaches. + Invariant.Require(failureOrFaultCount <= threshold); + return failureOrFaultCount >= threshold; + } - public static RedisValue CreateLockId() => LockIdPrefix + Guid.NewGuid().ToString("n"); + public static RedisValue CreateLockId() => LockIdPrefix + Guid.NewGuid().ToString("n"); - public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; + public static bool ReturnedFalse(Task task) => task.Status == TaskStatus.RanToCompletion && !task.Result; - public static void FireAndForgetReleaseUponCompletion(IRedLockReleasableSynchronizationPrimitive primitive, IDatabase database, Task acquireOrRenewTask) - { - if (ReturnedFalse(acquireOrRenewTask)) { return; } + public static void FireAndForgetReleaseUponCompletion(IRedLockReleasableSynchronizationPrimitive primitive, IDatabase database, Task acquireOrRenewTask) + { + if (ReturnedFalse(acquireOrRenewTask)) { return; } - acquireOrRenewTask.ContinueWith(async (t, state) => + acquireOrRenewTask.ContinueWith(async (t, state) => + { + // don't clean up if we know we failed + if (!ReturnedFalse(t)) { - // don't clean up if we know we failed - if (!ReturnedFalse(t)) - { - await primitive.ReleaseAsync((IDatabase) state, fireAndForget: true).ConfigureAwait(false); - } - }, - state: database - ); - } + await primitive.ReleaseAsync((IDatabase) state, fireAndForget: true).ConfigureAwait(false); + } + }, + state: database + ); + } - public static CommandFlags GetCommandFlags(bool fireAndForget) => - CommandFlags.DemandMaster | (fireAndForget ? CommandFlags.FireAndForget : CommandFlags.None); + public static CommandFlags GetCommandFlags(bool fireAndForget) => + CommandFlags.DemandMaster | (fireAndForget ? CommandFlags.FireAndForget : CommandFlags.None); - public static async Task AsBooleanTask(this Task redisResultTask) => (bool)await redisResultTask.ConfigureAwait(false); - } + public static async Task AsBooleanTask(this Task redisResultTask) => (bool)await redisResultTask.ConfigureAwait(false); } diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs index 5d4f0a33..8ba29c80 100644 --- a/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -6,97 +6,96 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal interface IRedLockReleasableSynchronizationPrimitive +{ + Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget); + void Release(IDatabase database, bool fireAndForget); +} + +/// +/// Implements the release operation in the RedLock algorithm. See https://redis.io/topics/distlock +/// +internal readonly struct RedLockRelease { - internal interface IRedLockReleasableSynchronizationPrimitive + private readonly IRedLockReleasableSynchronizationPrimitive _primitive; + private readonly IReadOnlyDictionary> _tryAcquireOrRenewTasks; + + public RedLockRelease( + IRedLockReleasableSynchronizationPrimitive primitive, + IReadOnlyDictionary> tryAcquireOrRenewTasks) { - Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget); - void Release(IDatabase database, bool fireAndForget); + this._primitive = primitive; + this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; } - /// - /// Implements the release operation in the RedLock algorithm. See https://redis.io/topics/distlock - /// - internal readonly struct RedLockRelease + public async ValueTask ReleaseAsync() { - private readonly IRedLockReleasableSynchronizationPrimitive _primitive; - private readonly IReadOnlyDictionary> _tryAcquireOrRenewTasks; + var isSynchronous = SyncViaAsync.IsSynchronous; + var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - public RedLockRelease( - IRedLockReleasableSynchronizationPrimitive primitive, - IReadOnlyDictionary> tryAcquireOrRenewTasks) - { - this._primitive = primitive; - this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; - } + List? releaseExceptions = null; + var successCount = 0; + var faultCount = 0; + var databaseCount = unreleasedTryAcquireOrRenewTasks.Count; - public async ValueTask ReleaseAsync() + try { - var isSynchronous = SyncViaAsync.IsSynchronous; - var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - - List? releaseExceptions = null; - var successCount = 0; - var faultCount = 0; - var databaseCount = unreleasedTryAcquireOrRenewTasks.Count; - - try + while (true) { - while (true) + var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) + // work through non-faulted tasks first + .OrderByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) + // then start with failed since no action is required to release those + .ThenBy(kvp => kvp.Value.Status == TaskStatus.RanToCompletion && kvp.Value.Result) + .Select(kvp => kvp.Key) + .ToArray(); + foreach (var db in releaseableDatabases) { - var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) - // work through non-faulted tasks first - .OrderByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) - // then start with failed since no action is required to release those - .ThenBy(kvp => kvp.Value.Status == TaskStatus.RanToCompletion && kvp.Value.Result) - .Select(kvp => kvp.Key) - .ToArray(); - foreach (var db in releaseableDatabases) - { - var tryAcquireOrRenewTask = unreleasedTryAcquireOrRenewTasks[db]; - unreleasedTryAcquireOrRenewTasks.Remove(db); + var tryAcquireOrRenewTask = unreleasedTryAcquireOrRenewTasks[db]; + unreleasedTryAcquireOrRenewTasks.Remove(db); - if (RedLockHelper.ReturnedFalse(tryAcquireOrRenewTask)) + if (RedLockHelper.ReturnedFalse(tryAcquireOrRenewTask)) + { + // if we failed to acquire, we don't need to release + ++successCount; + } + else + { + try { - // if we failed to acquire, we don't need to release + if (isSynchronous) { this._primitive.Release(db, fireAndForget: false); } + else { await this._primitive.ReleaseAsync(db, fireAndForget: false).ConfigureAwait(false); } ++successCount; } - else + catch (Exception ex) { - try + (releaseExceptions ??= new List()).Add(ex); + ++faultCount; + if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, databaseCount)) { - if (isSynchronous) { this._primitive.Release(db, fireAndForget: false); } - else { await this._primitive.ReleaseAsync(db, fireAndForget: false).ConfigureAwait(false); } - ++successCount; + throw new AggregateException(releaseExceptions!).Flatten(); } - catch (Exception ex) - { - (releaseExceptions ??= new List()).Add(ex); - ++faultCount; - if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, databaseCount)) - { - throw new AggregateException(releaseExceptions!).Flatten(); - } - } - } - - if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) - { - return; } } - // if we haven't released enough yet to be done or certain of success or failure, wait for another to finish - if (isSynchronous) { Task.WaitAny(unreleasedTryAcquireOrRenewTasks.Values.ToArray()); } - else { await Task.WhenAny(unreleasedTryAcquireOrRenewTasks.Values).ConfigureAwait(false); } + if (RedLockHelper.HasSufficientSuccesses(successCount, databaseCount)) + { + return; + } } + + // if we haven't released enough yet to be done or certain of success or failure, wait for another to finish + if (isSynchronous) { Task.WaitAny(unreleasedTryAcquireOrRenewTasks.Values.ToArray()); } + else { await Task.WhenAny(unreleasedTryAcquireOrRenewTasks.Values).ConfigureAwait(false); } } - finally // fire and forget the rest + } + finally // fire and forget the rest + { + foreach (var kvp in unreleasedTryAcquireOrRenewTasks) { - foreach (var kvp in unreleasedTryAcquireOrRenewTasks) - { - RedLockHelper.FireAndForgetReleaseUponCompletion(this._primitive, kvp.Key, kvp.Value); - } + RedLockHelper.FireAndForgetReleaseUponCompletion(this._primitive, kvp.Key, kvp.Value); } } } diff --git a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs index 224d5fc6..247d59db 100644 --- a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs +++ b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs @@ -5,20 +5,19 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis.RedLock +namespace Medallion.Threading.Redis.RedLock; + +internal readonly struct RedLockTimeouts { - internal readonly struct RedLockTimeouts + public RedLockTimeouts( + TimeoutValue expiry, + TimeoutValue minValidityTime) { - public RedLockTimeouts( - TimeoutValue expiry, - TimeoutValue minValidityTime) - { - this.Expiry = expiry; - this.MinValidityTime = minValidityTime; - } - - public TimeoutValue Expiry { get; } - public TimeoutValue MinValidityTime { get; } - public TimeoutValue AcquireTimeout => this.Expiry.TimeSpan - this.MinValidityTime.TimeSpan; + this.Expiry = expiry; + this.MinValidityTime = minValidityTime; } + + public TimeoutValue Expiry { get; } + public TimeoutValue MinValidityTime { get; } + public TimeoutValue AcquireTimeout => this.Expiry.TimeSpan - this.MinValidityTime.TimeSpan; } diff --git a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs index e9cdb7af..dc5760db 100644 --- a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +public partial class RedisDistributedLock { - public partial class RedisDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public RedisDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public RedisDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public RedisDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public RedisDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index 016a6b84..6c590b14 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -9,71 +9,70 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. +/// +public sealed partial class RedisDistributedLock : IInternalDistributedLock { + private readonly IReadOnlyList _databases; + private readonly RedisDistributedLockOptions _options; + /// - /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// Constructs a lock named using the provided and . /// - public sealed partial class RedisDistributedLock : IInternalDistributedLock + public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) + : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { - private readonly IReadOnlyList _databases; - private readonly RedisDistributedLockOptions _options; - - /// - /// Constructs a lock named using the provided and . - /// - public RedisDistributedLock(RedisKey key, IDatabase database, Action? options = null) - : this(key, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) - { - } + } - /// - /// Constructs a lock named using the provided and . - /// - public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) - { - if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } - this._databases = ValidateDatabases(databases); + /// + /// Constructs a lock named using the provided and . + /// + public RedisDistributedLock(RedisKey key, IEnumerable databases, Action? options = null) + { + if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } + this._databases = ValidateDatabases(databases); - this.Key = key; - this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); - } + this.Key = key; + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); + } - internal static IReadOnlyList ValidateDatabases(IEnumerable databases) - { - var databasesArray = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); - if (databasesArray.Length == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } - if (databasesArray.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } - return databasesArray; - } + internal static IReadOnlyList ValidateDatabases(IEnumerable databases) + { + var databasesArray = databases?.ToArray() ?? throw new ArgumentNullException(nameof(databases)); + if (databasesArray.Length == 0) { throw new ArgumentException("may not be empty", nameof(databases)); } + if (databasesArray.Contains(null!)) { throw new ArgumentNullException(nameof(databases), "may not contain null"); } + return databasesArray; + } - /// - /// The Redis key used to implement the lock - /// - public RedisKey Key { get; } + /// + /// The Redis key used to implement the lock + /// + public RedisKey Key { get; } - /// - /// Implements - /// - public string Name => this.Key.ToString(); + /// + /// Implements + /// + public string Name => this.Key.ToString(); - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - BusyWaitHelper.WaitAsync( - state: this, - tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), - timeout: timeout, - minSleepTime: this._options.MinBusyWaitSleepTime, - maxSleepTime: this._options.MaxBusyWaitSleepTime, - cancellationToken: cancellationToken - ); + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken: cancellationToken + ); - private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) - { - var primitive = new RedisMutexPrimitive(this.Key, RedLockHelper.CreateLockId(), this._options.RedLockTimeouts); - var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); - return tryAcquireTasks != null - ? new RedisDistributedLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) - : null; - } + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) + { + var primitive = new RedisMutexPrimitive(this.Key, RedLockHelper.CreateLockId(), this._options.RedLockTimeouts); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null + ? new RedisDistributedLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; } } diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs index 5a160798..15bb6182 100644 --- a/DistributedLock.Redis/RedisDistributedLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -7,34 +7,33 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements for +/// +public sealed class RedisDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements for - /// - public sealed class RedisDistributedLockHandle : IDistributedSynchronizationHandle - { - private RedLockHandle? _innerHandle; + private RedLockHandle? _innerHandle; - internal RedisDistributedLockHandle(RedLockHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal RedisDistributedLockHandle(RedLockHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index dc025e8b..b0f6fa3a 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -3,28 +3,28 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +public partial class RedisDistributedReaderWriterLock { - public partial class RedisDistributedReaderWriterLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -154,5 +154,4 @@ public RedisDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? timeout public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); - } } \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index 31b7aad3..6e14c644 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -9,151 +9,150 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. +/// +public sealed partial class RedisDistributedReaderWriterLock : IInternalDistributedReaderWriterLock { + private readonly IReadOnlyList _databases; + private readonly RedisDistributedLockOptions _options; + /// - /// Implements a using Redis. Can leverage multiple servers via the RedLock algorithm. + /// Constructs a lock named using the provided and . /// - public sealed partial class RedisDistributedReaderWriterLock : IInternalDistributedReaderWriterLock + public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) + : this(name, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { - private readonly IReadOnlyList _databases; - private readonly RedisDistributedLockOptions _options; - - /// - /// Constructs a lock named using the provided and . - /// - public RedisDistributedReaderWriterLock(string name, IDatabase database, Action? options = null) - : this(name, new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) - { - } + } - /// - /// Constructs a lock named using the provided and . - /// - public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - this._databases = RedisDistributedLock.ValidateDatabases(databases); + /// + /// Constructs a lock named using the provided and . + /// + public RedisDistributedReaderWriterLock(string name, IEnumerable databases, Action? options = null) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + this._databases = RedisDistributedLock.ValidateDatabases(databases); - this.ReaderKey = name + ".readers"; - this.WriterKey = name + ".writer"; - this.Name = name; - this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); + this.ReaderKey = name + ".readers"; + this.WriterKey = name + ".writer"; + this.Name = name; + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); - // We insist on this rule to ensure that when we take the writer waiting lock it won't expire between attempts - // to upgrade it to the write lock. This avoids the need to extend the writer waiting lock - if (this._options.RedLockTimeouts.MinValidityTime.CompareTo(this._options.MaxBusyWaitSleepTime) <= 0) - { - throw new ArgumentException($"{nameof(RedisDistributedSynchronizationOptionsBuilder.BusyWaitSleepTime)} must be <= {nameof(RedisDistributedSynchronizationOptionsBuilder.MinValidityTime)}", nameof(options)); - } + // We insist on this rule to ensure that when we take the writer waiting lock it won't expire between attempts + // to upgrade it to the write lock. This avoids the need to extend the writer waiting lock + if (this._options.RedLockTimeouts.MinValidityTime.CompareTo(this._options.MaxBusyWaitSleepTime) <= 0) + { + throw new ArgumentException($"{nameof(RedisDistributedSynchronizationOptionsBuilder.BusyWaitSleepTime)} must be <= {nameof(RedisDistributedSynchronizationOptionsBuilder.MinValidityTime)}", nameof(options)); } + } - internal RedisKey ReaderKey { get; } - internal RedisKey WriterKey { get; } + internal RedisKey ReaderKey { get; } + internal RedisKey WriterKey { get; } - /// - /// Implements - /// - public string Name { get; } + /// + /// Implements + /// + public string Name { get; } - ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( - TimeoutValue timeout, - CancellationToken cancellationToken, - bool isWrite) + ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) + { + return isWrite + ? this.TryAcquireWriteLockAsync(timeout, cancellationToken) + : BusyWaitHelper.WaitAsync( + this, + (@lock, cancellationToken) => @lock.TryAcquireAsync(new RedisReadLockPrimitive(@lock.ReaderKey, @lock.WriterKey, @lock._options.RedLockTimeouts), cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken + ); + } + + private async ValueTask TryAcquireWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var acquireWriteLockState = new AcquireWriteLockState(canRetry: !timeout.IsZero); + RedisDistributedReaderWriterLockHandle? handle = null; + try { - return isWrite - ? this.TryAcquireWriteLockAsync(timeout, cancellationToken) - : BusyWaitHelper.WaitAsync( - this, - (@lock, cancellationToken) => @lock.TryAcquireAsync(new RedisReadLockPrimitive(@lock.ReaderKey, @lock.WriterKey, @lock._options.RedLockTimeouts), cancellationToken), - timeout: timeout, - minSleepTime: this._options.MinBusyWaitSleepTime, - maxSleepTime: this._options.MaxBusyWaitSleepTime, - cancellationToken - ); + return handle = await BusyWaitHelper.WaitAsync( + (Lock: this, State: acquireWriteLockState), + (state, cancellationToken) => state.Lock.TryAcquireWriteLockAsync(state.State, cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken + ).ConfigureAwait(false); } - - private async ValueTask TryAcquireWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + finally { - var acquireWriteLockState = new AcquireWriteLockState(canRetry: !timeout.IsZero); - RedisDistributedReaderWriterLockHandle? handle = null; - try - { - return handle = await BusyWaitHelper.WaitAsync( - (Lock: this, State: acquireWriteLockState), - (state, cancellationToken) => state.Lock.TryAcquireWriteLockAsync(state.State, cancellationToken), - timeout: timeout, - minSleepTime: this._options.MinBusyWaitSleepTime, - maxSleepTime: this._options.MaxBusyWaitSleepTime, - cancellationToken - ).ConfigureAwait(false); - } - finally + // If we failed to take the write lock but we took the writer waiting lock, release + // the writer waiting lock on our way out. + if (handle == null && acquireWriteLockState.WriterWaiting.TryGetValue(out var writerWaiting)) { - // If we failed to take the write lock but we took the writer waiting lock, release - // the writer waiting lock on our way out. - if (handle == null && acquireWriteLockState.WriterWaiting.TryGetValue(out var writerWaiting)) - { - await new RedLockRelease(writerWaiting.Primitive, writerWaiting.TryAcquireTasks).ReleaseAsync().ConfigureAwait(false); - } + await new RedLockRelease(writerWaiting.Primitive, writerWaiting.TryAcquireTasks).ReleaseAsync().ConfigureAwait(false); } } + } - private async ValueTask TryAcquireWriteLockAsync(AcquireWriteLockState state, CancellationToken cancellationToken) + private async ValueTask TryAcquireWriteLockAsync(AcquireWriteLockState state, CancellationToken cancellationToken) + { + // The first time, through, just try to acquire the write lock. This covers the TryAcquire(0) case and ensures that we + // don't bother with taking the writer waiting lock if we don't need to. + if (state.IsFirstTry) { - // The first time, through, just try to acquire the write lock. This covers the TryAcquire(0) case and ensures that we - // don't bother with taking the writer waiting lock if we don't need to. - if (state.IsFirstTry) - { - state.IsFirstTry = false; - var firstTryResult = await TryAcquireWriteLockAsync(RedLockHelper.CreateLockId()).ConfigureAwait(false); - if (firstTryResult != null) { return firstTryResult; } - // if we're not going to retry the acquire, don't bother attempting the writer waiting lock - if (!state.CanRetry) { return null; } - } + state.IsFirstTry = false; + var firstTryResult = await TryAcquireWriteLockAsync(RedLockHelper.CreateLockId()).ConfigureAwait(false); + if (firstTryResult != null) { return firstTryResult; } + // if we're not going to retry the acquire, don't bother attempting the writer waiting lock + if (!state.CanRetry) { return null; } + } - Invariant.Require(state.CanRetry); + Invariant.Require(state.CanRetry); - // Otherwise, if we don't have the writer waiting lock yet, try to take that - if (!state.WriterWaiting.HasValue) - { - var lockId = RedLockHelper.CreateLockId(); - var primitive = new RedisWriterWaitingPrimitive(this.WriterKey, lockId, this._options.RedLockTimeouts); - var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); - if (tryAcquireTasks == null) { return null; } + // Otherwise, if we don't have the writer waiting lock yet, try to take that + if (!state.WriterWaiting.HasValue) + { + var lockId = RedLockHelper.CreateLockId(); + var primitive = new RedisWriterWaitingPrimitive(this.WriterKey, lockId, this._options.RedLockTimeouts); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + if (tryAcquireTasks == null) { return null; } - // if we took writer waiting, save off the info and just keep going - state.WriterWaiting = (primitive, tryAcquireTasks, lockId); - } + // if we took writer waiting, save off the info and just keep going + state.WriterWaiting = (primitive, tryAcquireTasks, lockId); + } - // If we get here, we have the writer waiting lock. Try to "upgrade" that to an actual writer lock - return await TryAcquireWriteLockAsync(state.WriterWaiting.Value.LockId).ConfigureAwait(false); + // If we get here, we have the writer waiting lock. Try to "upgrade" that to an actual writer lock + return await TryAcquireWriteLockAsync(state.WriterWaiting.Value.LockId).ConfigureAwait(false); - ValueTask TryAcquireWriteLockAsync(RedisValue lockId) => - this.TryAcquireAsync(new RedisWriteLockPrimitive(this.ReaderKey, this.WriterKey, lockId, this._options.RedLockTimeouts), cancellationToken); - } + ValueTask TryAcquireWriteLockAsync(RedisValue lockId) => + this.TryAcquireAsync(new RedisWriteLockPrimitive(this.ReaderKey, this.WriterKey, lockId, this._options.RedLockTimeouts), cancellationToken); + } - private async ValueTask TryAcquireAsync(TPrimitive primitive, CancellationToken cancellationToken) - where TPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive - { - var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); - return tryAcquireTasks != null - ? new RedisDistributedReaderWriterLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) - : null; - } + private async ValueTask TryAcquireAsync(TPrimitive primitive, CancellationToken cancellationToken) + where TPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive + { + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null + ? new RedisDistributedReaderWriterLockHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; + } - private class AcquireWriteLockState + private class AcquireWriteLockState + { + public AcquireWriteLockState(bool canRetry) { - public AcquireWriteLockState(bool canRetry) - { - this.CanRetry = canRetry; - } + this.CanRetry = canRetry; + } - public bool CanRetry { get; } + public bool CanRetry { get; } - public bool IsFirstTry { get; set; } = true; + public bool IsFirstTry { get; set; } = true; - public (RedisWriterWaitingPrimitive Primitive, IReadOnlyDictionary> TryAcquireTasks, RedisValue LockId)? WriterWaiting { get; set; } - } + public (RedisWriterWaitingPrimitive Primitive, IReadOnlyDictionary> TryAcquireTasks, RedisValue LockId)? WriterWaiting { get; set; } } } diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs index 959001fd..b4261a57 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs @@ -7,34 +7,33 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements for +/// +public sealed class RedisDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements for - /// - public sealed class RedisDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle - { - private RedLockHandle? _innerHandle; + private RedLockHandle? _innerHandle; - internal RedisDistributedReaderWriterLockHandle(RedLockHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal RedisDistributedReaderWriterLockHandle(RedLockHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs index 42fc0694..0f62ff86 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +public partial class RedisDistributedSemaphore { - public partial class RedisDistributedSemaphore - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire a semaphore ticket synchronously. Usage: - /// - /// using (var handle = mySemaphore.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public RedisDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public RedisDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: - /// - /// using (mySemaphore.Acquire(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public RedisDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public RedisDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index 4117cced..e49a51a3 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -9,64 +9,63 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements a using Redis. +/// +public sealed partial class RedisDistributedSemaphore : IInternalDistributedSemaphore { /// - /// Implements a using Redis. + /// Note: while we store this as a list to simplify the interactions with the RedLock components, in fact the semaphore + /// algorithm only works with a single database. With multiple databases, we risk violating our . + /// For example, with 3 dbs and 2 tickets, we can have 3 users acquiring AB, BC, and AC. Each database sees 2 tickets taken! /// - public sealed partial class RedisDistributedSemaphore : IInternalDistributedSemaphore - { - /// - /// Note: while we store this as a list to simplify the interactions with the RedLock components, in fact the semaphore - /// algorithm only works with a single database. With multiple databases, we risk violating our . - /// For example, with 3 dbs and 2 tickets, we can have 3 users acquiring AB, BC, and AC. Each database sees 2 tickets taken! - /// - private readonly IReadOnlyList _databases; - private readonly RedisDistributedLockOptions _options; + private readonly IReadOnlyList _databases; + private readonly RedisDistributedLockOptions _options; - /// - /// Constructs a semaphore named using the provided , , and . - /// - public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) - { - if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } - if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } - this._databases = new[] { database ?? throw new ArgumentNullException(nameof(database)) }; + /// + /// Constructs a semaphore named using the provided , , and . + /// + public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, Action? options = null) + { + if (key == default(RedisKey)) { throw new ArgumentNullException(nameof(key)); } + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + this._databases = new[] { database ?? throw new ArgumentNullException(nameof(database)) }; - this.Key = key; - this.MaxCount = maxCount; - this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); - } + this.Key = key; + this.MaxCount = maxCount; + this._options = RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); + } - internal RedisKey Key { get; } + internal RedisKey Key { get; } - /// - /// Implements - /// - public string Name => this.Key.ToString(); + /// + /// Implements + /// + public string Name => this.Key.ToString(); - /// - /// Implements - /// - public int MaxCount { get; } + /// + /// Implements + /// + public int MaxCount { get; } - ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - BusyWaitHelper.WaitAsync( - state: this, - tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), - timeout: timeout, - minSleepTime: this._options.MinBusyWaitSleepTime, - maxSleepTime: this._options.MaxBusyWaitSleepTime, - cancellationToken: cancellationToken - ); + ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync( + state: this, + tryGetValue: (@this, cancellationToken) => @this.TryAcquireAsync(cancellationToken), + timeout: timeout, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, + cancellationToken: cancellationToken + ); - private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) - { - var primitive = new RedisSemaphorePrimitive(this.Key, this.MaxCount, this._options.RedLockTimeouts); - var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); - return tryAcquireTasks != null - ? new RedisDistributedSemaphoreHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) - : null; - } + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) + { + var primitive = new RedisSemaphorePrimitive(this.Key, this.MaxCount, this._options.RedLockTimeouts); + var tryAcquireTasks = await new RedLockAcquire(primitive, this._databases, cancellationToken).TryAcquireAsync().ConfigureAwait(false); + return tryAcquireTasks != null + ? new RedisDistributedSemaphoreHandle(new RedLockHandle(primitive, tryAcquireTasks, extensionCadence: this._options.ExtensionCadence, expiry: this._options.RedLockTimeouts.Expiry)) + : null; } } diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs index 8a2de772..5f7528d4 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs @@ -7,34 +7,33 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements for a +/// +public sealed class RedisDistributedSemaphoreHandle : IDistributedSynchronizationHandle { - /// - /// Implements for a - /// - public sealed class RedisDistributedSemaphoreHandle : IDistributedSynchronizationHandle - { - private RedLockHandle? _innerHandle; + private RedLockHandle? _innerHandle; - internal RedisDistributedSemaphoreHandle(RedLockHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal RedisDistributedSemaphoreHandle(RedLockHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => Volatile.Read(ref this._innerHandle)?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs index f15c0803..76dafcfe 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs @@ -7,188 +7,187 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Options for configuring a redis-based distributed synchronization algorithm +/// +public sealed class RedisDistributedSynchronizationOptionsBuilder { + internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); /// - /// Options for configuring a redis-based distributed synchronization algorithm + /// We don't want to allow expiry to go too low, since then the lock doesn't even work (and the default + /// min observed expiry will end up greater than the default expiry) /// - public sealed class RedisDistributedSynchronizationOptionsBuilder + internal static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); + + private TimeoutValue? _expiry, + _extensionCadence, + _minValidityTime, + _minBusyWaitSleepTime, + _maxBusyWaitSleepTime; + + internal RedisDistributedSynchronizationOptionsBuilder() { } + + /// + /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, + /// this value generally will have little effect on program behavior. However, making the expiry longer means that + /// auto-extension requests can occur less frequently, saving resources. On the other hand, when a lock is abandoned + /// without explicit release (e. g. if the holding process crashes), the expiry determines how long other processes + /// would need to wait in order to acquire it. + /// + /// Defaults to 30s. + /// + public RedisDistributedSynchronizationOptionsBuilder Expiry(TimeSpan expiry) { - internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); - /// - /// We don't want to allow expiry to go too low, since then the lock doesn't even work (and the default - /// min observed expiry will end up greater than the default expiry) - /// - internal static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); - - private TimeoutValue? _expiry, - _extensionCadence, - _minValidityTime, - _minBusyWaitSleepTime, - _maxBusyWaitSleepTime; - - internal RedisDistributedSynchronizationOptionsBuilder() { } - - /// - /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, - /// this value generally will have little effect on program behavior. However, making the expiry longer means that - /// auto-extension requests can occur less frequently, saving resources. On the other hand, when a lock is abandoned - /// without explicit release (e. g. if the holding process crashes), the expiry determines how long other processes - /// would need to wait in order to acquire it. - /// - /// Defaults to 30s. - /// - public RedisDistributedSynchronizationOptionsBuilder Expiry(TimeSpan expiry) + var expiryTimeoutValue = new TimeoutValue(expiry, nameof(expiry)); + if (expiryTimeoutValue.IsInfinite || expiryTimeoutValue.CompareTo(MinimumExpiry) < 0) { - var expiryTimeoutValue = new TimeoutValue(expiry, nameof(expiry)); - if (expiryTimeoutValue.IsInfinite || expiryTimeoutValue.CompareTo(MinimumExpiry) < 0) - { - throw new ArgumentOutOfRangeException(nameof(expiry), expiry, $"Must be >= {MinimumExpiry.TimeSpan} and < ∞"); - } - this._expiry = expiryTimeoutValue; - return this; + throw new ArgumentOutOfRangeException(nameof(expiry), expiry, $"Must be >= {MinimumExpiry.TimeSpan} and < ∞"); } + this._expiry = expiryTimeoutValue; + return this; + } - /// - /// Determines how frequently the lock will be extended while held. More frequent extension means more unnecessary requests - /// but also a lower chance of losing the lock due to the process hanging or otherwise failing to get its extension request in - /// before the lock expiry elapses. - /// - /// Defaults to 1/3 of the specified . - /// - public RedisDistributedSynchronizationOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) - { - this._extensionCadence = new TimeoutValue(extensionCadence, nameof(extensionCadence)); - return this; - } + /// + /// Determines how frequently the lock will be extended while held. More frequent extension means more unnecessary requests + /// but also a lower chance of losing the lock due to the process hanging or otherwise failing to get its extension request in + /// before the lock expiry elapses. + /// + /// Defaults to 1/3 of the specified . + /// + public RedisDistributedSynchronizationOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) + { + this._extensionCadence = new TimeoutValue(extensionCadence, nameof(extensionCadence)); + return this; + } - /// - /// The lock expiry determines how long the lock will be held without being extended. However, since it takes some amount - /// of time to acquire the lock, we will not have all of expiry available upon acquisition. - /// - /// This value sets a minimum amount which we'll be guaranteed to have left once acquisition completes. - /// - /// Defaults to 90% of the specified lock expiry. - /// - public RedisDistributedSynchronizationOptionsBuilder MinValidityTime(TimeSpan minValidityTime) + /// + /// The lock expiry determines how long the lock will be held without being extended. However, since it takes some amount + /// of time to acquire the lock, we will not have all of expiry available upon acquisition. + /// + /// This value sets a minimum amount which we'll be guaranteed to have left once acquisition completes. + /// + /// Defaults to 90% of the specified lock expiry. + /// + public RedisDistributedSynchronizationOptionsBuilder MinValidityTime(TimeSpan minValidityTime) + { + var minValidityTimeoutValue = new TimeoutValue(minValidityTime, nameof(minValidityTime)); + if (minValidityTimeoutValue.IsZero) { - var minValidityTimeoutValue = new TimeoutValue(minValidityTime, nameof(minValidityTime)); - if (minValidityTimeoutValue.IsZero) - { - throw new ArgumentOutOfRangeException(nameof(minValidityTime), minValidityTime, "may not be zero"); - } - this._minValidityTime = minValidityTimeoutValue; - return this; + throw new ArgumentOutOfRangeException(nameof(minValidityTime), minValidityTime, "may not be zero"); } + this._minValidityTime = minValidityTimeoutValue; + return this; + } + + /// + /// Waiting to acquire a lock requires a busy wait that alternates acquire attempts and sleeps. + /// This determines how much time is spent sleeping between attempts. Lower values will raise the + /// volume of acquire requests under contention but will also raise the responsiveness (how long + /// it takes a waiter to notice that a contended the lock has become available). + /// + /// Specifying a range of values allows the implementation to select an actual value in the range + /// at random for each sleep. This helps avoid the case where two clients become "synchronized" + /// in such a way that results in one client monopolizing the lock. + /// + /// The default is [10ms, 800ms] + /// + public RedisDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + { + var minTimeoutValue = new TimeoutValue(min, nameof(min)); + var maxTimeoutValue = new TimeoutValue(max, nameof(max)); - /// - /// Waiting to acquire a lock requires a busy wait that alternates acquire attempts and sleeps. - /// This determines how much time is spent sleeping between attempts. Lower values will raise the - /// volume of acquire requests under contention but will also raise the responsiveness (how long - /// it takes a waiter to notice that a contended the lock has become available). - /// - /// Specifying a range of values allows the implementation to select an actual value in the range - /// at random for each sleep. This helps avoid the case where two clients become "synchronized" - /// in such a way that results in one client monopolizing the lock. - /// - /// The default is [10ms, 800ms] - /// - public RedisDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } + if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) { - var minTimeoutValue = new TimeoutValue(min, nameof(min)); - var maxTimeoutValue = new TimeoutValue(max, nameof(max)); + throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); + } - if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } - if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) - { - throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); - } + this._minBusyWaitSleepTime = minTimeoutValue; + this._maxBusyWaitSleepTime = maxTimeoutValue; + return this; + } - this._minBusyWaitSleepTime = minTimeoutValue; - this._maxBusyWaitSleepTime = maxTimeoutValue; - return this; + internal static RedisDistributedLockOptions GetOptions(Action? optionsBuilder) + { + RedisDistributedSynchronizationOptionsBuilder? options; + if (optionsBuilder != null) + { + options = new RedisDistributedSynchronizationOptionsBuilder(); + optionsBuilder(options); } - - internal static RedisDistributedLockOptions GetOptions(Action? optionsBuilder) + else { - RedisDistributedSynchronizationOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new RedisDistributedSynchronizationOptionsBuilder(); - optionsBuilder(options); - } - else - { - options = null; - } + options = null; + } - var expiry = options?._expiry ?? DefaultExpiry; + var expiry = options?._expiry ?? DefaultExpiry; - TimeoutValue minValidityTime; - if (options?._minValidityTime is { } specifiedMinValidityTime) - { - if (specifiedMinValidityTime.CompareTo(expiry) >= 0) - { - throw new ArgumentOutOfRangeException( - nameof(minValidityTime), - specifiedMinValidityTime.TimeSpan, - $"{nameof(minValidityTime)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" - ); - } - minValidityTime = specifiedMinValidityTime; - } - else + TimeoutValue minValidityTime; + if (options?._minValidityTime is { } specifiedMinValidityTime) + { + if (specifiedMinValidityTime.CompareTo(expiry) >= 0) { - minValidityTime = TimeSpan.FromMilliseconds(Math.Max(0.9 * expiry.InMilliseconds, 1)); + throw new ArgumentOutOfRangeException( + nameof(minValidityTime), + specifiedMinValidityTime.TimeSpan, + $"{nameof(minValidityTime)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" + ); } + minValidityTime = specifiedMinValidityTime; + } + else + { + minValidityTime = TimeSpan.FromMilliseconds(Math.Max(0.9 * expiry.InMilliseconds, 1)); + } - TimeoutValue extensionCadence; - if (options?._extensionCadence is { } specifiedExtensionCadence) - { - // Note: we do not allow for disabling auto-extension here because it leads to traps - // where people might abandon the handle and then have it be closed due to GC. - // See discussion here: https://github.com/madelson/DistributedLock/issues/130. - if (specifiedExtensionCadence.CompareTo(minValidityTime) >= 0) - { - throw new ArgumentOutOfRangeException( - nameof(extensionCadence), - specifiedExtensionCadence.TimeSpan, - $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" - ); - } - extensionCadence = specifiedExtensionCadence; - } - else + TimeoutValue extensionCadence; + if (options?._extensionCadence is { } specifiedExtensionCadence) + { + // Note: we do not allow for disabling auto-extension here because it leads to traps + // where people might abandon the handle and then have it be closed due to GC. + // See discussion here: https://github.com/madelson/DistributedLock/issues/130. + if (specifiedExtensionCadence.CompareTo(minValidityTime) >= 0) { - extensionCadence = TimeSpan.FromMilliseconds(minValidityTime.InMilliseconds / 3.0); + throw new ArgumentOutOfRangeException( + nameof(extensionCadence), + specifiedExtensionCadence.TimeSpan, + $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan})" + ); } - - return new RedisDistributedLockOptions( - redLockTimeouts: new RedLockTimeouts(expiry: expiry, minValidityTime: minValidityTime), - extensionCadence: extensionCadence, - minBusyWaitSleepTime: options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(10), - maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(0.8) - ); + extensionCadence = specifiedExtensionCadence; } - } - - internal readonly struct RedisDistributedLockOptions - { - public RedisDistributedLockOptions( - RedLockTimeouts redLockTimeouts, - TimeoutValue extensionCadence, - TimeoutValue minBusyWaitSleepTime, - TimeoutValue maxBusyWaitSleepTime) + else { - this.RedLockTimeouts = redLockTimeouts; - this.ExtensionCadence = extensionCadence; - this.MinBusyWaitSleepTime = minBusyWaitSleepTime; - this.MaxBusyWaitSleepTime = maxBusyWaitSleepTime; + extensionCadence = TimeSpan.FromMilliseconds(minValidityTime.InMilliseconds / 3.0); } - public RedLockTimeouts RedLockTimeouts { get; } - public TimeoutValue ExtensionCadence { get; } - public TimeoutValue MinBusyWaitSleepTime { get; } - public TimeoutValue MaxBusyWaitSleepTime { get; } + return new RedisDistributedLockOptions( + redLockTimeouts: new RedLockTimeouts(expiry: expiry, minValidityTime: minValidityTime), + extensionCadence: extensionCadence, + minBusyWaitSleepTime: options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(10), + maxBusyWaitSleepTime: options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(0.8) + ); } } + +internal readonly struct RedisDistributedLockOptions +{ + public RedisDistributedLockOptions( + RedLockTimeouts redLockTimeouts, + TimeoutValue extensionCadence, + TimeoutValue minBusyWaitSleepTime, + TimeoutValue maxBusyWaitSleepTime) + { + this.RedLockTimeouts = redLockTimeouts; + this.ExtensionCadence = extensionCadence; + this.MinBusyWaitSleepTime = minBusyWaitSleepTime; + this.MaxBusyWaitSleepTime = maxBusyWaitSleepTime; + } + + public RedLockTimeouts RedLockTimeouts { get; } + public TimeoutValue ExtensionCadence { get; } + public TimeoutValue MinBusyWaitSleepTime { get; } + public TimeoutValue MaxBusyWaitSleepTime { get; } +} diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs index e0b948d6..791464e5 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs @@ -5,62 +5,61 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Implements for , +/// for , +/// and for . +/// +public sealed class RedisDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider { + private readonly IReadOnlyList _databases; + private readonly Action? _options; + /// - /// Implements for , - /// for , - /// and for . + /// Constructs a that connects to the provided + /// and uses the provided . /// - public sealed class RedisDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider + public RedisDistributedSynchronizationProvider(IDatabase database, Action? options = null) + : this(new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) { - private readonly IReadOnlyList _databases; - private readonly Action? _options; - - /// - /// Constructs a that connects to the provided - /// and uses the provided . - /// - public RedisDistributedSynchronizationProvider(IDatabase database, Action? options = null) - : this(new[] { database ?? throw new ArgumentNullException(nameof(database)) }, options) - { - } + } - /// - /// Constructs a that connects to the provided - /// and uses the provided . - /// - /// Note that if multiple s are provided, will use only the first - /// . - /// - public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) - { - this._databases = RedisDistributedLock.ValidateDatabases(databases); - this._options = options; - } + /// + /// Constructs a that connects to the provided + /// and uses the provided . + /// + /// Note that if multiple s are provided, will use only the first + /// . + /// + public RedisDistributedSynchronizationProvider(IEnumerable databases, Action? options = null) + { + this._databases = RedisDistributedLock.ValidateDatabases(databases); + this._options = options; + } - /// - /// Creates a using the given . - /// - public RedisDistributedLock CreateLock(RedisKey key) => new RedisDistributedLock(key, this._databases, this._options); + /// + /// Creates a using the given . + /// + public RedisDistributedLock CreateLock(RedisKey key) => new RedisDistributedLock(key, this._databases, this._options); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - /// - /// Creates a using the given . - /// - public RedisDistributedReaderWriterLock CreateReaderWriterLock(string name) => - new RedisDistributedReaderWriterLock(name, this._databases, this._options); + /// + /// Creates a using the given . + /// + public RedisDistributedReaderWriterLock CreateReaderWriterLock(string name) => + new RedisDistributedReaderWriterLock(name, this._databases, this._options); - IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => - this.CreateReaderWriterLock(name); + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); - /// - /// Creates a using the provided and . - /// - public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases[0], this._options); + /// + /// Creates a using the provided and . + /// + public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases[0], this._options); - IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => - this.CreateSemaphore(name, maxCount); - } + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => + this.CreateSemaphore(name, maxCount); } diff --git a/DistributedLock.Redis/TimeoutTask.cs b/DistributedLock.Redis/TimeoutTask.cs index a4e9ba08..077bae50 100644 --- a/DistributedLock.Redis/TimeoutTask.cs +++ b/DistributedLock.Redis/TimeoutTask.cs @@ -6,36 +6,35 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Redis +namespace Medallion.Threading.Redis; + +/// +/// Acts as a which is cleaned up when +/// the gets disposed +/// +internal readonly struct TimeoutTask : IDisposable { - /// - /// Acts as a which is cleaned up when - /// the gets disposed - /// - internal readonly struct TimeoutTask : IDisposable - { - private readonly CancellationTokenSource _cleanupTokenSource; - private readonly CancellationTokenSource? _linkedTokenSource; + private readonly CancellationTokenSource _cleanupTokenSource; + private readonly CancellationTokenSource? _linkedTokenSource; - public TimeoutTask(TimeoutValue timeout, CancellationToken cancellationToken) - { - this._cleanupTokenSource = new CancellationTokenSource(); - this._linkedTokenSource = cancellationToken.CanBeCanceled - ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, this._cleanupTokenSource.Token) - : null; - this.Task = Task.Delay(timeout.TimeSpan, this._linkedTokenSource?.Token ?? this._cleanupTokenSource.Token); - } + public TimeoutTask(TimeoutValue timeout, CancellationToken cancellationToken) + { + this._cleanupTokenSource = new CancellationTokenSource(); + this._linkedTokenSource = cancellationToken.CanBeCanceled + ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, this._cleanupTokenSource.Token) + : null; + this.Task = Task.Delay(timeout.TimeSpan, this._linkedTokenSource?.Token ?? this._cleanupTokenSource.Token); + } - public Task Task { get; } + public Task Task { get; } - public void Dispose() + public void Dispose() + { + try { this._cleanupTokenSource.Cancel(); } + finally { - try { this._cleanupTokenSource.Cancel(); } - finally - { - this._linkedTokenSource?.Dispose(); - this._cleanupTokenSource.Dispose(); - } + this._linkedTokenSource?.Dispose(); + this._cleanupTokenSource.Dispose(); } } } diff --git a/DistributedLock.SqlServer/SqlApplicationLock.cs b/DistributedLock.SqlServer/SqlApplicationLock.cs index d72fe964..1357ba32 100644 --- a/DistributedLock.SqlServer/SqlApplicationLock.cs +++ b/DistributedLock.SqlServer/SqlApplicationLock.cs @@ -6,217 +6,216 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements using sp_getapplock +/// +internal sealed class SqlApplicationLock : IDbSynchronizationStrategy { - /// - /// Implements using sp_getapplock - /// - internal sealed class SqlApplicationLock : IDbSynchronizationStrategy - { - public const int TimeoutExitCode = -1, - AlreadyHeldExitCode = 103, - InvalidUpgradeExitCode = 104; + public const int TimeoutExitCode = -1, + AlreadyHeldExitCode = 103, + InvalidUpgradeExitCode = 104; - public static readonly SqlApplicationLock SharedLock = new SqlApplicationLock(Mode.Shared), - UpdateLock = new SqlApplicationLock(Mode.Update), - ExclusiveLock = new SqlApplicationLock(Mode.Exclusive), - UpgradeLock = new SqlApplicationLock(Mode.Exclusive, isUpgrade: true); + public static readonly SqlApplicationLock SharedLock = new SqlApplicationLock(Mode.Shared), + UpdateLock = new SqlApplicationLock(Mode.Update), + ExclusiveLock = new SqlApplicationLock(Mode.Exclusive), + UpgradeLock = new SqlApplicationLock(Mode.Exclusive, isUpgrade: true); - private static readonly object Cookie = new object(); - private readonly Mode _mode; - private readonly bool _isUpgrade; + private static readonly object Cookie = new object(); + private readonly Mode _mode; + private readonly bool _isUpgrade; - private SqlApplicationLock(Mode mode, bool isUpgrade = false) - { - Invariant.Require(!isUpgrade || mode == Mode.Exclusive); + private SqlApplicationLock(Mode mode, bool isUpgrade = false) + { + Invariant.Require(!isUpgrade || mode == Mode.Exclusive); - this._mode = mode; - this._isUpgrade = isUpgrade; - } + this._mode = mode; + this._isUpgrade = isUpgrade; + } - bool IDbSynchronizationStrategy.IsUpgradeable => this._mode == Mode.Update; + bool IDbSynchronizationStrategy.IsUpgradeable => this._mode == Mode.Update; - async ValueTask IDbSynchronizationStrategy.TryAcquireAsync( - DatabaseConnection connection, - string resourceName, - TimeoutValue timeout, - CancellationToken cancellationToken) + async ValueTask IDbSynchronizationStrategy.TryAcquireAsync( + DatabaseConnection connection, + string resourceName, + TimeoutValue timeout, + CancellationToken cancellationToken) + { + try { - try - { - return await this.ExecuteAcquireCommandAsync(connection, resourceName, timeout, cancellationToken).ConfigureAwait(false) ? Cookie : null; - } - catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) - { - // If the command is canceled, I believe there's a slim chance that acquisition just completed before the cancellation went through. - // In that case, I'm pretty sure it won't be rolled back. Therefore, to be safe we issue a try-release - await ExecuteReleaseCommandAsync(connection, resourceName, isTry: true).ConfigureAwait(false); - throw; - } + return await this.ExecuteAcquireCommandAsync(connection, resourceName, timeout, cancellationToken).ConfigureAwait(false) ? Cookie : null; } - - ValueTask IDbSynchronizationStrategy.ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) => - ExecuteReleaseCommandAsync(connection, resourceName, isTry: false); - - private async Task ExecuteAcquireCommandAsync(DatabaseConnection connection, string lockName, TimeoutValue timeout, CancellationToken cancellationToken) + catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) { - using var command = this.CreateAcquireCommand(connection, lockName, timeout, out var returnValue); - await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); - return await ParseExitCodeAsync((int)returnValue.Value, timeout, cancellationToken).ConfigureAwait(false); + // If the command is canceled, I believe there's a slim chance that acquisition just completed before the cancellation went through. + // In that case, I'm pretty sure it won't be rolled back. Therefore, to be safe we issue a try-release + await ExecuteReleaseCommandAsync(connection, resourceName, isTry: true).ConfigureAwait(false); + throw; } + } - private static async ValueTask ExecuteReleaseCommandAsync(DatabaseConnection connection, string lockName, bool isTry) - { - using var command = CreateReleaseCommand(connection, lockName, isTry, out var returnValue); - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - await ParseExitCodeAsync((int)returnValue.Value, TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); - } + ValueTask IDbSynchronizationStrategy.ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) => + ExecuteReleaseCommandAsync(connection, resourceName, isTry: false); + + private async Task ExecuteAcquireCommandAsync(DatabaseConnection connection, string lockName, TimeoutValue timeout, CancellationToken cancellationToken) + { + using var command = this.CreateAcquireCommand(connection, lockName, timeout, out var returnValue); + await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); + return await ParseExitCodeAsync((int)returnValue.Value, timeout, cancellationToken).ConfigureAwait(false); + } - private DatabaseCommand CreateAcquireCommand( - DatabaseConnection connection, - string lockName, - TimeoutValue timeout, - out IDbDataParameter returnValue) + private static async ValueTask ExecuteReleaseCommandAsync(DatabaseConnection connection, string lockName, bool isTry) + { + using var command = CreateReleaseCommand(connection, lockName, isTry, out var returnValue); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + await ParseExitCodeAsync((int)returnValue.Value, TimeSpan.Zero, CancellationToken.None).ConfigureAwait(false); + } + + private DatabaseCommand CreateAcquireCommand( + DatabaseConnection connection, + string lockName, + TimeoutValue timeout, + out IDbDataParameter returnValue) + { + var command = connection.CreateCommand(); + + if (connection.IsExernallyOwned || this._isUpgrade) { - var command = connection.CreateCommand(); + returnValue = command.AddParameter("Result", type: DbType.Int32, direction: ParameterDirection.Output); - if (connection.IsExernallyOwned || this._isUpgrade) + const string CurrentOwnerMode = "APPLOCK_MODE('public', @Resource, @LockOwner)", + GetAppLock = "EXEC @Result = dbo.sp_getapplock @Resource=@Resource, @LockMode=@LockMode, @LockOwner=@LockOwner, @LockTimeout=@LockTimeout, @DbPrincipal='public'"; + var alternateOwnerHasLockCheck = connection.IsExernallyOwned && connection.HasTransaction + ? " OR APPLOCK_MODE('public', @Resource, 'Session') != 'NoLock'" + : string.Empty; + + if (this._isUpgrade) { - returnValue = command.AddParameter("Result", type: DbType.Int32, direction: ParameterDirection.Output); - - const string CurrentOwnerMode = "APPLOCK_MODE('public', @Resource, @LockOwner)", - GetAppLock = "EXEC @Result = dbo.sp_getapplock @Resource=@Resource, @LockMode=@LockMode, @LockOwner=@LockOwner, @LockTimeout=@LockTimeout, @DbPrincipal='public'"; - var alternateOwnerHasLockCheck = connection.IsExernallyOwned && connection.HasTransaction - ? " OR APPLOCK_MODE('public', @Resource, 'Session') != 'NoLock'" - : string.Empty; - - if (this._isUpgrade) - { - command.SetCommandText( - $@"DECLARE @Mode NVARCHAR(32) = {CurrentOwnerMode} + command.SetCommandText( + $@"DECLARE @Mode NVARCHAR(32) = {CurrentOwnerMode} IF @Mode = 'NoLock' SET @Result = {InvalidUpgradeExitCode} ELSE IF @Mode != '{GetModeString(Mode.Update)}'{alternateOwnerHasLockCheck} SET @Result = {AlreadyHeldExitCode} ELSE {GetAppLock}" - ); - } - else - { - command.SetCommandText( - $@"IF {CurrentOwnerMode} != 'NoLock'{alternateOwnerHasLockCheck} - SET @Result = {AlreadyHeldExitCode} - ELSE - {GetAppLock}" - ); - } + ); } else { - returnValue = command.AddParameter(type: DbType.Int32, direction: ParameterDirection.ReturnValue); - command.SetCommandText("dbo.sp_getapplock"); - command.SetCommandType(CommandType.StoredProcedure); + command.SetCommandText( + $@"IF {CurrentOwnerMode} != 'NoLock'{alternateOwnerHasLockCheck} + SET @Result = {AlreadyHeldExitCode} + ELSE + {GetAppLock}" + ); } - command.SetTimeout(timeout); - - command.AddParameter("Resource", lockName); - command.AddParameter("LockMode", GetModeString(this._mode)); - command.AddParameter("LockOwner", connection.HasTransaction ? "Transaction" : "Session"); - command.AddParameter("LockTimeout", timeout.InMilliseconds); - - return command; } + else + { + returnValue = command.AddParameter(type: DbType.Int32, direction: ParameterDirection.ReturnValue); + command.SetCommandText("dbo.sp_getapplock"); + command.SetCommandType(CommandType.StoredProcedure); + } + command.SetTimeout(timeout); + + command.AddParameter("Resource", lockName); + command.AddParameter("LockMode", GetModeString(this._mode)); + command.AddParameter("LockOwner", connection.HasTransaction ? "Transaction" : "Session"); + command.AddParameter("LockTimeout", timeout.InMilliseconds); + + return command; + } - private static DatabaseCommand CreateReleaseCommand(DatabaseConnection connection, string lockName, bool isTry, out IDbDataParameter returnValue) + private static DatabaseCommand CreateReleaseCommand(DatabaseConnection connection, string lockName, bool isTry, out IDbDataParameter returnValue) + { + var command = connection.CreateCommand(); + if (isTry) { - var command = connection.CreateCommand(); - if (isTry) - { - command.SetCommandText( - @"IF APPLOCK_MODE('public', @Resource, @LockOwner) != 'NoLock' + command.SetCommandText( + @"IF APPLOCK_MODE('public', @Resource, @LockOwner) != 'NoLock' EXEC @Result = dbo.sp_releaseapplock @Resource, @LockOwner ELSE SET @Result = 0" - ); - } - else - { - command.SetCommandText("dbo.sp_releaseapplock"); - command.SetCommandType(CommandType.StoredProcedure); - } - - command.AddParameter("Resource", lockName); - command.AddParameter("LockOwner", connection.HasTransaction ? "Transaction" : "Session"); - - if (isTry) - { - returnValue = command.AddParameter("Result", type: DbType.Int32, direction: ParameterDirection.Output); - } - else - { - returnValue = command.AddParameter(type: DbType.Int32, direction: ParameterDirection.ReturnValue); - } - - return command; + ); } - - public static async ValueTask ParseExitCodeAsync(int exitCode, TimeoutValue timeout, CancellationToken cancellationToken) + else { - // sp_getapplock exit codes documented at - // https://msdn.microsoft.com/en-us/library/ms189823.aspx + command.SetCommandText("dbo.sp_releaseapplock"); + command.SetCommandType(CommandType.StoredProcedure); + } - switch (exitCode) - { - case 0: - case 1: - return true; - - case TimeoutExitCode: - return false; - - case -2: // canceled - throw new OperationCanceledException(GetErrorMessage(exitCode, "canceled")); - case -3: // deadlock - throw new DeadlockException(GetErrorMessage(exitCode, "deadlock")); - case -999: // parameter / unknown - throw new ArgumentException(GetErrorMessage(exitCode, "parameter validation or other error")); - - case InvalidUpgradeExitCode: - // should never happen unless something goes wrong (e. g. user manually releases the lock on an externally-owned connection) - throw new InvalidOperationException("Cannot upgrade to an exclusive lock because the update lock is not held"); - case AlreadyHeldExitCode: - return timeout.IsZero ? false - : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") - : await WaitThenReturnFalseAsync().ConfigureAwait(false); - - default: - if (exitCode <= 0) { throw new InvalidOperationException(GetErrorMessage(exitCode, "unknown")); } - return true; // unknown success code - } + command.AddParameter("Resource", lockName); + command.AddParameter("LockOwner", connection.HasTransaction ? "Transaction" : "Session"); - async ValueTask WaitThenReturnFalseAsync() - { - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return false; - } + if (isTry) + { + returnValue = command.AddParameter("Result", type: DbType.Int32, direction: ParameterDirection.Output); } + else + { + returnValue = command.AddParameter(type: DbType.Int32, direction: ParameterDirection.ReturnValue); + } + + return command; + } - private static string GetErrorMessage(int exitCode, string type) => $"The request for the distributed lock failed with exit code {exitCode} ({type})"; + public static async ValueTask ParseExitCodeAsync(int exitCode, TimeoutValue timeout, CancellationToken cancellationToken) + { + // sp_getapplock exit codes documented at + // https://msdn.microsoft.com/en-us/library/ms189823.aspx - private static string GetModeString(Mode mode) => mode switch + switch (exitCode) { - Mode.Shared => "Shared", - Mode.Update => "Update", - Mode.Exclusive => "Exclusive", - _ => throw new ArgumentException(nameof(mode)), - }; + case 0: + case 1: + return true; + + case TimeoutExitCode: + return false; + + case -2: // canceled + throw new OperationCanceledException(GetErrorMessage(exitCode, "canceled")); + case -3: // deadlock + throw new DeadlockException(GetErrorMessage(exitCode, "deadlock")); + case -999: // parameter / unknown + throw new ArgumentException(GetErrorMessage(exitCode, "parameter validation or other error")); + + case InvalidUpgradeExitCode: + // should never happen unless something goes wrong (e. g. user manually releases the lock on an externally-owned connection) + throw new InvalidOperationException("Cannot upgrade to an exclusive lock because the update lock is not held"); + case AlreadyHeldExitCode: + return timeout.IsZero ? false + : timeout.IsInfinite ? throw new DeadlockException("Attempted to acquire a lock that is already held on the same connection") + : await WaitThenReturnFalseAsync().ConfigureAwait(false); + + default: + if (exitCode <= 0) { throw new InvalidOperationException(GetErrorMessage(exitCode, "unknown")); } + return true; // unknown success code + } - private enum Mode + async ValueTask WaitThenReturnFalseAsync() { - Shared, - Update, - Exclusive, + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return false; } } + + private static string GetErrorMessage(int exitCode, string type) => $"The request for the distributed lock failed with exit code {exitCode} ({type})"; + + private static string GetModeString(Mode mode) => mode switch + { + Mode.Shared => "Shared", + Mode.Update => "Update", + Mode.Exclusive => "Exclusive", + _ => throw new ArgumentException(nameof(mode)), + }; + + private enum Mode + { + Shared, + Update, + Exclusive, + } } diff --git a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs index b94213e5..20acc839 100644 --- a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs +++ b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs @@ -5,96 +5,95 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Specifies options for connecting to and locking against a SQL database +/// +public sealed class SqlConnectionOptionsBuilder { + private TimeoutValue? _keepaliveCadence; + private bool? _useTransaction, _useMultiplexing; + + internal SqlConnectionOptionsBuilder() { } + /// - /// Specifies options for connecting to and locking against a SQL database + /// Using SQL Azure as a distributed synchronization provider can be challenging due to Azure's aggressive connection governor + /// which proactively kills idle connections. + /// + /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. + /// Note that this still does not guarantee protection for the connection from all conditions where the governor might kill it. + /// + /// To disable keepalive, set to . + /// + /// Defaults to 10 minutes based on Azure's 30 minute default behavior. + /// + /// For more information, see the dicussion on https://github.com/madelson/DistributedLock/issues/5 /// - public sealed class SqlConnectionOptionsBuilder + public SqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) { - private TimeoutValue? _keepaliveCadence; - private bool? _useTransaction, _useMultiplexing; + this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); + return this; + } - internal SqlConnectionOptionsBuilder() { } + /// + /// Whether the synchronization should use a transaction scope rather than a session scope. Defaults to false. + /// + /// Synchronizing based on a transaction is marginally less expensive than using a connection + /// because releasing requires only disposing the underlying . + /// The disadvantage is that using this strategy may lead to long-running transactions, which can be + /// problematic for databases using the full recovery model. + /// + public SqlConnectionOptionsBuilder UseTransaction(bool useTransaction = true) + { + this._useTransaction = useTransaction; + return this; + } - /// - /// Using SQL Azure as a distributed synchronization provider can be challenging due to Azure's aggressive connection governor - /// which proactively kills idle connections. - /// - /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. - /// Note that this still does not guarantee protection for the connection from all conditions where the governor might kill it. - /// - /// To disable keepalive, set to . - /// - /// Defaults to 10 minutes based on Azure's 30 minute default behavior. - /// - /// For more information, see the dicussion on https://github.com/madelson/DistributedLock/issues/5 - /// - public SqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) - { - this._keepaliveCadence = new TimeoutValue(keepaliveCadence, nameof(keepaliveCadence)); - return this; - } + /// + /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. + /// + /// Multiplexing is on by default. + /// + /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an + /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// connection will be allocated. + /// + /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also + /// particularly applicable to cases where + /// semantics are used with a zero-length timeout. + /// + public SqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + { + this._useMultiplexing = useMultiplexing; + return this; + } - /// - /// Whether the synchronization should use a transaction scope rather than a session scope. Defaults to false. - /// - /// Synchronizing based on a transaction is marginally less expensive than using a connection - /// because releasing requires only disposing the underlying . - /// The disadvantage is that using this strategy may lead to long-running transactions, which can be - /// problematic for databases using the full recovery model. - /// - public SqlConnectionOptionsBuilder UseTransaction(bool useTransaction = true) + internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions(Action? optionsBuilder) + { + SqlConnectionOptionsBuilder? options; + if (optionsBuilder != null) { - this._useTransaction = useTransaction; - return this; + options = new SqlConnectionOptionsBuilder(); + optionsBuilder(options); } - - /// - /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) - /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is - /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. - /// - /// Multiplexing is on by default. - /// - /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an - /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing - /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) - /// connection will be allocated. - /// - /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also - /// particularly applicable to cases where - /// semantics are used with a zero-length timeout. - /// - public SqlConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = true) + else { - this._useMultiplexing = useMultiplexing; - return this; + options = null; } - internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions(Action? optionsBuilder) - { - SqlConnectionOptionsBuilder? options; - if (optionsBuilder != null) - { - options = new SqlConnectionOptionsBuilder(); - optionsBuilder(options); - } - else - { - options = null; - } - - var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromMinutes(10); - var useTransaction = options?._useTransaction ?? false; - var useMultiplexing = options?._useMultiplexing ?? true; - - if (useMultiplexing && useTransaction) - { - throw new ArgumentException(nameof(UseTransaction) + ": is not compatible with " + nameof(UseMultiplexing)); - } + var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromMinutes(10); + var useTransaction = options?._useTransaction ?? false; + var useMultiplexing = options?._useMultiplexing ?? true; - return (keepaliveCadence, useTransaction, useMultiplexing); + if (useMultiplexing && useTransaction) + { + throw new ArgumentException(nameof(UseTransaction) + ": is not compatible with " + nameof(UseMultiplexing)); } + + return (keepaliveCadence, useTransaction, useMultiplexing); } } diff --git a/DistributedLock.SqlServer/SqlDatabaseConnection.cs b/DistributedLock.SqlServer/SqlDatabaseConnection.cs index 1bcad50c..55218f42 100644 --- a/DistributedLock.SqlServer/SqlDatabaseConnection.cs +++ b/DistributedLock.SqlServer/SqlDatabaseConnection.cs @@ -9,65 +9,64 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +internal sealed class SqlDatabaseConnection : DatabaseConnection { - internal sealed class SqlDatabaseConnection : DatabaseConnection + public SqlDatabaseConnection(IDbConnection connection, bool isExternallyOwned = true) + : base(connection, isExternallyOwned: isExternallyOwned) { - public SqlDatabaseConnection(IDbConnection connection, bool isExternallyOwned = true) - : base(connection, isExternallyOwned: isExternallyOwned) - { - } + } - public SqlDatabaseConnection(IDbTransaction transaction) - : base(transaction, isExternallyOwned: true) - { - } + public SqlDatabaseConnection(IDbTransaction transaction) + : base(transaction, isExternallyOwned: true) + { + } - public SqlDatabaseConnection(string connectionString) - : this(new SqlConnection(connectionString), isExternallyOwned: false) - { - } + public SqlDatabaseConnection(string connectionString) + : this(new SqlConnection(connectionString), isExternallyOwned: false) + { + } - // SQLServer gets no benefit from this - public override bool ShouldPrepareCommands => false; + // SQLServer gets no benefit from this + public override bool ShouldPrepareCommands => false; - public override bool IsCommandCancellationException(Exception exception) - { - const int CanceledNumber = 0; + public override bool IsCommandCancellationException(Exception exception) + { + const int CanceledNumber = 0; - // fast path using default SqlClient - if (exception is SqlException sqlException && sqlException.Number == CanceledNumber) - { - return true; - } + // fast path using default SqlClient + if (exception is SqlException sqlException && sqlException.Number == CanceledNumber) + { + return true; + } - var exceptionType = exception.GetType(); - // since SqlException is sealed (as of 2020-01-26) - if (exceptionType.ToString() == "System.Data.SqlClient.SqlException") + var exceptionType = exception.GetType(); + // since SqlException is sealed (as of 2020-01-26) + if (exceptionType.ToString() == "System.Data.SqlClient.SqlException") + { + var numberProperty = exceptionType + .GetProperty(nameof(SqlException.Number), BindingFlags.Public | BindingFlags.Instance); + Invariant.Require(numberProperty != null); + if (numberProperty != null) { - var numberProperty = exceptionType - .GetProperty(nameof(SqlException.Number), BindingFlags.Public | BindingFlags.Instance); - Invariant.Require(numberProperty != null); - if (numberProperty != null) - { - return Equals(numberProperty.GetValue(exception), CanceledNumber); - } + return Equals(numberProperty.GetValue(exception), CanceledNumber); } - - // this shows up when you call DbCommand.Cancel() - return exception is InvalidOperationException; } - public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) - { - Invariant.Require(sleepTime >= TimeSpan.Zero && sleepTime < TimeSpan.FromDays(1)); + // this shows up when you call DbCommand.Cancel() + return exception is InvalidOperationException; + } - using var command = this.CreateCommand(); - command.SetCommandText(@"WAITFOR DELAY @delay"); - command.AddParameter("delay", sleepTime.ToString(@"hh\:mm\:ss\.fff"), DbType.AnsiStringFixedLength); - command.SetTimeout(sleepTime); + public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) + { + Invariant.Require(sleepTime >= TimeSpan.Zero && sleepTime < TimeSpan.FromDays(1)); - await executor(command, cancellationToken).ConfigureAwait(false); - } + using var command = this.CreateCommand(); + command.SetCommandText(@"WAITFOR DELAY @delay"); + command.AddParameter("delay", sleepTime.ToString(@"hh\:mm\:ss\.fff"), DbType.AnsiStringFixedLength); + command.SetTimeout(sleepTime); + + await executor(command, cancellationToken).ConfigureAwait(false); } } diff --git a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs index 93fd4d14..64ea0bb7 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +public partial class SqlDistributedLock { - public partial class SqlDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public SqlDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public SqlDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public SqlDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public SqlDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index 6c623621..a5343a40 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -5,110 +5,108 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements a distributed lock using a SQL server application lock +/// (see https://msdn.microsoft.com/en-us/library/ms189823.aspx) +/// +public sealed partial class SqlDistributedLock : IInternalDistributedLock { + private readonly IDbDistributedLock _internalLock; + /// - /// Implements a distributed lock using a SQL server application lock - /// (see https://msdn.microsoft.com/en-us/library/ms189823.aspx) + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class SqlDistributedLock : IInternalDistributedLock + public SqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) { - private readonly IDbDistributedLock _internalLock; - - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedLock(string name, string connectionString, Action? options = null, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connectionString, options)) - { - } + } - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be opened or closed. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedLock(string name, IDbConnection connection, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, connection)) - { - } + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be opened or closed. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public SqlDistributedLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, connection)) + { + } + + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be committed or rolled back. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public SqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) + : this(name, exactName, n => CreateInternalLock(n, transaction)) + { + } - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be committed or rolled back. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedLock(string name, IDbTransaction transaction, bool exactName = false) - : this(name, exactName, n => CreateInternalLock(n, transaction)) + private SqlDistributedLock(string name, bool exactName, Func internalLockFactory) + { + if (exactName) { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + this.Name = name; } - - private SqlDistributedLock(string name, bool exactName, Func internalLockFactory) + else { - if (exactName) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - this.Name = name; - } - else - { - this.Name = GetSafeName(name); - } - - this._internalLock = internalLockFactory(this.Name); + this.Name = GetSafeName(name); } - /// - /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx - /// - internal static int MaxNameLength => 255; + this._internalLock = internalLockFactory(this.Name); + } - /// - /// Implements - /// - public string Name { get; } + /// + /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx + /// + internal static int MaxNameLength => 255; - internal static string GetSafeName(string name) => - DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); + /// + /// Implements + /// + public string Name { get; } - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => - this._internalLock.TryAcquireAsync(timeout, SqlApplicationLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new SqlDistributedLockHandle(h)); + internal static string GetSafeName(string name) => + DistributedLockHelpers.ToSafeName(name, MaxNameLength, s => s); - internal static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? optionsBuilder) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + this._internalLock.TryAcquireAsync(timeout, SqlApplicationLock.ExclusiveLock, cancellationToken, contextHandle: null).Wrap(h => new SqlDistributedLockHandle(h)); - var (keepaliveCadence, useTransaction, useMultiplexing) = SqlConnectionOptionsBuilder.GetOptions(optionsBuilder); + internal static IDbDistributedLock CreateInternalLock(string name, string connectionString, Action? optionsBuilder) + { + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - if (useMultiplexing) - { - return new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, SqlMultiplexedConnectionLockPool.Instance, keepaliveCadence); - } + var (keepaliveCadence, useTransaction, useMultiplexing) = SqlConnectionOptionsBuilder.GetOptions(optionsBuilder); - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(connectionString), useTransaction: useTransaction, keepaliveCadence); - } + return useMultiplexing + ? new OptimisticConnectionMultiplexingDbDistributedLock(name, connectionString, SqlMultiplexedConnectionLockPool.Instance, keepaliveCadence) + : new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(connectionString), useTransaction: useTransaction, keepaliveCadence); + } - internal static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(connection)); - } + internal static IDbDistributedLock CreateInternalLock(string name, IDbConnection connection) + { + return connection == null + ? throw new ArgumentNullException(nameof(connection)) + : new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(connection)); + } - internal static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - return new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(transaction)); - } + internal static IDbDistributedLock CreateInternalLock(string name, IDbTransaction transaction) + { + return transaction == null + ? throw new ArgumentNullException(nameof(transaction)) + : new DedicatedConnectionOrTransactionDbDistributedLock(name, () => new SqlDatabaseConnection(transaction)); } } diff --git a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs index a0f4e379..82735fcf 100644 --- a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs @@ -2,33 +2,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements +/// +public sealed class SqlDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class SqlDistributedLockHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal SqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal SqlDistributedLockHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the lock + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs index a288250f..900f0c4e 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -3,36 +3,36 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +public partial class SqlDistributedReaderWriterLock { - public partial class SqlDistributedReaderWriterLock - { - // AUTO-GENERATED - - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); - IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireUpgradeableReadLock(timeout, cancellationToken); - ValueTask IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + // AUTO-GENERATED + + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedLockUpgradeableHandle? IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLock(timeout, cancellationToken); + IDistributedLockUpgradeableHandle IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLock(timeout, cancellationToken); + ValueTask IDistributedUpgradeableReaderWriterLock.TryAcquireUpgradeableReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedUpgradeableReaderWriterLock.AcquireUpgradeableReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); /// /// Attempts to acquire a READ lock synchronously. Multiple readers are allowed. Not compatible with a WRITE lock. Usage: @@ -226,5 +226,4 @@ public SqlDistributedReaderWriterLockHandle AcquireWriteLock(TimeSpan? timeout = public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); - } } \ No newline at end of file diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs index 3998b851..08fccbba 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs @@ -5,106 +5,105 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements reader-writer lock semantics using a SQL server application lock +/// (see https://msdn.microsoft.com/en-us/library/ms189823.aspx). +/// +/// This class supports the following patterns: +/// * Multiple readers AND single writer (using and ) +/// * Multiple readers OR single writer (using and ) +/// * Upgradeable read locks similar to (using and ) +/// +public sealed partial class SqlDistributedReaderWriterLock : IInternalDistributedUpgradeableReaderWriterLock { + private readonly IDbDistributedLock _internalLock; + + #region ---- Constructors ---- /// - /// Implements reader-writer lock semantics using a SQL server application lock - /// (see https://msdn.microsoft.com/en-us/library/ms189823.aspx). + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database. /// - /// This class supports the following patterns: - /// * Multiple readers AND single writer (using and ) - /// * Multiple readers OR single writer (using and ) - /// * Upgradeable read locks similar to (using and ) + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class SqlDistributedReaderWriterLock : IInternalDistributedUpgradeableReaderWriterLock + public SqlDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) + : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connectionString, options)) { - private readonly IDbDistributedLock _internalLock; + } - #region ---- Constructors ---- - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedReaderWriterLock(string name, string connectionString, Action? options = null, bool exactName = false) - : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connectionString, options)) - { - } + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be opened or closed. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public SqlDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) + : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connection)) + { + } - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be opened or closed. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedReaderWriterLock(string name, IDbConnection connection, bool exactName = false) - : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, connection)) - { - } + /// + /// Constructs a new lock using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be committed or rolled back. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. + /// + public SqlDistributedReaderWriterLock(string name, IDbTransaction transaction, bool exactName = false) + : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, transaction)) + { + } - /// - /// Constructs a new lock using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be committed or rolled back. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public SqlDistributedReaderWriterLock(string name, IDbTransaction transaction, bool exactName = false) - : this(name, exactName, n => SqlDistributedLock.CreateInternalLock(n, transaction)) + private SqlDistributedReaderWriterLock(string name, bool exactName, Func internalLockFactory) + { + if (exactName) { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + this.Name = name; } - - private SqlDistributedReaderWriterLock(string name, bool exactName, Func internalLockFactory) + else { - if (exactName) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - this.Name = name; - } - else - { - this.Name = GetSafeName(name); - } - - this._internalLock = internalLockFactory(this.Name); + this.Name = GetSafeName(name); } - #endregion - /// - /// Implements - /// - public string Name { get; } + this._internalLock = internalLockFactory(this.Name); + } + #endregion + + /// + /// Implements + /// + public string Name { get; } - /// - /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx - /// - internal static int MaxNameLength => SqlDistributedLock.MaxNameLength; + /// + /// The maximum allowed length for lock names. See https://msdn.microsoft.com/en-us/library/ms189823.aspx + /// + internal static int MaxNameLength => SqlDistributedLock.MaxNameLength; - internal static string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); + internal static string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); - async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( - TimeoutValue timeout, - CancellationToken cancellationToken) - { - var innerHandle = await this._internalLock - .TryAcquireAsync(timeout, SqlApplicationLock.UpdateLock, cancellationToken, contextHandle: null).ConfigureAwait(false); - return innerHandle != null ? new SqlDistributedReaderWriterLockUpgradeableHandle(innerHandle, this._internalLock) : null; - } + async ValueTask IInternalDistributedUpgradeableReaderWriterLock.InternalTryAcquireUpgradeableReadLockAsync( + TimeoutValue timeout, + CancellationToken cancellationToken) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, SqlApplicationLock.UpdateLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new SqlDistributedReaderWriterLockUpgradeableHandle(innerHandle, this._internalLock) : null; + } - async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( - TimeoutValue timeout, - CancellationToken cancellationToken, - bool isWrite) - { - var innerHandle = await this._internalLock - .TryAcquireAsync(timeout, isWrite ? SqlApplicationLock.ExclusiveLock : SqlApplicationLock.SharedLock, cancellationToken, contextHandle: null).ConfigureAwait(false); - return innerHandle != null ? new SqlDistributedReaderWriterLockNonUpgradeableHandle(innerHandle) : null; - } + async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken, + bool isWrite) + { + var innerHandle = await this._internalLock + .TryAcquireAsync(timeout, isWrite ? SqlApplicationLock.ExclusiveLock : SqlApplicationLock.SharedLock, cancellationToken, contextHandle: null).ConfigureAwait(false); + return innerHandle != null ? new SqlDistributedReaderWriterLockNonUpgradeableHandle(innerHandle) : null; } } diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index 220d1a38..d8bd19cb 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -4,124 +4,123 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements +/// +public abstract class SqlDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { + // forbid external inheritors + internal SqlDistributedReaderWriterLockHandle() { } + + /// + /// Implements + /// + public abstract CancellationToken HandleLostToken { get; } + /// - /// Implements + /// Releases the lock /// - public abstract class SqlDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle + public void Dispose() => this.DisposeSyncViaAsync(); + + /// + /// Releases the lock asynchronously + /// + public abstract ValueTask DisposeAsync(); +} + +internal sealed class SqlDistributedReaderWriterLockNonUpgradeableHandle : SqlDistributedReaderWriterLockHandle +{ + private IDistributedSynchronizationHandle? _innerHandle; + + internal SqlDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) { - // forbid external inheritors - internal SqlDistributedReaderWriterLockHandle() { } - - /// - /// Implements - /// - public abstract CancellationToken HandleLostToken { get; } - - /// - /// Releases the lock - /// - public void Dispose() => this.DisposeSyncViaAsync(); - - /// - /// Releases the lock asynchronously - /// - public abstract ValueTask DisposeAsync(); + this._innerHandle = handle; } - internal sealed class SqlDistributedReaderWriterLockNonUpgradeableHandle : SqlDistributedReaderWriterLockHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + public override CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - internal SqlDistributedReaderWriterLockNonUpgradeableHandle(IDistributedSynchronizationHandle? handle) - { - this._innerHandle = handle; - } + public override ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; +} - public override CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); +/// +/// Implements +/// +public sealed class SqlDistributedReaderWriterLockUpgradeableHandle : SqlDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle +{ + private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; - public override ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + internal SqlDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) + { + this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); } /// - /// Implements + /// Implements /// - public sealed class SqlDistributedReaderWriterLockUpgradeableHandle : SqlDistributedReaderWriterLockHandle, IInternalDistributedLockUpgradeableHandle - { - private RefBox<(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock, IDistributedSynchronizationHandle? upgradedHandle)>? _box; + public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; - internal SqlDistributedReaderWriterLockUpgradeableHandle(IDistributedSynchronizationHandle innerHandle, IDbDistributedLock @lock) + /// + /// Releases the lock asynchronously + /// + public override async ValueTask DisposeAsync() + { + if (RefBox.TryConsume(ref this._box, out var contents)) { - this._box = RefBox.Create((innerHandle, @lock, default(IDistributedSynchronizationHandle?))); + try { await (contents.upgradedHandle?.DisposeAsync() ?? default).ConfigureAwait(false); } + finally { await contents.innerHandle.DisposeAsync().ConfigureAwait(false); } } + } + + /// + /// Implements + /// + public bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryUpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As().InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken); + + /// + /// Implements + /// + public void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLock(this, timeout, cancellationToken); + + /// + /// Implements + /// + public ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.UpgradeToWriteLockAsync(this, timeout, cancellationToken); - /// - /// Implements - /// - public override CancellationToken HandleLostToken => (this._box ?? throw this.ObjectDisposed()).Value.innerHandle.HandleLostToken; + ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var box = this._box ?? throw this.ObjectDisposed(); + var contents = box.Value; + if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } + return TryPerformUpgradeAsync(); - /// - /// Releases the lock asynchronously - /// - public override async ValueTask DisposeAsync() + async ValueTask TryPerformUpgradeAsync() { - if (RefBox.TryConsume(ref this._box, out var contents)) + var upgradedHandle = + await contents.@lock.TryAcquireAsync(timeout, SqlApplicationLock.UpgradeLock, cancellationToken, contextHandle: contents.innerHandle).ConfigureAwait(false); + if (upgradedHandle == null) { - try { await (contents.upgradedHandle?.DisposeAsync() ?? default).ConfigureAwait(false); } - finally { await contents.innerHandle.DisposeAsync().ConfigureAwait(false); } + return false; } - } - /// - /// Implements - /// - public bool TryUpgradeToWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryUpgradeToWriteLock(this, timeout, cancellationToken); - - /// - /// Implements - /// - public ValueTask TryUpgradeToWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As().InternalTryUpgradeToWriteLockAsync(timeout, cancellationToken); - - /// - /// Implements - /// - public void UpgradeToWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.UpgradeToWriteLock(this, timeout, cancellationToken); - - /// - /// Implements - /// - public ValueTask UpgradeToWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.UpgradeToWriteLockAsync(this, timeout, cancellationToken); - - ValueTask IInternalDistributedLockUpgradeableHandle.InternalTryUpgradeToWriteLockAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var box = this._box ?? throw this.ObjectDisposed(); - var contents = box.Value; - if (contents.upgradedHandle != null) { throw new InvalidOperationException("the lock has already been upgraded"); } - return TryPerformUpgradeAsync(); - - async ValueTask TryPerformUpgradeAsync() + contents.upgradedHandle = upgradedHandle; + var newBox = RefBox.Create(contents); + if (Interlocked.CompareExchange(ref this._box, newBox, comparand: box) != box) { - var upgradedHandle = - await contents.@lock.TryAcquireAsync(timeout, SqlApplicationLock.UpgradeLock, cancellationToken, contextHandle: contents.innerHandle).ConfigureAwait(false); - if (upgradedHandle == null) - { - return false; - } - - contents.upgradedHandle = upgradedHandle; - var newBox = RefBox.Create(contents); - if (Interlocked.CompareExchange(ref this._box, newBox, comparand: box) != box) - { - await upgradedHandle.DisposeAsync().ConfigureAwait(false); - } - - return true; + await upgradedHandle.DisposeAsync().ConfigureAwait(false); } + + return true; } } } diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs index fef63440..ca33c619 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +public partial class SqlDistributedSemaphore { - public partial class SqlDistributedSemaphore - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire a semaphore ticket synchronously. Usage: - /// - /// using (var handle = mySemaphore.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public SqlDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public SqlDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: - /// - /// using (mySemaphore.Acquire(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public SqlDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public SqlDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs index 08df4e79..e9771bce 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs @@ -5,72 +5,71 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements a distributed semaphore using SQL Server constructs. +/// +public sealed partial class SqlDistributedSemaphore : IInternalDistributedSemaphore { + private readonly IDbDistributedLock _internalLock; + private readonly SqlSemaphore _strategy; + + #region ---- Constructors ---- /// - /// Implements a distributed semaphore using SQL Server constructs. + /// Creates a semaphore with name that can be acquired up to + /// times concurrently. The provided will be used to connect to the database. /// - public sealed partial class SqlDistributedSemaphore : IInternalDistributedSemaphore + public SqlDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) + : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, connectionString, options)) { - private readonly IDbDistributedLock _internalLock; - private readonly SqlSemaphore _strategy; - - #region ---- Constructors ---- - /// - /// Creates a semaphore with name that can be acquired up to - /// times concurrently. The provided will be used to connect to the database. - /// - public SqlDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) - : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, connectionString, options)) - { - } + } - /// - /// Creates a semaphore with name that can be acquired up to - /// times concurrently. When acquired, the semaphore will be scoped to the given . - /// The is assumed to be externally managed: the will - /// not attempt to open, close, or dispose it - /// - public SqlDistributedSemaphore(string name, int maxCount, IDbConnection connection) - : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, connection)) - { - } + /// + /// Creates a semaphore with name that can be acquired up to + /// times concurrently. When acquired, the semaphore will be scoped to the given . + /// The is assumed to be externally managed: the will + /// not attempt to open, close, or dispose it + /// + public SqlDistributedSemaphore(string name, int maxCount, IDbConnection connection) + : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, connection)) + { + } - /// - /// Creates a semaphore with name that can be acquired up to - /// times concurrently. When acquired, the semaphore will be scoped to the given . - /// The and its are assumed to be externally managed: - /// the will not attempt to open, close, commit, roll back, or dispose them - /// - public SqlDistributedSemaphore(string name, int maxCount, IDbTransaction transaction) - : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, transaction)) - { - } + /// + /// Creates a semaphore with name that can be acquired up to + /// times concurrently. When acquired, the semaphore will be scoped to the given . + /// The and its are assumed to be externally managed: + /// the will not attempt to open, close, commit, roll back, or dispose them + /// + public SqlDistributedSemaphore(string name, int maxCount, IDbTransaction transaction) + : this(name, maxCount, n => SqlDistributedLock.CreateInternalLock(n, transaction)) + { + } - private SqlDistributedSemaphore(string name, int maxCount, Func createInternalLockFromName) - { - if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + private SqlDistributedSemaphore(string name, int maxCount, Func createInternalLockFromName) + { + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } - this.Name = name ?? throw new ArgumentNullException(nameof(name)); - this._strategy = new SqlSemaphore(maxCount); - this._internalLock = createInternalLockFromName(SqlSemaphore.ToSafeName(name)); - } - #endregion + this.Name = name ?? throw new ArgumentNullException(nameof(name)); + this._strategy = new SqlSemaphore(maxCount); + this._internalLock = createInternalLockFromName(SqlSemaphore.ToSafeName(name)); + } + #endregion - /// - /// Implements - /// - public string Name { get; } + /// + /// Implements + /// + public string Name { get; } - /// - /// Implements - /// - public int MaxCount => this._strategy.MaxCount; + /// + /// Implements + /// + public int MaxCount => this._strategy.MaxCount; - async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var handle = await this._internalLock.TryAcquireAsync(timeout, this._strategy, cancellationToken, contextHandle: null).ConfigureAwait(false); - return handle != null ? new SqlDistributedSemaphoreHandle(handle) : null; - } + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var handle = await this._internalLock.TryAcquireAsync(timeout, this._strategy, cancellationToken, contextHandle: null).ConfigureAwait(false); + return handle != null ? new SqlDistributedSemaphoreHandle(handle) : null; } } diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs index 7def7857..9666d8f0 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs @@ -2,33 +2,32 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements +/// +public sealed class SqlDistributedSemaphoreHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class SqlDistributedSemaphoreHandle : IDistributedSynchronizationHandle - { - private IDistributedSynchronizationHandle? _innerHandle; + private IDistributedSynchronizationHandle? _innerHandle; - internal SqlDistributedSemaphoreHandle(IDistributedSynchronizationHandle innerHandle) - { - this._innerHandle = innerHandle; - } + internal SqlDistributedSemaphoreHandle(IDistributedSynchronizationHandle innerHandle) + { + this._innerHandle = innerHandle; + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); + /// + /// Implements + /// + public CancellationToken HandleLostToken => this._innerHandle?.HandleLostToken ?? throw this.ObjectDisposed(); - /// - /// Releases the semaphore - /// - public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); + /// + /// Releases the semaphore + /// + public void Dispose() => Interlocked.Exchange(ref this._innerHandle, null)?.Dispose(); - /// - /// Releases the semaphore asynchronously - /// - public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the semaphore asynchronously + /// + public ValueTask DisposeAsync() => Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } diff --git a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs index c21520b0..3b2f208e 100644 --- a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs +++ b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs @@ -5,80 +5,79 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +/// +/// Implements for , +/// for , +/// and for . +/// +public sealed class SqlDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider, IDistributedSemaphoreProvider { + private readonly Func _lockFactory; + private readonly Func _readerWriterLockFactory; + private readonly Func _semaphoreFactory; + /// - /// Implements for , - /// for , - /// and for . + /// Constructs a provider that connects with and . /// - public sealed class SqlDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedUpgradeableReaderWriterLockProvider, IDistributedSemaphoreProvider + public SqlDistributedSynchronizationProvider(string connectionString, Action? options = null) { - private readonly Func _lockFactory; - private readonly Func _readerWriterLockFactory; - private readonly Func _semaphoreFactory; - - /// - /// Constructs a provider that connects with and . - /// - public SqlDistributedSynchronizationProvider(string connectionString, Action? options = null) - { - if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } + if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connectionString, options, exactName); - this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connectionString, options, exactName); - this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connectionString, options); - } + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connectionString, options, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connectionString, options, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connectionString, options); + } - /// - /// Constructs a provider that connects with . - /// - public SqlDistributedSynchronizationProvider(IDbConnection connection) - { - if (connection == null) { throw new ArgumentNullException(nameof(connection)); } + /// + /// Constructs a provider that connects with . + /// + public SqlDistributedSynchronizationProvider(IDbConnection connection) + { + if (connection == null) { throw new ArgumentNullException(nameof(connection)); } - this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connection, exactName); - this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connection, exactName); - this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connection); - } + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, connection, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, connection, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, connection); + } - /// - /// Constructs a provider that connects with . - /// - public SqlDistributedSynchronizationProvider(IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + /// + /// Constructs a provider that connects with . + /// + public SqlDistributedSynchronizationProvider(IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - this._lockFactory = (name, exactName) => new SqlDistributedLock(name, transaction, exactName); - this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, transaction, exactName); - this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, transaction); - } + this._lockFactory = (name, exactName) => new SqlDistributedLock(name, transaction, exactName); + this._readerWriterLockFactory = (name, exactName) => new SqlDistributedReaderWriterLock(name, transaction, exactName); + this._semaphoreFactory = (name, maxCount) => new SqlDistributedSemaphore(name, maxCount, transaction); + } - /// - /// Constructs an instance of with the provided . Unless - /// is specified, invalid applock names will be escaped/hashed. - /// - public SqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); + /// + /// Constructs an instance of with the provided . Unless + /// is specified, invalid applock names will be escaped/hashed. + /// + public SqlDistributedLock CreateLock(string name, bool exactName = false) => this._lockFactory(name, exactName); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - /// - /// Constructs an instance of with the provided . Unless - /// is specified, invalid applock names will be escaped/hashed. - /// - public SqlDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); + /// + /// Constructs an instance of with the provided . Unless + /// is specified, invalid applock names will be escaped/hashed. + /// + public SqlDistributedReaderWriterLock CreateReaderWriterLock(string name, bool exactName = false) => this._readerWriterLockFactory(name, exactName); - IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => - this.CreateReaderWriterLock(name); + IDistributedUpgradeableReaderWriterLock IDistributedUpgradeableReaderWriterLockProvider.CreateUpgradeableReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); - IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => - this.CreateReaderWriterLock(name); + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => + this.CreateReaderWriterLock(name); - /// - /// Constructs an instance of with the provided and . - /// - public SqlDistributedSemaphore CreateSemaphore(string name, int maxCount) => this._semaphoreFactory(name, maxCount); + /// + /// Constructs an instance of with the provided and . + /// + public SqlDistributedSemaphore CreateSemaphore(string name, int maxCount) => this._semaphoreFactory(name, maxCount); - IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); - } + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); } diff --git a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs index ce5602bb..56ff8020 100644 --- a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs +++ b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs @@ -4,10 +4,9 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +internal static class SqlMultiplexedConnectionLockPool { - internal static class SqlMultiplexedConnectionLockPool - { - public static readonly MultiplexedConnectionLockPool Instance = new(s => new SqlDatabaseConnection(s)); - } + public static readonly MultiplexedConnectionLockPool Instance = new(s => new SqlDatabaseConnection(s)); } diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index 537a7424..1e2c7085 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -7,336 +7,336 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.SqlServer +namespace Medallion.Threading.SqlServer; + +internal sealed class SqlSemaphore : IDbSynchronizationStrategy { - internal sealed class SqlSemaphore : IDbSynchronizationStrategy + public SqlSemaphore(int maxCount) + { + this.MaxCount = maxCount; + } + + public int MaxCount { get; } + + #region ---- Execution ---- + public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) { - public SqlSemaphore(int maxCount) + cancellationToken.ThrowIfCancellationRequested(); + string? markerTableName; + + // when we aren't supporting cancellation, we can use a simplified one-step algorithm. We treat a timeout of + // zero in the same way: since there is no blocking, we don't need to bother with explicit cancellation support + if (!cancellationToken.CanBeCanceled || timeout.IsZero) { - this.MaxCount = maxCount; + using var command = CreateTextCommand(connection, operationTimeout: timeout); + command.SetCommandText(AcquireNonCancelableQuery.Value); + this.AddCommonParameters(command, resourceName, timeout: timeout); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + return await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false) + ? new Cookie(ticket: ticketLockName!, markerTable: markerTableName!) + : null; } - public int MaxCount { get; } + // cancelable case - #region ---- Execution ---- - public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) + using (var command = CreateTextCommand(connection, operationTimeout: timeout)) { - cancellationToken.ThrowIfCancellationRequested(); - string? markerTableName; - - // when we aren't supporting cancellation, we can use a simplified one-step algorithm. We treat a timeout of - // zero in the same way: since there is no blocking, we don't need to bother with explicit cancellation support - if (!cancellationToken.CanBeCanceled || timeout.IsZero) + command.SetCommandText(AcquireCancelablePreambleQuery.Value); + this.AddCommonParameters(command, resourceName); + // preamble is non-cancelable + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + if (await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false)) { - using var command = CreateTextCommand(connection, operationTimeout: timeout); - command.SetCommandText(AcquireNonCancelableQuery.Value); - this.AddCommonParameters(command, resourceName, timeout: timeout); - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - return await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false) - ? new Cookie(ticket: ticketLockName!, markerTable: markerTableName!) - : null; + return new Cookie(ticket: ticketLockName!, markerTable: markerTableName!); } + } - // cancelable case - - using (var command = CreateTextCommand(connection, operationTimeout: timeout)) + using (var command = CreateTextCommand(connection, operationTimeout: timeout)) + { + command.SetCommandText(AcquireCancelableQuery.Value); + this.AddCommonParameters(command, resourceName, timeout: timeout, markerTableName: markerTableName); + try { - command.SetCommandText(AcquireCancelablePreambleQuery.Value); - this.AddCommonParameters(command, resourceName); - // preamble is non-cancelable - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - if (await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false)) - { - return new Cookie(ticket: ticketLockName!, markerTable: markerTableName!); - } + // see comments around disallowAsyncCancellation for why we pass this flag + await command.ExecuteNonQueryAsync(cancellationToken, disallowAsyncCancellation: true).ConfigureAwait(false); } - - using (var command = CreateTextCommand(connection, operationTimeout: timeout)) + catch when (cancellationToken.IsCancellationRequested) { - command.SetCommandText(AcquireCancelableQuery.Value); - this.AddCommonParameters(command, resourceName, timeout: timeout, markerTableName: markerTableName); - try - { - // see comments around disallowAsyncCancellation for why we pass this flag - await command.ExecuteNonQueryAsync(cancellationToken, disallowAsyncCancellation: true).ConfigureAwait(false); - } - catch when (cancellationToken.IsCancellationRequested) - { - // if we canceled the query, we need to perform cleanup to make sure we don't leave marker tables or held locks + // if we canceled the query, we need to perform cleanup to make sure we don't leave marker tables or held locks - using (var cleanupCommand = CreateTextCommand(connection, operationTimeout: TimeSpan.Zero)) - { - cleanupCommand.SetCommandText(CancellationCleanupQuery.Value); - this.AddCommonParameters(cleanupCommand, resourceName, markerTableName: markerTableName); - await cleanupCommand.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); - } - - throw; + using (var cleanupCommand = CreateTextCommand(connection, operationTimeout: TimeSpan.Zero)) + { + cleanupCommand.SetCommandText(CancellationCleanupQuery.Value); + this.AddCommonParameters(cleanupCommand, resourceName, markerTableName: markerTableName); + await cleanupCommand.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); } - return await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false) - ? new Cookie(ticket: ticketLockName!, markerTable: markerTableName!) - : null; + throw; } - } - public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, Cookie lockCookie) - { - using var command = CreateTextCommand(connection, operationTimeout: Timeout.InfiniteTimeSpan); - command.SetCommandText(ReleaseQuery.Value); - this.AddCommonParameters(command, resourceName, markerTableName: lockCookie.MarkerTable, ticketLockName: lockCookie.Ticket); - await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + return await ProcessAcquireResultAsync(command.Parameters, timeout, cancellationToken, out markerTableName, out var ticketLockName).ConfigureAwait(false) + ? new Cookie(ticket: ticketLockName!, markerTable: markerTableName!) + : null; } + } - bool IDbSynchronizationStrategy.IsUpgradeable => false; + public async ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, Cookie lockCookie) + { + using var command = CreateTextCommand(connection, operationTimeout: Timeout.InfiniteTimeSpan); + command.SetCommandText(ReleaseQuery.Value); + this.AddCommonParameters(command, resourceName, markerTableName: lockCookie.MarkerTable, ticketLockName: lockCookie.Ticket); + await command.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + } - public sealed class Cookie - { - public Cookie(string ticket, string markerTable) - { - this.Ticket = ticket ?? throw new ArgumentNullException(nameof(ticket)); - this.MarkerTable = markerTable ?? throw new ArgumentNullException(nameof(markerTable)); - } + bool IDbSynchronizationStrategy.IsUpgradeable => false; - public string Ticket { get; } - public string MarkerTable { get; } + public sealed class Cookie + { + public Cookie(string ticket, string markerTable) + { + this.Ticket = ticket ?? throw new ArgumentNullException(nameof(ticket)); + this.MarkerTable = markerTable ?? throw new ArgumentNullException(nameof(markerTable)); } - #endregion - - #region ---- Command Execution ---- - private static ValueTask ProcessAcquireResultAsync( - IDataParameterCollection parameters, - TimeoutValue timeout, - CancellationToken cancellationToken, - out string? markerTableName, - out string? ticketLockName) + + public string Ticket { get; } + public string MarkerTable { get; } + } + #endregion + + #region ---- Command Execution ---- + private static ValueTask ProcessAcquireResultAsync( + IDataParameterCollection parameters, + TimeoutValue timeout, + CancellationToken cancellationToken, + out string? markerTableName, + out string? ticketLockName) + { + var resultCode = (int)((IDbDataParameter)parameters[ResultCodeParameter]).Value; + switch (resultCode) { - var resultCode = (int)((IDbDataParameter)parameters[ResultCodeParameter]).Value; - switch (resultCode) - { - case SuccessCode: - ticketLockName = (string)((IDbDataParameter)parameters[TicketLockNameParameter]).Value; - markerTableName = (string)((IDbDataParameter)parameters[MarkerTableNameParameter]).Value; - return true.AsValueTask(); - case FinishedPreambleWithoutAcquiringCode: - ticketLockName = null; - markerTableName = (string)((IDbDataParameter)parameters[MarkerTableNameParameter]).Value; - return false.AsValueTask(); - case FailedToAcquireWithSpaceRemainingCode: - throw new InvalidOperationException($"An internal semaphore algorithm error ({resultCode}) occurred: failed to acquire a ticket despite indication that tickets are available"); - case BusyWaitTimeoutCode: - ticketLockName = markerTableName = null; - return false.AsValueTask(); - case AllTicketsHeldByCurrentSessionCode: - // whenever we hit this case, it's a deadlock. If the user asked us to wait forever, we just throw. However, - // if the user asked us to wait a specified amount of time we will wait in C#. There are other justifiable policies - // but this one seems relatively safe and likely to do what you want. It seems reasonable that no one intends to hang - // forever but also reasonable that someone should be able to test for lock acquisition without getting a throw - if (timeout.IsInfinite) - { - throw new DeadlockException("Deadlock detected: attempt to acquire the semaphore cannot succeed because all tickets are held by the current connection"); - } + case SuccessCode: + ticketLockName = (string)((IDbDataParameter)parameters[TicketLockNameParameter]).Value; + markerTableName = (string)((IDbDataParameter)parameters[MarkerTableNameParameter]).Value; + return true.AsValueTask(); + case FinishedPreambleWithoutAcquiringCode: + ticketLockName = null; + markerTableName = (string)((IDbDataParameter)parameters[MarkerTableNameParameter]).Value; + return false.AsValueTask(); + case FailedToAcquireWithSpaceRemainingCode: + throw new InvalidOperationException($"An internal semaphore algorithm error ({resultCode}) occurred: failed to acquire a ticket despite indication that tickets are available"); + case BusyWaitTimeoutCode: + ticketLockName = markerTableName = null; + return false.AsValueTask(); + case AllTicketsHeldByCurrentSessionCode: + // whenever we hit this case, it's a deadlock. If the user asked us to wait forever, we just throw. However, + // if the user asked us to wait a specified amount of time we will wait in C#. There are other justifiable policies + // but this one seems relatively safe and likely to do what you want. It seems reasonable that no one intends to hang + // forever but also reasonable that someone should be able to test for lock acquisition without getting a throw + if (timeout.IsInfinite) + { + throw new DeadlockException("Deadlock detected: attempt to acquire the semaphore cannot succeed because all tickets are held by the current connection"); + } - ticketLockName = markerTableName = null; + ticketLockName = markerTableName = null; - async ValueTask DelayFalseAsync() - { - await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); - return false; - } - return DelayFalseAsync(); - case SqlApplicationLock.TimeoutExitCode: - ticketLockName = markerTableName = null; - return false.AsValueTask(); - default: - ticketLockName = markerTableName = null; - return FailAsync(); - - async ValueTask FailAsync() + async ValueTask DelayFalseAsync() + { + await SyncViaAsync.Delay(timeout, cancellationToken).ConfigureAwait(false); + return false; + } + return DelayFalseAsync(); + case SqlApplicationLock.TimeoutExitCode: + ticketLockName = markerTableName = null; + return false.AsValueTask(); + default: + ticketLockName = markerTableName = null; + return FailAsync(); + + async ValueTask FailAsync() + { + if (resultCode < 0) { - if (resultCode < 0) - { - await SqlApplicationLock.ParseExitCodeAsync(resultCode, timeout, cancellationToken).ConfigureAwait(false); - } - throw new InvalidOperationException($"Unexpected semaphore algorithm result code {resultCode}"); + await SqlApplicationLock.ParseExitCodeAsync(resultCode, timeout, cancellationToken).ConfigureAwait(false); } - } + throw new InvalidOperationException($"Unexpected semaphore algorithm result code {resultCode}"); + } } + } - private static DatabaseCommand CreateTextCommand(DatabaseConnection connection, TimeoutValue operationTimeout) - { - var command = connection.CreateCommand(); - command.SetTimeout(operationTimeout); - return command; - } + private static DatabaseCommand CreateTextCommand(DatabaseConnection connection, TimeoutValue operationTimeout) + { + var command = connection.CreateCommand(); + command.SetTimeout(operationTimeout); + return command; + } - private void AddCommonParameters(DatabaseCommand command, string semaphoreName, TimeoutValue? timeout = null, string? markerTableName = null, string? ticketLockName = null) + private void AddCommonParameters(DatabaseCommand command, string semaphoreName, TimeoutValue? timeout = null, string? markerTableName = null, string? ticketLockName = null) + { + command.AddParameter(SemaphoreNameParameter, semaphoreName); + command.AddParameter(MaxCountParameter, this.MaxCount); + if (timeout.TryGetValue(out var timeoutValue)) { - command.AddParameter(SemaphoreNameParameter, semaphoreName); - command.AddParameter(MaxCountParameter, this.MaxCount); - if (timeout.TryGetValue(out var timeoutValue)) - { - command.AddParameter(TimeoutMillisParameter, timeoutValue.InMilliseconds); - } + command.AddParameter(TimeoutMillisParameter, timeoutValue.InMilliseconds); + } - command.AddParameter(ResultCodeParameter, type: DbType.Int32, direction: ParameterDirection.Output); + command.AddParameter(ResultCodeParameter, type: DbType.Int32, direction: ParameterDirection.Output); - var ticket = command.AddParameter(TicketLockNameParameter, ticketLockName, type: DbType.String); - if (ticketLockName == null) - { - ticket.Direction = ParameterDirection.Output; - } - const int MaxOutputStringLength = 8000; // plenty long enough - ticket.Size = MaxOutputStringLength; - - var markerTable = command.AddParameter(MarkerTableNameParameter, markerTableName, type: DbType.String); - if (markerTableName == null) - { - markerTable.Direction = ParameterDirection.Output; - } - markerTable.Size = MaxOutputStringLength; + var ticket = command.AddParameter(TicketLockNameParameter, ticketLockName, type: DbType.String); + if (ticketLockName == null) + { + ticket.Direction = ParameterDirection.Output; } - #endregion - - #region ---- Naming ---- - public static string ToSafeName(string semaphoreName) + const int MaxOutputStringLength = 8000; // plenty long enough + ticket.Size = MaxOutputStringLength; + + var markerTable = command.AddParameter(MarkerTableNameParameter, markerTableName, type: DbType.String); + if (markerTableName == null) { - // the max table name length is 128 for global and 116 for local temp tables. While we don't use local temp tables - // currently, to be conservative we use the lower cap. We're using 115 not 116 to reflect the missing '#' which counts - // towards the limit - const int MaxTableNameLength = 115; - const string Suffix = "semaphore"; - // this accounts for various other things we pad onto the name: - // * Marker table adds SPID + "s" + WAITERNUMBER (10 + 1 + 10 = 21) - // * Ticket lock name adds TICKETNUMBER (10) - // * Intent table name adds "intent_" + SPID + "_" + TICKETNUMBER (7 + 10 + 1 + 10 = 28) - // We will use 30 as a safe number - const int AdditionalSuffixMaxLength = 30; - - var nameWithoutInvalidCharacters = ReplaceInvalidCharacters(semaphoreName); - // note that we hash the original name, not the replaced name. This makes us even more robust to collisions - var nameHash = HashName(semaphoreName); - var maxBaseNameLength = MaxTableNameLength - (nameHash.Length + Suffix.Length + AdditionalSuffixMaxLength); - var baseName = nameWithoutInvalidCharacters.Length <= maxBaseNameLength - ? nameWithoutInvalidCharacters - : nameWithoutInvalidCharacters.Substring(0, maxBaseNameLength); - return $"{baseName}{nameHash}{Suffix}"; + markerTable.Direction = ParameterDirection.Output; } + markerTable.Size = MaxOutputStringLength; + } + #endregion - private static string ReplaceInvalidCharacters(string semaphoreName) + #region ---- Naming ---- + public static string ToSafeName(string semaphoreName) + { + // the max table name length is 128 for global and 116 for local temp tables. While we don't use local temp tables + // currently, to be conservative we use the lower cap. We're using 115 not 116 to reflect the missing '#' which counts + // towards the limit + const int MaxTableNameLength = 115; + const string Suffix = "semaphore"; + // this accounts for various other things we pad onto the name: + // * Marker table adds SPID + "s" + WAITERNUMBER (10 + 1 + 10 = 21) + // * Ticket lock name adds TICKETNUMBER (10) + // * Intent table name adds "intent_" + SPID + "_" + TICKETNUMBER (7 + 10 + 1 + 10 = 28) + // We will use 30 as a safe number + const int AdditionalSuffixMaxLength = 30; + + var nameWithoutInvalidCharacters = ReplaceInvalidCharacters(semaphoreName); + // note that we hash the original name, not the replaced name. This makes us even more robust to collisions + var nameHash = HashName(semaphoreName); + var maxBaseNameLength = MaxTableNameLength - (nameHash.Length + Suffix.Length + AdditionalSuffixMaxLength); + var baseName = nameWithoutInvalidCharacters.Length <= maxBaseNameLength + ? nameWithoutInvalidCharacters + : nameWithoutInvalidCharacters.Substring(0, maxBaseNameLength); + return $"{baseName}{nameHash}{Suffix}"; + } + + private static string ReplaceInvalidCharacters(string semaphoreName) + { + StringBuilder? modifiedName = null; + for (var i = 0; i < semaphoreName.Length; ++i) { - StringBuilder? modifiedName = null; - for (var i = 0; i < semaphoreName.Length; ++i) + var @char = semaphoreName[i]; + if (!IsAsciiLetterOrDigit(@char)) { - var @char = semaphoreName[i]; - if (!IsAsciiLetterOrDigit(@char)) + if (modifiedName == null) { - if (modifiedName == null) - { - modifiedName = new StringBuilder(); - for (var j = 0; j < i; ++j) { modifiedName.Append(semaphoreName[j]); } - } - - modifiedName.Append(((int)@char).ToString("x")); + modifiedName = new StringBuilder(); + for (var j = 0; j < i; ++j) { modifiedName.Append(semaphoreName[j]); } } - else if (modifiedName != null) - { - modifiedName.Append(@char); - } - } - return modifiedName?.ToString() ?? semaphoreName; + modifiedName.Append(((int)@char).ToString("x")); + } + else if (modifiedName != null) + { + modifiedName.Append(@char); + } } - private static bool IsAsciiLetterOrDigit(char @char) => ('a' <= @char && @char <= 'z') - || ('A' <= @char && @char <= 'Z') - || ('0' <= @char && @char <= '9'); + return modifiedName?.ToString() ?? semaphoreName; + } - private static string HashName(string name) - { - using var hashAlgorithm = SHA256.Create(); - var hashBytes = hashAlgorithm.ComputeHash(Encoding.UTF8.GetBytes(name)); - return BitConverter.ToString(hashBytes) - .Replace("-", string.Empty) - .ToLowerInvariant(); - } - #endregion - - #region ---- Query Generation ---- - private const string SemaphoreNameParameter = "semaphoreName", - MaxCountParameter = "maxCount", - ResultCodeParameter = "resultCode", - TimeoutMillisParameter = "timeoutMillis", - MarkerTableNameParameter = "markerTableName", - TicketLockNameParameter = "ticketLockName", - LockResultVariable = "lockResult", - LockScopeVariable = "lockScope", - PreambleLockNameVariable = "preambleLock", - BusyWaitLockNameVariable = "busyWaitLock"; - - private const int SuccessCode = 0, - FinishedPreambleWithoutAcquiringCode = 100, - FailedToAcquireWithSpaceRemainingCode = 101, - BusyWaitTimeoutCode = 102, - AllTicketsHeldByCurrentSessionCode = SqlApplicationLock.AlreadyHeldExitCode; - - // when we don't have to deal with cancellation, we can put everything in one big query to save on round trips - private static readonly Lazy AcquireNonCancelableQuery = new Lazy(() => Merge( - CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), - CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: null), - CreateAcquireSql(cancelable: false), - CreateCodaSql(includePreambleLockRelease: true, includeBusyWaitLockRelease: true) - )), - // for cancellation, we run the preamble first as non-cancellable followed by a cancelable busy wait. This - // ensures that we avoid the case where we create a marker table in the preamble and then cancel before returning it - AcquireCancelablePreambleQuery = new Lazy(() => Merge( - CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: false, includeTryAcquireOnceVariables: true), - CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: true), - CreateCodaSql(includePreambleLockRelease: true, includeBusyWaitLockRelease: false) - )), - AcquireCancelableQuery = new Lazy(() => Merge( - CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), - CreateAcquireSql(cancelable: true), - CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) - )), - CancellationCleanupQuery = new Lazy(() => Merge( - CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: false), - CreateCancellationCleanupSql(), - CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) - )), - ReleaseQuery = new Lazy(() => Merge( - CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: false, includeTryAcquireOnceVariables: false), - CreateReleaseSql() - )); - - private const string IntentMarkerTablePrefix = "intent"; - - /// - /// Used for making comments in format strings - /// - private static readonly object? C = null; - - /// - /// The preamble is the first part of the acquire algorithm. It is not cancellation-safe - /// - private static string CreateAcquirePreambleSql(bool? willRetryInSeparateQueryAfterPreamble) - { - const string SpidCountSeparator = "s"; - // if everything is going smoothly then the preamble lock should never even come close to timing out since - // nothing blocking happens inside the preamble. However, to be safe we do eventually give up - var preambleLockTimeoutMillis = (int)TimeSpan.FromMinutes(1).TotalMilliseconds; + private static bool IsAsciiLetterOrDigit(char @char) => ('a' <= @char && @char <= 'z') + || ('A' <= @char && @char <= 'Z') + || ('0' <= @char && @char <= '9'); - return $@" + private static string HashName(string name) + { + using var hashAlgorithm = SHA256.Create(); + var hashBytes = hashAlgorithm.ComputeHash(Encoding.UTF8.GetBytes(name)); + return BitConverter.ToString(hashBytes) + .Replace("-", string.Empty) + .ToLowerInvariant(); + } + #endregion + + #region ---- Query Generation ---- + private const string SemaphoreNameParameter = "semaphoreName", + MaxCountParameter = "maxCount", + ResultCodeParameter = "resultCode", + TimeoutMillisParameter = "timeoutMillis", + MarkerTableNameParameter = "markerTableName", + TicketLockNameParameter = "ticketLockName", + LockResultVariable = "lockResult", + LockScopeVariable = "lockScope", + PreambleLockNameVariable = "preambleLock", + BusyWaitLockNameVariable = "busyWaitLock"; + + private const int SuccessCode = 0, + FinishedPreambleWithoutAcquiringCode = 100, + FailedToAcquireWithSpaceRemainingCode = 101, + BusyWaitTimeoutCode = 102, + AllTicketsHeldByCurrentSessionCode = SqlApplicationLock.AlreadyHeldExitCode; + + // when we don't have to deal with cancellation, we can put everything in one big query to save on round trips + private static readonly Lazy AcquireNonCancelableQuery = new Lazy(() => Merge( + CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), + CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: null), + CreateAcquireSql(cancelable: false), + CreateCodaSql(includePreambleLockRelease: true, includeBusyWaitLockRelease: true) + )), + // for cancellation, we run the preamble first as non-cancellable followed by a cancelable busy wait. This + // ensures that we avoid the case where we create a marker table in the preamble and then cancel before returning it + AcquireCancelablePreambleQuery = new Lazy(() => Merge( + CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: false, includeTryAcquireOnceVariables: true), + CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: true), + CreateCodaSql(includePreambleLockRelease: true, includeBusyWaitLockRelease: false) + )), + AcquireCancelableQuery = new Lazy(() => Merge( + CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), + CreateAcquireSql(cancelable: true), + CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) + )), + CancellationCleanupQuery = new Lazy(() => Merge( + CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: false), + CreateCancellationCleanupSql(), + CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) + )), + ReleaseQuery = new Lazy(() => Merge( + CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: false, includeTryAcquireOnceVariables: false), + CreateReleaseSql() + )); + + private const string IntentMarkerTablePrefix = "intent"; + + /// + /// Used for making comments in format strings + /// + private static readonly object? C = null; + + /// + /// The preamble is the first part of the acquire algorithm. It is not cancellation-safe + /// + private static string CreateAcquirePreambleSql(bool? willRetryInSeparateQueryAfterPreamble) + { + const string SpidCountSeparator = "s"; + // if everything is going smoothly then the preamble lock should never even come close to timing out since + // nothing blocking happens inside the preamble. However, to be safe we do eventually give up + var preambleLockTimeoutMillis = (int)TimeSpan.FromMinutes(1).TotalMilliseconds; + + return $@" {C/* The preamble body executes inside a special lock. Since the preamble is designed to be - non-blocking we can wait for a long time on this lock without worrying about respecting - our timeout. We avoid waiting forever in case there are unexpected problems (e. g. a lock on sys.tables) */} + non-blocking we can wait for a long time on this lock without worrying about respecting + our timeout. We avoid waiting forever in case there are unexpected problems (e. g. a lock on sys.tables) */} EXEC @{LockResultVariable} = sys.sp_getapplock @{PreambleLockNameVariable}, 'Exclusive', @{LockScopeVariable}, {preambleLockTimeoutMillis} IF @{LockResultVariable} < 0 GOTO CODA {C/* First, we determine the number of existing waiters/holders so we know whether we will have to block or not. - At the same time, we determine a value for our marker table which has not been chosen yet. This value is 1 greater - than the greatest value that exists so far, so it can be > the count. The expression for determining this value is - somewhat complex. We are looking at table names like ##[sem name][spid][separator][value] and parsing out value. */} + At the same time, we determine a value for our marker table which has not been chosen yet. This value is 1 greater + than the greatest value that exists so far, so it can be > the count. The expression for determining this value is + somewhat complex. We are looking at table names like ##[sem name][spid][separator][value] and parsing out value. */} DECLARE @waiterNumber INT, @waiterCount INT SELECT TOP 1 @waiterNumber = ISNULL(MAX(CAST(SUBSTRING(name, CHARINDEX('{SpidCountSeparator}', name, LEN(@{SemaphoreNameParameter})) + 1, LEN(name)) AS INT) + 1), 0), @waiterCount = COUNT(*) @@ -346,9 +346,9 @@ FROM tempdb.sys.tables WITH(NOLOCK) WHERE name LIKE '##' + @{SemaphoreNameParameter} + '%' {C/* Create the marker table. This table is exists to give others a count of the number of waiting/holding processes. - we name our marker table using the form ##[sem name][spid][separator][value]. We use SPID over a random value since SPID values are typically small integers - that recycle over time; this means that we may be able to take advantage of SQL temp table caching. The reason we need SPID here at all is because if another - transaction creates and destroys a table of name X, we will be blocked if we try to create table X before the transaction ends. */} + we name our marker table using the form ##[sem name][spid][separator][value]. We use SPID over a random value since SPID values are typically small integers + that recycle over time; this means that we may be able to take advantage of SQL temp table caching. The reason we need SPID here at all is because if another + transaction creates and destroys a table of name X, we will be blocked if we try to create table X before the transaction ends. */} SET @{MarkerTableNameParameter} = '##' + @{SemaphoreNameParameter} + CAST(@@SPID AS NVARCHAR(MAX)) + '{SpidCountSeparator}' + CAST(@waiterNumber AS NVARCHAR(MAX)) DECLARE @createMarkerTableSql NVARCHAR(MAX) = 'CREATE TABLE ' + @{MarkerTableNameParameter} + ' (_ BIT)' EXEC sp_executeSql @createMarkerTableSql @@ -365,19 +365,19 @@ IF @waiterCount < @{MaxCountParameter} {C/* If we get here, it means we finished the preamble without acquiring a ticket */} {( - // if this is the end of the query, we have to set an exit code. If we are going to retry we indicate the special code that will trigger that and otherwise we indicate - // timeout. If this is not the end of the query, we just release the preamble lock and keep going - willRetryInSeparateQueryAfterPreamble.TryGetValue(out var willRetryInSeparateQueryAfterPreambleValue) - ? $@"SET @{ResultCodeParameter} = {(willRetryInSeparateQueryAfterPreambleValue ? FinishedPreambleWithoutAcquiringCode : SqlApplicationLock.TimeoutExitCode)}" - : $"EXEC sys.sp_releaseapplock @{PreambleLockNameVariable}, @{LockScopeVariable}" - )}"; - } + // if this is the end of the query, we have to set an exit code. If we are going to retry we indicate the special code that will trigger that and otherwise we indicate + // timeout. If this is not the end of the query, we just release the preamble lock and keep going + willRetryInSeparateQueryAfterPreamble.TryGetValue(out var willRetryInSeparateQueryAfterPreambleValue) + ? $@"SET @{ResultCodeParameter} = {(willRetryInSeparateQueryAfterPreambleValue ? FinishedPreambleWithoutAcquiringCode : SqlApplicationLock.TimeoutExitCode)}" + : $"EXEC sys.sp_releaseapplock @{PreambleLockNameVariable}, @{LockScopeVariable}" + )}"; + } - private static string CreateAcquireSql(bool cancelable) - { - return $@" + private static string CreateAcquireSql(bool cancelable) + { + return $@" {C/* The next step is to do a busy wait on all ticket locks. For fairness and to reduce resource usage, - use a "busy wait lock" to permit only one thread to busy wait at a time. */} + use a "busy wait lock" to permit only one thread to busy wait at a time. */} EXEC @{LockResultVariable} = sys.sp_getapplock @{BusyWaitLockNameVariable}, 'Exclusive', @{LockScopeVariable}, @{TimeoutMillisParameter} IF @{LockResultVariable} < 0 GOTO CODA @@ -393,14 +393,14 @@ IF SYSUTCDATETIME() > @expiry GOTO CODA END END"; - } + } - private static string CreateCancellationCleanupSql() - { - // we check for the existence of an intent marker table since this indicates that we may have - // acquired a lock before being canceled and not have released it + private static string CreateCancellationCleanupSql() + { + // we check for the existence of an intent marker table since this indicates that we may have + // acquired a lock before being canceled and not have released it - return $@" + return $@" DECLARE @intentMarkerTableName NVARCHAR(MAX) SELECT TOP 1 @intentMarkerTableName = name FROM tempdb.sys.tables WITH(NOLOCK) @@ -416,35 +416,35 @@ DECLARE @dropIntentMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @intentMarkerT EXEC sp_executeSql @dropIntentMarkerTableSql END "; - } + } - private static string CreateReleaseSql() - { - return $@" + private static string CreateReleaseSql() + { + return $@" EXEC sys.sp_releaseAppLock @{TicketLockNameParameter}, @{LockScopeVariable} DECLARE @dropMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @{MarkerTableNameParameter} EXEC sp_executeSql @dropMarkerTableSql"; - } + } - private static string CreateCommonVariableDeclarationsSql( - bool includePreambleLock, - bool includeBusyWaitLock, - bool includeTryAcquireOnceVariables) - { - return $@" + private static string CreateCommonVariableDeclarationsSql( + bool includePreambleLock, + bool includeBusyWaitLock, + bool includeTryAcquireOnceVariables) + { + return $@" DECLARE @{LockResultVariable} INT , @{LockScopeVariable} NVARCHAR(32) = CASE @@TRANCOUNT WHEN 0 THEN 'Session' ELSE 'Transaction' END {(includePreambleLock ? $", @{PreambleLockNameVariable} NVARCHAR(MAX) = 'preamble_' + @semaphoreName" : null)} {(includeBusyWaitLock ? $", @{BusyWaitLockNameVariable} NVARCHAR(MAX) = 'busyWait_' + @semaphoreName" : null)} {(includeTryAcquireOnceVariables ? @", @i INT, @baseTicketIndex INT, @anyNotHeld BIT" : null)}"; - } + } - private static string CreateTryAcquireOnceSql(bool allowOneWait, bool cancelable) - { - return $@" + private static string CreateTryAcquireOnceSql(bool allowOneWait, bool cancelable) + { + return $@" SET @i = 0 {C/* Rather than always looping through tickets 0 .. N-1, we start at a random ticket. This should reduce looping in the average case and means - that if we are allowing a wait then the one ticket we wait on is randomized. */} + that if we are allowing a wait then the one ticket we wait on is randomized. */} SET @baseTicketIndex = CAST(RAND() * @{MaxCountParameter} AS INT) SET @anyNotHeld = 0 WHILE @i < @{MaxCountParameter} @@ -452,27 +452,27 @@ WHILE @i < @{MaxCountParameter} SET @{TicketLockNameParameter} = @{SemaphoreNameParameter} + CAST((@baseTicketIndex + @i) % @{MaxCountParameter} AS NVARCHAR(MAX)) {C/* Since app locks are reentrant on the same connection, we must do an explicit check to avoid taking the same ticket twice. - Additionally, if we are transaction-scoped we must check whether we hold the lock on EITHER the transaction or the session. */} + Additionally, if we are transaction-scoped we must check whether we hold the lock on EITHER the transaction or the session. */} IF APPLOCK_MODE('public', @{TicketLockNameParameter}, @{LockScopeVariable}) = 'NoLock' AND (@{LockScopeVariable} = 'Session' OR APPLOCK_MODE('public', @{TicketLockNameParameter}, 'Session') = 'NoLock') BEGIN {C/* "allowOneWait" will be specified when we are in a busy wait loop. To avoid burning CPU we pick the first unheld ticket we come - across and allow that wait to be 32ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket - becomes available. Note that we used to wait just 1ms here. However, in testing that proved flaky in detecting - deadlocks; empirically, 32ms seems to be sufficient to work reliably. The longer wait should also reduce the - CPU load without meaningfully adding delay overhead. */} + across and allow that wait to be 32ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket + becomes available. Note that we used to wait just 1ms here. However, in testing that proved flaky in detecting + deadlocks; empirically, 32ms seems to be sufficient to work reliably. The longer wait should also reduce the + CPU load without meaningfully adding delay overhead. */} {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 32 ELSE 0 END" : null)} SET @anyNotHeld = 1 {( - cancelable - // The intent marker supports robust cancellation by ensuring that we never leave a lingering lock on a connection. By creating a marker before - // any lock acquisition, we have a way of determining the case where the query is canceled right after acquiring a lock - ? $@"DECLARE @intentMarkerTableName NVARCHAR(MAX) = '##{IntentMarkerTablePrefix}_' + CAST(@@SPID AS NVARCHAR(MAX)) + '_' + @{TicketLockNameParameter} + cancelable + // The intent marker supports robust cancellation by ensuring that we never leave a lingering lock on a connection. By creating a marker before + // any lock acquisition, we have a way of determining the case where the query is canceled right after acquiring a lock + ? $@"DECLARE @intentMarkerTableName NVARCHAR(MAX) = '##{IntentMarkerTablePrefix}_' + CAST(@@SPID AS NVARCHAR(MAX)) + '_' + @{TicketLockNameParameter} DECLARE @createIntentMarkerTableSql NVARCHAR(MAX) = 'CREATE TABLE ' + @intentMarkerTableName + ' (_ BIT)' EXEC sp_executeSql @createIntentMarkerTableSql" - : null - )} + : null + )} EXEC @{LockResultVariable} = sys.sp_getapplock @{TicketLockNameParameter}, 'Exclusive', @{LockScopeVariable}, {(allowOneWait ? "@lockTimeoutMillis" : "0")} IF @{LockResultVariable} >= 0 @@ -482,12 +482,12 @@ GOTO CODA END {( - cancelable - // on any failed acquisition, drop the intent marker - ? $@"DECLARE @dropIntentMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @intentMarkerTableName + cancelable + // on any failed acquisition, drop the intent marker + ? $@"DECLARE @dropIntentMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @intentMarkerTableName EXEC sp_executeSql @dropIntentMarkerTableSql" - : null - )} + : null + )} {C/* on any unexpected lock failure, quit */} IF @{LockResultVariable} < -1 GOTO CODA @@ -501,24 +501,24 @@ IF @{LockResultVariable} < -1 GOTO CODA GOTO CODA END "; - } + } - private static string CreateCodaSql(bool includePreambleLockRelease, bool includeBusyWaitLockRelease) - { - return $@" + private static string CreateCodaSql(bool includePreambleLockRelease, bool includeBusyWaitLockRelease) + { + return $@" CODA: {( - includePreambleLockRelease - ? $@"IF APPLOCK_MODE('public', @{PreambleLockNameVariable}, @{LockScopeVariable}) != 'NoLock' + includePreambleLockRelease + ? $@"IF APPLOCK_MODE('public', @{PreambleLockNameVariable}, @{LockScopeVariable}) != 'NoLock' EXEC sys.sp_releaseapplock @{PreambleLockNameVariable}, @{LockScopeVariable}" - : null - )} + : null + )} {( - includeBusyWaitLockRelease - ? $@"IF APPLOCK_MODE('public', @{BusyWaitLockNameVariable}, @{LockScopeVariable}) != 'NoLock' + includeBusyWaitLockRelease + ? $@"IF APPLOCK_MODE('public', @{BusyWaitLockNameVariable}, @{LockScopeVariable}) != 'NoLock' EXEC sys.sp_releaseapplock @{BusyWaitLockNameVariable}, @{LockScopeVariable}" - : null - )} + : null + )} IF @{ResultCodeParameter} IS NULL AND @{LockResultVariable} < 0 SET @{ResultCodeParameter} = @{LockResultVariable} IF @{ResultCodeParameter} NOT IN ({SuccessCode}, {FinishedPreambleWithoutAcquiringCode}) @@ -529,9 +529,8 @@ DECLARE @dropMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @{MarkerTableNamePar EXEC sp_executeSql @dropMarkerTableSql END END"; - } - - private static string Merge(params string[] parts) => string.Join(Environment.NewLine, parts); - #endregion } + + private static string Merge(params string[] parts) => string.Join(Environment.NewLine, parts); + #endregion } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index af1d7538..a9e8e628 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -5,120 +5,119 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data -{ - public abstract class ConnectionStringStrategyTestCases - where TLockProvider : TestingLockProvider, new() - where TStrategy : TestingConnectionStringSynchronizationStrategy, new() - where TDb : TestingPrimaryClientDb, new() - { - private TLockProvider _lockProvider = default!; - - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); +namespace Medallion.Threading.Tests.Data; - /// - /// Tests that internally-owned connections are properly cleaned up by disposing the lock handle - /// - [Test] - public void TestConnectionDoesNotLeak() - { - // If the lock is based on a multi-ticket semaphore, then the first creation will claim N-1 connections. To avoid this messing with - // our count, we create a throwaway lock instance here to hold those connections using the default application name - this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); +public abstract class ConnectionStringStrategyTestCases + where TLockProvider : TestingLockProvider, new() + where TStrategy : TestingConnectionStringSynchronizationStrategy, new() + where TDb : TestingPrimaryClientDb, new() +{ + private TLockProvider _lockProvider = default!; - // set a distinctive application name so that we can count how many connections are used - var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - var @lock = this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); - for (var i = 0; i < 30; ++i) - { - using (@lock.Acquire()) - { - this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1, this.GetType().Name); - } - // still alive due to pooling, except in Oracle where the application name (client info) is not part of the pool key - Assert.LessOrEqual(this._lockProvider.Strategy.Db.CountActiveSessions(applicationName), 1, this.GetType().Name); - } + /// + /// Tests that internally-owned connections are properly cleaned up by disposing the lock handle + /// + [Test] + public void TestConnectionDoesNotLeak() + { + // If the lock is based on a multi-ticket semaphore, then the first creation will claim N-1 connections. To avoid this messing with + // our count, we create a throwaway lock instance here to hold those connections using the default application name + this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); - using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) - { - this._lockProvider.Strategy.Db.ClearPool(connection); - } + // set a distinctive application name so that we can count how many connections are used + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - // checking immediately seems flaky; likely clear pool finishing - // doesn't guarantee that SQL will immediately reflect the clear - var maxWaitForPoolsToClear = TimeSpan.FromSeconds(5); - var stopwatch = Stopwatch.StartNew(); - do + var @lock = this._lockProvider.CreateLock(nameof(TestConnectionDoesNotLeak)); + for (var i = 0; i < 30; ++i) + { + using (@lock.Acquire()) { - var activeCount = this._lockProvider.Strategy.Db.CountActiveSessions(applicationName); - if (activeCount == 0) { return; } - Thread.Sleep(10); + this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1, this.GetType().Name); } - while (stopwatch.Elapsed < maxWaitForPoolsToClear); - - Assert.Fail("Connection was not released"); + // still alive due to pooling, except in Oracle where the application name (client info) is not part of the pool key + Assert.LessOrEqual(this._lockProvider.Strategy.Db.CountActiveSessions(applicationName), 1, this.GetType().Name); } - [Test] - [NonParallelizable, Retry(5)] // timing-sensitive - public void TestKeepaliveProtectsFromIdleSessionKiller() + using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) { - var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - - this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); - var @lock = this._lockProvider.CreateLock(Guid.NewGuid().ToString()); // use unique name due to retry - - var handle = @lock.Acquire(); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); - Thread.Sleep(TimeSpan.FromSeconds(2)); - Assert.DoesNotThrow(() => handle.Dispose()); + this._lockProvider.Strategy.Db.ClearPool(connection); } - /// - /// Demonstrates that we don't multi-thread the connection despite running keepalive queries - /// - [Test] - public void TestKeepaliveDoesNotCreateRaceCondition() + // checking immediately seems flaky; likely clear pool finishing + // doesn't guarantee that SQL will immediately reflect the clear + var maxWaitForPoolsToClear = TimeSpan.FromSeconds(5); + var stopwatch = Stopwatch.StartNew(); + do { - this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMilliseconds(1); + var activeCount = this._lockProvider.Strategy.Db.CountActiveSessions(applicationName); + if (activeCount == 0) { return; } + Thread.Sleep(10); + } + while (stopwatch.Elapsed < maxWaitForPoolsToClear); + + Assert.Fail("Connection was not released"); + } - Assert.DoesNotThrow(() => + [Test] + [NonParallelizable, Retry(5)] // timing-sensitive + public void TestKeepaliveProtectsFromIdleSessionKiller() + { + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.05); + var @lock = this._lockProvider.CreateLock(Guid.NewGuid().ToString()); // use unique name due to retry + + var handle = @lock.Acquire(); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); + Thread.Sleep(TimeSpan.FromSeconds(2)); + Assert.DoesNotThrow(() => handle.Dispose()); + } + + /// + /// Demonstrates that we don't multi-thread the connection despite running keepalive queries + /// + [Test] + public void TestKeepaliveDoesNotCreateRaceCondition() + { + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMilliseconds(1); + + Assert.DoesNotThrow(() => + { + var @lock = this._lockProvider.CreateLock(nameof(TestKeepaliveDoesNotCreateRaceCondition)); + for (var i = 0; i < 25; ++i) { - var @lock = this._lockProvider.CreateLock(nameof(TestKeepaliveDoesNotCreateRaceCondition)); - for (var i = 0; i < 25; ++i) + using (@lock.Acquire()) { - using (@lock.Acquire()) - { - Thread.Sleep(1); - } + Thread.Sleep(1); } - }); - } + } + }); + } - // replicates issue from https://github.com/madelson/DistributedLock/issues/85 - [Test] - public async Task TestAccessingHandleLostTokenWhileKeepaliveActiveDoesNotBlock() - { - this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMinutes(5); + // replicates issue from https://github.com/madelson/DistributedLock/issues/85 + [Test] + public async Task TestAccessingHandleLostTokenWhileKeepaliveActiveDoesNotBlock() + { + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMinutes(5); - var @lock = this._lockProvider.CreateLock(string.Empty); - var handle = await @lock.TryAcquireAsync(); - if (handle != null) + var @lock = this._lockProvider.CreateLock(string.Empty); + var handle = await @lock.TryAcquireAsync(); + if (handle != null) + { + var accessHandleLostTokenTask = Task.Run(() => { - var accessHandleLostTokenTask = Task.Run(() => + if (handle.HandleLostToken.CanBeCanceled) { - if (handle.HandleLostToken.CanBeCanceled) - { - handle.HandleLostToken.Register(() => { }); - } - }); - Assert.IsTrue(await accessHandleLostTokenTask.WaitAsync(TimeSpan.FromSeconds(5))); - - // do this only on success; on failure we're likely deadlocked and dispose will hang - await handle.DisposeAsync(); - } + handle.HandleLostToken.Register(() => { }); + } + }); + Assert.IsTrue(await accessHandleLostTokenTask.WaitAsync(TimeSpan.FromSeconds(5))); + + // do this only on success; on failure we're likely deadlocked and dispose will hang + await handle.DisposeAsync(); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs index 0fb58b29..e451869f 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs @@ -3,103 +3,102 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class DbSemaphoreTestCases + where TSemaphoreProvider : TestingSemaphoreProvider, new() + where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() + where TDb : TestingDb, new() { - public abstract class DbSemaphoreTestCases - where TSemaphoreProvider : TestingSemaphoreProvider, new() - where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() - where TDb : TestingDb, new() + private TSemaphoreProvider _semaphoreProvider = default!; + + [SetUp] public void SetUp() => this._semaphoreProvider = new TSemaphoreProvider(); + [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); + + /// + /// This case and several that follow test "self-deadlock", where a semaphore acquire cannot possibly succeed because + /// the current connection owns all tickets. Since this can only happen when a connection/transaction is re-used, we require + /// on our providers. + /// + [Test] + public void TestSelfDeadlockThrowsOnInfiniteWait() + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockThrowsOnInfiniteWait), maxCount: 2); + semaphore.Acquire(); + semaphore.Acquire(); + var ex = Assert.Catch(() => semaphore.Acquire()); + ex.Message.Contains("Deadlock").ShouldEqual(true, ex.Message); + } + + [Test] + public void TestMultipleConnectionsCannotTriggerSelfDeadlock() { - private TSemaphoreProvider _semaphoreProvider = default!; - - [SetUp] public void SetUp() => this._semaphoreProvider = new TSemaphoreProvider(); - [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); - - /// - /// This case and several that follow test "self-deadlock", where a semaphore acquire cannot possibly succeed because - /// the current connection owns all tickets. Since this can only happen when a connection/transaction is re-used, we require - /// on our providers. - /// - [Test] - public void TestSelfDeadlockThrowsOnInfiniteWait() - { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockThrowsOnInfiniteWait), maxCount: 2); - semaphore.Acquire(); - semaphore.Acquire(); - var ex = Assert.Catch(() => semaphore.Acquire()); - ex.Message.Contains("Deadlock").ShouldEqual(true, ex.Message); - } - - [Test] - public void TestMultipleConnectionsCannotTriggerSelfDeadlock() - { - var semaphore1 = this._semaphoreProvider.CreateSemaphore(nameof(TestMultipleConnectionsCannotTriggerSelfDeadlock), maxCount: 2); - var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestMultipleConnectionsCannotTriggerSelfDeadlock), maxCount: 2); - semaphore1.Acquire(); - semaphore2.Acquire(); - - var source = new CancellationTokenSource(); - var acquireTask = semaphore1.AcquireAsync(cancellationToken: source.Token).AsTask(); - acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); - source.Cancel(); - acquireTask.ContinueWith(t => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); - acquireTask.Status.ShouldEqual(TaskStatus.Canceled); - } - - [Test] - public void TestSelfDeadlockWaitsOnSpecifiedTime() - { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockWaitsOnSpecifiedTime), maxCount: 1); - semaphore.Acquire(); - - var acquireTask = Task.Run(() => semaphore.TryAcquire(TimeSpan.FromSeconds(.2))); - acquireTask.Wait(TimeSpan.FromSeconds(.05)).ShouldEqual(false); - acquireTask.Wait(TimeSpan.FromSeconds(.3)).ShouldEqual(true); - acquireTask.Result.ShouldEqual(null); - } - - [Test] - public void TestSelfDeadlockWaitRespectsCancellation() - { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockWaitsOnSpecifiedTime), maxCount: 1); - semaphore.Acquire(); - - var source = new CancellationTokenSource(); - var acquireTask = semaphore.AcquireAsync(TimeSpan.FromSeconds(20), source.Token).AsTask(); - acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); - source.Cancel(); - acquireTask.ContinueWith(t => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); - acquireTask.Status.ShouldEqual(TaskStatus.Canceled); - } - - [Test] - public void TestSameNameDifferentCounts() - { - var longTimeout = TimeSpan.FromSeconds(5); - - // if 2 semaphores have different views of what the max count is, things still kind of - // work. The semaphore with the higher count behaves normally. The semaphore with the lower - // count behaves normally when the number of contenders is below it's count. After that, it - // behaves unpredictably. For example, if we have counts 2 and 3 and the 3-semaphore holds 2 tickets, - // then the 2-semaphore might or might not be able to acquire a ticket depending on whether the - // 3-semaphore holds tickets 1&2 (no), 1&3 (yes), or 2&3 (yes). This test serves to document - // the behavior that is more well-defined - - var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 2); - var semaphore3 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 3); - - var handle1 = semaphore2.Acquire(longTimeout); - var handle2 = semaphore3.Acquire(longTimeout); - var handle3 = semaphore3.Acquire(longTimeout); - semaphore2.TryAcquire().ShouldEqual(null); - semaphore3.TryAcquire().ShouldEqual(null); - - handle1.Dispose(); - handle1 = semaphore3.Acquire(longTimeout); - - handle1.Dispose(); - handle2.Dispose(); - handle3.Dispose(); - } + var semaphore1 = this._semaphoreProvider.CreateSemaphore(nameof(TestMultipleConnectionsCannotTriggerSelfDeadlock), maxCount: 2); + var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestMultipleConnectionsCannotTriggerSelfDeadlock), maxCount: 2); + semaphore1.Acquire(); + semaphore2.Acquire(); + + var source = new CancellationTokenSource(); + var acquireTask = semaphore1.AcquireAsync(cancellationToken: source.Token).AsTask(); + acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); + source.Cancel(); + acquireTask.ContinueWith(t => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); + acquireTask.Status.ShouldEqual(TaskStatus.Canceled); + } + + [Test] + public void TestSelfDeadlockWaitsOnSpecifiedTime() + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockWaitsOnSpecifiedTime), maxCount: 1); + semaphore.Acquire(); + + var acquireTask = Task.Run(() => semaphore.TryAcquire(TimeSpan.FromSeconds(.2))); + acquireTask.Wait(TimeSpan.FromSeconds(.05)).ShouldEqual(false); + acquireTask.Wait(TimeSpan.FromSeconds(.3)).ShouldEqual(true); + acquireTask.Result.ShouldEqual(null); + } + + [Test] + public void TestSelfDeadlockWaitRespectsCancellation() + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSelfDeadlockWaitsOnSpecifiedTime), maxCount: 1); + semaphore.Acquire(); + + var source = new CancellationTokenSource(); + var acquireTask = semaphore.AcquireAsync(TimeSpan.FromSeconds(20), source.Token).AsTask(); + acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); + source.Cancel(); + acquireTask.ContinueWith(t => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); + acquireTask.Status.ShouldEqual(TaskStatus.Canceled); + } + + [Test] + public void TestSameNameDifferentCounts() + { + var longTimeout = TimeSpan.FromSeconds(5); + + // if 2 semaphores have different views of what the max count is, things still kind of + // work. The semaphore with the higher count behaves normally. The semaphore with the lower + // count behaves normally when the number of contenders is below it's count. After that, it + // behaves unpredictably. For example, if we have counts 2 and 3 and the 3-semaphore holds 2 tickets, + // then the 2-semaphore might or might not be able to acquire a ticket depending on whether the + // 3-semaphore holds tickets 1&2 (no), 1&3 (yes), or 2&3 (yes). This test serves to document + // the behavior that is more well-defined + + var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 2); + var semaphore3 = this._semaphoreProvider.CreateSemaphore(nameof(TestSameNameDifferentCounts), 3); + + var handle1 = semaphore2.Acquire(longTimeout); + var handle2 = semaphore3.Acquire(longTimeout); + var handle3 = semaphore3.Acquire(longTimeout); + semaphore2.TryAcquire().ShouldEqual(null); + semaphore3.TryAcquire().ShouldEqual(null); + + handle1.Dispose(); + handle1 = semaphore3.Acquire(longTimeout); + + handle1.Dispose(); + handle2.Dispose(); + handle3.Dispose(); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index c0ba41b9..e8792b1f 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -7,100 +7,99 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class ExternalConnectionOrTransactionStrategyTestCases + where TLockProvider : TestingLockProvider, new() + where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() + where TDb : TestingDb, new() { - public abstract class ExternalConnectionOrTransactionStrategyTestCases - where TLockProvider : TestingLockProvider, new() - where TStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy, new() - where TDb : TestingDb, new() - { - private TLockProvider _lockProvider = default!; + private TLockProvider _lockProvider = default!; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing sensitive for SqlSemaphore (see comment in that file regarding the 32ms wait) - public void TestDeadlockDetection() - { - var timeout = TimeSpan.FromSeconds(20); + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing sensitive for SqlSemaphore (see comment in that file regarding the 32ms wait) + public void TestDeadlockDetection() + { + var timeout = TimeSpan.FromSeconds(20); - using var barrier = new Barrier(participantCount: 2); - const string LockName1 = nameof(TestDeadlockDetection) + "_1", - LockName2 = nameof(TestDeadlockDetection) + "_2"; + using var barrier = new Barrier(participantCount: 2); + const string LockName1 = nameof(TestDeadlockDetection) + "_1", + LockName2 = nameof(TestDeadlockDetection) + "_2"; - Task RunDeadlock(bool isFirst) + Task RunDeadlock(bool isFirst) + { + this._lockProvider.Strategy.StartAmbient(); + var lock1 = this._lockProvider.CreateLock(isFirst ? LockName1 : LockName2); + var lock2 = this._lockProvider.CreateLock(isFirst ? LockName2 : LockName1); + return Task.Run(async () => { - this._lockProvider.Strategy.StartAmbient(); - var lock1 = this._lockProvider.CreateLock(isFirst ? LockName1 : LockName2); - var lock2 = this._lockProvider.CreateLock(isFirst ? LockName2 : LockName1); - return Task.Run(async () => + using (await lock1.AcquireAsync(timeout)) { - using (await lock1.AcquireAsync(timeout)) - { - barrier.SignalAndWait(); - (await lock2.AcquireAsync(timeout)).Dispose(); - } - }); - } - - var tasks = new[] { RunDeadlock(isFirst: true), RunDeadlock(isFirst: false) }; + barrier.SignalAndWait(); + (await lock2.AcquireAsync(timeout)).Dispose(); + } + }); + } - Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); + var tasks = new[] { RunDeadlock(isFirst: true), RunDeadlock(isFirst: false) }; - // MariaDB fails both tasks due to deadlock instead of just picking a single victim - Assert.GreaterOrEqual(tasks.Count(t => t.IsFaulted), 1); - Assert.LessOrEqual(tasks.Count(t => t.Status == TaskStatus.RanToCompletion), 1); - Assert.IsEmpty(tasks.Where(t => t.IsCanceled)); + Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); - foreach (var deadlockVictim in tasks.Where(t => t.IsFaulted)) - { - Assert.IsInstanceOf(deadlockVictim.Exception!.GetBaseException()); // backwards compat check - Assert.IsInstanceOf(deadlockVictim.Exception.GetBaseException()); - } - } + // MariaDB fails both tasks due to deadlock instead of just picking a single victim + Assert.GreaterOrEqual(tasks.Count(t => t.IsFaulted), 1); + Assert.LessOrEqual(tasks.Count(t => t.Status == TaskStatus.RanToCompletion), 1); + Assert.IsEmpty(tasks.Where(t => t.IsCanceled)); - [Test] - public async Task TestReAcquireLockOnSameConnection() + foreach (var deadlockVictim in tasks.Where(t => t.IsFaulted)) { - var @lock = this._lockProvider.CreateLock("lock"); - await using var handle = await @lock.AcquireAsync(); - Assert.ThrowsAsync(() => @lock.AcquireAsync().AsTask()); - Assert.ThrowsAsync(() => @lock.AcquireAsync(TimeSpan.FromSeconds(.01)).AsTask()); + Assert.IsInstanceOf(deadlockVictim.Exception!.GetBaseException()); // backwards compat check + Assert.IsInstanceOf(deadlockVictim.Exception.GetBaseException()); } + } - /// - /// Currently, we leverage to track handle loss. This test - /// validates that the handler is properly removed when the lock handle is disposed - /// - [Test] - public void TestStateChangeHandlerIsNotLeaked() - { - this._lockProvider.Strategy.StartAmbient(); + [Test] + public async Task TestReAcquireLockOnSameConnection() + { + var @lock = this._lockProvider.CreateLock("lock"); + await using var handle = await @lock.AcquireAsync(); + Assert.ThrowsAsync(() => @lock.AcquireAsync().AsTask()); + Assert.ThrowsAsync(() => @lock.AcquireAsync(TimeSpan.FromSeconds(.01)).AsTask()); + } - // creating this first assures that the Semaphore5 provider's handlers get included in initial - var @lock = this._lockProvider.CreateLock(nameof(TestStateChangeHandlerIsNotLeaked)); + /// + /// Currently, we leverage to track handle loss. This test + /// validates that the handler is properly removed when the lock handle is disposed + /// + [Test] + public void TestStateChangeHandlerIsNotLeaked() + { + this._lockProvider.Strategy.StartAmbient(); - var initialHandler = GetStateChanged(this._lockProvider.Strategy.AmbientConnection!); + // creating this first assures that the Semaphore5 provider's handlers get included in initial + var @lock = this._lockProvider.CreateLock(nameof(TestStateChangeHandlerIsNotLeaked)); - using (@lock.Acquire()) - { - Assert.IsNotNull(GetStateChanged(this._lockProvider.Strategy.AmbientConnection!)); - } - - GetStateChanged(this._lockProvider.Strategy.AmbientConnection!).ShouldEqual(initialHandler); - - static StateChangeEventHandler? GetStateChanged(DbConnection connection) => - // We check both the connection type and the base type because OracleConnection overrides the storage for - // the StateChange event handler - (StateChangeEventHandler?)new[] { connection.GetType(), typeof(DbConnection) } - .Select( - t => t.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly) - .Where(f => f.FieldType == typeof(StateChangeEventHandler)) - .SingleOrDefault() - ) - .First(f => f != null) - .GetValue(connection); + var initialHandler = GetStateChanged(this._lockProvider.Strategy.AmbientConnection!); + + using (@lock.Acquire()) + { + Assert.IsNotNull(GetStateChanged(this._lockProvider.Strategy.AmbientConnection!)); } + + GetStateChanged(this._lockProvider.Strategy.AmbientConnection!).ShouldEqual(initialHandler); + + static StateChangeEventHandler? GetStateChanged(DbConnection connection) => + // We check both the connection type and the base type because OracleConnection overrides the storage for + // the StateChange event handler + (StateChangeEventHandler?)new[] { connection.GetType(), typeof(DbConnection) } + .Select( + t => t.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly) + .Where(f => f.FieldType == typeof(StateChangeEventHandler)) + .SingleOrDefault() + ) + .First(f => f != null) + .GetValue(connection); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs index d2fd3685..e3652c5d 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs @@ -1,64 +1,63 @@ using NUnit.Framework; using System; -namespace Medallion.Threading.Tests.Data -{ - public abstract class ExternalConnectionStrategyTestCases - where TLockProvider : TestingLockProvider>, new() - where TDb : TestingDb, new() - { - private TLockProvider _lockProvider = default!; +namespace Medallion.Threading.Tests.Data; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); +public abstract class ExternalConnectionStrategyTestCases + where TLockProvider : TestingLockProvider>, new() + where TDb : TestingDb, new() +{ + private TLockProvider _lockProvider = default!; - [Test] - public void TestCloseLockOnClosedConnection() - { - var nonAmbientConnectionLock = this._lockProvider.CreateLock(nameof(TestCloseLockOnClosedConnection)); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - // Disable pooling for the ambient connection. This is important because we want to show that the lock - // will get released; in reality for a pooled connection in this scenario the lock-holding connection will - // return to the pool and would get released the next time that connection was fetched from the pool - this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; - this._lockProvider.Strategy.StartAmbient(); - var ambientConnectionLock = this._lockProvider.CreateLock(nameof(TestCloseLockOnClosedConnection)); + [Test] + public void TestCloseLockOnClosedConnection() + { + var nonAmbientConnectionLock = this._lockProvider.CreateLock(nameof(TestCloseLockOnClosedConnection)); - this._lockProvider.Strategy.AmbientConnection!.Close(); + // Disable pooling for the ambient connection. This is important because we want to show that the lock + // will get released; in reality for a pooled connection in this scenario the lock-holding connection will + // return to the pool and would get released the next time that connection was fetched from the pool + this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; + this._lockProvider.Strategy.StartAmbient(); + var ambientConnectionLock = this._lockProvider.CreateLock(nameof(TestCloseLockOnClosedConnection)); - Assert.Catch(() => ambientConnectionLock.Acquire()); + this._lockProvider.Strategy.AmbientConnection!.Close(); - this._lockProvider.Strategy.AmbientConnection!.Open(); + Assert.Catch(() => ambientConnectionLock.Acquire()); - var handle = ambientConnectionLock.Acquire(); - - nonAmbientConnectionLock.IsHeld().ShouldEqual(true, this.GetType().Name); + this._lockProvider.Strategy.AmbientConnection!.Open(); - this._lockProvider.Strategy.AmbientConnection!.Close(); + var handle = ambientConnectionLock.Acquire(); + + nonAmbientConnectionLock.IsHeld().ShouldEqual(true, this.GetType().Name); - // Note: in version 1.0 we'd avoid throwing in this scenario. However, that approach could hide bugs because - // merely closing the connection doesn't release the lock: it just returns the connection to the pool where - // it will continue to hold the lock until it is used again. - Assert.Throws(() => handle.Dispose()); + this._lockProvider.Strategy.AmbientConnection!.Close(); - // lock can be re-acquired - nonAmbientConnectionLock.IsHeld().ShouldEqual(false); - } + // Note: in version 1.0 we'd avoid throwing in this scenario. However, that approach could hide bugs because + // merely closing the connection doesn't release the lock: it just returns the connection to the pool where + // it will continue to hold the lock until it is used again. + Assert.Throws(() => handle.Dispose()); - [Test] - public void TestIsNotScopedToTransaction() - { - var nonAmbientConnectionLock = this._lockProvider.CreateLock(nameof(TestIsNotScopedToTransaction)); + // lock can be re-acquired + nonAmbientConnectionLock.IsHeld().ShouldEqual(false); + } - this._lockProvider.Strategy.StartAmbient(); + [Test] + public void TestIsNotScopedToTransaction() + { + var nonAmbientConnectionLock = this._lockProvider.CreateLock(nameof(TestIsNotScopedToTransaction)); - using var handle = this._lockProvider.CreateLock(nameof(TestIsNotScopedToTransaction)).Acquire(); - using (var transaction = this._lockProvider.Strategy.AmbientConnection!.BeginTransaction()) - { - transaction.Rollback(); - } + this._lockProvider.Strategy.StartAmbient(); - nonAmbientConnectionLock.IsHeld().ShouldEqual(true, this.GetType().Name); + using var handle = this._lockProvider.CreateLock(nameof(TestIsNotScopedToTransaction)).Acquire(); + using (var transaction = this._lockProvider.Strategy.AmbientConnection!.BeginTransaction()) + { + transaction.Rollback(); } + + nonAmbientConnectionLock.IsHeld().ShouldEqual(true, this.GetType().Name); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index 1f751ac5..643e5661 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -4,141 +4,140 @@ using System.Linq; using System.Runtime.CompilerServices; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class ExternalTransactionStrategyTestCases + where TLockProvider : TestingLockProvider>, new() + where TDb : TestingDb, new() { - public abstract class ExternalTransactionStrategyTestCases - where TLockProvider : TestingLockProvider>, new() - where TDb : TestingDb, new() - { - private TLockProvider _lockProvider = default!; + private TLockProvider _lockProvider = default!; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - [Test] - public void TestScopedToTransactionOnly() + [Test] + public void TestScopedToTransactionOnly() + { + this._lockProvider.Strategy.StartAmbient(); + + var ambientTransactionLock = this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)); + using (ambientTransactionLock.Acquire()) { - this._lockProvider.Strategy.StartAmbient(); - - var ambientTransactionLock = this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)); - using (ambientTransactionLock.Acquire()) - { - Assert.IsTrue(this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)).IsHeld()); - - // create a lock of the same type on the underlying connection of the ambient transaction - using dynamic specificConnectionProvider = Activator.CreateInstance( - ReplaceGenericParameter(typeof(TLockProvider), this._lockProvider.Strategy.GetType(), typeof(SpecificConnectionStrategy)) - )!; - specificConnectionProvider.Strategy.Test = this; - Assert.Catch(() => ((IDistributedLock)specificConnectionProvider.CreateLock(nameof(TestScopedToTransactionOnly))).Acquire()); - } - - static Type ReplaceGenericParameter(Type type, Type old, Type @new) - { - if (type == old) { return @new; } - if (!type.IsConstructedGenericType) { return type; } - - var newGenericArguments = type.GetGenericArguments() - .Select(a => ReplaceGenericParameter(a, old, @new)) - .ToArray(); - return type.GetGenericTypeDefinition() - .MakeGenericType(newGenericArguments); - } + Assert.IsTrue(this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)).IsHeld()); + + // create a lock of the same type on the underlying connection of the ambient transaction + using dynamic specificConnectionProvider = Activator.CreateInstance( + ReplaceGenericParameter(typeof(TLockProvider), this._lockProvider.Strategy.GetType(), typeof(SpecificConnectionStrategy)) + )!; + specificConnectionProvider.Strategy.Test = this; + Assert.Catch(() => ((IDistributedLock)specificConnectionProvider.CreateLock(nameof(TestScopedToTransactionOnly))).Acquire()); } - /// - /// Special strategy designed to allow us to make connection-scoped locks using the same connection as - /// the ambient transaction from our own - /// - private class SpecificConnectionStrategy : TestingDbSynchronizationStrategy + static Type ReplaceGenericParameter(Type type, Type old, Type @new) { - public ExternalTransactionStrategyTestCases? Test { get; set; } - - public override TestingDbConnectionOptions GetConnectionOptions() => - new TestingDbConnectionOptions { Connection = this.Test!._lockProvider.Strategy.AmbientTransaction!.Connection }; + if (type == old) { return @new; } + if (!type.IsConstructedGenericType) { return type; } + + var newGenericArguments = type.GetGenericArguments() + .Select(a => ReplaceGenericParameter(a, old, @new)) + .ToArray(); + return type.GetGenericTypeDefinition() + .MakeGenericType(newGenericArguments); } + } - public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] bool closeConnection) - { - var lockName = closeConnection ? "Connection" : "Transaction"; - - var nonAmbientTransactionLock = this._lockProvider.CreateLock(lockName); - - // Disable pooling for the ambient connection. This is important because we want to show that the lock - // will get released; in reality for a pooled connection in this scenario the lock-holding connection will - // return to the pool and would get released the next time that connection was fetched from the pool - this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; - this._lockProvider.Strategy.StartAmbient(); - var ambientTransactionLock = this._lockProvider.CreateLock(lockName); - - using var handle = ambientTransactionLock.Acquire(); - Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); - - if (closeConnection) - { - this._lockProvider.Strategy.AmbientTransaction!.Connection.Dispose(); - } - else - { - this._lockProvider.Strategy.AmbientTransaction!.Dispose(); - } - Assert.DoesNotThrow(handle.Dispose); + /// + /// Special strategy designed to allow us to make connection-scoped locks using the same connection as + /// the ambient transaction from our own + /// + private class SpecificConnectionStrategy : TestingDbSynchronizationStrategy + { + public ExternalTransactionStrategyTestCases? Test { get; set; } - // now lock can be re-acquired - Assert.IsFalse(nonAmbientTransactionLock.IsHeld()); + public override TestingDbConnectionOptions GetConnectionOptions() => + new TestingDbConnectionOptions { Connection = this.Test!._lockProvider.Strategy.AmbientTransaction!.Connection }; + } + + public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] bool closeConnection) + { + var lockName = closeConnection ? "Connection" : "Transaction"; + + var nonAmbientTransactionLock = this._lockProvider.CreateLock(lockName); + + // Disable pooling for the ambient connection. This is important because we want to show that the lock + // will get released; in reality for a pooled connection in this scenario the lock-holding connection will + // return to the pool and would get released the next time that connection was fetched from the pool + this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; + this._lockProvider.Strategy.StartAmbient(); + var ambientTransactionLock = this._lockProvider.CreateLock(lockName); + + using var handle = ambientTransactionLock.Acquire(); + Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); + + if (closeConnection) + { + this._lockProvider.Strategy.AmbientTransaction!.Connection.Dispose(); } + else + { + this._lockProvider.Strategy.AmbientTransaction!.Dispose(); + } + Assert.DoesNotThrow(handle.Dispose); + + // now lock can be re-acquired + Assert.IsFalse(nonAmbientTransactionLock.IsHeld()); + } - [Test] - public void TestLockOnRolledBackTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Rollback()); + [Test] + public void TestLockOnRolledBackTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Rollback()); - [Test] - public void TestLockOnCommittedTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Commit()); + [Test] + public void TestLockOnCommittedTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Commit()); - [Test] - public void TestLockOnDisposedTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Dispose()); + [Test] + public void TestLockOnDisposedTransaction() => this.TestLockOnCompletedTransactionHelper(t => t.Dispose()); + + private void TestLockOnCompletedTransactionHelper(Action complete, [CallerMemberName] string lockName = "") + { + var nonAmbientTransactionLock = this._lockProvider.CreateLock(lockName); - private void TestLockOnCompletedTransactionHelper(Action complete, [CallerMemberName] string lockName = "") + // Disable pooling for the ambient connection. This is important because we want to show that the lock + // will get released; in reality for a pooled connection in this scenario the lock-holding connection will + // return to the pool and would get released the next time that connection was fetched from the pool + this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; + this._lockProvider.Strategy.StartAmbient(); + var ambientTransactionLock = this._lockProvider.CreateLock(lockName); + + using var handle = ambientTransactionLock.Acquire(); + Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); + + complete(this._lockProvider.Strategy.AmbientTransaction!); + + var transactionSupport = this._lockProvider.Strategy.Db.TransactionSupport; + if (transactionSupport == TransactionSupport.ExplicitParticipation) + { + // this will throw because the lock will still be trying to use the transaction and we've ended it + Assert.Throws(handle.Dispose); + } + else + { + Assert.DoesNotThrow(handle.Dispose); + } + + nonAmbientTransactionLock.IsHeld() + // explicit participation will fail to release above, so it is still held + .ShouldEqual(transactionSupport == TransactionSupport.ExplicitParticipation ? true : false); + + if (transactionSupport == TransactionSupport.ImplicitParticipation) + { + // If we use transactions implicitly then we can keep using our lock without issue + // because we're just using the underlyign connection which is still good. + Assert.DoesNotThrow(() => ambientTransactionLock.Acquire().Dispose()); + } + else { - var nonAmbientTransactionLock = this._lockProvider.CreateLock(lockName); - - // Disable pooling for the ambient connection. This is important because we want to show that the lock - // will get released; in reality for a pooled connection in this scenario the lock-holding connection will - // return to the pool and would get released the next time that connection was fetched from the pool - this._lockProvider.Strategy.Db.ConnectionStringBuilder["Pooling"] = false; - this._lockProvider.Strategy.StartAmbient(); - var ambientTransactionLock = this._lockProvider.CreateLock(lockName); - - using var handle = ambientTransactionLock.Acquire(); - Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); - - complete(this._lockProvider.Strategy.AmbientTransaction!); - - var transactionSupport = this._lockProvider.Strategy.Db.TransactionSupport; - if (transactionSupport == TransactionSupport.ExplicitParticipation) - { - // this will throw because the lock will still be trying to use the transaction and we've ended it - Assert.Throws(handle.Dispose); - } - else - { - Assert.DoesNotThrow(handle.Dispose); - } - - nonAmbientTransactionLock.IsHeld() - // explicit participation will fail to release above, so it is still held - .ShouldEqual(transactionSupport == TransactionSupport.ExplicitParticipation ? true : false); - - if (transactionSupport == TransactionSupport.ImplicitParticipation) - { - // If we use transactions implicitly then we can keep using our lock without issue - // because we're just using the underlyign connection which is still good. - Assert.DoesNotThrow(() => ambientTransactionLock.Acquire().Dispose()); - } - else - { - // Otherwise we'll fail to use a transaction that has been ended - Assert.Catch(() => ambientTransactionLock.Acquire()); - } + // Otherwise we'll fail to use a transaction that has been ended + Assert.Catch(() => ambientTransactionLock.Acquire()); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index cc025dc3..f8b40b13 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -8,146 +8,145 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class MultiplexingConnectionStrategyTestCases + where TLockProvider : TestingLockProvider>, new() + where TDb : TestingPrimaryClientDb, new() { - public abstract class MultiplexingConnectionStrategyTestCases - where TLockProvider : TestingLockProvider>, new() - where TDb : TestingPrimaryClientDb, new() - { - private TLockProvider _lockProvider = default!; + private TLockProvider _lockProvider = default!; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - /// - /// Similar to but demonstrates - /// the time-based cleanup loop rather than forcing a cleanup - /// - [Test, NonParallelizable] // timing sensitive - public void TestLockAbandonmentWithTimeBasedCleanupRun() + /// + /// Similar to but demonstrates + /// the time-based cleanup loop rather than forcing a cleanup + /// + [Test, NonParallelizable] // timing sensitive + public void TestLockAbandonmentWithTimeBasedCleanupRun() + { + var lock1 = this._lockProvider.CreateLock(nameof(this.TestLockAbandonmentWithTimeBasedCleanupRun)); + var lock2 = this._lockProvider.CreateLock(nameof(this.TestLockAbandonmentWithTimeBasedCleanupRun)); + var handleReference = this.TestCleanupHelper(lock1, lock2); + + GC.Collect(); + GC.WaitForPendingFinalizers(); + handleReference.IsAlive.ShouldEqual(false); + + // We might get lucky and wait for less than the cadence based on how the timing works out. However, + // due to system load we might also need to wait longer than the cadence. To be safe, we wait for up + // to 2x the cadence but check in frequently to see if we can finish early. + var maxWait = TimeSpan.FromSeconds(2 * ManagedFinalizerQueue.FinalizerCadence.TotalSeconds); + var stopwatch = Stopwatch.StartNew(); + while (lock2.IsHeld()) { - var lock1 = this._lockProvider.CreateLock(nameof(this.TestLockAbandonmentWithTimeBasedCleanupRun)); - var lock2 = this._lockProvider.CreateLock(nameof(this.TestLockAbandonmentWithTimeBasedCleanupRun)); - var handleReference = this.TestCleanupHelper(lock1, lock2); - - GC.Collect(); - GC.WaitForPendingFinalizers(); - handleReference.IsAlive.ShouldEqual(false); - - // We might get lucky and wait for less than the cadence based on how the timing works out. However, - // due to system load we might also need to wait longer than the cadence. To be safe, we wait for up - // to 2x the cadence but check in frequently to see if we can finish early. - var maxWait = TimeSpan.FromSeconds(2 * ManagedFinalizerQueue.FinalizerCadence.TotalSeconds); - var stopwatch = Stopwatch.StartNew(); - while (lock2.IsHeld()) + if (stopwatch.Elapsed > maxWait) { - if (stopwatch.Elapsed > maxWait) - { - Assert.Fail(this.GetType().ToString()); - } - Thread.Sleep(TimeSpan.FromSeconds(.25)); + Assert.Fail(this.GetType().ToString()); } + Thread.Sleep(TimeSpan.FromSeconds(.25)); } + } - [MethodImpl(MethodImplOptions.NoInlining)] // need to isolate for GC - private WeakReference TestCleanupHelper(IDistributedLock lock1, IDistributedLock lock2) - { - var handle = lock1.Acquire(); + [MethodImpl(MethodImplOptions.NoInlining)] // need to isolate for GC + private WeakReference TestCleanupHelper(IDistributedLock lock1, IDistributedLock lock2) + { + var handle = lock1.Acquire(); - Assert.IsNull(lock2.TryAcquireAsync().Result); + Assert.IsNull(lock2.TryAcquireAsync().Result); - return new WeakReference(handle); - } + return new WeakReference(handle); + } + + /// + /// This method demonstrates how multiplexing can be used to hold many locks concurrently on one underlying connection. + /// + /// Note: I would like this test to actually leverage multiple threads, but this runs into issues because the current + /// implementation of optimistic multiplexing only makes one attempt to use a shared lock before opening a new connection. + /// This runs into problems because the attempt to use a shared lock can fail if, for example, a lock is being released on + /// that connection which means that the mutex for the connection can't be acquired without waiting. Once something like + /// this happens, we try to open a new connection which times out due to pool size limits + /// + [Test] + public void TestHighConcurrencyWithSmallPool() + { + const int LockNameCount = 20; - /// - /// This method demonstrates how multiplexing can be used to hold many locks concurrently on one underlying connection. - /// - /// Note: I would like this test to actually leverage multiple threads, but this runs into issues because the current - /// implementation of optimistic multiplexing only makes one attempt to use a shared lock before opening a new connection. - /// This runs into problems because the attempt to use a shared lock can fail if, for example, a lock is being released on - /// that connection which means that the mutex for the connection can't be acquired without waiting. Once something like - /// this happens, we try to open a new connection which times out due to pool size limits - /// - [Test] - public void TestHighConcurrencyWithSmallPool() + // Pre-generate all locks we will use. This is necessary for our Semaphore5 strategy, where the first lock created + // takes 4 of the 5 tickets (and thus may need more connections than a single-connection pool can support). For other + // lock types this does nothing since creating a lock might open a connection but otherwise won't run any commands + for (var i = 0; i < LockNameCount; ++i) { - const int LockNameCount = 20; + this._lockProvider.CreateLock(MakeLockName(i)); + } - // Pre-generate all locks we will use. This is necessary for our Semaphore5 strategy, where the first lock created - // takes 4 of the 5 tickets (and thus may need more connections than a single-connection pool can support). For other - // lock types this does nothing since creating a lock might open a connection but otherwise won't run any commands - for (var i = 0; i < LockNameCount; ++i) - { - this._lockProvider.CreateLock(MakeLockName(i)); - } + // Multiplexing is not allowed for upgrade locks since the upgrade operation could block. Therefore + // we don't allow a lock provider based on a RW lock to use its upgrade lock as an exclusive lock + if (this._lockProvider is ITestingReaderWriterLockAsMutexProvider readerWriterAsMutexProvider) + { + readerWriterAsMutexProvider.DisableUpgradeLock = true; + } - // Multiplexing is not allowed for upgrade locks since the upgrade operation could block. Therefore - // we don't allow a lock provider based on a RW lock to use its upgrade lock as an exclusive lock - if (this._lockProvider is ITestingReaderWriterLockAsMutexProvider readerWriterAsMutexProvider) - { - readerWriterAsMutexProvider.DisableUpgradeLock = true; - } + // assign a unique app name to make sure we'll own the entire pool + this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + this._lockProvider.Strategy.Db.MaxPoolSize = 1; - // assign a unique app name to make sure we'll own the entire pool - this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - this._lockProvider.Strategy.Db.MaxPoolSize = 1; + async Task Test() + { + var random = new Random(12345); - async Task Test() + var heldLocks = new Dictionary(); + for (var i = 0; i < 1000; ++i) { - var random = new Random(12345); - - var heldLocks = new Dictionary(); - for (var i = 0; i < 1000; ++i) + var lockName = MakeLockName(random.Next(20)); + if (heldLocks.TryGetValue(lockName, out var existingHandle)) { - var lockName = MakeLockName(random.Next(20)); - if (heldLocks.TryGetValue(lockName, out var existingHandle)) - { - existingHandle.Dispose(); - heldLocks.Remove(lockName); - } - else - { - var @lock = this._lockProvider.CreateLock(lockName); - var handle = await @lock.TryAcquireAsync(); - if (handle != null) { heldLocks.Add(lockName, handle); } - } + existingHandle.Dispose(); + heldLocks.Remove(lockName); } - - foreach (var remainingHandle in heldLocks.Values) + else { - remainingHandle.Dispose(); + var @lock = this._lockProvider.CreateLock(lockName); + var handle = await @lock.TryAcquireAsync(); + if (handle != null) { heldLocks.Add(lockName, handle); } } - }; + } - Assert.IsTrue(Task.Run(Test).Wait(Debugger.IsAttached ? TimeSpan.FromMinutes(10) : TimeSpan.FromSeconds(10))); + foreach (var remainingHandle in heldLocks.Values) + { + remainingHandle.Dispose(); + } + }; - string MakeLockName(int i) => $"{nameof(TestHighConcurrencyWithSmallPool)}_{i}"; - } + Assert.IsTrue(Task.Run(Test).Wait(Debugger.IsAttached ? TimeSpan.FromMinutes(10) : TimeSpan.FromSeconds(10))); - [Test] - public async Task TestBrokenConnectionDoesNotCorruptPool() - { - // This makes sure that for the Semaphore5 lock initial 4 tickets are taken with the default - // application name and therefore won't be killed - this._lockProvider.CreateLock("1"); - this._lockProvider.CreateLock("2"); - var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + string MakeLockName(int i) => $"{nameof(TestHighConcurrencyWithSmallPool)}_{i}"; + } - var lock1 = this._lockProvider.CreateLock("1"); - await using var handle1 = await lock1.AcquireAsync(); + [Test] + public async Task TestBrokenConnectionDoesNotCorruptPool() + { + // This makes sure that for the Semaphore5 lock initial 4 tickets are taken with the default + // application name and therefore won't be killed + this._lockProvider.CreateLock("1"); + this._lockProvider.CreateLock("2"); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - // kill the session - await this._lockProvider.Strategy.Db.KillSessionsAsync(applicationName); + var lock1 = this._lockProvider.CreateLock("1"); + await using var handle1 = await lock1.AcquireAsync(); - var lock2 = this._lockProvider.CreateLock("2"); - Assert.DoesNotThrowAsync(async () => await (await lock2.AcquireAsync()).DisposeAsync()); + // kill the session + await this._lockProvider.Strategy.Db.KillSessionsAsync(applicationName); - await using var handle2 = await lock2.AcquireAsync(); - Assert.DoesNotThrow(() => lock2.TryAcquire()?.Dispose()); + var lock2 = this._lockProvider.CreateLock("2"); + Assert.DoesNotThrowAsync(async () => await (await lock2.AcquireAsync()).DisposeAsync()); - Assert.Catch(() => handle1.Dispose()); + await using var handle2 = await lock2.AcquireAsync(); + Assert.DoesNotThrow(() => lock2.TryAcquire()?.Dispose()); - Assert.DoesNotThrowAsync(async () => await (await lock1.AcquireAsync()).DisposeAsync()); - } + Assert.Catch(() => handle1.Dispose()); + + Assert.DoesNotThrowAsync(async () => await (await lock1.AcquireAsync()).DisposeAsync()); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs index 2c35d338..8cf69da7 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs @@ -7,58 +7,57 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class OwnedConnectionStrategyTestCases + where TLockProvider : TestingLockProvider>, new() + where TDb : TestingPrimaryClientDb, new() { - public abstract class OwnedConnectionStrategyTestCases - where TLockProvider : TestingLockProvider>, new() - where TDb : TestingPrimaryClientDb, new() + private TLockProvider _lockProvider = default!; + + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); + + /// + /// Tests that our idle session killer works, therefore validating our other tests that use it. + /// + /// We test this here rather than in + /// because (a) we don't need to repeat the test for both regular and multiplexed and (2) for owned-transaction the test won't + /// pass because you can safely Dispose a transaction on a killed SQL connection + /// + [Test] + public void TestIdleSessionKiller() { - private TLockProvider _lockProvider = default!; - - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + // This makes sure that for the Semaphore5 lock initial 4 tickets are taken with the default + // application name and therefore won't be counted or killed + this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); - /// - /// Tests that our idle session killer works, therefore validating our other tests that use it. - /// - /// We test this here rather than in - /// because (a) we don't need to repeat the test for both regular and multiplexed and (2) for owned-transaction the test won't - /// pass because you can safely Dispose a transaction on a killed SQL connection - /// - [Test] - public void TestIdleSessionKiller() - { - // This makes sure that for the Semaphore5 lock initial 4 tickets are taken with the default - // application name and therefore won't be counted or killed - this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + var @lock = this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); - var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - var @lock = this._lockProvider.CreateLock(nameof(TestIdleSessionKiller)); + // go through one acquire/dispose cycle to ensure all commands are prepared. Due to + // https://github.com/npgsql/npgsql/issues/2912 in Postgres, we get NRE on the post-kill Dispose() + // call rather than the DbException we expected. + @lock.Acquire().Dispose(); - // go through one acquire/dispose cycle to ensure all commands are prepared. Due to - // https://github.com/npgsql/npgsql/issues/2912 in Postgres, we get NRE on the post-kill Dispose() - // call rather than the DbException we expected. - @lock.Acquire().Dispose(); + using var handle = @lock.Acquire(); + this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1); - using var handle = @lock.Acquire(); - this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1); - - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.1)); - var stopwatch = Stopwatch.StartNew(); - while (true) + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.1)); + var stopwatch = Stopwatch.StartNew(); + while (true) + { + Thread.Sleep(TimeSpan.FromSeconds(.02)); + if (this._lockProvider.Strategy.Db.CountActiveSessions(applicationName) == 0) { - Thread.Sleep(TimeSpan.FromSeconds(.02)); - if (this._lockProvider.Strategy.Db.CountActiveSessions(applicationName) == 0) - { - break; - } - if (stopwatch.Elapsed > TimeSpan.FromSeconds(5)) - { - Assert.Fail("Timed out waiting for idle session to be killed"); - } + break; + } + if (stopwatch.Elapsed > TimeSpan.FromSeconds(5)) + { + Assert.Fail("Timed out waiting for idle session to be killed"); } - - Assert.Catch(() => handle.Dispose()); } + + Assert.Catch(() => handle.Dispose()); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs index 4ed8b928..7a8793c8 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs @@ -3,77 +3,76 @@ using System; using System.Data; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class OwnedTransactionStrategyTestCases + where TLockProvider : TestingLockProvider>, new() + where TDb : TestingPrimaryClientDb, new() { - public abstract class OwnedTransactionStrategyTestCases - where TLockProvider : TestingLockProvider>, new() - where TDb : TestingPrimaryClientDb, new() - { - private TLockProvider _lockProvider = default!; + private TLockProvider _lockProvider = default!; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - /// - /// Validates that we use the default isolation level to avoid the problem described - /// here: https://msdn.microsoft.com/en-us/library/5ha4240h(v=vs.110).aspx - /// - /// From MSDN: - /// After a transaction is committed or rolled back, the isolation level of the transaction - /// persists for all subsequent commands that are in autocommit mode (the SQL Server default). - /// This can produce unexpected results, such as an isolation level of REPEATABLE READ persisting - /// and locking other users out of a row. To reset the isolation level to the default (READ COMMITTED), - /// execute the Transact-SQL SET TRANSACTION ISOLATION LEVEL READ COMMITTED statement, or call - /// SqlConnection.BeginTransaction followed immediately by SqlTransaction.Commit. For more - /// information on SQL Server isolation levels, see "Isolation Levels in the Database Engine" in SQL - /// Server Books Online. - /// - /// This obviously only applies to SQLServer currently. However, we might as well run this test against - /// other providers in case they have the same issue. - /// - [Test] - public void TestIsolationLevelLeakage() + /// + /// Validates that we use the default isolation level to avoid the problem described + /// here: https://msdn.microsoft.com/en-us/library/5ha4240h(v=vs.110).aspx + /// + /// From MSDN: + /// After a transaction is committed or rolled back, the isolation level of the transaction + /// persists for all subsequent commands that are in autocommit mode (the SQL Server default). + /// This can produce unexpected results, such as an isolation level of REPEATABLE READ persisting + /// and locking other users out of a row. To reset the isolation level to the default (READ COMMITTED), + /// execute the Transact-SQL SET TRANSACTION ISOLATION LEVEL READ COMMITTED statement, or call + /// SqlConnection.BeginTransaction followed immediately by SqlTransaction.Commit. For more + /// information on SQL Server isolation levels, see "Isolation Levels in the Database Engine" in SQL + /// Server Books Online. + /// + /// This obviously only applies to SQLServer currently. However, we might as well run this test against + /// other providers in case they have the same issue. + /// + [Test] + public void TestIsolationLevelLeakage() + { + // Needed because MySQL has RepeatableRead while SqlServer and Postgres have ReadCommitted + IsolationLevel defaultIsolationLevel; + using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) { - // Needed because MySQL has RepeatableRead while SqlServer and Postgres have ReadCommitted - IsolationLevel defaultIsolationLevel; - using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) + connection.Open(); + try + { + defaultIsolationLevel = this._lockProvider.Strategy.Db.GetIsolationLevel(connection); + } + catch (NotSupportedException) { - connection.Open(); - try - { - defaultIsolationLevel = this._lockProvider.Strategy.Db.GetIsolationLevel(connection); - } - catch (NotSupportedException) - { - Assert.Pass("Getting isolation level not supported"); - throw; - } + Assert.Pass("Getting isolation level not supported"); + throw; } + } - // Pre-generate the lock we will use. This is necessary for our Semaphore5 strategy, where the first lock created - // takes 4 of the 5 tickets (and thus may need more connections than a single-connection pool can support). For other - // lock types this does nothing since creating a lock might open a connection but otherwise won't run any commands - this._lockProvider.CreateLock(nameof(TestIsolationLevelLeakage)); + // Pre-generate the lock we will use. This is necessary for our Semaphore5 strategy, where the first lock created + // takes 4 of the 5 tickets (and thus may need more connections than a single-connection pool can support). For other + // lock types this does nothing since creating a lock might open a connection but otherwise won't run any commands + this._lockProvider.CreateLock(nameof(TestIsolationLevelLeakage)); - // use a unique pool of size 1 so we can reclaim the connection after we use it and test for leaks - this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - this._lockProvider.Strategy.Db.MaxPoolSize = 1; + // use a unique pool of size 1 so we can reclaim the connection after we use it and test for leaks + this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + this._lockProvider.Strategy.Db.MaxPoolSize = 1; - AssertHasDefaultIsolationLevel(); + AssertHasDefaultIsolationLevel(); - var @lock = this._lockProvider.CreateLock(nameof(TestIsolationLevelLeakage)); - @lock.Acquire().Dispose(); - AssertHasDefaultIsolationLevel(); + var @lock = this._lockProvider.CreateLock(nameof(TestIsolationLevelLeakage)); + @lock.Acquire().Dispose(); + AssertHasDefaultIsolationLevel(); - @lock.AcquireAsync().Result.Dispose(); - AssertHasDefaultIsolationLevel(); + @lock.AcquireAsync().Result.Dispose(); + AssertHasDefaultIsolationLevel(); - void AssertHasDefaultIsolationLevel() - { - using var connection = this._lockProvider.Strategy.Db.CreateConnection(); - connection.Open(); - this._lockProvider.Strategy.Db.GetIsolationLevel(connection).ShouldEqual(defaultIsolationLevel); - } + void AssertHasDefaultIsolationLevel() + { + using var connection = this._lockProvider.Strategy.Db.CreateConnection(); + connection.Open(); + this._lockProvider.Strategy.Db.GetIsolationLevel(connection).ShouldEqual(defaultIsolationLevel); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index 21161a13..191ccb89 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -5,64 +5,63 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCases + where TLockProvider : TestingUpgradeableReaderWriterLockProvider, new() + where TStrategy : TestingConnectionStringSynchronizationStrategy, new() + where TDb : TestingPrimaryClientDb, new() { - public abstract class UpgradeableReaderWriterLockConnectionStringStrategyTestCases - where TLockProvider : TestingUpgradeableReaderWriterLockProvider, new() - where TStrategy : TestingConnectionStringSynchronizationStrategy, new() - where TDb : TestingPrimaryClientDb, new() - { - private TLockProvider _lockProvider = default!; + private TLockProvider _lockProvider = default!; - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); - /// - /// Tests the logic where upgrading a connection stops and restarts the keepalive - /// - [Test] - [NonParallelizable, Retry(tryCount: 5)] // this test is somewhat timing sensitive - public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() - { - var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); + /// + /// Tests the logic where upgrading a connection stops and restarts the keepalive + /// + [Test] + [NonParallelizable, Retry(tryCount: 5)] // this test is somewhat timing sensitive + public void TestKeepaliveProtectsFromIdleSessionKillerAfterFailedUpgrade() + { + var applicationName = this._lockProvider.Strategy.Db.SetUniqueApplicationName(); - this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromSeconds(.1); + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(Guid.NewGuid().ToString()); - using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(2)); + using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(2)); - using (@lock.AcquireReadLock()) - { - var handle = @lock.AcquireUpgradeableReadLock(); - handle.TryUpgradeToWriteLock().ShouldEqual(false); - handle.TryUpgradeToWriteLockAsync().Result.ShouldEqual(false); - Thread.Sleep(TimeSpan.FromSeconds(4)); - Assert.DoesNotThrow(() => handle.Dispose()); - } + using (@lock.AcquireReadLock()) + { + var handle = @lock.AcquireUpgradeableReadLock(); + handle.TryUpgradeToWriteLock().ShouldEqual(false); + handle.TryUpgradeToWriteLockAsync().Result.ShouldEqual(false); + Thread.Sleep(TimeSpan.FromSeconds(4)); + Assert.DoesNotThrow(() => handle.Dispose()); } + } - /// - /// Demonstrates that we don't multi-thread the connection despite running keepalive queries - /// - /// This test is similar to , - /// but in this case we additionally test lock upgrading which must pause and restart the keepalive process. - /// - [Test] - public void TestKeepaliveDoesNotCreateRaceCondition() - { - this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMilliseconds(1); + /// + /// Demonstrates that we don't multi-thread the connection despite running keepalive queries + /// + /// This test is similar to , + /// but in this case we additionally test lock upgrading which must pause and restart the keepalive process. + /// + [Test] + public void TestKeepaliveDoesNotCreateRaceCondition() + { + this._lockProvider.Strategy.KeepaliveCadence = TimeSpan.FromMilliseconds(1); - Assert.DoesNotThrow(() => + Assert.DoesNotThrow(() => + { + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestKeepaliveDoesNotCreateRaceCondition)); + for (var i = 0; i < 30; ++i) { - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestKeepaliveDoesNotCreateRaceCondition)); - for (var i = 0; i < 30; ++i) - { - using var handle = @lock.AcquireUpgradeableReadLockAsync().Result; - Thread.Sleep(1); - handle.UpgradeToWriteLock(); - Thread.Sleep(1); - } - }); - } + using var handle = @lock.AcquireUpgradeableReadLockAsync().Result; + Thread.Sleep(1); + handle.UpgradeToWriteLock(); + Thread.Sleep(1); + } + }); } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 05d28947..bead266e 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -11,478 +11,477 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class DistributedLockCoreTestCases + where TLockProvider : TestingLockProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class DistributedLockCoreTestCases - where TLockProvider : TestingLockProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - private TLockProvider _lockProvider = default!; - private readonly List _cleanupActions = new List(); + private TLockProvider _lockProvider = default!; + private readonly List _cleanupActions = new List(); - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] - public void TearDown() - { - this._cleanupActions.ForEach(a => a()); - this._cleanupActions.Clear(); - this._lockProvider.Dispose(); - } + [TearDown] + public void TearDown() + { + this._cleanupActions.ForEach(a => a()); + this._cleanupActions.Clear(); + this._lockProvider.Dispose(); + } + + [Test] + public void BasicTest() + { + var @lock = this._lockProvider.CreateLock(nameof(BasicTest)); + var lock2 = this._lockProvider.CreateLock(nameof(BasicTest) + "2"); - [Test] - public void BasicTest() + using (var handle = @lock.TryAcquire()) { - var @lock = this._lockProvider.CreateLock(nameof(BasicTest)); - var lock2 = this._lockProvider.CreateLock(nameof(BasicTest) + "2"); + Assert.IsNotNull(handle, this.GetType() + ": should be able to acquire new lock"); - using (var handle = @lock.TryAcquire()) + using (var nestedHandle = @lock.TryAcquire()) { - Assert.IsNotNull(handle, this.GetType() + ": should be able to acquire new lock"); - - using (var nestedHandle = @lock.TryAcquire()) - { - Assert.IsNull(nestedHandle, "should not be reentrant"); - } - - using var nestedHandle2 = lock2.TryAcquire(); - Assert.IsNotNull(nestedHandle2, this.GetType() + ": should be able to acquire a different lock"); + Assert.IsNull(nestedHandle, "should not be reentrant"); } - using (var handle = @lock.TryAcquire()) - { - Assert.IsNotNull(handle, this.GetType() + ": should be able to re-acquire after releasing"); - } + using var nestedHandle2 = lock2.TryAcquire(); + Assert.IsNotNull(nestedHandle2, this.GetType() + ": should be able to acquire a different lock"); } - [Test] - public async Task BasicAsyncTest() + using (var handle = @lock.TryAcquire()) { - // note: we intentionally have a mix of await using vs using and await - // vs .Result here to excercise various code paths + Assert.IsNotNull(handle, this.GetType() + ": should be able to re-acquire after releasing"); + } + } - var @lock = this._lockProvider.CreateLock(nameof(BasicAsyncTest)); - var lock2 = this._lockProvider.CreateLock(nameof(BasicAsyncTest) + "2"); + [Test] + public async Task BasicAsyncTest() + { + // note: we intentionally have a mix of await using vs using and await + // vs .Result here to excercise various code paths - await using (var handle = await @lock.TryAcquireAsync()) - { - Assert.IsNotNull(handle, this.GetType().Name); + var @lock = this._lockProvider.CreateLock(nameof(BasicAsyncTest)); + var lock2 = this._lockProvider.CreateLock(nameof(BasicAsyncTest) + "2"); - using (var nestedHandle = await @lock.TryAcquireAsync()) - { - Assert.IsNull(nestedHandle, this.GetType().Name); - } - - await using var nestedHandle2 = lock2.TryAcquireAsync().AsTask().Result; - Assert.IsNotNull(nestedHandle2, this.GetType().Name); - } + await using (var handle = await @lock.TryAcquireAsync()) + { + Assert.IsNotNull(handle, this.GetType().Name); - await using (var handle = await @lock.TryAcquireAsync()) + using (var nestedHandle = await @lock.TryAcquireAsync()) { - Assert.IsNotNull(handle, this.GetType().Name); + Assert.IsNull(nestedHandle, this.GetType().Name); } - } - [Test] - public void TestBadArguments() - { - var @lock = this._lockProvider.CreateLock(nameof(TestBadArguments)); - Assert.Catch(() => @lock.Acquire(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquire(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.Acquire(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.AcquireAsync(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquire(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(int.MaxValue))); + await using var nestedHandle2 = lock2.TryAcquireAsync().AsTask().Result; + Assert.IsNotNull(nestedHandle2, this.GetType().Name); } - [Test] - public void TestDisposeHandleIsIdempotent() + await using (var handle = await @lock.TryAcquireAsync()) { - var @lock = this._lockProvider.CreateLock(nameof(TestDisposeHandleIsIdempotent)); - var handle = @lock.Acquire(TimeSpan.FromSeconds(30)); - Assert.IsNotNull(handle); - handle.Dispose(); - var handle2 = @lock.Acquire(TimeSpan.FromSeconds(30)); - Assert.DoesNotThrow(() => handle.Dispose()); - Assert.DoesNotThrow(() => handle2.Dispose()); + Assert.IsNotNull(handle, this.GetType().Name); } + } - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public void TestTimeouts() - { - // use a randomized name in case we end up retrying - var lockName = Guid.NewGuid().ToString(); + [Test] + public void TestBadArguments() + { + var @lock = this._lockProvider.CreateLock(nameof(TestBadArguments)); + Assert.Catch(() => @lock.Acquire(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquire(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.Acquire(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.AcquireAsync(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquire(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(int.MaxValue))); + } - var @lock = this._lockProvider.CreateLock(lockName); - // acquire with a different lock instance to avoid reentrancy mattering - using (this._lockProvider.CreateLock(lockName).Acquire()) - { - var timeout = TimeSpan.FromSeconds(.2); - var waitTime = TimeSpan.FromSeconds(.5); + [Test] + public void TestDisposeHandleIsIdempotent() + { + var @lock = this._lockProvider.CreateLock(nameof(TestDisposeHandleIsIdempotent)); + var handle = @lock.Acquire(TimeSpan.FromSeconds(30)); + Assert.IsNotNull(handle); + handle.Dispose(); + var handle2 = @lock.Acquire(TimeSpan.FromSeconds(30)); + Assert.DoesNotThrow(() => handle.Dispose()); + Assert.DoesNotThrow(() => handle2.Dispose()); + } - var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); - syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire"); - Assert.IsInstanceOf(syncAcquireTask.Exception?.InnerException, "sync acquire"); + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public void TestTimeouts() + { + // use a randomized name in case we end up retrying + var lockName = Guid.NewGuid().ToString(); - var asyncAcquireTask = @lock.AcquireAsync(timeout).AsTask(); - asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire"); - Assert.IsInstanceOf(asyncAcquireTask.Exception!.InnerException, "async acquire"); + var @lock = this._lockProvider.CreateLock(lockName); + // acquire with a different lock instance to avoid reentrancy mattering + using (this._lockProvider.CreateLock(lockName).Acquire()) + { + var timeout = TimeSpan.FromSeconds(.2); + var waitTime = TimeSpan.FromSeconds(.5); - var syncTryAcquireTask = Task.Run(() => @lock.TryAcquire(timeout)); - syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire"); - syncTryAcquireTask.Result.ShouldEqual(null, "sync tryAcquire"); + var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); + syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire"); + Assert.IsInstanceOf(syncAcquireTask.Exception?.InnerException, "sync acquire"); - var asyncTryAcquireTask = @lock.TryAcquireAsync(timeout).AsTask(); - asyncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "async tryAcquire"); - asyncTryAcquireTask.Result.ShouldEqual(null, "async tryAcquire"); - } - } + var asyncAcquireTask = @lock.AcquireAsync(timeout).AsTask(); + asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire"); + Assert.IsInstanceOf(asyncAcquireTask.Exception!.InnerException, "async acquire"); - [Test] - public void CancellationTest() - { - var lockName = nameof(CancellationTest); - var @lock = this._lockProvider.CreateLock(lockName); + var syncTryAcquireTask = Task.Run(() => @lock.TryAcquire(timeout)); + syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire"); + syncTryAcquireTask.Result.ShouldEqual(null, "sync tryAcquire"); - var source = new CancellationTokenSource(); - using (var handle = this._lockProvider.CreateLock(lockName).Acquire()) - { - // Task.Run() forces true asynchrony even for locks that don't support it - var blocked = Task.Run(() => @lock.AcquireAsync(cancellationToken: source.Token).AsTask()); - blocked.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); - source.Cancel(); - blocked.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, this.GetType().Name); - blocked.Status.ShouldEqual(TaskStatus.Canceled, (blocked.Exception ?? (object)"no exception").ToString()); - } + var asyncTryAcquireTask = @lock.TryAcquireAsync(timeout).AsTask(); + asyncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "async tryAcquire"); + asyncTryAcquireTask.Result.ShouldEqual(null, "async tryAcquire"); + } + } + + [Test] + public void CancellationTest() + { + var lockName = nameof(CancellationTest); + var @lock = this._lockProvider.CreateLock(lockName); - // already canceled - source = new CancellationTokenSource(); + var source = new CancellationTokenSource(); + using (var handle = this._lockProvider.CreateLock(lockName).Acquire()) + { + // Task.Run() forces true asynchrony even for locks that don't support it + var blocked = Task.Run(() => @lock.AcquireAsync(cancellationToken: source.Token).AsTask()); + blocked.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false); source.Cancel(); - Assert.Catch(() => @lock.Acquire(cancellationToken: source.Token)); + blocked.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, this.GetType().Name); + blocked.Status.ShouldEqual(TaskStatus.Canceled, (blocked.Exception ?? (object)"no exception").ToString()); } - [Test] - public async Task TestParallelism() - { - var taskCount = 100; - this._lockProvider.Strategy.PrepareForHighContention(ref taskCount); - - // NOTE: if this test fails for Postgres, we may need to raise the default connection limit. This can - // be done by setting max_connections in C:\Program Files\PostgreSQL\\data\postgresql.conf or - // /var/lib/pgsql//data/postgresql.conf and then restarting Postgres. I set max_connections = 10000. - // See https://docs.alfresco.com/5.0/tasks/postgresql-config.html - - var locks = Enumerable.Range(0, taskCount) - .Select(_ => this._lockProvider.CreateLock("parallel_test")) - .ToArray(); - var counter = 0; - // Task.Run() ensures true parallelism even for locks that don't support it - var tasks = Enumerable.Range(0, taskCount).Select(i => Task.Run(async () => + // already canceled + source = new CancellationTokenSource(); + source.Cancel(); + Assert.Catch(() => @lock.Acquire(cancellationToken: source.Token)); + } + + [Test] + public async Task TestParallelism() + { + var taskCount = 100; + this._lockProvider.Strategy.PrepareForHighContention(ref taskCount); + + // NOTE: if this test fails for Postgres, we may need to raise the default connection limit. This can + // be done by setting max_connections in C:\Program Files\PostgreSQL\\data\postgresql.conf or + // /var/lib/pgsql//data/postgresql.conf and then restarting Postgres. I set max_connections = 10000. + // See https://docs.alfresco.com/5.0/tasks/postgresql-config.html + + var locks = Enumerable.Range(0, taskCount) + .Select(_ => this._lockProvider.CreateLock("parallel_test")) + .ToArray(); + var counter = 0; + // Task.Run() ensures true parallelism even for locks that don't support it + var tasks = Enumerable.Range(0, taskCount).Select(i => Task.Run(async () => + { + await using (await locks[i].AcquireAsync()) { - await using (await locks[i].AcquireAsync()) + // increment going in + if (Interlocked.Increment(ref counter) == 2) { - // increment going in - if (Interlocked.Increment(ref counter) == 2) - { - Assert.Fail($"Concurrent lock acquisitions ({this.GetType()}"); - } + Assert.Fail($"Concurrent lock acquisitions ({this.GetType()}"); + } - // hang out for a bit to ensure concurrency - await Task.Delay(TimeSpan.FromMilliseconds(10)); + // hang out for a bit to ensure concurrency + await Task.Delay(TimeSpan.FromMilliseconds(10)); - // decrement and return on the way out (returns # inside the lock when this left ... should be 0) - return Interlocked.Decrement(ref counter); - } - })) - .ToList(); + // decrement and return on the way out (returns # inside the lock when this left ... should be 0) + return Interlocked.Decrement(ref counter); + } + })) + .ToList(); - var failure = new TaskCompletionSource(); - foreach (var task in tasks) - { - _ = task.ContinueWith(t => failure.TrySetException(t.Exception!), TaskContinuationOptions.OnlyOnFaulted); - } + var failure = new TaskCompletionSource(); + foreach (var task in tasks) + { + _ = task.ContinueWith(t => failure.TrySetException(t.Exception!), TaskContinuationOptions.OnlyOnFaulted); + } - var timeout = Task.Delay(TimeSpan.FromSeconds(30)); + var timeout = Task.Delay(TimeSpan.FromSeconds(30)); - var completed = await Task.WhenAny(Task.WhenAll(tasks), failure.Task, timeout); - Assert.AreNotSame(failure.Task, completed, $"Failed with {(failure.Task.IsFaulted ? failure.Task.Exception!.ToString() : null)}"); - Assert.AreNotSame(timeout, completed, $"Timed out! (only {tasks.Count(t => t.IsCompleted)}/{taskCount} completed)"); + var completed = await Task.WhenAny(Task.WhenAll(tasks), failure.Task, timeout); + Assert.AreNotSame(failure.Task, completed, $"Failed with {(failure.Task.IsFaulted ? failure.Task.Exception!.ToString() : null)}"); + Assert.AreNotSame(timeout, completed, $"Timed out! (only {tasks.Count(t => t.IsCompleted)}/{taskCount} completed)"); - tasks.ForEach(t => t.Result.ShouldEqual(0)); - } + tasks.ForEach(t => t.Result.ShouldEqual(0)); + } - [Test] - [NonParallelizable] // takes locks with known names - public void TestGetSafeName() - { - Assert.Catch(() => this._lockProvider.GetSafeName(null!)); + [Test] + [NonParallelizable] // takes locks with known names + public void TestGetSafeName() + { + Assert.Catch(() => this._lockProvider.GetSafeName(null!)); - foreach (var name in new[] { string.Empty, new string('a', 1000), @"\\\\\", new string('\\', 1000) }) - { - var safeName = this._lockProvider.GetSafeName(name); - Assert.DoesNotThrow(() => this._lockProvider.CreateLockWithExactName(safeName).Acquire(TimeSpan.FromSeconds(10)).Dispose(), $"{this.GetType().Name}: could not acquire '{name}'"); - } + foreach (var name in new[] { string.Empty, new string('a', 1000), @"\\\\\", new string('\\', 1000) }) + { + var safeName = this._lockProvider.GetSafeName(name); + Assert.DoesNotThrow(() => this._lockProvider.CreateLockWithExactName(safeName).Acquire(TimeSpan.FromSeconds(10)).Dispose(), $"{this.GetType().Name}: could not acquire '{name}'"); } + } - [Test] - public void TestGetSafeLockNameIsCaseSensitive() - { - var longName1 = new string('a', 1000); - var longName2 = new string('a', longName1.Length - 1) + "A"; - StringComparer.OrdinalIgnoreCase.Equals(longName1, longName2).ShouldEqual(true, "sanity check"); + [Test] + public void TestGetSafeLockNameIsCaseSensitive() + { + var longName1 = new string('a', 1000); + var longName2 = new string('a', longName1.Length - 1) + "A"; + StringComparer.OrdinalIgnoreCase.Equals(longName1, longName2).ShouldEqual(true, "sanity check"); - Assert.AreNotEqual(this._lockProvider.GetSafeName(longName1), this._lockProvider.GetSafeName(longName2)); - } + Assert.AreNotEqual(this._lockProvider.GetSafeName(longName1), this._lockProvider.GetSafeName(longName2)); + } - [Test] - public async Task TestLockNamesAreCaseSensitive() + [Test] + public async Task TestLockNamesAreCaseSensitive() + { + // the goal here is to construct 2 valid lock names that differ only by case. We start by generating a hash name + // that is unique to this test yet stable across runs. Then we truncate it to avoid need for further hashing in Postgres + // (which only supports very short ASCII string names). Finally, we re-run through GetSafeName to pick up any special prefix + // that is needed (e. g. for wait handles) + using var sha1 = SHA1.Create(); + var uniqueHashName = BitConverter.ToString(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))) + .Replace("-", string.Empty) + // normalize to upper case per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 + .ToUpperInvariant(); + var lowerBaseName = $"{uniqueHashName.Substring(0, 6)}_a"; + var lowerName = this._lockProvider.GetSafeName(lowerBaseName); + var upperBaseName = $"{uniqueHashName.Substring(0, 6)}_A"; + var upperName = this._lockProvider.GetSafeName(upperBaseName); + // make sure we succeeded in generating what we set out to generate + Assert.AreNotEqual(lowerName, upperName); + if (StringComparer.OrdinalIgnoreCase.Equals(lowerName, upperName)) { - // the goal here is to construct 2 valid lock names that differ only by case. We start by generating a hash name - // that is unique to this test yet stable across runs. Then we truncate it to avoid need for further hashing in Postgres - // (which only supports very short ASCII string names). Finally, we re-run through GetSafeName to pick up any special prefix - // that is needed (e. g. for wait handles) - using var sha1 = SHA1.Create(); - var uniqueHashName = BitConverter.ToString(sha1.ComputeHash(Encoding.UTF8.GetBytes(this._lockProvider.GetUniqueSafeName()))) - .Replace("-", string.Empty) - // normalize to upper case per https://docs.microsoft.com/en-us/visualstudio/code-quality/ca1308?view=vs-2019 - .ToUpperInvariant(); - var lowerBaseName = $"{uniqueHashName.Substring(0, 6)}_a"; - var lowerName = this._lockProvider.GetSafeName(lowerBaseName); - var upperBaseName = $"{uniqueHashName.Substring(0, 6)}_A"; - var upperName = this._lockProvider.GetSafeName(upperBaseName); - // make sure we succeeded in generating what we set out to generate - Assert.AreNotEqual(lowerName, upperName); - if (StringComparer.OrdinalIgnoreCase.Equals(lowerName, upperName)) + // if the names vary only by case, test that they are different locks + await using (await this._lockProvider.CreateLockWithExactName(lowerName).AcquireAsync()) + await using (var handle = await this._lockProvider.CreateLockWithExactName(upperName).TryAcquireAsync()) { - // if the names vary only by case, test that they are different locks - await using (await this._lockProvider.CreateLockWithExactName(lowerName).AcquireAsync()) - await using (var handle = await this._lockProvider.CreateLockWithExactName(upperName).TryAcquireAsync()) - { - Assert.IsNotNull(handle); - } - } - else - { - // otherwise, check that the names still contain the suffixes we added - Assert.IsTrue(lowerName.IndexOf(lowerBaseName, StringComparison.OrdinalIgnoreCase) >= 0); - Assert.IsTrue(upperName.IndexOf(upperBaseName, StringComparison.OrdinalIgnoreCase) >= 0); + Assert.IsNotNull(handle); } } - - [Test] - public void TestCanceledAlreadyThrowsForSyncAndDoesNotThrowForAsync() + else { - using var source = new CancellationTokenSource(); - source.Cancel(); + // otherwise, check that the names still contain the suffixes we added + Assert.IsTrue(lowerName.IndexOf(lowerBaseName, StringComparison.OrdinalIgnoreCase) >= 0); + Assert.IsTrue(upperName.IndexOf(upperBaseName, StringComparison.OrdinalIgnoreCase) >= 0); + } + } - var @lock = this._lockProvider.CreateLock("already-canceled"); + [Test] + public void TestCanceledAlreadyThrowsForSyncAndDoesNotThrowForAsync() + { + using var source = new CancellationTokenSource(); + source.Cancel(); - Assert.Catch(() => @lock.Acquire(cancellationToken: source.Token)); - Assert.Catch(() => @lock.TryAcquire(cancellationToken: source.Token)); + var @lock = this._lockProvider.CreateLock("already-canceled"); - var acquireTask = @lock.AcquireAsync(cancellationToken: source.Token).AsTask(); - acquireTask.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); - acquireTask.IsCanceled.ShouldEqual(true, "acquire"); + Assert.Catch(() => @lock.Acquire(cancellationToken: source.Token)); + Assert.Catch(() => @lock.TryAcquire(cancellationToken: source.Token)); - var tryAcquireTask = @lock.TryAcquireAsync(cancellationToken: source.Token).AsTask(); - tryAcquireTask.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); - tryAcquireTask.IsCanceled.ShouldEqual(true, "tryAcquire"); - } + var acquireTask = @lock.AcquireAsync(cancellationToken: source.Token).AsTask(); + acquireTask.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); + acquireTask.IsCanceled.ShouldEqual(true, "acquire"); - [Test] - public async Task TestHandleLostTriggersCorrectly() - { - // pre-create the lock so that semaphore5 tickets don't get created on the connection - // we're going to kill - this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); + var tryAcquireTask = @lock.TryAcquireAsync(cancellationToken: source.Token).AsTask(); + tryAcquireTask.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true); + tryAcquireTask.IsCanceled.ShouldEqual(true, "tryAcquire"); + } - var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); + [Test] + public async Task TestHandleLostTriggersCorrectly() + { + // pre-create the lock so that semaphore5 tickets don't get created on the connection + // we're going to kill + this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); - var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); + var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); - var handle = await @lock.AcquireAsync(); - try - { - handle.HandleLostToken.CanBeCanceled.ShouldEqual(handleLostHelper != null); - Assert.IsFalse(handle.HandleLostToken.IsCancellationRequested); + var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); - if (handleLostHelper != null) - { - using var canceledEvent = new ManualResetEventSlim(initialState: false); - using var registration = handle.HandleLostToken.Register(canceledEvent.Set); + var handle = await @lock.AcquireAsync(); + try + { + handle.HandleLostToken.CanBeCanceled.ShouldEqual(handleLostHelper != null); + Assert.IsFalse(handle.HandleLostToken.IsCancellationRequested); + + if (handleLostHelper != null) + { + using var canceledEvent = new ManualResetEventSlim(initialState: false); + using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); - handleLostHelper.Dispose(); + handleLostHelper.Dispose(); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); - Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); - } + Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); + Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); } - finally - { - // when the handle is lost, Dispose() may throw - try { await handle.DisposeAsync(); } - catch { } - } - - Assert.Throws(() => handle.HandleLostToken.GetType()); } - - [Test] - public async Task TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost() + finally { - // pre-create the lock so that semaphore5 tickets don't get created on the connection - // we're going to kill - this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); + // when the handle is lost, Dispose() may throw + try { await handle.DisposeAsync(); } + catch { } + } - var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); - if (handleLostHelper == null) { Assert.Pass(); } + Assert.Throws(() => handle.HandleLostToken.GetType()); + } - var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); + [Test] + public async Task TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost() + { + // pre-create the lock so that semaphore5 tickets don't get created on the connection + // we're going to kill + this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); - using var handle = await @lock.AcquireAsync(); - - handleLostHelper!.Dispose(); + var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); + if (handleLostHelper == null) { Assert.Pass(); } - using var canceledEvent = new ManualResetEventSlim(initialState: false); - handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(5))); + var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost)); - // when the handle is lost, Dispose() may throw - try { handle.Dispose(); } - catch { } - } + using var handle = await @lock.AcquireAsync(); + + handleLostHelper!.Dispose(); - [Test] - public void TestCanSafelyDisposeWhileMonitoring() - { - var @lock = this._lockProvider.CreateLock(nameof(TestCanSafelyDisposeWhileMonitoring)); + using var canceledEvent = new ManualResetEventSlim(initialState: false); + handle.HandleLostToken.Register(canceledEvent.Set); + Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(5))); - using var handle = @lock.Acquire(); + // when the handle is lost, Dispose() may throw + try { handle.Dispose(); } + catch { } + } - // force monitoring to happen - using var canceledEvent = new ManualResetEventSlim(initialState: false); - using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + [Test] + public void TestCanSafelyDisposeWhileMonitoring() + { + var @lock = this._lockProvider.CreateLock(nameof(TestCanSafelyDisposeWhileMonitoring)); - Assert.DoesNotThrow(handle.Dispose); - } + using var handle = @lock.Acquire(); - [Test] - public async Task TestLockAbandonment() - { - const string LockName = nameof(TestLockAbandonment); + // force monitoring to happen + using var canceledEvent = new ManualResetEventSlim(initialState: false); + using var registration = handle.HandleLostToken.Register(canceledEvent.Set); + Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); - // pre-create the lock so that the semaphore5 provider will allocate the extra tickets - // against a connection that won't get cleand up when we force additional cleanup - this._lockProvider.CreateLock(LockName); + Assert.DoesNotThrow(handle.Dispose); + } - this._lockProvider.Strategy.PrepareForHandleAbandonment(); - new Action(name => this._lockProvider.CreateLock(name).Acquire())(LockName); - GC.Collect(); - GC.WaitForPendingFinalizers(); - await ManagedFinalizerQueue.Instance.FinalizeAsync(); - this._lockProvider.Strategy.PerformAdditionalCleanupForHandleAbandonment(); + [Test] + public async Task TestLockAbandonment() + { + const string LockName = nameof(TestLockAbandonment); - using var handle = this._lockProvider.CreateLock(LockName).TryAcquire(); - Assert.IsNotNull(handle, this.GetType().Name); - } + // pre-create the lock so that the semaphore5 provider will allocate the extra tickets + // against a connection that won't get cleand up when we force additional cleanup + this._lockProvider.CreateLock(LockName); - [Test] - public void TestCrossProcess() - { - var lockName = this._lockProvider.GetUniqueSafeName(); - var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), lockName); - Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); - Assert.IsFalse(command.Task.Wait(TimeSpan.FromSeconds(.1))); + this._lockProvider.Strategy.PrepareForHandleAbandonment(); + new Action(name => this._lockProvider.CreateLock(name).Acquire())(LockName); + GC.Collect(); + GC.WaitForPendingFinalizers(); + await ManagedFinalizerQueue.Instance.FinalizeAsync(); + this._lockProvider.Strategy.PerformAdditionalCleanupForHandleAbandonment(); - var @lock = this._lockProvider.CreateLockWithExactName(lockName); - @lock.TryAcquire().ShouldEqual(null, this.GetType().Name); + using var handle = this._lockProvider.CreateLock(LockName).TryAcquire(); + Assert.IsNotNull(handle, this.GetType().Name); + } - command.StandardInput.WriteLine("done"); - command.StandardInput.Flush(); - - using var handle = @lock.TryAcquire(TimeSpan.FromSeconds(10)); - Assert.IsNotNull(handle, this.GetType().Name); + [Test] + public void TestCrossProcess() + { + var lockName = this._lockProvider.GetUniqueSafeName(); + var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), lockName); + Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); + Assert.IsFalse(command.Task.Wait(TimeSpan.FromSeconds(.1))); - Assert.IsTrue(command.Task.Wait(TimeSpan.FromSeconds(10))); - } + var @lock = this._lockProvider.CreateLockWithExactName(lockName); + @lock.TryAcquire().ShouldEqual(null, this.GetType().Name); - [Test] - public void TestCrossProcessAbandonment() - { - this.CrossProcessAbandonmentHelper(asyncWait: false, kill: false); - } + command.StandardInput.WriteLine("done"); + command.StandardInput.Flush(); + + using var handle = @lock.TryAcquire(TimeSpan.FromSeconds(10)); + Assert.IsNotNull(handle, this.GetType().Name); - [Test] - public void TestCrossProcessAbandonmentWithKill() - { - this.CrossProcessAbandonmentHelper(asyncWait: true, kill: true); - } + Assert.IsTrue(command.Task.Wait(TimeSpan.FromSeconds(10))); + } - private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) - { - var name = this._lockProvider.GetUniqueSafeName($"cpl-{asyncWait}-{kill}"); - var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), name); - Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); - Assert.IsFalse(command.Task.IsCompleted); + [Test] + public void TestCrossProcessAbandonment() + { + this.CrossProcessAbandonmentHelper(asyncWait: false, kill: false); + } - var @lock = this._lockProvider.CreateLockWithExactName(name); + [Test] + public void TestCrossProcessAbandonmentWithKill() + { + this.CrossProcessAbandonmentHelper(asyncWait: true, kill: true); + } - var acquireTask = asyncWait - // always use Task.Run() to force asynchrony even for locks that don't truly support it - ? Task.Run(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(20)).AsTask()) - : Task.Run(() => @lock.TryAcquire(TimeSpan.FromSeconds(20))); - acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, this.GetType().Name); + private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) + { + var name = this._lockProvider.GetUniqueSafeName($"cpl-{asyncWait}-{kill}"); + var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), name); + Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); + Assert.IsFalse(command.Task.IsCompleted); - if (kill) - { - command.Kill(); - } - else - { - command.StandardInput.WriteLine("abandon"); - command.StandardInput.Flush(); - } - // make sure it actually exits - Assert.IsTrue(command.Task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), "lock taker should exit"); + var @lock = this._lockProvider.CreateLockWithExactName(name); - if (this._lockProvider.SupportsCrossProcessAbandonment) - { - using var handle = acquireTask.Result; - Assert.IsNotNull(handle, this.GetType().Name); - } - else - { - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromSeconds(1))); - } + var acquireTask = asyncWait + // always use Task.Run() to force asynchrony even for locks that don't truly support it + ? Task.Run(() => @lock.TryAcquireAsync(TimeSpan.FromSeconds(20)).AsTask()) + : Task.Run(() => @lock.TryAcquire(TimeSpan.FromSeconds(20))); + acquireTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, this.GetType().Name); + + if (kill) + { + command.Kill(); + } + else + { + command.StandardInput.WriteLine("abandon"); + command.StandardInput.Flush(); } + // make sure it actually exits + Assert.IsTrue(command.Task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), "lock taker should exit"); - private Command RunLockTaker(TLockProvider engine, params string[] args) + if (this._lockProvider.SupportsCrossProcessAbandonment) { - const string Configuration = + using var handle = acquireTask.Result; + Assert.IsNotNull(handle, this.GetType().Name); + } + else + { + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromSeconds(1))); + } + } + + private Command RunLockTaker(TLockProvider engine, params string[] args) + { + const string Configuration = #if DEBUG - "Debug"; + "Debug"; #else - "Release"; + "Release"; #endif - var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; - var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker" + exeExtension); + var exeExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; + var exePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "DistributedLockTaker", "bin", Configuration, TargetFramework.Current, "DistributedLockTaker" + exeExtension); - var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) - .RedirectStandardErrorTo(Console.Error); - this._cleanupActions.Add(() => + var command = Command.Run(exePath, args, o => o.WorkingDirectory(TestContext.CurrentContext.TestDirectory).ThrowOnError(true)) + .RedirectStandardErrorTo(Console.Error); + this._cleanupActions.Add(() => + { + if (!command.Task.IsCompleted) { - if (!command.Task.IsCompleted) - { - command.Kill(); - } - }); - return command; - } + command.Kill(); + } + }); + return command; } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index 4d790c6d..cf0fc50c 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -2,92 +2,91 @@ using System; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class DistributedReaderWriterLockCoreTestCases + where TLockProvider : TestingReaderWriterLockProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class DistributedReaderWriterLockCoreTestCases - where TLockProvider : TestingReaderWriterLockProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() + private TLockProvider _lockProvider = default!; + + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); + + [Test] + public async Task TestMultipleReadersSingleWriter() + { + IDistributedReaderWriterLock Lock() => + this._lockProvider.CreateReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); + + using var readHandle1 = await Lock().TryAcquireReadLockAsync(); + Assert.IsNotNull(readHandle1, this.GetType().ToString()); + using var readHandle2 = Lock().TryAcquireReadLock(); + Assert.IsNotNull(readHandle2, this.GetType().ToString()); + + using var writeHandle1 = Lock().TryAcquireWriteLock(); + Assert.IsNull(writeHandle1); + + var writeHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); + Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); + + readHandle1!.Dispose(); + Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); + + readHandle2!.Dispose(); + Assert.IsTrue(writeHandleTask.Wait(TimeSpan.FromSeconds(10))); + using var writeHandle2 = writeHandleTask.Result; + + using var writeHandle3 = Lock().TryAcquireWriteLock(); + Assert.IsNull(writeHandle3); + + writeHandle2.Dispose(); + + using var writeHandle4 = Lock().TryAcquireWriteLock(); + Assert.IsNotNull(writeHandle4); + } + + [Test] + public async Task TestWriterTrumpsReader() + { + IDistributedReaderWriterLock Lock() => + this._lockProvider.CreateReaderWriterLock(nameof(this.TestWriterTrumpsReader)); + + await using var readerHandle = await Lock().AcquireReadLockAsync(); + + var writerHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); + Assert.IsFalse(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(0.2))); + + // trying to take a read lock here fails because there is a writer waiting + await using var readerHandle2 = await Lock().TryAcquireReadLockAsync(); + Assert.IsNull(readerHandle2); + + await readerHandle.DisposeAsync(); + + Assert.IsTrue(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + await writerHandleTask.Result.DisposeAsync(); + } + + [Test] + public void TestReaderWriterLockBadArguments() { - private TLockProvider _lockProvider = default!; - - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); - - [Test] - public async Task TestMultipleReadersSingleWriter() - { - IDistributedReaderWriterLock Lock() => - this._lockProvider.CreateReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); - - using var readHandle1 = await Lock().TryAcquireReadLockAsync(); - Assert.IsNotNull(readHandle1, this.GetType().ToString()); - using var readHandle2 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle2, this.GetType().ToString()); - - using var writeHandle1 = Lock().TryAcquireWriteLock(); - Assert.IsNull(writeHandle1); - - var writeHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); - Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); - - readHandle1!.Dispose(); - Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); - - readHandle2!.Dispose(); - Assert.IsTrue(writeHandleTask.Wait(TimeSpan.FromSeconds(10))); - using var writeHandle2 = writeHandleTask.Result; - - using var writeHandle3 = Lock().TryAcquireWriteLock(); - Assert.IsNull(writeHandle3); - - writeHandle2.Dispose(); - - using var writeHandle4 = Lock().TryAcquireWriteLock(); - Assert.IsNotNull(writeHandle4); - } - - [Test] - public async Task TestWriterTrumpsReader() - { - IDistributedReaderWriterLock Lock() => - this._lockProvider.CreateReaderWriterLock(nameof(this.TestWriterTrumpsReader)); - - await using var readerHandle = await Lock().AcquireReadLockAsync(); - - var writerHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); - Assert.IsFalse(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(0.2))); - - // trying to take a read lock here fails because there is a writer waiting - await using var readerHandle2 = await Lock().TryAcquireReadLockAsync(); - Assert.IsNull(readerHandle2); - - await readerHandle.DisposeAsync(); - - Assert.IsTrue(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); - await writerHandleTask.Result.DisposeAsync(); - } - - [Test] - public void TestReaderWriterLockBadArguments() - { - var @lock = this._lockProvider.CreateReaderWriterLock(nameof(TestReaderWriterLockBadArguments)); - Assert.Catch(() => @lock.AcquireReadLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireReadLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireReadLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireReadLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireReadLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.AcquireReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireReadLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - - Assert.Catch(() => @lock.AcquireWriteLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireWriteLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireWriteLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireWriteLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.AcquireWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireWriteLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - } + var @lock = this._lockProvider.CreateReaderWriterLock(nameof(TestReaderWriterLockBadArguments)); + Assert.Catch(() => @lock.AcquireReadLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireReadLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireReadLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireReadLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireReadLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.AcquireReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireReadLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + + Assert.Catch(() => @lock.AcquireWriteLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireWriteLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireWriteLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireWriteLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.AcquireWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireWriteLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index 14f06b82..cec2afff 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -5,134 +5,133 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class DistributedSemaphoreCoreTestCases + where TSemaphoreProvider : TestingSemaphoreProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class DistributedSemaphoreCoreTestCases - where TSemaphoreProvider : TestingSemaphoreProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - private static readonly TimeSpan LongTimeout = TimeSpan.FromSeconds(5); + private static readonly TimeSpan LongTimeout = TimeSpan.FromSeconds(5); - private TSemaphoreProvider _semaphoreProvider = default!; + private TSemaphoreProvider _semaphoreProvider = default!; - [SetUp] public void SetUp() => this._semaphoreProvider = new TSemaphoreProvider(); - [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); + [SetUp] public void SetUp() => this._semaphoreProvider = new TSemaphoreProvider(); + [TearDown] public void TearDown() => this._semaphoreProvider.Dispose(); - [Test] - public void TestMaxCount() - { - this._semaphoreProvider.CreateSemaphore(string.Empty, 5).MaxCount.ShouldEqual(5); - this._semaphoreProvider.CreateSemaphore(string.Empty, 23).MaxCount.ShouldEqual(23); - } + [Test] + public void TestMaxCount() + { + this._semaphoreProvider.CreateSemaphore(string.Empty, 5).MaxCount.ShouldEqual(5); + this._semaphoreProvider.CreateSemaphore(string.Empty, 23).MaxCount.ShouldEqual(23); + } - [Test] - [NonParallelizable] // timing-sensitive - public void TestConcurrencyHandling() - { - const int MaxCount = 3; + [Test] + [NonParallelizable] // timing-sensitive + public void TestConcurrencyHandling() + { + const int MaxCount = 3; - var counter = 0; - var seenCounterValues = new HashSet(); + var counter = 0; + var seenCounterValues = new HashSet(); - const int Threads = 10; - const int Trials = 25; - var barrier = new Barrier(Threads); - var threads = Enumerable.Range(0, Threads) - .Select(_ => Task.Factory.StartNew(() => + const int Threads = 10; + const int Trials = 25; + var barrier = new Barrier(Threads); + var threads = Enumerable.Range(0, Threads) + .Select(_ => Task.Factory.StartNew(() => + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestConcurrencyHandling), MaxCount); + + barrier.SignalAndWait(); + for (var i = 0; i < Trials; ++i) { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestConcurrencyHandling), MaxCount); - - barrier.SignalAndWait(); - for (var i = 0; i < Trials; ++i) - { - using var _ = semaphore.Acquire(LongTimeout); - var newCounterValue = Interlocked.Increment(ref counter); - lock (seenCounterValues) { seenCounterValues.Add(newCounterValue); } - Thread.Sleep(10); - Interlocked.Decrement(ref counter); - } - }, - TaskCreationOptions.LongRunning // dedicated thread - )) - .ToArray(); - Task.WaitAll(threads); - - CollectionAssert.AreEquivalent(new[] { 1, 2, 3 }, seenCounterValues.ToArray()); - } + using var _ = semaphore.Acquire(LongTimeout); + var newCounterValue = Interlocked.Increment(ref counter); + lock (seenCounterValues) { seenCounterValues.Add(newCounterValue); } + Thread.Sleep(10); + Interlocked.Decrement(ref counter); + } + }, + TaskCreationOptions.LongRunning // dedicated thread + )) + .ToArray(); + Task.WaitAll(threads); - [Test] - public void TestDrain() - { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestDrain), maxCount: 4); - var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestDrain), maxCount: 4); + CollectionAssert.AreEquivalent(new[] { 1, 2, 3 }, seenCounterValues.ToArray()); + } - var handles = new List { semaphore.Acquire(LongTimeout) }; - Assert.DoesNotThrow(() => semaphore2.Acquire().Dispose()); - while (handles.Count < 4) { handles.Add(semaphore.Acquire(LongTimeout)); } + [Test] + public void TestDrain() + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestDrain), maxCount: 4); + var semaphore2 = this._semaphoreProvider.CreateSemaphore(nameof(TestDrain), maxCount: 4); - semaphore2.TryAcquire().ShouldEqual(null); - semaphore.TryAcquire().ShouldEqual(null); + var handles = new List { semaphore.Acquire(LongTimeout) }; + Assert.DoesNotThrow(() => semaphore2.Acquire().Dispose()); + while (handles.Count < 4) { handles.Add(semaphore.Acquire(LongTimeout)); } - handles[0].Dispose(); - Assert.DoesNotThrow(() => semaphore2.Acquire().Dispose()); + semaphore2.TryAcquire().ShouldEqual(null); + semaphore.TryAcquire().ShouldEqual(null); - handles.ForEach(h => h.Dispose()); - } + handles[0].Dispose(); + Assert.DoesNotThrow(() => semaphore2.Acquire().Dispose()); - [Test] - public void TestHighTicketCount() - { - var semaphore = this._semaphoreProvider.CreateSemaphore($"s{new string('o', 1000)} many tickets!", int.MaxValue); - var handles = Enumerable.Range(0, 100) - .Select(_ => semaphore.Acquire(LongTimeout)) - .ToList(); - handles.ForEach(h => h.Dispose()); - } + handles.ForEach(h => h.Dispose()); + } - [Test] - [NonParallelizable, Retry(tryCount: 3)] // somewhat perf-sensitive - public void TestSemaphoreParallelism() - { - const int MaxCount = 10; + [Test] + public void TestHighTicketCount() + { + var semaphore = this._semaphoreProvider.CreateSemaphore($"s{new string('o', 1000)} many tickets!", int.MaxValue); + var handles = Enumerable.Range(0, 100) + .Select(_ => semaphore.Acquire(LongTimeout)) + .ToList(); + handles.ForEach(h => h.Dispose()); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // somewhat perf-sensitive + public void TestSemaphoreParallelism() + { + const int MaxCount = 10; - var counter = 0; - var maxCounterValue = 0; - var maxCounterValueLock = new object(); - var tasks = Enumerable.Range(1, 100).Select(async _ => + var counter = 0; + var maxCounterValue = 0; + var maxCounterValueLock = new object(); + var tasks = Enumerable.Range(1, 100).Select(async _ => + { + var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSemaphoreParallelism), MaxCount); + using (await semaphore.AcquireAsync()) { - var semaphore = this._semaphoreProvider.CreateSemaphore(nameof(TestSemaphoreParallelism), MaxCount); - using (await semaphore.AcquireAsync()) - { - // increment going in - var currentCounterValue = Interlocked.Increment(ref counter); + // increment going in + var currentCounterValue = Interlocked.Increment(ref counter); - lock (maxCounterValueLock) - { - maxCounterValue = Math.Max(maxCounterValue, currentCounterValue); - } + lock (maxCounterValueLock) + { + maxCounterValue = Math.Max(maxCounterValue, currentCounterValue); + } - // hang out for a bit to ensure concurrency - await Task.Delay(TimeSpan.FromMilliseconds(30)); + // hang out for a bit to ensure concurrency + await Task.Delay(TimeSpan.FromMilliseconds(30)); - // decrement and return on the way out (returns # inside the lock when this left ... should be 0) - return Interlocked.Decrement(ref counter); - } - }) - .ToList(); + // decrement and return on the way out (returns # inside the lock when this left ... should be 0) + return Interlocked.Decrement(ref counter); + } + }) + .ToList(); - Task.WaitAll(tasks.ToArray(), TimeSpan.FromSeconds(30)).ShouldEqual(true, this.GetType().Name); + Task.WaitAll(tasks.ToArray(), TimeSpan.FromSeconds(30)).ShouldEqual(true, this.GetType().Name); - tasks.ForEach(t => - { - (t.Result >= 0).ShouldEqual(true); - (t.Result <= MaxCount).ShouldEqual(true); - }); - Volatile.Read(ref counter).ShouldEqual(0); + tasks.ForEach(t => + { + (t.Result >= 0).ShouldEqual(true); + (t.Result <= MaxCount).ShouldEqual(true); + }); + Volatile.Read(ref counter).ShouldEqual(0); - lock (maxCounterValueLock) - { - maxCounterValue.ShouldEqual(MaxCount, this.GetType().Name + ": should reach the maximum level of allowed concurrency"); - } + lock (maxCounterValueLock) + { + maxCounterValue.ShouldEqual(MaxCount, this.GetType().Name + ": should reach the maximum level of allowed concurrency"); } } } diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index 64010732..7b6d3282 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -5,148 +5,147 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class DistributedUpgradeableReaderWriterLockCoreTestCases + where TLockProvider : TestingUpgradeableReaderWriterLockProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class DistributedUpgradeableReaderWriterLockCoreTestCases - where TLockProvider : TestingUpgradeableReaderWriterLockProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() + private TLockProvider _lockProvider = default!; + + [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); + [TearDown] public void TearDown() => this._lockProvider.Dispose(); + + [Test] + public void TestMultipleReadersSingleWriter() { - private TLockProvider _lockProvider = default!; + IDistributedUpgradeableReaderWriterLock Lock() => + this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); - [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); - [TearDown] public void TearDown() => this._lockProvider.Dispose(); + using var readHandle1 = Lock().TryAcquireReadLockAsync().AsTask().Result; + Assert.IsNotNull(readHandle1, this.GetType().ToString()); + using var readHandle2 = Lock().TryAcquireReadLock(); + Assert.IsNotNull(readHandle2, this.GetType().ToString()); - [Test] - public void TestMultipleReadersSingleWriter() + using (var handle = Lock().TryAcquireUpgradeableReadLock()) { - IDistributedUpgradeableReaderWriterLock Lock() => - this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); + Assert.IsNotNull(handle); - using var readHandle1 = Lock().TryAcquireReadLockAsync().AsTask().Result; - Assert.IsNotNull(readHandle1, this.GetType().ToString()); - using var readHandle2 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle2, this.GetType().ToString()); + using var readHandle3 = Lock().TryAcquireReadLock(); + Assert.IsNotNull(readHandle3); - using (var handle = Lock().TryAcquireUpgradeableReadLock()) - { - Assert.IsNotNull(handle); + Lock().TryAcquireUpgradeableReadLock().ShouldEqual(null); + Lock().TryAcquireWriteLock().ShouldEqual(null); - using var readHandle3 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle3); + readHandle3!.Dispose(); + } - Lock().TryAcquireUpgradeableReadLock().ShouldEqual(null); - Lock().TryAcquireWriteLock().ShouldEqual(null); + readHandle1!.Dispose(); + readHandle2!.Dispose(); - readHandle3!.Dispose(); - } + using var upgradeHandle = Lock().TryAcquireUpgradeableReadLock(); + Assert.IsNotNull(upgradeHandle); + } - readHandle1!.Dispose(); - readHandle2!.Dispose(); + [Test] + public void TestUpgradeToWriteLock() + { + IDistributedUpgradeableReaderWriterLock Lock() => + this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeToWriteLock)); - using var upgradeHandle = Lock().TryAcquireUpgradeableReadLock(); - Assert.IsNotNull(upgradeHandle); - } + var readHandle = Lock().AcquireReadLock(); - [Test] - public void TestUpgradeToWriteLock() + Task readTask; + using (var upgradeableHandle = Lock().AcquireUpgradeableReadLockAsync().AsTask().Result) { - IDistributedUpgradeableReaderWriterLock Lock() => - this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeToWriteLock)); + upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(false); // read lock still held - var readHandle = Lock().AcquireReadLock(); + readHandle.Dispose(); - Task readTask; - using (var upgradeableHandle = Lock().AcquireUpgradeableReadLockAsync().AsTask().Result) - { - upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(false); // read lock still held + upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(true); - readHandle.Dispose(); - - upgradeableHandle.TryUpgradeToWriteLock().ShouldEqual(true); - - readTask = Task.Run(() => Lock().AcquireReadLockAsync().AsTask()); - readTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, "write lock held"); - } - - readTask.Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, "write lock released"); - readTask.Result.Dispose(); + readTask = Task.Run(() => Lock().AcquireReadLockAsync().AsTask()); + readTask.Wait(TimeSpan.FromSeconds(.1)).ShouldEqual(false, "write lock held"); } - [Test] - public void TestReaderWriterLockBadArguments() - { - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestReaderWriterLockBadArguments)); - Assert.Catch(() => @lock.AcquireUpgradeableReadLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireUpgradeableReadLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.TryAcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => @lock.AcquireUpgradeableReadLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.AcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireUpgradeableReadLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => @lock.TryAcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - - using var upgradeableHandle = @lock.AcquireUpgradeableReadLock(); - Assert.Catch(() => upgradeableHandle.UpgradeToWriteLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => upgradeableHandle.UpgradeToWriteLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLock(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLockAsync(TimeSpan.FromSeconds(-2))); - Assert.Catch(() => upgradeableHandle.UpgradeToWriteLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => upgradeableHandle.UpgradeToWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLock(TimeSpan.FromSeconds(int.MaxValue))); - Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); - } + readTask.Wait(TimeSpan.FromSeconds(10)).ShouldEqual(true, "write lock released"); + readTask.Result.Dispose(); + } - [Test] - public void TestUpgradeableHandleDisposal() - { - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeableHandleDisposal)); - - var handle = @lock.AcquireUpgradeableReadLock(); - handle.Dispose(); - Assert.DoesNotThrow(() => handle.Dispose()); - Assert.Catch(() => handle.TryUpgradeToWriteLock()); - Assert.Catch(() => handle.TryUpgradeToWriteLockAsync()); - Assert.Catch(() => handle.UpgradeToWriteLock()); - Assert.Catch(() => handle.UpgradeToWriteLockAsync()); - } + [Test] + public void TestReaderWriterLockBadArguments() + { + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestReaderWriterLockBadArguments)); + Assert.Catch(() => @lock.AcquireUpgradeableReadLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireUpgradeableReadLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.TryAcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => @lock.AcquireUpgradeableReadLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.AcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireUpgradeableReadLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => @lock.TryAcquireUpgradeableReadLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + + using var upgradeableHandle = @lock.AcquireUpgradeableReadLock(); + Assert.Catch(() => upgradeableHandle.UpgradeToWriteLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => upgradeableHandle.UpgradeToWriteLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLock(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLockAsync(TimeSpan.FromSeconds(-2))); + Assert.Catch(() => upgradeableHandle.UpgradeToWriteLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => upgradeableHandle.UpgradeToWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLock(TimeSpan.FromSeconds(int.MaxValue))); + Assert.Catch(() => upgradeableHandle.TryUpgradeToWriteLockAsync(TimeSpan.FromSeconds(int.MaxValue))); + } - [Test] - public void TestUpgradeableHandleMultipleUpgrades() - { - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeableHandleMultipleUpgrades)); + [Test] + public void TestUpgradeableHandleDisposal() + { + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeableHandleDisposal)); + + var handle = @lock.AcquireUpgradeableReadLock(); + handle.Dispose(); + Assert.DoesNotThrow(() => handle.Dispose()); + Assert.Catch(() => handle.TryUpgradeToWriteLock()); + Assert.Catch(() => handle.TryUpgradeToWriteLockAsync()); + Assert.Catch(() => handle.UpgradeToWriteLock()); + Assert.Catch(() => handle.UpgradeToWriteLockAsync()); + } - using var upgradeHandle = @lock.AcquireUpgradeableReadLock(); - upgradeHandle.UpgradeToWriteLock(); - Assert.Catch(() => upgradeHandle.TryUpgradeToWriteLock()); - } + [Test] + public void TestUpgradeableHandleMultipleUpgrades() + { + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestUpgradeableHandleMultipleUpgrades)); - [Test] - public async Task TestCanUpgradeHandleWhileMonitoring() - { - var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); + using var upgradeHandle = @lock.AcquireUpgradeableReadLock(); + upgradeHandle.UpgradeToWriteLock(); + Assert.Catch(() => upgradeHandle.TryUpgradeToWriteLock()); + } - var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestCanUpgradeHandleWhileMonitoring)); + [Test] + public async Task TestCanUpgradeHandleWhileMonitoring() + { + var handleLostHelper = this._lockProvider.Strategy.PrepareForHandleLost(); - using var handle = await @lock.AcquireUpgradeableReadLockAsync(); + var @lock = this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestCanUpgradeHandleWhileMonitoring)); - // start monitoring - using var canceledEvent = new ManualResetEventSlim(initialState: false); - using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + using var handle = await @lock.AcquireUpgradeableReadLockAsync(); - Assert.DoesNotThrowAsync(() => handle.UpgradeToWriteLockAsync().AsTask()); + // start monitoring + using var canceledEvent = new ManualResetEventSlim(initialState: false); + using var registration = handle.HandleLostToken.Register(canceledEvent.Set); + Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.DoesNotThrowAsync(() => handle.UpgradeToWriteLockAsync().AsTask()); - if (handleLostHelper != null) - { - handleLostHelper.Dispose(); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); - } + Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); - // when the handle is lost, Dispose() may throw - try { await handle.DisposeAsync(); } - catch { } + if (handleLostHelper != null) + { + handleLostHelper.Dispose(); + Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); } + + // when the handle is lost, Dispose() may throw + try { await handle.DisposeAsync(); } + catch { } } } diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index 7c7ea812..e9b95a5b 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -5,36 +5,35 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public abstract class RedisExtensionTestCases + where TLockProvider : TestingLockProvider>, new() + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { - public abstract class RedisExtensionTestCases - where TLockProvider : TestingLockProvider>, new() - where TDatabaseProvider : TestingRedisDatabaseProvider, new() - { - private TLockProvider _provider = default!; + private TLockProvider _provider = default!; - [SetUp] - public void SetUp() => this._provider = new TLockProvider(); + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); - [TearDown] - public void TearDown() => this._provider.Dispose(); + [TearDown] + public void TearDown() => this._provider.Dispose(); - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestCanExtendLock() - { - this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(50), TimeSpan.FromMilliseconds(50))); - var @lock = this._provider.CreateLock(Guid.NewGuid().ToString()); + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestCanExtendLock() + { + this._provider.Strategy.SetOptions(o => o.Expiry(TimeSpan.FromSeconds(1)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(50), TimeSpan.FromMilliseconds(50))); + var @lock = this._provider.CreateLock(Guid.NewGuid().ToString()); - await using var handle = await @lock.AcquireAsync(); + await using var handle = await @lock.AcquireAsync(); - var secondHandleTask = @lock.AcquireAsync().AsTask(); - _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(2))); + var secondHandleTask = @lock.AcquireAsync().AsTask(); + _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup + Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(2))); - await handle.DisposeAsync(); + await handle.DisposeAsync(); - Assert.IsTrue(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); - } + Assert.IsTrue(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); } } diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 3777614d..ad9b02e9 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -11,169 +11,168 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public abstract class RedisSynchronizationCoreTestCases + // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't + // want to see cases for each possible db provider type + where TLockProvider : TestingLockProvider>, new() { - public abstract class RedisSynchronizationCoreTestCases - // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't - // want to see cases for each possible db provider type - where TLockProvider : TestingLockProvider>, new() + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + public void TestMajorityFaultingDatabasesCauseAcquireToThrow() { - private TLockProvider _provider = default!; + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); - [SetUp] - public void SetUp() => this._provider = new TLockProvider(); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("multi"); - [TearDown] - public void TearDown() => this._provider.Dispose(); + // we only get the one exception + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); - [Test] - public void TestMajorityFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); + // single sync acquire flow is different + this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; + var singleDatabaseLock = this._provider.CreateLock("single"); + Assert.Throws(() => singleDatabaseLock.Acquire()); + } - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("multi"); + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestMajorityHangingDatabasesCauseAcquireToFail() + { + using var @event = new ManualResetEventSlim(initialState: false); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[1], () => { @event.Wait(); return true; }); + MockDatabase(databases[2], () => { @event.Wait(); return false; }); - // we only get the one exception - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); + var @lock = this._provider.CreateLock("lock"); - // single sync acquire flow is different - this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; - var singleDatabaseLock = this._provider.CreateLock("single"); - Assert.Throws(() => singleDatabaseLock.Acquire()); - } + Assert.IsNull(await @lock.TryAcquireAsync()); - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestMajorityHangingDatabasesCauseAcquireToFail() - { - using var @event = new ManualResetEventSlim(initialState: false); - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[1], () => { @event.Wait(); return true; }); - MockDatabase(databases[2], () => { @event.Wait(); return false; }); + @event.Set(); // just to free the waiting threads + } - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); - var @lock = this._provider.CreateLock("lock"); + [Test] + public void TestMajorityFaultingDatabasesCauseReleaseToThrow() + { + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("lock"); + using var handle = @lock.Acquire(); + + new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); + var aggregateException = Assert.Throws(() => handle.Dispose()); + Assert.IsInstanceOf(aggregateException.InnerException); + } - Assert.IsNull(await @lock.TryAcquireAsync()); + [Test] + public void TestHalfFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - @event.Set(); // just to free the waiting threads - } + var @lock = this._provider.CreateLock("lock"); + Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); + } - [Test] - public void TestMajorityFaultingDatabasesCauseReleaseToThrow() - { - var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("lock"); - using var handle = @lock.Acquire(); - - new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); - var aggregateException = Assert.Throws(() => handle.Dispose()); - Assert.IsInstanceOf(aggregateException.InnerException); - } + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) + { + var database = CreateDatabaseMock(); + MockDatabase(database, () => { Thread.Sleep(50); return true; }); - [Test] - public void TestHalfFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); + var @lock = this._provider.CreateLock("lock"); - var @lock = this._provider.CreateLock("lock"); - Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); - } + // single sync acquire has different timeout logic, so we test it separately + Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + } - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) - { - var database = CreateDatabaseMock(); - MockDatabase(database, () => { Thread.Sleep(50); return true; }); + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() + { + using var @event = new ManualResetEventSlim(); + var failDatabase = CreateDatabaseMock(); + MockDatabase(failDatabase, () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; + var @lock = this._provider.CreateLock("lock"); + + var acquireTask = @lock.TryAcquireAsync().AsTask(); + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + @event.Set(); + Assert.IsNull(await acquireTask); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; + var singleDatabaseLock = this._provider.CreateLock("lock"); + using var handle = await singleDatabaseLock.TryAcquireAsync(); + Assert.IsNotNull(handle); + } - this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); - var @lock = this._provider.CreateLock("lock"); + [Test] + public void TestAcquireWithLockPrefix() + { + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; + var implicitPrefixLock = this._provider.CreateLock("N"); - // single sync acquire has different timeout logic, so we test it separately - Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); - } + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; + var noPrefixLock = this._provider.CreateLock("N"); + var explicitPrefixLock = this._provider.CreateLock("PN"); - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() - { - using var @event = new ManualResetEventSlim(); - var failDatabase = CreateDatabaseMock(); - MockDatabase(failDatabase, () => { @event.Wait(); return false; }); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; - var @lock = this._provider.CreateLock("lock"); - - var acquireTask = @lock.TryAcquireAsync().AsTask(); - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); - @event.Set(); - Assert.IsNull(await acquireTask); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; - var singleDatabaseLock = this._provider.CreateLock("lock"); - using var handle = await singleDatabaseLock.TryAcquireAsync(); - Assert.IsNotNull(handle); - } + using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); + Assert.IsNotNull(implicitPrefixHandle); + using var noPrefixHandle = noPrefixLock.TryAcquire(); + Assert.IsNotNull(noPrefixHandle); + using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); + Assert.IsNull(explicitPrefixHandle); - [Test] - public void TestAcquireWithLockPrefix() + static IDatabase CreateDatabase(string? keyPrefix = null) { - this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; - var implicitPrefixLock = this._provider.CreateLock("N"); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; - var noPrefixLock = this._provider.CreateLock("N"); - var explicitPrefixLock = this._provider.CreateLock("PN"); - - using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); - Assert.IsNotNull(implicitPrefixHandle); - using var noPrefixHandle = noPrefixLock.TryAcquire(); - Assert.IsNotNull(noPrefixHandle); - using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); - Assert.IsNull(explicitPrefixHandle); - - static IDatabase CreateDatabase(string? keyPrefix = null) - { - var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); - return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); - } + var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); } + } - private static Mock CreateDatabaseMock() - { - var mock = new Mock(MockBehavior.Strict); - MockDatabase(mock, () => true); - return mock; - } + private static Mock CreateDatabaseMock() + { + var mock = new Mock(MockBehavior.Strict); + MockDatabase(mock, () => true); + return mock; + } - private static void MockDatabase(Mock mockDatabase, Func returns) - { - mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(returns); - mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(returns)); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => (bool)RedisResult.Create(returns())); - mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); - } + private static void MockDatabase(Mock mockDatabase, Func returns) + { + mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(returns); + mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(returns)); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => (bool)RedisResult.Create(returns())); + mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); } } diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 9ddae13f..05d4ecd8 100644 --- a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -11,211 +11,210 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public abstract class ZooKeeperSynchronizationCoreTestCases + where TLockProvider : TestingLockProvider, new() { - public abstract class ZooKeeperSynchronizationCoreTestCases - where TLockProvider : TestingLockProvider, new() - { - private TLockProvider _provider = default!; + private TLockProvider _provider = default!; - [SetUp] - public void SetUp() => this._provider = new TLockProvider(); + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); - [TearDown] - public void TearDown() => this._provider.Dispose(); + [TearDown] + public void TearDown() => this._provider.Dispose(); - [Test] - public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() + [Test] + public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() + { + // This doesn't work because creating the lock attempts to acquire which will then fail initially. We could work around this by testing + // for a different set of conditions in the multi-ticket case, but the extra coverage doesn't seem valuable (we still have coverage of single-ticket) + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } + + var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + + // pre-clean up just in case + try { await connection.ZooKeeper.deleteAsync(path.ToString()); } + catch (KeeperException.NoNodeException) { } + + this._provider.Strategy.AssumeNodeExists = true; + var @lock = this._provider.CreateLockWithExactName(path.ToString()); + + Assert.That( + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, + Does.Contain("does not exist") + ); + + await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperNodeCreator.PublicAcl }, CreateMode.PERSISTENT); + try { - // This doesn't work because creating the lock attempts to acquire which will then fail initially. We could work around this by testing - // for a different set of conditions in the multi-ticket case, but the extra coverage doesn't seem valuable (we still have coverage of single-ticket) - if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } - - var path = new ZooKeeperPath($"/{this.GetType()}.{nameof(this.TestDoesNotAttemptToCreateOrDeleteExistingNode)} ({TargetFramework.Current})"); - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - - // pre-clean up just in case - try { await connection.ZooKeeper.deleteAsync(path.ToString()); } - catch (KeeperException.NoNodeException) { } - - this._provider.Strategy.AssumeNodeExists = true; - var @lock = this._provider.CreateLockWithExactName(path.ToString()); - - Assert.That( - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, - Does.Contain("does not exist") - ); - - await connection.ZooKeeper.createAsync(path.ToString(), Array.Empty(), new List { ZooKeeperNodeCreator.PublicAcl }, CreateMode.PERSISTENT); - try - { - await using (var handle = await @lock.TryAcquireAsync()) - { - Assert.IsNotNull(handle); - } - - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); - } - finally + await using (var handle = await @lock.TryAcquireAsync()) { - await connection.ZooKeeper.deleteAsync(path.ToString()); + Assert.IsNotNull(handle); } + + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); } + finally + { + await connection.ZooKeeper.deleteAsync(path.ToString()); + } + } - [TestCase("/")] - [TestCase(".")] - [TestCase("..")] - [TestCase("zookeeper")] - [TestCase("abc\0")] - public void TestGetSafeName(string name) => - Assert.DoesNotThrowAsync(async () => await (await this._provider.CreateLockWithExactName(this._provider.GetSafeName(name)).AcquireAsync()).DisposeAsync()); + [TestCase("/")] + [TestCase(".")] + [TestCase("..")] + [TestCase("zookeeper")] + [TestCase("abc\0")] + public void TestGetSafeName(string name) => + Assert.DoesNotThrowAsync(async () => await (await this._provider.CreateLockWithExactName(this._provider.GetSafeName(name)).AcquireAsync()).DisposeAsync()); - [Test] - public void TestGetSafeNameWithControlCharacters() => this.TestGetSafeName("\u001f\u009F\uf8ff\ufff1"); + [Test] + public void TestGetSafeNameWithControlCharacters() => this.TestGetSafeName("\u001f\u009F\uf8ff\ufff1"); - [Test] - public async Task TestCustomAclAndAuth() - { - // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) - // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). - if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } + [Test] + public async Task TestCustomAclAndAuth() + { + // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) + // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } - const string Username = "username"; - const string Password = "secretPassword"; + const string Username = "username"; + const string Password = "secretPassword"; - var unauthenticatedLock = this._provider.CreateLock(string.Empty); + var unauthenticatedLock = this._provider.CreateLock(string.Empty); - this._provider.Strategy.Options = o => o.AddAccessControl("digest", GenerateDigestAclId(Username, Password), 0x1f) - .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); - var @lock = this._provider.CreateLock(string.Empty); + this._provider.Strategy.Options = o => o.AddAccessControl("digest", GenerateDigestAclId(Username, Password), 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); + var @lock = this._provider.CreateLock(string.Empty); - await using (await @lock.AcquireAsync()) - { - Assert.ThrowsAsync(() => unauthenticatedLock.TryAcquireAsync().AsTask()); - } + await using (await @lock.AcquireAsync()) + { + Assert.ThrowsAsync(() => unauthenticatedLock.TryAcquireAsync().AsTask()); + } - Assert.DoesNotThrowAsync(async () => await (await unauthenticatedLock.AcquireAsync()).DisposeAsync()); + Assert.DoesNotThrowAsync(async () => await (await unauthenticatedLock.AcquireAsync()).DisposeAsync()); - // Based on - // https://github.com/apache/zookeeper/blob/d8561f620fa8611e9a6819d9879b0f18e5a404a9/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java - static string GenerateDigestAclId(string username, string password) - { - using var sha = SHA1.Create(); - var digest = sha.ComputeHash(Encoding.UTF8.GetBytes($"{username}:{password}")); - return $"{username}:{Convert.ToBase64String(digest)}"; - } + // Based on + // https://github.com/apache/zookeeper/blob/d8561f620fa8611e9a6819d9879b0f18e5a404a9/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java + static string GenerateDigestAclId(string username, string password) + { + using var sha = SHA1.Create(); + var digest = sha.ComputeHash(Encoding.UTF8.GetBytes($"{username}:{password}")); + return $"{username}:{Convert.ToBase64String(digest)}"; } + } - [Test] - public async Task TestInvalidAclDoesNotCorruptStore() - { - // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) - // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). - if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } - - const string Username = "username"; - const string Password = "xyz"; - - // ACL is the right format but the wrong password (this can easily happen if you get the encoding wrong) - this._provider.Strategy.Options = o => o.AddAccessControl("digest", $"{Username}:1eYGPn6j9+P9osACW8ob4HhZT+s=", 0x1f) - .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); - var invalidAclLock = this._provider.CreateLock(string.Empty); - - // pre-cleanup to make sure we will actually create the path - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - try { await connection.ZooKeeper.deleteAsync(invalidAclLock.Name); } - catch (KeeperException.NoNodeException) { } + [Test] + public async Task TestInvalidAclDoesNotCorruptStore() + { + // This doesn't work because creating the lock causes the node to be created (from taking the other tickets) + // and releasing the lock doesn't cause the node to be deleted (due to those other tickets). + if (IsMultiTicketSemaphoreProvider) { Assert.Pass("not supported"); } - Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); + const string Username = "username"; + const string Password = "xyz"; - Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Name)); + // ACL is the right format but the wrong password (this can easily happen if you get the encoding wrong) + this._provider.Strategy.Options = o => o.AddAccessControl("digest", $"{Username}:1eYGPn6j9+P9osACW8ob4HhZT+s=", 0x1f) + .AddAuthInfo("digest", Encoding.UTF8.GetBytes($"{Username}:{Password}")); + var invalidAclLock = this._provider.CreateLock(string.Empty); - this._provider.Strategy.Options = null; - var validLock = this._provider.CreateLock(string.Empty); - Assert.DoesNotThrowAsync(async () => await (await validLock.AcquireAsync()).DisposeAsync()); - } + // pre-cleanup to make sure we will actually create the path + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + try { await connection.ZooKeeper.deleteAsync(invalidAclLock.Name); } + catch (KeeperException.NoNodeException) { } - [Test] - public async Task TestDeepDirectoryCreation() - { - var directory = new ZooKeeperPath($"/{TestHelper.UniqueName}/foo/bar/baz"); - - // pre-cleanup to make sure we will actually create the directory - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - for (var toDelete = directory; toDelete != ZooKeeperPath.Root; toDelete = toDelete.GetDirectory()!.Value) - { - try { await connection.ZooKeeper.deleteAsync(toDelete.ToString()); } - catch (KeeperException.NoNodeException) { } - } + Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); - var @lock = this._provider.CreateLockWithExactName(directory.GetChildNodePathWithSafeName("qux").ToString()); + Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Name)); - await using (await @lock.AcquireAsync()) - { - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); - } + this._provider.Strategy.Options = null; + var validLock = this._provider.CreateLock(string.Empty); + Assert.DoesNotThrowAsync(async () => await (await validLock.AcquireAsync()).DisposeAsync()); + } - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); + [Test] + public async Task TestDeepDirectoryCreation() + { + var directory = new ZooKeeperPath($"/{TestHelper.UniqueName}/foo/bar/baz"); + + // pre-cleanup to make sure we will actually create the directory + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + for (var toDelete = directory; toDelete != ZooKeeperPath.Root; toDelete = toDelete.GetDirectory()!.Value) + { + try { await connection.ZooKeeper.deleteAsync(toDelete.ToString()); } + catch (KeeperException.NoNodeException) { } } - [Test] - public async Task TestThrowsIfPathDeletedWhileWaiting() + var @lock = this._provider.CreateLockWithExactName(directory.GetChildNodePathWithSafeName("qux").ToString()); + + await using (await @lock.AcquireAsync()) { - var @lock = this._provider.CreateLock(string.Empty); + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); + } - // hold the lock - await using var handle = await @lock.AcquireAsync(); + Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); + } - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ); - var initialChildren = await connection.ZooKeeper.getChildrenAsync(@lock.Name); + [Test] + public async Task TestThrowsIfPathDeletedWhileWaiting() + { + var @lock = this._provider.CreateLock(string.Empty); - // start waiting - var blockedAcquireTask = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); - // once the wait has started... - var newChild = await WaitForNewChildAsync(); - // ... start another waiter... - var blockedAcquireTask2 = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); - // ... and delete the first waiter's node - await connection.ZooKeeper.deleteAsync(newChild); + // hold the lock + await using var handle = await @lock.AcquireAsync(); - // release the lock - await handle.DisposeAsync(); + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ); + var initialChildren = await connection.ZooKeeper.getChildrenAsync(@lock.Name); - // the first waiter should throw - Assert.ThrowsAsync(() => blockedAcquireTask); + // start waiting + var blockedAcquireTask = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // once the wait has started... + var newChild = await WaitForNewChildAsync(); + // ... start another waiter... + var blockedAcquireTask2 = @lock.AcquireAsync(TimeSpan.FromSeconds(30)).AsTask(); + // ... and delete the first waiter's node + await connection.ZooKeeper.deleteAsync(newChild); - // the second waiter should complete - Assert.DoesNotThrowAsync(async () => await (await blockedAcquireTask2).DisposeAsync()); + // release the lock + await handle.DisposeAsync(); - async Task WaitForNewChildAsync() + // the first waiter should throw + Assert.ThrowsAsync(() => blockedAcquireTask); + + // the second waiter should complete + Assert.DoesNotThrowAsync(async () => await (await blockedAcquireTask2).DisposeAsync()); + + async Task WaitForNewChildAsync() + { + var start = DateTime.UtcNow; + while (true) { - var start = DateTime.UtcNow; - while (true) - { - var children = await connection.ZooKeeper.getChildrenAsync(@lock.Name); - var newChild = children.Children.Except(initialChildren.Children).SingleOrDefault(); - if (newChild != null) { return $"{@lock.Name}/{newChild}"; } + var children = await connection.ZooKeeper.getChildrenAsync(@lock.Name); + var newChild = children.Children.Except(initialChildren.Children).SingleOrDefault(); + if (newChild != null) { return $"{@lock.Name}/{newChild}"; } - if (DateTime.UtcNow - start >= TimeSpan.FromSeconds(10)) { Assert.Fail("Timed out"); } + if (DateTime.UtcNow - start >= TimeSpan.FromSeconds(10)) { Assert.Fail("Timed out"); } - await Task.Delay(5); - } + await Task.Delay(5); } } - - private static bool IsMultiTicketSemaphoreProvider => - typeof(TLockProvider) == typeof(TestingSemaphore5AsMutexProvider); } + + private static bool IsMultiTicketSemaphoreProvider => + typeof(TLockProvider) == typeof(TestingSemaphore5AsMutexProvider); } diff --git a/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs index 3c1a18e5..8571988f 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs @@ -8,55 +8,54 @@ using System.Linq; using System.Text; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +[SetUpFixture] +public class AzureSetUpFixture { - [SetUpFixture] - public class AzureSetUpFixture - { - private Command? _azureStorageEmulatorCommand; + private Command? _azureStorageEmulatorCommand; - [OneTimeSetUp] - public void OneTimeSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() + { + var existingProcesses = Process.GetProcessesByName("AzureStorageEmulator"); + if (existingProcesses.Any()) { - var existingProcesses = Process.GetProcessesByName("AzureStorageEmulator"); - if (existingProcesses.Any()) - { - Console.WriteLine($"Emulator already running (PID={existingProcesses[0].Id})"); - foreach (var process in existingProcesses) { process.Dispose(); } - } - else + Console.WriteLine($"Emulator already running (PID={existingProcesses[0].Id})"); + foreach (var process in existingProcesses) { process.Dispose(); } + } + else + { + var emulatorExePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft SDKs", "Azure", "Storage Emulator", "AzureStorageEmulator.exe"); + if (!File.Exists(emulatorExePath)) { - var emulatorExePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft SDKs", "Azure", "Storage Emulator", "AzureStorageEmulator.exe"); - if (!File.Exists(emulatorExePath)) - { - throw new FileNotFoundException($"Could not locate the AzureStorageEmulator at {emulatorExePath}. This is required to run Azure tests. See https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator"); - } - - var command = Command.Run(emulatorExePath, new[] { "start" }, o => o.StartInfo(i => i.RedirectStandardInput = false)) - .RedirectTo(Console.Out) - .RedirectStandardErrorTo(Console.Error); - Console.WriteLine($"Launched AzureStorageEmulator (PID={command.ProcessId})"); - this._azureStorageEmulatorCommand = command; + throw new FileNotFoundException($"Could not locate the AzureStorageEmulator at {emulatorExePath}. This is required to run Azure tests. See https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator"); } - new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).CreateIfNotExists(); + var command = Command.Run(emulatorExePath, new[] { "start" }, o => o.StartInfo(i => i.RedirectStandardInput = false)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error); + Console.WriteLine($"Launched AzureStorageEmulator (PID={command.ProcessId})"); + this._azureStorageEmulatorCommand = command; } - [OneTimeTearDown] - public void OneTimeTearDown() - { - new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).DeleteIfExists(); + new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).CreateIfNotExists(); + } - if (this._azureStorageEmulatorCommand != null) - { - if (this._azureStorageEmulatorCommand.Task.IsCompleted) - { - throw new InvalidOperationException($"AzureStorageEmulator exited unexpectedly with error code {this._azureStorageEmulatorCommand.Result.ExitCode}"); - } + [OneTimeTearDown] + public void OneTimeTearDown() + { + new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).DeleteIfExists(); - this._azureStorageEmulatorCommand.Kill(); - this._azureStorageEmulatorCommand.Wait(); + if (this._azureStorageEmulatorCommand != null) + { + if (this._azureStorageEmulatorCommand.Task.IsCompleted) + { + throw new InvalidOperationException($"AzureStorageEmulator exited unexpectedly with error code {this._azureStorageEmulatorCommand.Result.ExitCode}"); } + + this._azureStorageEmulatorCommand.Kill(); + this._azureStorageEmulatorCommand.Wait(); } } } diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs index 60374e83..ef304621 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs @@ -5,29 +5,28 @@ using System.IO; using System.Text; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +public sealed class TestingAzureBlobLeaseDistributedLockProvider : TestingLockProvider { - public sealed class TestingAzureBlobLeaseDistributedLockProvider : TestingLockProvider - { - private readonly HashSet _createdBlobs = new HashSet(); + private readonly HashSet _createdBlobs = new HashSet(); - public override IDistributedLock CreateLockWithExactName(string name) + public override IDistributedLock CreateLockWithExactName(string name) + { + var client = new BlobClient(AzureCredentials.ConnectionString, this.Strategy.ContainerName, name); + if (this.Strategy.CreateBlobBeforeLockIsCreated) { - var client = new BlobClient(AzureCredentials.ConnectionString, this.Strategy.ContainerName, name); - if (this.Strategy.CreateBlobBeforeLockIsCreated) + lock (this._createdBlobs) { - lock (this._createdBlobs) + if (this._createdBlobs.Add(client.Uri)) { - if (this._createdBlobs.Add(client.Uri)) - { - client.Upload(Stream.Null); - } + client.Upload(Stream.Null); } } - return new AzureBlobLeaseDistributedLock(client, this.Strategy.Options); } - - public override string GetSafeName(string name) => - AzureBlobLeaseDistributedLock.GetSafeName(name, new BlobContainerClient(AzureCredentials.ConnectionString, this.Strategy.ContainerName)); + return new AzureBlobLeaseDistributedLock(client, this.Strategy.Options); } + + public override string GetSafeName(string name) => + AzureBlobLeaseDistributedLock.GetSafeName(name, new BlobContainerClient(AzureCredentials.ConnectionString, this.Strategy.ContainerName)); } diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs index ebe5ec89..1689784c 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs @@ -9,66 +9,65 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +public sealed class TestingAzureBlobLeaseSynchronizationStrategy : TestingSynchronizationStrategy { - public sealed class TestingAzureBlobLeaseSynchronizationStrategy : TestingSynchronizationStrategy - { - private readonly DisposableCollection _disposables = new DisposableCollection(); + private readonly DisposableCollection _disposables = new DisposableCollection(); - private static readonly Action DefaultTestingOptions = o => - // for test speed - o.BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(25)); + private static readonly Action DefaultTestingOptions = o => + // for test speed + o.BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(25)); - public string ContainerName { get; set; } = AzureCredentials.DefaultBlobContainerName; - - public Action? Options { get; set; } = DefaultTestingOptions; - public bool CreateBlobBeforeLockIsCreated { get; set; } + public string ContainerName { get; set; } = AzureCredentials.DefaultBlobContainerName; + + public Action? Options { get; set; } = DefaultTestingOptions; + public bool CreateBlobBeforeLockIsCreated { get; set; } - public override IDisposable? PrepareForHandleLost() + public override IDisposable? PrepareForHandleLost() + { + this.Options = o => { - this.Options = o => - { - DefaultTestingOptions(o); - o.RenewalCadence(TimeSpan.FromMilliseconds(10)); - }; + DefaultTestingOptions(o); + o.RenewalCadence(TimeSpan.FromMilliseconds(10)); + }; - using var md5 = MD5.Create(); - this.ContainerName = $"distributed-lock-handle-lost-{new BigInteger(md5.ComputeHash(Encoding.UTF8.GetBytes(TargetFramework.Current + TestContext.CurrentContext.Test.FullName))):x}"; - var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, this.ContainerName); - containerClient.CreateIfNotExists(); - this._disposables.Add(() => containerClient.DeleteIfExists()); - return new HandleLostScope(this.ContainerName); - } + using var md5 = MD5.Create(); + this.ContainerName = $"distributed-lock-handle-lost-{new BigInteger(md5.ComputeHash(Encoding.UTF8.GetBytes(TargetFramework.Current + TestContext.CurrentContext.Test.FullName))):x}"; + var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, this.ContainerName); + containerClient.CreateIfNotExists(); + this._disposables.Add(() => containerClient.DeleteIfExists()); + return new HandleLostScope(this.ContainerName); + } - public override void PrepareForHighContention(ref int maxConcurrentAcquires) - { - this.Options = null; // reduces # of requests under high contention - this.CreateBlobBeforeLockIsCreated = true; - } + public override void PrepareForHighContention(ref int maxConcurrentAcquires) + { + this.Options = null; // reduces # of requests under high contention + this.CreateBlobBeforeLockIsCreated = true; + } - public override void Dispose() + public override void Dispose() + { + try { this._disposables.Dispose(); } + finally { base.Dispose(); } + } + + private class HandleLostScope : IDisposable + { + private readonly string _containerName; + + public HandleLostScope(string containerName) { - try { this._disposables.Dispose(); } - finally { base.Dispose(); } + this._containerName = containerName; } - private class HandleLostScope : IDisposable + public void Dispose() { - private readonly string _containerName; - - public HandleLostScope(string containerName) - { - this._containerName = containerName; - } - - public void Dispose() + var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, this._containerName); + foreach (var blob in containerClient.GetBlobs()) { - var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, this._containerName); - foreach (var blob in containerClient.GetBlobs()) - { - var leaseClient = containerClient.GetBlobClient(blob.Name).GetBlobLeaseClient(); - leaseClient.Break(breakPeriod: TimeSpan.Zero); - } + var leaseClient = containerClient.GetBlobClient(blob.Name).GetBlobLeaseClient(); + leaseClient.Break(breakPeriod: TimeSpan.Zero); } } } diff --git a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs index 811680e4..0d49212b 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs @@ -4,42 +4,41 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +/// +/// Determines how an ADO.NET-based distributed lock should manage its connection to the database +/// and its locking strategy +/// +public sealed class TestingDbConnectionOptions { - /// - /// Determines how an ADO.NET-based distributed lock should manage its connection to the database - /// and its locking strategy - /// - public sealed class TestingDbConnectionOptions - { - public string? ConnectionString { get; set; } - public bool ConnectionStringUseMultiplexing { get; set; } - public bool ConnectionStringUseTransaction { get; set; } - public TimeSpan? ConnectionStringKeepaliveCadence { get; set; } - public DbConnection? Connection { get; set; } - public DbTransaction? Transaction { get; set; } + public string? ConnectionString { get; set; } + public bool ConnectionStringUseMultiplexing { get; set; } + public bool ConnectionStringUseTransaction { get; set; } + public TimeSpan? ConnectionStringKeepaliveCadence { get; set; } + public DbConnection? Connection { get; set; } + public DbTransaction? Transaction { get; set; } - public T Create( - Func fromConnectionString, - Func fromConnection, - Func fromTransaction) + public T Create( + Func fromConnectionString, + Func fromConnection, + Func fromTransaction) + { + if (this.ConnectionString != null) { - if (this.ConnectionString != null) - { - return fromConnectionString(this.ConnectionString, (this.ConnectionStringUseMultiplexing, this.ConnectionStringUseTransaction, this.ConnectionStringKeepaliveCadence)); - } - - if (this.Connection != null) - { - return fromConnection(this.Connection); - } + return fromConnectionString(this.ConnectionString, (this.ConnectionStringUseMultiplexing, this.ConnectionStringUseTransaction, this.ConnectionStringKeepaliveCadence)); + } - if (this.Transaction != null) - { - return fromTransaction(this.Transaction); - } + if (this.Connection != null) + { + return fromConnection(this.Connection); + } - throw new InvalidOperationException("should never get here"); + if (this.Transaction != null) + { + return fromTransaction(this.Transaction); } + + throw new InvalidOperationException("should never get here"); } } diff --git a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs index 305fbb71..a122d706 100644 --- a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs +++ b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs @@ -4,37 +4,36 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +internal class IdleSessionKiller : IDisposable { - internal class IdleSessionKiller : IDisposable - { - private readonly CancellationTokenSource _cancellationTokenSource; - private readonly Task _task; + private readonly CancellationTokenSource _cancellationTokenSource; + private readonly Task _task; - public IdleSessionKiller(TestingPrimaryClientDb db, string applicationName, TimeSpan idleTimeout) + public IdleSessionKiller(TestingPrimaryClientDb db, string applicationName, TimeSpan idleTimeout) + { + this._cancellationTokenSource = new CancellationTokenSource(); + var cancellationToken = this._cancellationTokenSource.Token; + this._task = Task.Run(async () => { - this._cancellationTokenSource = new CancellationTokenSource(); - var cancellationToken = this._cancellationTokenSource.Token; - this._task = Task.Run(async () => + while (!cancellationToken.IsCancellationRequested) { - while (!cancellationToken.IsCancellationRequested) - { - var expirationDate = DateTimeOffset.Now - idleTimeout; - await db.KillSessionsAsync(applicationName, expirationDate); - await Task.Delay(TimeSpan.FromTicks(idleTimeout.Ticks / 2), cancellationToken); - } - }); - } + var expirationDate = DateTimeOffset.Now - idleTimeout; + await db.KillSessionsAsync(applicationName, expirationDate); + await Task.Delay(TimeSpan.FromTicks(idleTimeout.Ticks / 2), cancellationToken); + } + }); + } - public void Dispose() - { - this._cancellationTokenSource.Cancel(); + public void Dispose() + { + this._cancellationTokenSource.Cancel(); - // wait and swallow any OCE - try { this._task.Wait(); } - catch when (this._task.IsCanceled) { } + // wait and swallow any OCE + try { this._task.Wait(); } + catch when (this._task.IsCanceled) { } - this._cancellationTokenSource.Dispose(); - } + this._cancellationTokenSource.Dispose(); } } diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs index ae1c7904..72d2f317 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs @@ -8,86 +8,85 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +/// +/// Abstraction over an ADO.NET client for a database technology +/// +public abstract class TestingDb { - /// - /// Abstraction over an ADO.NET client for a database technology - /// - public abstract class TestingDb - { - public abstract DbConnectionStringBuilder ConnectionStringBuilder { get; } + public abstract DbConnectionStringBuilder ConnectionStringBuilder { get; } - public virtual string ApplicationName - { - get => (string)this.ConnectionStringBuilder["Application Name"]; - set => this.ConnectionStringBuilder["Application Name"] = value; - } + public virtual string ApplicationName + { + get => (string)this.ConnectionStringBuilder["Application Name"]; + set => this.ConnectionStringBuilder["Application Name"] = value; + } - public string SetUniqueApplicationName(string baseName = "") - { - return this.ApplicationName = DistributedLockHelpers.ToSafeName( - // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool - $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", - maxNameLength: this.MaxApplicationNameLength, - s => s - ); - } + public string SetUniqueApplicationName(string baseName = "") + { + return this.ApplicationName = DistributedLockHelpers.ToSafeName( + // note: due to retries, we incorporate a GUID here to ensure that we have a fresh connection pool + $"{(baseName.Length > 0 ? baseName + "_" : string.Empty)}{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}_{Guid.NewGuid()}", + maxNameLength: this.MaxApplicationNameLength, + s => s + ); + } - public virtual string ConnectionString => this.ConnectionStringBuilder.ConnectionString; + public virtual string ConnectionString => this.ConnectionStringBuilder.ConnectionString; - // needed since different providers have different names for this key - public virtual int MaxPoolSize - { - get => (int)this.GetMaxPoolSizeProperty().GetValue(this.ConnectionStringBuilder)!; - set => this.GetMaxPoolSizeProperty().SetValue(this.ConnectionStringBuilder, value); - } + // needed since different providers have different names for this key + public virtual int MaxPoolSize + { + get => (int)this.GetMaxPoolSizeProperty().GetValue(this.ConnectionStringBuilder)!; + set => this.GetMaxPoolSizeProperty().SetValue(this.ConnectionStringBuilder, value); + } - private PropertyInfo GetMaxPoolSizeProperty() => this.ConnectionStringBuilder.GetType() - .GetProperty("MaxPoolSize", BindingFlags.Public | BindingFlags.Instance)!; - - public abstract int MaxApplicationNameLength { get; } + private PropertyInfo GetMaxPoolSizeProperty() => this.ConnectionStringBuilder.GetType() + .GetProperty("MaxPoolSize", BindingFlags.Public | BindingFlags.Instance)!; + + public abstract int MaxApplicationNameLength { get; } - public abstract TransactionSupport TransactionSupport { get; } + public abstract TransactionSupport TransactionSupport { get; } - public abstract DbConnection CreateConnection(); + public abstract DbConnection CreateConnection(); - public void ClearPool(DbConnection connection) - { - var clearPoolMethod = connection.GetType().GetMethod("ClearPool", BindingFlags.Public | BindingFlags.Static); - clearPoolMethod!.Invoke(null, new[] { connection }); - } + public void ClearPool(DbConnection connection) + { + var clearPoolMethod = connection.GetType().GetMethod("ClearPool", BindingFlags.Public | BindingFlags.Static); + clearPoolMethod!.Invoke(null, new[] { connection }); + } - public abstract int CountActiveSessions(string applicationName); + public abstract int CountActiveSessions(string applicationName); - public abstract IsolationLevel GetIsolationLevel(DbConnection connection); + public abstract IsolationLevel GetIsolationLevel(DbConnection connection); - public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } - } + public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } +} - public enum TransactionSupport - { - /// - /// The lifetime of the lock is tied to the transaction - /// - TransactionScoped, - - /// - /// Connection-scoped lifetime, but locking requests will automatically participate in a transaction if the connection has one - /// - ImplicitParticipation, - - /// - /// Connection-scoped lifetime, but locking requests will participate in a transaction if one is explicitly provided - /// - ExplicitParticipation, - } +public enum TransactionSupport +{ + /// + /// The lifetime of the lock is tied to the transaction + /// + TransactionScoped, /// - /// Interface for the "primary" ADO.NET client for a particular DB backend. For now - /// this is just used to designate Microsoft.Data.SqlClient vs. System.Data.SqlClient + /// Connection-scoped lifetime, but locking requests will automatically participate in a transaction if the connection has one /// - public abstract class TestingPrimaryClientDb : TestingDb - { - public abstract Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null); - } + ImplicitParticipation, + + /// + /// Connection-scoped lifetime, but locking requests will participate in a transaction if one is explicitly provided + /// + ExplicitParticipation, +} + +/// +/// Interface for the "primary" ADO.NET client for a particular DB backend. For now +/// this is just used to designate Microsoft.Data.SqlClient vs. System.Data.SqlClient +/// +public abstract class TestingPrimaryClientDb : TestingDb +{ + public abstract Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null); } diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 36b13ae8..2dd71923 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -6,221 +6,220 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Data +namespace Medallion.Threading.Tests.Data; + +/// +/// Determines how an ADO.NET-based synchronization primitive should function +/// +public abstract class TestingDbSynchronizationStrategy : TestingSynchronizationStrategy { - /// - /// Determines how an ADO.NET-based synchronization primitive should function - /// - public abstract class TestingDbSynchronizationStrategy : TestingSynchronizationStrategy + protected TestingDbSynchronizationStrategy(TestingDb db) { - protected TestingDbSynchronizationStrategy(TestingDb db) - { - this.Db = db; - } + this.Db = db; + } - public TestingDb Db { get; } + public TestingDb Db { get; } - public abstract TestingDbConnectionOptions GetConnectionOptions(); + public abstract TestingDbConnectionOptions GetConnectionOptions(); - public override void PrepareForHighContention(ref int maxConcurrentAcquires) => - this.Db.PrepareForHighContention(ref maxConcurrentAcquires); - } + public override void PrepareForHighContention(ref int maxConcurrentAcquires) => + this.Db.PrepareForHighContention(ref maxConcurrentAcquires); +} - public abstract class TestingDbSynchronizationStrategy : TestingDbSynchronizationStrategy - where TDb : TestingDb, new() - { - protected TestingDbSynchronizationStrategy() : base(new TDb()) { } +public abstract class TestingDbSynchronizationStrategy : TestingDbSynchronizationStrategy + where TDb : TestingDb, new() +{ + protected TestingDbSynchronizationStrategy() : base(new TDb()) { } - public new TDb Db => (TDb)base.Db; + public new TDb Db => (TDb)base.Db; - public override void Dispose() + public override void Dispose() + { + // if we have a uniquely-named connection, clear it's pool to avoid "leaking" connections into pools we'll never + // use again + if (!Equals(this.Db.ApplicationName, new TDb().ApplicationName)) { - // if we have a uniquely-named connection, clear it's pool to avoid "leaking" connections into pools we'll never - // use again - if (!Equals(this.Db.ApplicationName, new TDb().ApplicationName)) - { - using var connection = this.Db.CreateConnection(); - this.Db.ClearPool(connection); - } - - base.Dispose(); + using var connection = this.Db.CreateConnection(); + this.Db.ClearPool(connection); } + + base.Dispose(); } +} - public abstract class TestingConnectionStringSynchronizationStrategy : TestingDbSynchronizationStrategy - // since we're just going to be generating from connection strings, we only care about - // the primary ADO client for the database - where TDb : TestingPrimaryClientDb, new() +public abstract class TestingConnectionStringSynchronizationStrategy : TestingDbSynchronizationStrategy + // since we're just going to be generating from connection strings, we only care about + // the primary ADO client for the database + where TDb : TestingPrimaryClientDb, new() +{ + protected abstract bool? UseMultiplexingNotTransaction { get; } + public TimeSpan? KeepaliveCadence { get; set; } + + public sealed override TestingDbConnectionOptions GetConnectionOptions() => + new TestingDbConnectionOptions + { + ConnectionString = this.Db.ConnectionString, + ConnectionStringUseMultiplexing = this.UseMultiplexingNotTransaction == true, + ConnectionStringUseTransaction = this.UseMultiplexingNotTransaction == false, + ConnectionStringKeepaliveCadence = this.KeepaliveCadence, + }; + + public sealed override IDisposable? PrepareForHandleLost() => + new HandleLostScope(this.Db.SetUniqueApplicationName(nameof(this.PrepareForHandleLost)), this.Db); + + private class HandleLostScope : IDisposable { - protected abstract bool? UseMultiplexingNotTransaction { get; } - public TimeSpan? KeepaliveCadence { get; set; } - - public sealed override TestingDbConnectionOptions GetConnectionOptions() => - new TestingDbConnectionOptions - { - ConnectionString = this.Db.ConnectionString, - ConnectionStringUseMultiplexing = this.UseMultiplexingNotTransaction == true, - ConnectionStringUseTransaction = this.UseMultiplexingNotTransaction == false, - ConnectionStringKeepaliveCadence = this.KeepaliveCadence, - }; - - public sealed override IDisposable? PrepareForHandleLost() => - new HandleLostScope(this.Db.SetUniqueApplicationName(nameof(this.PrepareForHandleLost)), this.Db); - - private class HandleLostScope : IDisposable - { - private string? _applicationName; - private readonly TDb _db; + private string? _applicationName; + private readonly TDb _db; - public HandleLostScope(string applicationName, TDb testingDb) - { - this._applicationName = applicationName; - this._db = testingDb; - } + public HandleLostScope(string applicationName, TDb testingDb) + { + this._applicationName = applicationName; + this._db = testingDb; + } - public void Dispose() + public void Dispose() + { + var applicationName = Interlocked.Exchange(ref this._applicationName, null); + if (applicationName != null) { - var applicationName = Interlocked.Exchange(ref this._applicationName, null); - if (applicationName != null) - { - this._db.KillSessionsAsync(applicationName).Wait(); - } + this._db.KillSessionsAsync(applicationName).Wait(); } } } +} - public sealed class TestingConnectionMultiplexingSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : TestingPrimaryClientDb, new() - { - protected override bool? UseMultiplexingNotTransaction => true; - } +public sealed class TestingConnectionMultiplexingSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy + where TDb : TestingPrimaryClientDb, new() +{ + protected override bool? UseMultiplexingNotTransaction => true; +} - public sealed class TestingOwnedConnectionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : TestingPrimaryClientDb, new() - { - protected override bool? UseMultiplexingNotTransaction => null; - } +public sealed class TestingOwnedConnectionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy + where TDb : TestingPrimaryClientDb, new() +{ + protected override bool? UseMultiplexingNotTransaction => null; +} - public sealed class TestingOwnedTransactionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy - where TDb : TestingPrimaryClientDb, new() - { - protected override bool? UseMultiplexingNotTransaction => false; - } +public sealed class TestingOwnedTransactionSynchronizationStrategy : TestingConnectionStringSynchronizationStrategy + where TDb : TestingPrimaryClientDb, new() +{ + protected override bool? UseMultiplexingNotTransaction => false; +} - public abstract class TestingExternalConnectionOrTransactionSynchronizationStrategy : TestingDbSynchronizationStrategy - where TDb : TestingDb, new() - { - /// - /// Starts a new "ambient" connection or transaction that future locks will be created with - /// - public abstract void StartAmbient(); +public abstract class TestingExternalConnectionOrTransactionSynchronizationStrategy : TestingDbSynchronizationStrategy + where TDb : TestingDb, new() +{ + /// + /// Starts a new "ambient" connection or transaction that future locks will be created with + /// + public abstract void StartAmbient(); - protected abstract void EndAmbient(); + protected abstract void EndAmbient(); - /// - /// If has been called, returns the current ambient connection - /// - public abstract DbConnection? AmbientConnection { get; } + /// + /// If has been called, returns the current ambient connection + /// + public abstract DbConnection? AmbientConnection { get; } - public sealed override IDisposable? PrepareForHandleLost() - { - this.StartAmbient(); - return this.AmbientConnection; - } + public sealed override IDisposable? PrepareForHandleLost() + { + this.StartAmbient(); + return this.AmbientConnection; + } - public sealed override void PrepareForHandleAbandonment() => this.StartAmbient(); + public sealed override void PrepareForHandleAbandonment() => this.StartAmbient(); - public sealed override void PerformAdditionalCleanupForHandleAbandonment() - { - this.AmbientConnection!.Dispose(); - using var connection = this.Db.CreateConnection(); - this.Db.ClearPool(connection); - this.EndAmbient(); - } + public sealed override void PerformAdditionalCleanupForHandleAbandonment() + { + this.AmbientConnection!.Dispose(); + using var connection = this.Db.CreateConnection(); + this.Db.ClearPool(connection); + this.EndAmbient(); } +} - public sealed class TestingExternalConnectionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy - where TDb : TestingDb, new() - { - private readonly DisposableCollection _disposables = new DisposableCollection(); - private DbConnection? _ambientConnection; +public sealed class TestingExternalConnectionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy + where TDb : TestingDb, new() +{ + private readonly DisposableCollection _disposables = new DisposableCollection(); + private DbConnection? _ambientConnection; - public override DbConnection? AmbientConnection => this._ambientConnection; + public override DbConnection? AmbientConnection => this._ambientConnection; - public override void StartAmbient() - { - // clear first so GetConnectionOptions will make a new connection - this._ambientConnection = null; + public override void StartAmbient() + { + // clear first so GetConnectionOptions will make a new connection + this._ambientConnection = null; - this._ambientConnection = this.GetConnectionOptions().Connection; - } + this._ambientConnection = this.GetConnectionOptions().Connection; + } - protected override void EndAmbient() => this._ambientConnection = null; + protected override void EndAmbient() => this._ambientConnection = null; - public override TestingDbConnectionOptions GetConnectionOptions() + public override TestingDbConnectionOptions GetConnectionOptions() + { + DbConnection connection; + if (this.AmbientConnection != null) { - DbConnection connection; - if (this.AmbientConnection != null) - { - connection = this.AmbientConnection; - } - else - { - connection = this.Db.CreateConnection(); - this._disposables.Add(connection); - connection.Open(); - } - return new TestingDbConnectionOptions { Connection = connection }; + connection = this.AmbientConnection; } - - public override void Dispose() + else { - this._disposables.Dispose(); - base.Dispose(); + connection = this.Db.CreateConnection(); + this._disposables.Add(connection); + connection.Open(); } + return new TestingDbConnectionOptions { Connection = connection }; } - public sealed class TestingExternalTransactionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy - where TDb : TestingDb, new() + public override void Dispose() { - private readonly DisposableCollection _disposables = new DisposableCollection(); + this._disposables.Dispose(); + base.Dispose(); + } +} - public DbTransaction? AmbientTransaction { get; private set; } - public override DbConnection? AmbientConnection => this.AmbientTransaction?.Connection; +public sealed class TestingExternalTransactionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy + where TDb : TestingDb, new() +{ + private readonly DisposableCollection _disposables = new DisposableCollection(); - public override void StartAmbient() - { - // clear first so GetConnectionOptions will make a new transaction - this.AmbientTransaction = null; + public DbTransaction? AmbientTransaction { get; private set; } + public override DbConnection? AmbientConnection => this.AmbientTransaction?.Connection; - this.AmbientTransaction = this.GetConnectionOptions().Transaction; - } + public override void StartAmbient() + { + // clear first so GetConnectionOptions will make a new transaction + this.AmbientTransaction = null; - protected override void EndAmbient() => this.AmbientTransaction = null; + this.AmbientTransaction = this.GetConnectionOptions().Transaction; + } - public override TestingDbConnectionOptions GetConnectionOptions() - { - DbTransaction transaction; - if (this.AmbientTransaction != null) - { - transaction = this.AmbientTransaction; - } - else - { - var connection = this.Db.CreateConnection(); - this._disposables.Add(connection); - connection.Open(); - transaction = connection.BeginTransaction(); - this._disposables.Add(transaction); - } + protected override void EndAmbient() => this.AmbientTransaction = null; - return new TestingDbConnectionOptions { Transaction = transaction }; + public override TestingDbConnectionOptions GetConnectionOptions() + { + DbTransaction transaction; + if (this.AmbientTransaction != null) + { + transaction = this.AmbientTransaction; } - - public override void Dispose() + else { - this._disposables.Dispose(); - base.Dispose(); + var connection = this.Db.CreateConnection(); + this._disposables.Add(connection); + connection.Open(); + transaction = connection.BeginTransaction(); + this._disposables.Add(transaction); } + + return new TestingDbConnectionOptions { Transaction = transaction }; + } + + public override void Dispose() + { + this._disposables.Dispose(); + base.Dispose(); } } diff --git a/DistributedLock.Tests/Infrastructure/DisposableCollection.cs b/DistributedLock.Tests/Infrastructure/DisposableCollection.cs index 34b84f4f..30fa93fc 100644 --- a/DistributedLock.Tests/Infrastructure/DisposableCollection.cs +++ b/DistributedLock.Tests/Infrastructure/DisposableCollection.cs @@ -4,64 +4,63 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal sealed class DisposableCollection : IDisposable { - internal sealed class DisposableCollection : IDisposable - { - private readonly object _lock = new object(); - private Stack? _resources = new Stack(); + private readonly object _lock = new object(); + private Stack? _resources = new Stack(); - public void Add(IDisposable resource) + public void Add(IDisposable resource) + { + lock (this._lock) { - lock (this._lock) - { - (this._resources ?? throw new ObjectDisposedException(this.GetType().ToString())) - .Push(resource); - } + (this._resources ?? throw new ObjectDisposedException(this.GetType().ToString())) + .Push(resource); } + } - public void Add(Action cleanupAction) => this.Add(new ReleaseAction(cleanupAction)); + public void Add(Action cleanupAction) => this.Add(new ReleaseAction(cleanupAction)); - public void ClearAndDisposeAll() => this.InternalClearAndDisposeAll(isDispose: false); + public void ClearAndDisposeAll() => this.InternalClearAndDisposeAll(isDispose: false); - public void Dispose() => this.InternalClearAndDisposeAll(isDispose: true); + public void Dispose() => this.InternalClearAndDisposeAll(isDispose: true); - private void InternalClearAndDisposeAll(bool isDispose) + private void InternalClearAndDisposeAll(bool isDispose) + { + lock (this._lock) { - lock (this._lock) + if (this._resources == null) { - if (this._resources == null) - { - if (isDispose) { return; } - throw new ObjectDisposedException(this.GetType().ToString()); - } + if (isDispose) { return; } + throw new ObjectDisposedException(this.GetType().ToString()); + } - var exceptions = new List(); - while (this._resources.Count > 0) - { - try { this._resources.Pop().Dispose(); } - catch (Exception ex) { exceptions.Add(ex); } - } + var exceptions = new List(); + while (this._resources.Count > 0) + { + try { this._resources.Pop().Dispose(); } + catch (Exception ex) { exceptions.Add(ex); } + } - if (isDispose) - { - this._resources = null; - } + if (isDispose) + { + this._resources = null; + } - if (exceptions.Any()) - { - throw new AggregateException(exceptions).Flatten(); - } + if (exceptions.Any()) + { + throw new AggregateException(exceptions).Flatten(); } } + } - private class ReleaseAction : IDisposable - { - private Action? _action; + private class ReleaseAction : IDisposable + { + private Action? _action; - public ReleaseAction(Action action) { this._action = action; } + public ReleaseAction(Action action) { this._action = action; } - public void Dispose() => Interlocked.Exchange(ref this._action, null)?.Invoke(); - } + public void Dispose() => Interlocked.Exchange(ref this._action, null)?.Invoke(); } } diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs index c48c1f9a..17d80b62 100644 --- a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs @@ -4,15 +4,14 @@ using System.IO; using System.Text; -namespace Medallion.Threading.Tests.FileSystem +namespace Medallion.Threading.Tests.FileSystem; + +[SupportsContinuousIntegration] +public sealed class TestingFileDistributedLockProvider : TestingLockProvider { - [SupportsContinuousIntegration] - public sealed class TestingFileDistributedLockProvider : TestingLockProvider - { - public override IDistributedLock CreateLockWithExactName(string name) => - new FileDistributedLock(new FileInfo(name)); + public override IDistributedLock CreateLockWithExactName(string name) => + new FileDistributedLock(new FileInfo(name)); - public override string GetSafeName(string name) => - new FileDistributedLock(new DirectoryInfo(Path.Combine(Path.GetTempPath(), this.GetType().Name)), name).Name; - } + public override string GetSafeName(string name) => + new FileDistributedLock(new DirectoryInfo(Path.Combine(Path.GetTempPath(), this.GetType().Name)), name).Name; } diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs index 0ed565a9..ec4e71d5 100644 --- a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.FileSystem +namespace Medallion.Threading.Tests.FileSystem; + +[SupportsContinuousIntegration] +public sealed class TestingLockFileSynchronizationStrategy : TestingSynchronizationStrategy { - [SupportsContinuousIntegration] - public sealed class TestingLockFileSynchronizationStrategy : TestingSynchronizationStrategy - { - } } diff --git a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs index 5a0e9cc1..8279943a 100644 --- a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs +++ b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs @@ -3,20 +3,19 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public interface ITestingNameProvider { - public interface ITestingNameProvider - { - string GetSafeName(string name); - } + string GetSafeName(string name); +} - internal static class TestingNameProviderExtensions - { - /// - /// Returns a name based on which is "namespaced" by the current - /// test and framework name, thus avoiding potential collisions between test cases - /// - public static string GetUniqueSafeName(this ITestingNameProvider provider, string baseName = "") => - provider.GetSafeName($"{baseName}_{TestHelper.UniqueName}"); - } +internal static class TestingNameProviderExtensions +{ + /// + /// Returns a name based on which is "namespaced" by the current + /// test and framework name, thus avoiding potential collisions between test cases + /// + public static string GetUniqueSafeName(this ITestingNameProvider provider, string baseName = "") => + provider.GetSafeName($"{baseName}_{TestHelper.UniqueName}"); } diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index 5ea6cd78..0f77abae 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -9,63 +9,63 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.MySql +namespace Medallion.Threading.Tests.MySql; + +public class TestingMySqlDb : TestingPrimaryClientDb { - public class TestingMySqlDb : TestingPrimaryClientDb - { - private readonly string _defaultConnectionString; - private readonly MySqlConnectionStringBuilder _connectionStringBuilder; + private readonly string _defaultConnectionString; + private readonly MySqlConnectionStringBuilder _connectionStringBuilder; - public TestingMySqlDb() : - this(MySqlCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) - { - } + public TestingMySqlDb() : + this(MySqlCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) + { + } - protected TestingMySqlDb(string defaultConnectionString) - { - this._defaultConnectionString = defaultConnectionString; - this._connectionStringBuilder = new MySqlConnectionStringBuilder(this._defaultConnectionString); - } + protected TestingMySqlDb(string defaultConnectionString) + { + this._defaultConnectionString = defaultConnectionString; + this._connectionStringBuilder = new MySqlConnectionStringBuilder(this._defaultConnectionString); + } - public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public override int MaxPoolSize { get => (int)this._connectionStringBuilder.MaximumPoolSize; set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; } + public override int MaxPoolSize { get => (int)this._connectionStringBuilder.MaximumPoolSize; set => this._connectionStringBuilder.MaximumPoolSize = (uint)value; } - public override int MaxApplicationNameLength => 65390; // based on empirical testing + public override int MaxApplicationNameLength => 65390; // based on empirical testing - public override TransactionSupport TransactionSupport => TransactionSupport.ExplicitParticipation; + public override TransactionSupport TransactionSupport => TransactionSupport.ExplicitParticipation; - protected virtual string IsolationLevelVariableName => "transaction_isolation"; + protected virtual string IsolationLevelVariableName => "transaction_isolation"; - public override int CountActiveSessions(string applicationName) - { - using var connection = new MySqlConnection(this._defaultConnectionString); - connection.Open(); - using var command = connection.CreateCommand(); - command.CommandText = "SELECT COUNT(*) FROM performance_schema.session_connect_attrs WHERE ATTR_NAME = 'program_name' AND ATTR_VALUE = @applicationName"; - command.Parameters.AddWithValue(nameof(applicationName), applicationName); - return (int)(long)command.ExecuteScalar()!; - } + public override int CountActiveSessions(string applicationName) + { + using var connection = new MySqlConnection(this._defaultConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT COUNT(*) FROM performance_schema.session_connect_attrs WHERE ATTR_NAME = 'program_name' AND ATTR_VALUE = @applicationName"; + command.Parameters.AddWithValue(nameof(applicationName), applicationName); + return (int)(long)command.ExecuteScalar()!; + } - public override DbConnection CreateConnection() => new MySqlConnection(this.ConnectionStringBuilder.ConnectionString); - public override IsolationLevel GetIsolationLevel(DbConnection connection) - { - using var command = connection.CreateCommand(); - command.CommandText = "SELECT @@" + this.IsolationLevelVariableName; - var rawIsolationLevel = (string)command.ExecuteScalar()!; - return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), rawIsolationLevel.Replace("-", string.Empty), ignoreCase: true); - } + public override DbConnection CreateConnection() => new MySqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override IsolationLevel GetIsolationLevel(DbConnection connection) + { + using var command = connection.CreateCommand(); + command.CommandText = "SELECT @@" + this.IsolationLevelVariableName; + var rawIsolationLevel = (string)command.ExecuteScalar()!; + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), rawIsolationLevel.Replace("-", string.Empty), ignoreCase: true); + } - public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) - { - var minTimeSeconds = idleSince.HasValue - ? (int?)(DateTimeOffset.UtcNow - idleSince.Value).TotalSeconds - : null; - - using var connection = new MySqlConnection(this._defaultConnectionString); - await connection.OpenAsync(); - using var idleSessionsCommand = connection.CreateCommand(); - idleSessionsCommand.CommandText = @" + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + { + var minTimeSeconds = idleSince.HasValue + ? (int?)(DateTimeOffset.UtcNow - idleSince.Value).TotalSeconds + : null; + + using var connection = new MySqlConnection(this._defaultConnectionString); + await connection.OpenAsync(); + using var idleSessionsCommand = connection.CreateCommand(); + idleSessionsCommand.CommandText = @" SELECT a.PROCESSLIST_ID FROM performance_schema.session_connect_attrs a JOIN information_schema.processlist p @@ -73,28 +73,27 @@ JOIN information_schema.processlist p WHERE a.ATTR_NAME = 'program_name' AND a.ATTR_VALUE = @applicationName AND (@minTimeSeconds IS NULL OR p.TIME > @minTimeSeconds)"; - idleSessionsCommand.Parameters.AddWithValue(nameof(applicationName), applicationName); - idleSessionsCommand.Parameters.AddWithValue(nameof(minTimeSeconds), minTimeSeconds); - - var idsToKill = new List(); - await using (var reader = await idleSessionsCommand.ExecuteReaderAsync()) - { - while (await reader.ReadAsync()) { idsToKill.Add(reader.GetInt32(0)); } - } - - foreach (var idToKill in idsToKill) - { - using var killCommand = connection.CreateCommand(); - killCommand.CommandText = $"KILL {idToKill}"; - await killCommand.ExecuteNonQueryAsync(); - } + idleSessionsCommand.Parameters.AddWithValue(nameof(applicationName), applicationName); + idleSessionsCommand.Parameters.AddWithValue(nameof(minTimeSeconds), minTimeSeconds); + + var idsToKill = new List(); + await using (var reader = await idleSessionsCommand.ExecuteReaderAsync()) + { + while (await reader.ReadAsync()) { idsToKill.Add(reader.GetInt32(0)); } + } + + foreach (var idToKill in idsToKill) + { + using var killCommand = connection.CreateCommand(); + killCommand.CommandText = $"KILL {idToKill}"; + await killCommand.ExecuteNonQueryAsync(); } } +} - public sealed class TestingMariaDbDb : TestingMySqlDb - { - public TestingMariaDbDb() : base(MariaDbCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) { } +public sealed class TestingMariaDbDb : TestingMySqlDb +{ + public TestingMariaDbDb() : base(MariaDbCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) { } - protected override string IsolationLevelVariableName => "tx_isolation"; - } + protected override string IsolationLevelVariableName => "tx_isolation"; } diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs index 6aa82b16..d870a64e 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs @@ -4,28 +4,27 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.MySql +namespace Medallion.Threading.Tests.MySql; + +public sealed class TestingMySqlDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + where TDb : TestingMySqlDb, new() { - public sealed class TestingMySqlDistributedLockProvider : TestingLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : TestingMySqlDb, new() - { - public override IDistributedLock CreateLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => new MySqlDistributedLock(name, connectionString, options: ToMySqlOptions(options)), - connection => new MySqlDistributedLock(name, connection, exactName: true), - transaction => new MySqlDistributedLock(name, transaction, exactName: true) - ); + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => new MySqlDistributedLock(name, connectionString, options: ToMySqlOptions(options)), + connection => new MySqlDistributedLock(name, connection, exactName: true), + transaction => new MySqlDistributedLock(name, transaction, exactName: true) + ); - public override string GetSafeName(string name) => new MySqlDistributedLock(name, new TDb().ConnectionStringBuilder.ConnectionString).Name; + public override string GetSafeName(string name) => new MySqlDistributedLock(name, new TDb().ConnectionStringBuilder.ConnectionString).Name; - public override string GetCrossProcessLockType() => (typeof(TDb) == typeof(TestingMariaDbDb) ? "MariaDB" : string.Empty) + base.GetCrossProcessLockType(); + public override string GetCrossProcessLockType() => (typeof(TDb) == typeof(TestingMariaDbDb) ? "MariaDB" : string.Empty) + base.GetCrossProcessLockType(); - internal static Action ToMySqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => - { - o.UseMultiplexing(options.useMultiplexing); - if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } - }; - } + internal static Action ToMySqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => + { + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; } diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index 7c45a29a..afc11dc1 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -10,84 +10,83 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +public sealed class TestingOracleDb : TestingPrimaryClientDb { - public sealed class TestingOracleDb : TestingPrimaryClientDb - { - internal static readonly string DefaultConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); + internal static readonly string DefaultConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(DefaultConnectionString); + private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(DefaultConnectionString); - public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public override string ApplicationName { get; set; } = string.Empty; + public override string ApplicationName { get; set; } = string.Empty; - public override string ConnectionString => - (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) - + this.ConnectionStringBuilder.ConnectionString; + public override string ConnectionString => + (this.ApplicationName.Length > 0 ? $"{OracleDatabaseConnection.ApplicationNameIndicatorPrefix}{this.ApplicationName};" : string.Empty) + + this.ConnectionStringBuilder.ConnectionString; - // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 - public override int MaxApplicationNameLength => 64; + // see https://docs.oracle.com/database/121/ARPLS/d_appinf.htm#ARPLS65237 + public override int MaxApplicationNameLength => 64; - public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; + public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; - public override int CountActiveSessions(string applicationName) - { - Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - - using var connection = new OracleConnection(DefaultConnectionString); - connection.Open(); - using var command = connection.CreateCommand(); - command.CommandText = "SELECT COUNT(*) FROM v$session WHERE client_info = :applicationName AND status != 'KILLED'"; - command.Parameters.Add("applicationName", applicationName); - return (int)(decimal)command.ExecuteScalar()!; - } + public override int CountActiveSessions(string applicationName) + { + Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - public override DbConnection CreateConnection() => OracleDatabaseConnection.CreateConnection(this.As().ConnectionString); + using var connection = new OracleConnection(DefaultConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT COUNT(*) FROM v$session WHERE client_info = :applicationName AND status != 'KILLED'"; + command.Parameters.Add("applicationName", applicationName); + return (int)(decimal)command.ExecuteScalar()!; + } - public override IsolationLevel GetIsolationLevel(DbConnection connection) - { - // After briefly trying the various approaches mentioned on https://stackoverflow.com/questions/10711204/how-to-check-isoloation-level - // I could not get them to work. Given that the tests using this are checking something relatively minor and SQLServer specific, not - // supporting this seems fine. - throw new NotSupportedException(); - } + public override DbConnection CreateConnection() => OracleDatabaseConnection.CreateConnection(this.As().ConnectionString); - public override void PrepareForHighContention(ref int maxConcurrentAcquires) - { - // The free Oracle Autonomous database has a fixed max session limit of 20. When concurrency approaches that, parellel - // execution slows down greatly because often releases become queued behind competing aquires. When concurrency surpasses - // that level we risk total deadlock where all active sessions are in use by acquires and as such no release can ever get - // through. - maxConcurrentAcquires = Math.Min(maxConcurrentAcquires, 15); - } + public override IsolationLevel GetIsolationLevel(DbConnection connection) + { + // After briefly trying the various approaches mentioned on https://stackoverflow.com/questions/10711204/how-to-check-isoloation-level + // I could not get them to work. Given that the tests using this are checking something relatively minor and SQLServer specific, not + // supporting this seems fine. + throw new NotSupportedException(); + } - public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) - { - using var connection = new OracleConnection(DefaultConnectionString); - await connection.OpenAsync(); + public override void PrepareForHighContention(ref int maxConcurrentAcquires) + { + // The free Oracle Autonomous database has a fixed max session limit of 20. When concurrency approaches that, parellel + // execution slows down greatly because often releases become queued behind competing aquires. When concurrency surpasses + // that level we risk total deadlock where all active sessions are in use by acquires and as such no release can ever get + // through. + maxConcurrentAcquires = Math.Min(maxConcurrentAcquires, 15); + } + + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince = null) + { + using var connection = new OracleConnection(DefaultConnectionString); + await connection.OpenAsync(); - using var getIdleSessionsCommand = connection.CreateCommand(); - var idleTimeSeconds = idleSince.HasValue ? (DateTimeOffset.Now - idleSince.Value).TotalSeconds : default(double?); - getIdleSessionsCommand.CommandText = $@" + using var getIdleSessionsCommand = connection.CreateCommand(); + var idleTimeSeconds = idleSince.HasValue ? (DateTimeOffset.Now - idleSince.Value).TotalSeconds : default(double?); + getIdleSessionsCommand.CommandText = $@" SELECT sid, serial# FROM v$session WHERE client_info = :applicationName {(idleTimeSeconds.HasValue ? $"AND last_call_et >= {idleTimeSeconds}" : string.Empty)}"; - getIdleSessionsCommand.Parameters.Add("applicationName", applicationName); - using var reader = await getIdleSessionsCommand.ExecuteReaderAsync(); - var sessionsToKill = new List<(int Sid, int SerialNumber)>(); - while (await reader.ReadAsync()) - { - sessionsToKill.Add((Sid: (int)reader.GetDecimal(0), SerialNumber: (int)reader.GetDecimal(1))); - } - - foreach (var (sid, serialNumber) in sessionsToKill) - { - using var killCommand = connection.CreateCommand(); - killCommand.CommandText = $"ALTER SYSTEM KILL SESSION '{sid},{serialNumber}'"; - await killCommand.ExecuteNonQueryAsync(); - } + getIdleSessionsCommand.Parameters.Add("applicationName", applicationName); + using var reader = await getIdleSessionsCommand.ExecuteReaderAsync(); + var sessionsToKill = new List<(int Sid, int SerialNumber)>(); + while (await reader.ReadAsync()) + { + sessionsToKill.Add((Sid: (int)reader.GetDecimal(0), SerialNumber: (int)reader.GetDecimal(1))); + } + + foreach (var (sid, serialNumber) in sessionsToKill) + { + using var killCommand = connection.CreateCommand(); + killCommand.CommandText = $"ALTER SYSTEM KILL SESSION '{sid},{serialNumber}'"; + await killCommand.ExecuteNonQueryAsync(); } } } diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index 8ee6ab04..de18c2ae 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -4,39 +4,38 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.Oracle -{ - public sealed class TestingOracleDistributedLockProvider : TestingLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - { - public override IDistributedLock CreateLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), - connection => new OracleDistributedLock(name, connection), - transaction => new OracleDistributedLock(name, transaction.Connection) - ); +namespace Medallion.Threading.Tests.Oracle; - public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; +public sealed class TestingOracleDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() +{ + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), + connection => new OracleDistributedLock(name, connection), + transaction => new OracleDistributedLock(name, transaction.Connection) + ); - internal static Action ToOracleOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => - { - o.UseMultiplexing(options.useMultiplexing); - if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } - }; - } + public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; - public sealed class TestingOracleDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() + internal static Action ToOracleOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => { - public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => - new OracleDistributedReaderWriterLock(name, connectionString, TestingOracleDistributedLockProvider.ToOracleOptions(options), exactName: true), - connection => new OracleDistributedReaderWriterLock(name, connection, exactName: true), - transaction => new OracleDistributedReaderWriterLock(name, transaction.Connection, exactName: true)); + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; +} + +public sealed class TestingOracleDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() +{ + public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => + new OracleDistributedReaderWriterLock(name, connectionString, TestingOracleDistributedLockProvider.ToOracleOptions(options), exactName: true), + connection => new OracleDistributedReaderWriterLock(name, connection, exactName: true), + transaction => new OracleDistributedReaderWriterLock(name, transaction.Connection, exactName: true)); - public override string GetSafeName(string name) => new OracleDistributedReaderWriterLock(name, TestingOracleDb.DefaultConnectionString).Name; - } + public override string GetSafeName(string name) => new OracleDistributedReaderWriterLock(name, TestingOracleDb.DefaultConnectionString).Name; } diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 63b17076..0d185430 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -10,55 +10,55 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public sealed class TestingPostgresDb : TestingPrimaryClientDb { - public sealed class TestingPostgresDb : TestingPrimaryClientDb - { - internal static readonly string DefaultConnectionString = PostgresCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); + internal static readonly string DefaultConnectionString = PostgresCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new NpgsqlConnectionStringBuilder(DefaultConnectionString); + private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new NpgsqlConnectionStringBuilder(DefaultConnectionString); - public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - // https://til.hashrocket.com/posts/8f87c65a0a-postgresqls-max-identifier-length-is-63-bytes - public override int MaxApplicationNameLength => 63; + // https://til.hashrocket.com/posts/8f87c65a0a-postgresqls-max-identifier-length-is-63-bytes + public override int MaxApplicationNameLength => 63; - /// - /// Technically Postgres does support this through xact advisory lock methods, but it is very unwieldy to use due to the transaction - /// abort semantics and largely unnecessary for our purposes since, unlike SQLServer, a connection-scoped Postgres lock can still - /// participate in an ongoing transaction. - /// - public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; + /// + /// Technically Postgres does support this through xact advisory lock methods, but it is very unwieldy to use due to the transaction + /// abort semantics and largely unnecessary for our purposes since, unlike SQLServer, a connection-scoped Postgres lock can still + /// participate in an ongoing transaction. + /// + public override TransactionSupport TransactionSupport => TransactionSupport.ImplicitParticipation; - public override int CountActiveSessions(string applicationName) - { - Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); + public override int CountActiveSessions(string applicationName) + { + Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - using var connection = new NpgsqlConnection(DefaultConnectionString); - connection.Open(); - using var command = connection.CreateCommand(); - command.CommandText = "SELECT COUNT(*)::int FROM pg_stat_activity WHERE application_name = @applicationName"; - command.Parameters.AddWithValue("applicationName", applicationName); - return (int)command.ExecuteScalar()!; - } + using var connection = new NpgsqlConnection(DefaultConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT COUNT(*)::int FROM pg_stat_activity WHERE application_name = @applicationName"; + command.Parameters.AddWithValue("applicationName", applicationName); + return (int)command.ExecuteScalar()!; + } - public override IsolationLevel GetIsolationLevel(DbConnection connection) - { - using var command = connection.CreateCommand(); - // values based on https://www.postgresql.org/docs/12/transaction-iso.html - command.CommandText = "SELECT REPLACE(current_setting('transaction_isolation'), ' ', '')"; - return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar(), ignoreCase: true); - } + public override IsolationLevel GetIsolationLevel(DbConnection connection) + { + using var command = connection.CreateCommand(); + // values based on https://www.postgresql.org/docs/12/transaction-iso.html + command.CommandText = "SELECT REPLACE(current_setting('transaction_isolation'), ' ', '')"; + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar(), ignoreCase: true); + } - public override DbConnection CreateConnection() => new NpgsqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override DbConnection CreateConnection() => new NpgsqlConnection(this.ConnectionStringBuilder.ConnectionString); - public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) - { - using var connection = new NpgsqlConnection(DefaultConnectionString); - await connection.OpenAsync(); - using var command = connection.CreateCommand(); - // based on https://stackoverflow.com/questions/13236160/is-there-a-timeout-for-idle-postgresql-connections - command.CommandText = @" + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) + { + using var connection = new NpgsqlConnection(DefaultConnectionString); + await connection.OpenAsync(); + using var command = connection.CreateCommand(); + // based on https://stackoverflow.com/questions/13236160/is-there-a-timeout-for-idle-postgresql-connections + command.CommandText = @" SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE application_name = @applicationName @@ -66,10 +66,9 @@ FROM pg_stat_activity @idleSince IS NULL OR (state = 'idle' AND state_change < @idleSince) )"; - command.Parameters.AddWithValue("applicationName", applicationName); - command.Parameters.Add(new NpgsqlParameter("idleSince", idleSince ?? DBNull.Value.As()) { NpgsqlDbType = NpgsqlDbType.TimestampTz }); + command.Parameters.AddWithValue("applicationName", applicationName); + command.Parameters.Add(new NpgsqlParameter("idleSince", idleSince ?? DBNull.Value.As()) { NpgsqlDbType = NpgsqlDbType.TimestampTz }); - await command.ExecuteNonQueryAsync(); - } + await command.ExecuteNonQueryAsync(); } } diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index 121c4861..65b62271 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -4,48 +4,47 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public sealed class TestingPostgresDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() { - public sealed class TestingPostgresDistributedLockProvider : TestingLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => new PostgresDistributedLock( + new PostgresAdvisoryLockKey(name, allowHashing: false), + connectionString, + ToPostgresOptions(options) + ), + connection => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), + transaction => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) + ); + + public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); + + internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => { - public override IDistributedLock CreateLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => new PostgresDistributedLock( + o.UseMultiplexing(options.useMultiplexing); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; +} + +public sealed class TestingPostgresDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() +{ + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => + new PostgresDistributedReaderWriterLock( new PostgresAdvisoryLockKey(name, allowHashing: false), connectionString, - ToPostgresOptions(options) + TestingPostgresDistributedLockProvider.ToPostgresOptions(options) ), - connection => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), - transaction => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) + connection => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), + transaction => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) ); - public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); - - internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => - { - o.UseMultiplexing(options.useMultiplexing); - if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } - }; - } - - public sealed class TestingPostgresDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - { - public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => - new PostgresDistributedReaderWriterLock( - new PostgresAdvisoryLockKey(name, allowHashing: false), - connectionString, - TestingPostgresDistributedLockProvider.ToPostgresOptions(options) - ), - connection => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), - transaction => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) - ); - - public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); - } + public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); } diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 03fdd30f..674414e0 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -8,86 +8,85 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +internal class RedisServer { - internal class RedisServer - { - // redis default is 6379, so go one above that - private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; + // redis default is 6379, so go one above that + private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; - // it's important for this to be lazy because it doesn't work when running on Linux - private static readonly Lazy WslPath = new Lazy( - () => Directory.GetDirectories(@"C:\Windows\WinSxS") - .Select(d => Path.Combine(d, "wsl.exe")) - .Where(File.Exists) - .OrderByDescending(File.GetCreationTimeUtc) - .First() - ); + // it's important for this to be lazy because it doesn't work when running on Linux + private static readonly Lazy WslPath = new Lazy( + () => Directory.GetDirectories(@"C:\Windows\WinSxS") + .Select(d => Path.Combine(d, "wsl.exe")) + .Where(File.Exists) + .OrderByDescending(File.GetCreationTimeUtc) + .First() + ); - private static readonly Dictionary ActiveServersByPort = new Dictionary(); - private static readonly RedisServer[] DefaultServers = new RedisServer[RedisPorts.DefaultPorts.Count]; + private static readonly Dictionary ActiveServersByPort = new Dictionary(); + private static readonly RedisServer[] DefaultServers = new RedisServer[RedisPorts.DefaultPorts.Count]; - private readonly Command _command; + private readonly Command _command; - public RedisServer(bool allowAdmin = false) : this(null, allowAdmin) { } + public RedisServer(bool allowAdmin = false) : this(null, allowAdmin) { } - private RedisServer(int? port, bool allowAdmin) + private RedisServer(int? port, bool allowAdmin) + { + lock (ActiveServersByPort) { - lock (ActiveServersByPort) - { - this.Port = port ?? Enumerable.Range(MinDynamicPort, count: MaxDynamicPort - MinDynamicPort + 1) - .First(p => !ActiveServersByPort.ContainsKey(p)); - this._command = Command.Run(WslPath.Value, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) - .RedirectTo(Console.Out) - .RedirectStandardErrorTo(Console.Error); - ActiveServersByPort.Add(this.Port, this); - } - this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}{(allowAdmin ? ",allowAdmin=true" : string.Empty)}"); - // Clean the db to ensure it is empty. Running an arbitrary command also ensures that - // the db successfully spun up before we proceed (Connect seemingly can complete before that happens). - // This is particularly important for cross-process locking where the lock taker process - // assumes we've already started a server on certain ports. - this.Multiplexer.GetDatabase().Execute("flushall", Array.Empty(), CommandFlags.DemandMaster); + this.Port = port ?? Enumerable.Range(MinDynamicPort, count: MaxDynamicPort - MinDynamicPort + 1) + .First(p => !ActiveServersByPort.ContainsKey(p)); + this._command = Command.Run(WslPath.Value, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error); + ActiveServersByPort.Add(this.Port, this); } + this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}{(allowAdmin ? ",allowAdmin=true" : string.Empty)}"); + // Clean the db to ensure it is empty. Running an arbitrary command also ensures that + // the db successfully spun up before we proceed (Connect seemingly can complete before that happens). + // This is particularly important for cross-process locking where the lock taker process + // assumes we've already started a server on certain ports. + this.Multiplexer.GetDatabase().Execute("flushall", Array.Empty(), CommandFlags.DemandMaster); + } - public int ProcessId => this._command.ProcessId; - public int Port { get; } - public ConnectionMultiplexer Multiplexer { get; } + public int ProcessId => this._command.ProcessId; + public int Port { get; } + public ConnectionMultiplexer Multiplexer { get; } - public static RedisServer GetDefaultServer(int index) + public static RedisServer GetDefaultServer(int index) + { + lock (DefaultServers) { - lock (DefaultServers) - { - return DefaultServers[index] ??= new RedisServer(RedisPorts.DefaultPorts[index], allowAdmin: false); - } + return DefaultServers[index] ??= new RedisServer(RedisPorts.DefaultPorts[index], allowAdmin: false); } + } - public static void DisposeAll() + public static void DisposeAll() + { + lock (ActiveServersByPort) { - lock (ActiveServersByPort) - { - var shutdownTasks = ActiveServersByPort.Values - .Select(async server => + var shutdownTasks = ActiveServersByPort.Values + .Select(async server => + { + server.Multiplexer.Dispose(); + try { - server.Multiplexer.Dispose(); - try - { - using var adminMultiplexer = await ConnectionMultiplexer.ConnectAsync($"localhost:{server.Port},allowAdmin=true"); - adminMultiplexer.GetServer("localhost", server.Port).Shutdown(ShutdownMode.Never); - } - finally + using var adminMultiplexer = await ConnectionMultiplexer.ConnectAsync($"localhost:{server.Port},allowAdmin=true"); + adminMultiplexer.GetServer("localhost", server.Port).Shutdown(ShutdownMode.Never); + } + finally + { + if (!await server._command.Task.WaitAsync(TimeSpan.FromSeconds(5))) { - if (!await server._command.Task.WaitAsync(TimeSpan.FromSeconds(5))) - { - server._command.Kill(); - throw new InvalidOperationException("Forced to kill Redis server"); - } + server._command.Kill(); + throw new InvalidOperationException("Forced to kill Redis server"); } - }) - .ToArray(); - ActiveServersByPort.Clear(); - Task.WaitAll(shutdownTasks); - } + } + }) + .ToArray(); + ActiveServersByPort.Clear(); + Task.WaitAll(shutdownTasks); } } } diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs index 80157c4a..69c6d347 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs @@ -3,15 +3,14 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +[SetUpFixture] +public class RedisSetUpFixture { - [SetUpFixture] - public class RedisSetUpFixture - { - [OneTimeSetUp] - public void OneTimeSetUp() { } + [OneTimeSetUp] + public void OneTimeSetUp() { } - [OneTimeTearDown] - public void OneTimeTearDown() => RedisServer.DisposeAll(); - } + [OneTimeTearDown] + public void OneTimeTearDown() => RedisServer.DisposeAll(); } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index ab789098..7d0e9b67 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -10,62 +10,61 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public abstract class TestingRedisDatabaseProvider { - public abstract class TestingRedisDatabaseProvider + protected TestingRedisDatabaseProvider(IEnumerable databases) { - protected TestingRedisDatabaseProvider(IEnumerable databases) - { - this.Databases = databases.ToArray(); - } - - protected TestingRedisDatabaseProvider(int count) - : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) - { - } - - // publicly settable so that callers can alter the dbs in use - public IReadOnlyList Databases { get; set; } - - public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); + this.Databases = databases.ToArray(); } - public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider + protected TestingRedisDatabaseProvider(int count) + : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) { - public TestingRedisSingleDatabaseProvider() : base(count: 1) { } } - public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider - { - public TestingRedisWithKeyPrefixSingleDatabaseProvider() - : base(new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase().WithKeyPrefix("distributed_locks:") }) { } + // publicly settable so that callers can alter the dbs in use + public IReadOnlyList Databases { get; set; } - public override string CrossProcessLockTypeSuffix => "1WithPrefix"; - } + public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); +} - public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider - { - public TestingRedis3DatabaseProvider() : base(count: 3) { } - } +public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedisSingleDatabaseProvider() : base(count: 1) { } +} - public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider - { - private static readonly IDatabase DeadDatabase; +public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedisWithKeyPrefixSingleDatabaseProvider() + : base(new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase().WithKeyPrefix("distributed_locks:") }) { } + + public override string CrossProcessLockTypeSuffix => "1WithPrefix"; +} - static TestingRedis2x1DatabaseProvider() - { - var server = new RedisServer(allowAdmin: true); - DeadDatabase = server.Multiplexer.GetDatabase(); - using var process = Process.GetProcessById(server.ProcessId); - server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); - Assert.IsTrue(process.WaitForExit(5000)); - } +public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedis3DatabaseProvider() : base(count: 3) { } +} - public TestingRedis2x1DatabaseProvider() - : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) - { - } +public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider +{ + private static readonly IDatabase DeadDatabase; - public override string CrossProcessLockTypeSuffix => "2x1"; + static TestingRedis2x1DatabaseProvider() + { + var server = new RedisServer(allowAdmin: true); + DeadDatabase = server.Multiplexer.GetDatabase(); + using var process = Process.GetProcessById(server.ProcessId); + server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); + Assert.IsTrue(process.WaitForExit(5000)); } + + public TestingRedis2x1DatabaseProvider() + : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) + { + } + + public override string CrossProcessLockTypeSuffix => "2x1"; } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs index 4da35203..cc41b77c 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -5,63 +5,62 @@ using System.Linq; using System.Text; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public sealed class TestingRedisDistributedLockProvider : TestingLockProvider> + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { - public sealed class TestingRedisDistributedLockProvider : TestingLockProvider> - where TDatabaseProvider : TestingRedisDatabaseProvider, new() + public override IDistributedLock CreateLockWithExactName(string name) { - public override IDistributedLock CreateLockWithExactName(string name) - { - var @lock = new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); - this.Strategy.RegisterKillHandleAction( - () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) - .ToList() - .ForEach(db => db.KeyDelete(@lock.Key)) - ); - return @lock; - } + var @lock = new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) + .ToList() + .ForEach(db => db.KeyDelete(@lock.Key)) + ); + return @lock; + } - public override string GetSafeName(string name) => new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases).Name; + public override string GetSafeName(string name) => new RedisDistributedLock(name, this.Strategy.DatabaseProvider.Databases).Name; - public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; - } + public override string GetCrossProcessLockType() => $"{nameof(RedisDistributedLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; +} - public sealed class TestingRedisDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider> - where TDatabaseProvider : TestingRedisDatabaseProvider, new() +public sealed class TestingRedisDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider> + where TDatabaseProvider : TestingRedisDatabaseProvider, new() +{ + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) { - public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) - { - var @lock = new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); - this.Strategy.RegisterKillHandleAction( - () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) - .ToList() - .ForEach(db => - { - db.KeyDelete(@lock.ReaderKey); - db.KeyDelete(@lock.WriterKey); - }) - ); - return @lock; - } + var @lock = new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases, this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) + .ToList() + .ForEach(db => + { + db.KeyDelete(@lock.ReaderKey); + db.KeyDelete(@lock.WriterKey); + }) + ); + return @lock; + } - public override string GetSafeName(string name) => new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases).Name; + public override string GetSafeName(string name) => new RedisDistributedReaderWriterLock(name, this.Strategy.DatabaseProvider.Databases).Name; - public override string GetCrossProcessLockType(ReaderWriterLockType type) => $"{type}{nameof(RedisDistributedReaderWriterLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; - } + public override string GetCrossProcessLockType(ReaderWriterLockType type) => $"{type}{nameof(RedisDistributedReaderWriterLock)}{this.Strategy.DatabaseProvider.CrossProcessLockTypeSuffix}"; +} - public sealed class TestingRedisDistributedSemaphoreProvider : TestingSemaphoreProvider> +public sealed class TestingRedisDistributedSemaphoreProvider : TestingSemaphoreProvider> +{ + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) { - public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) - { - var semaphore = new RedisDistributedSemaphore(name, maxCount, this.Strategy.DatabaseProvider.Databases.Single(), this.Strategy.Options); - this.Strategy.RegisterKillHandleAction( - () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) - .ToList() - .ForEach(db => db.KeyDelete(semaphore.Key)) - ); - return semaphore; - } - - public override string GetSafeName(string name) => new RedisDistributedSemaphore(name, 1, this.Strategy.DatabaseProvider.Databases.Single()).Name; + var semaphore = new RedisDistributedSemaphore(name, maxCount, this.Strategy.DatabaseProvider.Databases.Single(), this.Strategy.Options); + this.Strategy.RegisterKillHandleAction( + () => this.Strategy.DatabaseProvider.Databases.Take((this.Strategy.DatabaseProvider.Databases.Count / 2) + 1) + .ToList() + .ForEach(db => db.KeyDelete(semaphore.Key)) + ); + return semaphore; } + + public override string GetSafeName(string name) => new RedisDistributedSemaphore(name, 1, this.Strategy.DatabaseProvider.Databases.Single()).Name; } diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index 448d446d..d3c152a0 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -6,83 +6,82 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + where TDatabaseProvider : TestingRedisDatabaseProvider, new() { - public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy - where TDatabaseProvider : TestingRedisDatabaseProvider, new() - { - private bool _preparedForHandleLost, _preparedForHandleAbandonment; - private Action? _killHandleAction; - private Action? _options; + private bool _preparedForHandleLost, _preparedForHandleAbandonment; + private Action? _killHandleAction; + private Action? _options; - public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); + public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); - public void SetOptions(Action? options) - { - this._options = options; - } + public void SetOptions(Action? options) + { + this._options = options; + } - public void Options(RedisDistributedSynchronizationOptionsBuilder options) + public void Options(RedisDistributedSynchronizationOptionsBuilder options) + { + if (this._preparedForHandleLost) { - if (this._preparedForHandleLost) - { - options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); - } - if (this._preparedForHandleAbandonment) - { - options.Expiry(TimeSpan.FromSeconds(.2)) - // the reader writer lock requires that the busy wait sleep time is shorter - // than the expiry, so adjust for that - .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); - } - - this._options?.Invoke(options); + options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); } - - public override IDisposable? PrepareForHandleLost() + if (this._preparedForHandleAbandonment) { - Invariant.Require(!this._preparedForHandleLost); - this._preparedForHandleLost = true; - return new HandleLostScope(this); + options.Expiry(TimeSpan.FromSeconds(.2)) + // the reader writer lock requires that the busy wait sleep time is shorter + // than the expiry, so adjust for that + .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); } - public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; + this._options?.Invoke(options); + } - public override void PerformAdditionalCleanupForHandleAbandonment() + public override IDisposable? PrepareForHandleLost() + { + Invariant.Require(!this._preparedForHandleLost); + this._preparedForHandleLost = true; + return new HandleLostScope(this); + } + + public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; + + public override void PerformAdditionalCleanupForHandleAbandonment() + { + Invariant.Require(this._preparedForHandleAbandonment); + Thread.Sleep(TimeSpan.FromSeconds(.5)); + } + + public void RegisterKillHandleAction(Action action) + { + if (this._preparedForHandleLost) { - Invariant.Require(this._preparedForHandleAbandonment); - Thread.Sleep(TimeSpan.FromSeconds(.5)); + this._killHandleAction += action; } + } - public void RegisterKillHandleAction(Action action) + private class HandleLostScope : IDisposable + { + private TestingRedisSynchronizationStrategy? _strategy; + + public HandleLostScope(TestingRedisSynchronizationStrategy strategy) { - if (this._preparedForHandleLost) - { - this._killHandleAction += action; - } + this._strategy = strategy; } - private class HandleLostScope : IDisposable + public void Dispose() { - private TestingRedisSynchronizationStrategy? _strategy; - - public HandleLostScope(TestingRedisSynchronizationStrategy strategy) - { - this._strategy = strategy; - } - - public void Dispose() + var strategy = Interlocked.Exchange(ref this._strategy, null); + if (strategy != null) { - var strategy = Interlocked.Exchange(ref this._strategy, null); - if (strategy != null) + Invariant.Require(strategy._preparedForHandleLost); + try { strategy._killHandleAction?.Invoke(); } + finally { - Invariant.Require(strategy._preparedForHandleLost); - try { strategy._killHandleAction?.Invoke(); } - finally - { - strategy._killHandleAction = null; - strategy._preparedForHandleLost = false; - } + strategy._killHandleAction = null; + strategy._preparedForHandleLost = false; } } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs index 205539b0..1a7f1cee 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public static class AzureCredentials { - public static class AzureCredentials - { - // based on https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-a-shortcut - public const string ConnectionString = "UseDevelopmentStorage=true"; + // based on https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-a-shortcut + public const string ConnectionString = "UseDevelopmentStorage=true"; - public static string DefaultBlobContainerName { get; } = "distributed-lock-" + TargetFramework.Current.Replace('.', '-'); - } + public static string DefaultBlobContainerName { get; } = "distributed-lock-" + TargetFramework.Current.Replace('.', '-'); } diff --git a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs index 70ce51a6..2b320f23 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs @@ -4,42 +4,41 @@ using System.IO; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class MariaDbCredentials { - internal static class MariaDbCredentials + // MARIADB SETUP NOTE + // + // In order to enable application name tracking, we must enable the performance schema. Add the following to + // C:\Program Files\MariaDB 10.6\data\my.ini in the [mysqld] section + // + // ;from https://mariadb.com/kb/en/performance-schema-overview/#activating-the-performance-schema + // performance_schema=ON + + private static (string username, string password) GetCredentials(string baseDirectory) { - // MARIADB SETUP NOTE - // - // In order to enable application name tracking, we must enable the performance schema. Add the following to - // C:\Program Files\MariaDB 10.6\data\my.ini in the [mysqld] section - // - // ;from https://mariadb.com/kb/en/performance-schema-overview/#activating-the-performance-schema - // performance_schema=ON + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mariadb.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find MariaDB credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); + } - private static (string username, string password) GetCredentials(string baseDirectory) - { - var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mariadb.txt")); - if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find MariaDB credentials file {file}"); } - var lines = File.ReadAllLines(file); - if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } - return (lines[0], lines[1]); - } + public static string GetConnectionString(string baseDirectory) + { + var (username, password) = GetCredentials(baseDirectory); - public static string GetConnectionString(string baseDirectory) + return new MySqlConnectionStringBuilder { - var (username, password) = GetCredentials(baseDirectory); - - return new MySqlConnectionStringBuilder - { - Port = 3307, - Server = "localhost", - Database = "mysql", - UserID = username, - Password = password, - PersistSecurityInfo = true, - // set a high pool size so that we don't empty the pool through things like lock abandonment tests - MaximumPoolSize = 500, - }.ConnectionString; - } + Port = 3307, + Server = "localhost", + Database = "mysql", + UserID = username, + Password = password, + PersistSecurityInfo = true, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaximumPoolSize = 500, + }.ConnectionString; } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs index 57365582..85923710 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs @@ -6,34 +6,33 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class MySqlCredentials { - internal static class MySqlCredentials + private static (string username, string password) GetCredentials(string baseDirectory) { - private static (string username, string password) GetCredentials(string baseDirectory) - { - var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mysql.txt")); - if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find mysql credentials file {file}"); } - var lines = File.ReadAllLines(file); - if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } - return (lines[0], lines[1]); - } + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mysql.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find mysql credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); + } - public static string GetConnectionString(string baseDirectory) - { - var (username, password) = GetCredentials(baseDirectory); + public static string GetConnectionString(string baseDirectory) + { + var (username, password) = GetCredentials(baseDirectory); - return new MySqlConnectionStringBuilder - { - Port = 3306, - Server = "localhost", - Database = "mysql", - UserID = username, - Password = password, - PersistSecurityInfo = true, - // set a high pool size so that we don't empty the pool through things like lock abandonment tests - MaximumPoolSize = 500, - }.ConnectionString; - } + return new MySqlConnectionStringBuilder + { + Port = 3306, + Server = "localhost", + Database = "mysql", + UserID = username, + Password = password, + PersistSecurityInfo = true, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaximumPoolSize = 500, + }.ConnectionString; } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs index a04d6a32..ecbee8cb 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -6,59 +6,58 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +/// +/// For Oracle, we need both a password and a "wallet" directory. +/// +/// See https://www.oracle.com/topics/technologies/dotnet/tech-info-autonomousdatabase.html for setup instructions. +/// See also https://github.com/oracle/dotnet-db-samples/issues/225 +/// +/// If the tests haven't been run for some time, it might be necessary to start the autonomous database at https://cloud.oracle.com/, +/// since it will stop after being idle for some time. +/// +internal static class OracleCredentials { - /// - /// For Oracle, we need both a password and a "wallet" directory. - /// - /// See https://www.oracle.com/topics/technologies/dotnet/tech-info-autonomousdatabase.html for setup instructions. - /// See also https://github.com/oracle/dotnet-db-samples/issues/225 - /// - /// If the tests haven't been run for some time, it might be necessary to start the autonomous database at https://cloud.oracle.com/, - /// since it will stop after being idle for some time. - /// - internal static class OracleCredentials + public static string GetConnectionString(string baseDirectory) { - public static string GetConnectionString(string baseDirectory) - { - var credentialDirectory = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials")); - ConfigureWallet(credentialDirectory); - var (datasource, username, password) = GetCredentials(credentialDirectory); + var credentialDirectory = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials")); + ConfigureWallet(credentialDirectory); + var (datasource, username, password) = GetCredentials(credentialDirectory); - return new OracleConnectionStringBuilder - { - DataSource = datasource, - UserID = username, - Password = password, - PersistSecurityInfo = true, - // The free-tier autonomous database only allows 20 connections maximum (presumably across all clients) so this limit - // should help keep us below this limit. Running up against the limit throws errors on Connection.Open() - MaxPoolSize = 15, - }.ConnectionString; - } + return new OracleConnectionStringBuilder + { + DataSource = datasource, + UserID = username, + Password = password, + PersistSecurityInfo = true, + // The free-tier autonomous database only allows 20 connections maximum (presumably across all clients) so this limit + // should help keep us below this limit. Running up against the limit throws errors on Connection.Open() + MaxPoolSize = 15, + }.ConnectionString; + } - private static void ConfigureWallet(string credentialDirectory) + private static void ConfigureWallet(string credentialDirectory) + { + var walletDirectory = Directory.GetDirectories(credentialDirectory, "Wallet_*").Single(); + if (OracleConfiguration.TnsAdmin != walletDirectory) { - var walletDirectory = Directory.GetDirectories(credentialDirectory, "Wallet_*").Single(); - if (OracleConfiguration.TnsAdmin != walletDirectory) - { - // directory containing tnsnames.ora and sqlnet.ora - OracleConfiguration.TnsAdmin = walletDirectory; - } - if (OracleConfiguration.WalletLocation != walletDirectory) - { - // directory containing cwallet.sso - OracleConfiguration.WalletLocation = walletDirectory; - } + // directory containing tnsnames.ora and sqlnet.ora + OracleConfiguration.TnsAdmin = walletDirectory; } - - private static (string DataSource, string Username, string Password) GetCredentials(string credentialDirectory) + if (OracleConfiguration.WalletLocation != walletDirectory) { - var file = Path.Combine(credentialDirectory, "oracle.txt"); - if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find Oracle credentials file {file}"); } - var lines = File.ReadAllLines(file); - if (lines.Length != 3) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } - return (lines[0], lines[1], lines[2]); + // directory containing cwallet.sso + OracleConfiguration.WalletLocation = walletDirectory; } } + + private static (string DataSource, string Username, string Password) GetCredentials(string credentialDirectory) + { + var file = Path.Combine(credentialDirectory, "oracle.txt"); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find Oracle credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 3) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1], lines[2]); + } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs index 3441ec52..06b742b3 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs @@ -2,35 +2,34 @@ using System; using System.IO; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class PostgresCredentials { - internal static class PostgresCredentials + private static (string username, string password) GetCredentials(string baseDirectory) { - private static (string username, string password) GetCredentials(string baseDirectory) - { - var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "postgres.txt")); - if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find postgres credentials file {file}"); } - var lines = File.ReadAllLines(file); - if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } - return (lines[0], lines[1]); - } + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "postgres.txt")); + if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find postgres credentials file {file}"); } + var lines = File.ReadAllLines(file); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); + } - public static string GetConnectionString(string baseDirectory) - { - var (username, password) = GetCredentials(baseDirectory); + public static string GetConnectionString(string baseDirectory) + { + var (username, password) = GetCredentials(baseDirectory); - return new NpgsqlConnectionStringBuilder - { - Port = 5433, - Host = "localhost", - Database = "postgres", - Username = username, - Password = password, - PersistSecurityInfo = true, - ApplicationName = SqlServerCredentials.ApplicationName, - // set a high pool size so that we don't empty the pool through things like lock abandonment tests - MaxPoolSize = 500, - }.ConnectionString; - } + return new NpgsqlConnectionStringBuilder + { + Port = 5433, + Host = "localhost", + Database = "postgres", + Username = username, + Password = password, + PersistSecurityInfo = true, + ApplicationName = SqlServerCredentials.ApplicationName, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaxPoolSize = 500, + }.ConnectionString; } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs index 436abed5..3ef4137f 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs @@ -3,11 +3,10 @@ using System.Linq; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class RedisPorts { - internal static class RedisPorts - { - // 6379 is the redis default, so don't use that - public static readonly IReadOnlyList DefaultPorts = Enumerable.Range(6380, count: 10).ToArray(); - } + // 6379 is the redis default, so don't use that + public static readonly IReadOnlyList DefaultPorts = Enumerable.Range(6380, count: 10).ToArray(); } diff --git a/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs index bea982f9..89c6508f 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs @@ -2,21 +2,20 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class SqlServerCredentials { - internal static class SqlServerCredentials - { - public static readonly string ApplicationName = $"{typeof(SqlServerCredentials).Assembly.GetName().Name} ({TargetFramework.Current})"; + public static readonly string ApplicationName = $"{typeof(SqlServerCredentials).Assembly.GetName().Name} ({TargetFramework.Current})"; - public static readonly string ConnectionString = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder - { - DataSource = @".\SQLEXPRESS", - InitialCatalog = "master", - IntegratedSecurity = true, - ApplicationName = ApplicationName, - // set a high pool size so that we don't empty the pool through things like lock abandonment tests - MaxPoolSize = 10000, - } - .ConnectionString; - } + public static readonly string ConnectionString = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder + { + DataSource = @".\SQLEXPRESS", + InitialCatalog = "master", + IntegratedSecurity = true, + ApplicationName = ApplicationName, + // set a high pool size so that we don't empty the pool through things like lock abandonment tests + MaxPoolSize = 10000, + } + .ConnectionString; } diff --git a/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs b/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs index d5125901..26e13265 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs @@ -2,15 +2,14 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class TargetFramework { - internal static class TargetFramework - { - public const string Current = + public const string Current = #if NET471 - "net471"; + "net471"; #elif NETCOREAPP3_1 - "netcoreapp3.1"; + "netcoreapp3.1"; #endif - } } diff --git a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs index b50a3cd6..942f4c3a 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public static class ZooKeeperPorts { - public static class ZooKeeperPorts - { - public const int DefaultPort = 2181; + public const int DefaultPort = 2181; - public static readonly string DefaultConnectionString = "127.0.0.1:" + DefaultPort; - } + public static readonly string DefaultConnectionString = "127.0.0.1:" + DefaultPort; } diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index a81be9fa..1c2c493c 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -7,40 +7,40 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.SqlServer -{ - public interface ITestingSqlServerDb { } +namespace Medallion.Threading.Tests.SqlServer; - public sealed class TestingSqlServerDb : TestingPrimaryClientDb, ITestingSqlServerDb - { - internal static readonly string DefaultConnectionString = SqlServerCredentials.ConnectionString; +public interface ITestingSqlServerDb { } - private readonly Microsoft.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(DefaultConnectionString); +public sealed class TestingSqlServerDb : TestingPrimaryClientDb, ITestingSqlServerDb +{ + internal static readonly string DefaultConnectionString = SqlServerCredentials.ConnectionString; - public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + private readonly Microsoft.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = + new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(DefaultConnectionString); - // https://stackoverflow.com/questions/5808332/sql-server-maximum-character-length-of-object-names/41502228 - public override int MaxApplicationNameLength => 128; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; + // https://stackoverflow.com/questions/5808332/sql-server-maximum-character-length-of-object-names/41502228 + public override int MaxApplicationNameLength => 128; - public override int CountActiveSessions(string applicationName) - { - Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); - - using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); - connection.Open(); - using var command = connection.CreateCommand(); - command.CommandText = $@"SELECT COUNT(*) FROM sys.dm_exec_sessions WHERE program_name = @applicationName"; - command.Parameters.AddWithValue("applicationName", applicationName); - return (int)command.ExecuteScalar(); - } + public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; - public override IsolationLevel GetIsolationLevel(DbConnection connection) - { - using var command = connection.CreateCommand(); - command.CommandText = @" + public override int CountActiveSessions(string applicationName) + { + Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); + + using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); + connection.Open(); + using var command = connection.CreateCommand(); + command.CommandText = $@"SELECT COUNT(*) FROM sys.dm_exec_sessions WHERE program_name = @applicationName"; + command.Parameters.AddWithValue("applicationName", applicationName); + return (int)command.ExecuteScalar(); + } + + public override IsolationLevel GetIsolationLevel(DbConnection connection) + { + using var command = connection.CreateCommand(); + command.CommandText = @" SELECT CASE transaction_isolation_level WHEN 0 THEN 'Unspecified' WHEN 1 THEN 'ReadUncommitted' @@ -51,18 +51,18 @@ WHEN 5 THEN 'Snapshot' ELSE 'Unknown' END AS isolationLevel FROM sys.dm_exec_sessions WHERE session_id = @@SPID"; - return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()); - } + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()); + } - public override DbConnection CreateConnection() => new Microsoft.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); + public override DbConnection CreateConnection() => new Microsoft.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); - public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) - { - using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); - await connection.OpenAsync(); + public override async Task KillSessionsAsync(string applicationName, DateTimeOffset? idleSince) + { + using var connection = new Microsoft.Data.SqlClient.SqlConnection(DefaultConnectionString); + await connection.OpenAsync(); - var findIdleSessionsCommand = connection.CreateCommand(); - findIdleSessionsCommand.CommandText = @" + var findIdleSessionsCommand = connection.CreateCommand(); + findIdleSessionsCommand.CommandText = @" SELECT session_id FROM sys.dm_exec_sessions WHERE session_id != @@SPID AND program_name = @applicationName @@ -73,43 +73,42 @@ @idleSince IS NULL AND (last_request_end_time IS NULL OR last_request_end_time <= @idleSince) ) )"; - findIdleSessionsCommand.Parameters.AddWithValue("applicationName", applicationName); - findIdleSessionsCommand.Parameters.AddWithValue("idleSince", idleSince?.DateTime ?? DBNull.Value.As()).SqlDbType = SqlDbType.DateTime; + findIdleSessionsCommand.Parameters.AddWithValue("applicationName", applicationName); + findIdleSessionsCommand.Parameters.AddWithValue("idleSince", idleSince?.DateTime ?? DBNull.Value.As()).SqlDbType = SqlDbType.DateTime; - var spidsToKill = new List(); - using (var idleSessionsReader = await findIdleSessionsCommand.ExecuteReaderAsync()) + var spidsToKill = new List(); + using (var idleSessionsReader = await findIdleSessionsCommand.ExecuteReaderAsync()) + { + while (await idleSessionsReader.ReadAsync()) { - while (await idleSessionsReader.ReadAsync()) - { - spidsToKill.Add(idleSessionsReader.GetInt16(0)); - } + spidsToKill.Add(idleSessionsReader.GetInt16(0)); } + } - foreach (var spid in spidsToKill) - { - using var killCommand = connection.CreateCommand(); - killCommand.CommandText = "KILL " + spid; - try { await killCommand.ExecuteNonQueryAsync(); } - catch (Exception ex) { Console.WriteLine($"Failed to kill {spid}: {ex}"); } - } + foreach (var spid in spidsToKill) + { + using var killCommand = connection.CreateCommand(); + killCommand.CommandText = "KILL " + spid; + try { await killCommand.ExecuteNonQueryAsync(); } + catch (Exception ex) { Console.WriteLine($"Failed to kill {spid}: {ex}"); } } } +} - public sealed class TestingSystemDataSqlServerDb : TestingDb, ITestingSqlServerDb - { - private readonly System.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new System.Data.SqlClient.SqlConnectionStringBuilder(TestingSqlServerDb.DefaultConnectionString); +public sealed class TestingSystemDataSqlServerDb : TestingDb, ITestingSqlServerDb +{ + private readonly System.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = + new System.Data.SqlClient.SqlConnectionStringBuilder(TestingSqlServerDb.DefaultConnectionString); - public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; + public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; - public override int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; + public override int MaxApplicationNameLength => new TestingSqlServerDb().MaxApplicationNameLength; - public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; + public override TransactionSupport TransactionSupport => TransactionSupport.TransactionScoped; - public override int CountActiveSessions(string applicationName) => new TestingSqlServerDb().CountActiveSessions(applicationName); + public override int CountActiveSessions(string applicationName) => new TestingSqlServerDb().CountActiveSessions(applicationName); - public override IsolationLevel GetIsolationLevel(DbConnection connection) => new TestingSqlServerDb().GetIsolationLevel(connection); + public override IsolationLevel GetIsolationLevel(DbConnection connection) => new TestingSqlServerDb().GetIsolationLevel(connection); - public override DbConnection CreateConnection() => new System.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); - } + public override DbConnection CreateConnection() => new System.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); } diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs index f1dc7385..29c042b5 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs @@ -4,55 +4,54 @@ using Medallion.Threading.SqlServer; using Medallion.Threading.Tests.Data; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public sealed class TestingSqlDistributedLockProvider : TestingLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + where TDb : TestingDb, ITestingSqlServerDb, new() { - public sealed class TestingSqlDistributedLockProvider : TestingLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : TestingDb, ITestingSqlServerDb, new() - { - public override IDistributedLock CreateLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => new SqlDistributedLock(name, connectionString, ToSqlOptions(options), exactName: true), - connection => new SqlDistributedLock(name, connection, exactName: true), - transaction => new SqlDistributedLock(name, transaction, exactName: true)); - - public override string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); - - internal static Action ToSqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => - { - o.UseMultiplexing(options.useMultiplexing).UseTransaction(options.useTransaction); - if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } - }; - } - - public sealed class TestingSqlDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : TestingDb, ITestingSqlServerDb, new() - { - public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => - new SqlDistributedReaderWriterLock(name, connectionString, TestingSqlDistributedLockProvider.ToSqlOptions(options), exactName: true), - connection => new SqlDistributedReaderWriterLock(name, connection, exactName: true), - transaction => new SqlDistributedReaderWriterLock(name, transaction, exactName: true)); - - public override string GetSafeName(string name) => SqlDistributedReaderWriterLock.GetSafeName(name); - } - - public sealed class TestingSqlDistributedSemaphoreProvider : TestingSemaphoreProvider - where TStrategy : TestingDbSynchronizationStrategy, new() - where TDb : TestingDb, ITestingSqlServerDb, new() + public override IDistributedLock CreateLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => new SqlDistributedLock(name, connectionString, ToSqlOptions(options), exactName: true), + connection => new SqlDistributedLock(name, connection, exactName: true), + transaction => new SqlDistributedLock(name, transaction, exactName: true)); + + public override string GetSafeName(string name) => SqlDistributedLock.GetSafeName(name); + + internal static Action ToSqlOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => { - public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => - this.Strategy.GetConnectionOptions() - .Create( - (connectionString, options) => - new SqlDistributedSemaphore(name, maxCount, connectionString, TestingSqlDistributedLockProvider.ToSqlOptions(options)), - connection => new SqlDistributedSemaphore(name, maxCount, connection), - transaction => new SqlDistributedSemaphore(name, maxCount, transaction)); - - public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); - } + o.UseMultiplexing(options.useMultiplexing).UseTransaction(options.useTransaction); + if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } + }; +} + +public sealed class TestingSqlDistributedReaderWriterLockProvider : TestingUpgradeableReaderWriterLockProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + where TDb : TestingDb, ITestingSqlServerDb, new() +{ + public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => + new SqlDistributedReaderWriterLock(name, connectionString, TestingSqlDistributedLockProvider.ToSqlOptions(options), exactName: true), + connection => new SqlDistributedReaderWriterLock(name, connection, exactName: true), + transaction => new SqlDistributedReaderWriterLock(name, transaction, exactName: true)); + + public override string GetSafeName(string name) => SqlDistributedReaderWriterLock.GetSafeName(name); +} + +public sealed class TestingSqlDistributedSemaphoreProvider : TestingSemaphoreProvider + where TStrategy : TestingDbSynchronizationStrategy, new() + where TDb : TestingDb, ITestingSqlServerDb, new() +{ + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => + this.Strategy.GetConnectionOptions() + .Create( + (connectionString, options) => + new SqlDistributedSemaphore(name, maxCount, connectionString, TestingSqlDistributedLockProvider.ToSqlOptions(options)), + connection => new SqlDistributedSemaphore(name, maxCount, connection), + transaction => new SqlDistributedSemaphore(name, maxCount, transaction)); + + public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); } diff --git a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs index c3516f65..675b5a11 100644 --- a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs +++ b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs @@ -2,14 +2,13 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +/// +/// Indicates that a test infrastructure component supports being run in a remote continuous integration environment +/// +[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] +internal class SupportsContinuousIntegrationAttribute : Attribute { - /// - /// Indicates that a test infrastructure component supports being run in a remote continuous integration environment - /// - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - internal class SupportsContinuousIntegrationAttribute : Attribute - { - public bool WindowsOnly { get; set; } - } + public bool WindowsOnly { get; set; } } diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/DistributedLock.Tests/Infrastructure/TestHelper.cs index add18c0c..32d94380 100644 --- a/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -5,68 +5,67 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +internal static class TestHelper { - internal static class TestHelper - { - /// - /// Returns a name that is unique to the current test and target framework but stable otherwise. - /// - public static string UniqueName => $"{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}"; + /// + /// Returns a name that is unique to the current test and target framework but stable otherwise. + /// + public static string UniqueName => $"{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}"; - public static T ShouldEqual(this T @this, T that, string? message = null) - { - Assert.AreEqual(actual: @this, expected: that, message: message); - return @this; - } + public static T ShouldEqual(this T @this, T that, string? message = null) + { + Assert.AreEqual(actual: @this, expected: that, message: message); + return @this; + } - public static bool IsHeld(this IDistributedLock @lock) - { - using var handle = @lock.TryAcquire(); - return handle == null; - } + public static bool IsHeld(this IDistributedLock @lock) + { + using var handle = @lock.TryAcquire(); + return handle == null; + } - public static async Task WaitAsync(this Task task, TimeoutValue timeout) + public static async Task WaitAsync(this Task task, TimeoutValue timeout) + { + if (!task.IsCompleted) { - if (!task.IsCompleted) + using var timeoutTask = new TimeoutTask(timeout, CancellationToken.None); + if (await Task.WhenAny(task, timeoutTask.Task) != task) { - using var timeoutTask = new TimeoutTask(timeout, CancellationToken.None); - if (await Task.WhenAny(task, timeoutTask.Task) != task) - { - return false; - } + return false; } - - await task; - return true; } - /// - /// Waits up to for to return true. Checks every - /// . - /// - public static async Task WaitForAsync(Func> predicate, TimeoutValue timeout, TimeoutValue? checkCadence = null) - { - using var cancellationSource = new CancellationTokenSource(); - var waitForPredicateTask = WaitForPredicateAsync(); + await task; + return true; + } - if (!await waitForPredicateTask.WaitAsync(timeout)) - { - cancellationSource.Cancel(); - await waitForPredicateTask; - return false; - } + /// + /// Waits up to for to return true. Checks every + /// . + /// + public static async Task WaitForAsync(Func> predicate, TimeoutValue timeout, TimeoutValue? checkCadence = null) + { + using var cancellationSource = new CancellationTokenSource(); + var waitForPredicateTask = WaitForPredicateAsync(); - return true; + if (!await waitForPredicateTask.WaitAsync(timeout)) + { + cancellationSource.Cancel(); + await waitForPredicateTask; + return false; + } - async Task WaitForPredicateAsync() + return true; + + async Task WaitForPredicateAsync() + { + var cancellationToken = cancellationSource.Token; + while (!cancellationToken.IsCancellationRequested) { - var cancellationToken = cancellationSource.Token; - while (!cancellationToken.IsCancellationRequested) - { - if (await predicate()) { return; } - await Task.Delay(checkCadence?.TimeSpan ?? TimeSpan.FromMilliseconds(5)); - } + if (await predicate()) { return; } + await Task.Delay(checkCadence?.TimeSpan ?? TimeSpan.FromMilliseconds(5)); } } } diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index 6d21c7bf..c83e2f47 100644 --- a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -2,27 +2,26 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class TestingLockProvider : ITestingNameProvider, IDisposable + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class TestingLockProvider : ITestingNameProvider, IDisposable - where TStrategy : TestingSynchronizationStrategy, new() - { - private readonly Lazy _lazyStrategy = new Lazy(() => new TStrategy()); + private readonly Lazy _lazyStrategy = new Lazy(() => new TStrategy()); - public virtual TStrategy Strategy => this._lazyStrategy.Value; + public virtual TStrategy Strategy => this._lazyStrategy.Value; - public virtual bool SupportsCrossProcessAbandonment => true; + public virtual bool SupportsCrossProcessAbandonment => true; - public abstract IDistributedLock CreateLockWithExactName(string name); - public abstract string GetSafeName(string name); + public abstract IDistributedLock CreateLockWithExactName(string name); + public abstract string GetSafeName(string name); - public virtual string GetCrossProcessLockType() => this.CreateLock(string.Empty).GetType().Name; - public virtual void Dispose() => this.Strategy.Dispose(); + public virtual string GetCrossProcessLockType() => this.CreateLock(string.Empty).GetType().Name; + public virtual void Dispose() => this.Strategy.Dispose(); - /// - /// Returns a lock whose name is based on - /// - public IDistributedLock CreateLock(string baseName) => - this.CreateLockWithExactName(this.GetUniqueSafeName(baseName)); - } + /// + /// Returns a lock whose name is based on + /// + public IDistributedLock CreateLock(string baseName) => + this.CreateLockWithExactName(this.GetUniqueSafeName(baseName)); } diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs index 9abf9b05..0bf6f421 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs @@ -5,89 +5,88 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public interface ITestingReaderWriterLockAsMutexProvider { - public interface ITestingReaderWriterLockAsMutexProvider - { - public bool DisableUpgradeLock { get; set; } - } + public bool DisableUpgradeLock { get; set; } +} - public sealed class TestingReaderWriterLockAsMutexProvider : TestingLockProvider, ITestingReaderWriterLockAsMutexProvider - where TReaderWriterLockProvider : TestingReaderWriterLockProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - private readonly TReaderWriterLockProvider _readerWriterLockProvider = new TReaderWriterLockProvider(); +public sealed class TestingReaderWriterLockAsMutexProvider : TestingLockProvider, ITestingReaderWriterLockAsMutexProvider + where TReaderWriterLockProvider : TestingReaderWriterLockProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() +{ + private readonly TReaderWriterLockProvider _readerWriterLockProvider = new TReaderWriterLockProvider(); - public override TStrategy Strategy => this._readerWriterLockProvider.Strategy; + public override TStrategy Strategy => this._readerWriterLockProvider.Strategy; - public bool DisableUpgradeLock { get; set; } + public bool DisableUpgradeLock { get; set; } - public override IDistributedLock CreateLockWithExactName(string name) => - new ReaderWriterLockAsMutex(this._readerWriterLockProvider.CreateReaderWriterLockWithExactName(name), this); + public override IDistributedLock CreateLockWithExactName(string name) => + new ReaderWriterLockAsMutex(this._readerWriterLockProvider.CreateReaderWriterLockWithExactName(name), this); - public override string GetSafeName(string name) => this._readerWriterLockProvider.GetSafeName(name); + public override string GetSafeName(string name) => this._readerWriterLockProvider.GetSafeName(name); - public override string GetCrossProcessLockType() => - this._readerWriterLockProvider.GetCrossProcessLockType(ReaderWriterLockType.Write); + public override string GetCrossProcessLockType() => + this._readerWriterLockProvider.GetCrossProcessLockType(ReaderWriterLockType.Write); - public override void Dispose() - { - this._readerWriterLockProvider.Dispose(); - base.Dispose(); - } + public override void Dispose() + { + this._readerWriterLockProvider.Dispose(); + base.Dispose(); + } - private bool GetShouldUseUpgradeLock() - { - return !this.DisableUpgradeLock - // intended to be random yet consistent across runs (assuming no changes) - && (Environment.StackTrace.Length % 2) == 1; - } + private bool GetShouldUseUpgradeLock() + { + return !this.DisableUpgradeLock + // intended to be random yet consistent across runs (assuming no changes) + && (Environment.StackTrace.Length % 2) == 1; + } - private class ReaderWriterLockAsMutex : IDistributedLock - { - private readonly TestingReaderWriterLockAsMutexProvider _provider; - private readonly IDistributedReaderWriterLock _readerWriterLock; + private class ReaderWriterLockAsMutex : IDistributedLock + { + private readonly TestingReaderWriterLockAsMutexProvider _provider; + private readonly IDistributedReaderWriterLock _readerWriterLock; - public ReaderWriterLockAsMutex(IDistributedReaderWriterLock readerWriterLock, TestingReaderWriterLockAsMutexProvider provider) - { - this._readerWriterLock = readerWriterLock; - this._provider = provider; - } + public ReaderWriterLockAsMutex(IDistributedReaderWriterLock readerWriterLock, TestingReaderWriterLockAsMutexProvider provider) + { + this._readerWriterLock = readerWriterLock; + this._provider = provider; + } - string IDistributedLock.Name => this._readerWriterLock.Name; + string IDistributedLock.Name => this._readerWriterLock.Name; - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.AcquireUpgradeableReadLock(timeout, cancellationToken) - : this._readerWriterLock.AcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.ShouldUseUpgrade(out var upgradeable) + ? upgradeable.AcquireUpgradeableReadLock(timeout, cancellationToken) + : this._readerWriterLock.AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) - : this._readerWriterLock.AcquireWriteLockAsync(timeout, cancellationToken); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.ShouldUseUpgrade(out var upgradeable) + ? upgradeable.AcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) + : this._readerWriterLock.AcquireWriteLockAsync(timeout, cancellationToken); - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.TryAcquireUpgradeableReadLock(timeout, cancellationToken) - : this._readerWriterLock.TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.ShouldUseUpgrade(out var upgradeable) + ? upgradeable.TryAcquireUpgradeableReadLock(timeout, cancellationToken) + : this._readerWriterLock.TryAcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.ShouldUseUpgrade(out var upgradeable) - ? upgradeable.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) - : this._readerWriterLock.TryAcquireWriteLockAsync(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.ShouldUseUpgrade(out var upgradeable) + ? upgradeable.TryAcquireUpgradeableReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask) + : this._readerWriterLock.TryAcquireWriteLockAsync(timeout, cancellationToken); - private bool ShouldUseUpgrade(out IDistributedUpgradeableReaderWriterLock upgradeable) + private bool ShouldUseUpgrade(out IDistributedUpgradeableReaderWriterLock upgradeable) + { + if (this._readerWriterLock is IDistributedUpgradeableReaderWriterLock upgradeableLock + && this._provider.GetShouldUseUpgradeLock()) { - if (this._readerWriterLock is IDistributedUpgradeableReaderWriterLock upgradeableLock - && this._provider.GetShouldUseUpgradeLock()) - { - upgradeable = upgradeableLock; - return true; - } - - upgradeable = null!; - return false; + upgradeable = upgradeableLock; + return true; } + + upgradeable = null!; + return false; } } } diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs index bcaf5abe..6d427e64 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs @@ -2,47 +2,46 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class TestingReaderWriterLockProvider : ITestingNameProvider, IDisposable + where TStrategy : TestingSynchronizationStrategy, new() +{ + public TStrategy Strategy { get; } = new TStrategy(); + + public abstract IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name); + public abstract string GetSafeName(string name); + + public virtual string GetCrossProcessLockType(ReaderWriterLockType type) => + type + this.CreateReaderWriterLock(string.Empty).GetType().Name; + + /// + /// Returns a lock whose name is based on + /// + public IDistributedReaderWriterLock CreateReaderWriterLock(string baseName) => + this.CreateReaderWriterLockWithExactName(this.GetUniqueSafeName(baseName)); + + public void Dispose() => this.Strategy.Dispose(); +} + +public abstract class TestingUpgradeableReaderWriterLockProvider : TestingReaderWriterLockProvider + where TStrategy : TestingSynchronizationStrategy, new() +{ + public abstract IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name); + + public sealed override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => + this.CreateUpgradeableReaderWriterLockWithExactName(name); + + /// + /// Returns a lock whose name is based on + /// + public IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLock(string baseName) => + this.CreateUpgradeableReaderWriterLockWithExactName(this.GetUniqueSafeName(baseName)); +} + +public enum ReaderWriterLockType { - public abstract class TestingReaderWriterLockProvider : ITestingNameProvider, IDisposable - where TStrategy : TestingSynchronizationStrategy, new() - { - public TStrategy Strategy { get; } = new TStrategy(); - - public abstract IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name); - public abstract string GetSafeName(string name); - - public virtual string GetCrossProcessLockType(ReaderWriterLockType type) => - type + this.CreateReaderWriterLock(string.Empty).GetType().Name; - - /// - /// Returns a lock whose name is based on - /// - public IDistributedReaderWriterLock CreateReaderWriterLock(string baseName) => - this.CreateReaderWriterLockWithExactName(this.GetUniqueSafeName(baseName)); - - public void Dispose() => this.Strategy.Dispose(); - } - - public abstract class TestingUpgradeableReaderWriterLockProvider : TestingReaderWriterLockProvider - where TStrategy : TestingSynchronizationStrategy, new() - { - public abstract IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLockWithExactName(string name); - - public sealed override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => - this.CreateUpgradeableReaderWriterLockWithExactName(name); - - /// - /// Returns a lock whose name is based on - /// - public IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderWriterLock(string baseName) => - this.CreateUpgradeableReaderWriterLockWithExactName(this.GetUniqueSafeName(baseName)); - } - - public enum ReaderWriterLockType - { - Read, - Write, - Upgrade, - } + Read, + Write, + Upgrade, } diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index d55f434b..2fc749db 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -6,99 +6,98 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class TestingSemaphoreAsMutexProvider : TestingLockProvider + where TSemaphoreProvider : TestingSemaphoreProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class TestingSemaphoreAsMutexProvider : TestingLockProvider - where TSemaphoreProvider : TestingSemaphoreProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - private readonly TSemaphoreProvider _semaphoreProvider = new TSemaphoreProvider(); - private readonly DisposableCollection _disposables = new DisposableCollection(); - private readonly HashSet _mostlyDrainedSemaphoreNames = new HashSet(); - private readonly int _maxCount; + private readonly TSemaphoreProvider _semaphoreProvider = new TSemaphoreProvider(); + private readonly DisposableCollection _disposables = new DisposableCollection(); + private readonly HashSet _mostlyDrainedSemaphoreNames = new HashSet(); + private readonly int _maxCount; - protected TestingSemaphoreAsMutexProvider(int maxCount) - { - this._maxCount = maxCount; - this._disposables.Add(this._semaphoreProvider); - } + protected TestingSemaphoreAsMutexProvider(int maxCount) + { + this._maxCount = maxCount; + this._disposables.Add(this._semaphoreProvider); + } - public override TStrategy Strategy => this._semaphoreProvider.Strategy; + public override TStrategy Strategy => this._semaphoreProvider.Strategy; - public override string GetCrossProcessLockType() => $"{this._semaphoreProvider.GetCrossProcessLockType()}{this._maxCount}AsMutex"; + public override string GetCrossProcessLockType() => $"{this._semaphoreProvider.GetCrossProcessLockType()}{this._maxCount}AsMutex"; - public override IDistributedLock CreateLockWithExactName(string name) + public override IDistributedLock CreateLockWithExactName(string name) + { + var semaphore = this._semaphoreProvider.CreateSemaphoreWithExactName(name, this._maxCount); + lock (this._mostlyDrainedSemaphoreNames) { - var semaphore = this._semaphoreProvider.CreateSemaphoreWithExactName(name, this._maxCount); - lock (this._mostlyDrainedSemaphoreNames) + if (!this._mostlyDrainedSemaphoreNames.Contains(name)) { - if (!this._mostlyDrainedSemaphoreNames.Contains(name)) + this._mostlyDrainedSemaphoreNames.Add(name); + + // If our max count is > 1, we'll acquire the extra tickets such that any resolved semaphore + // functions as a mutex + for (var i = 0; i < this._maxCount - 1; ++i) { - this._mostlyDrainedSemaphoreNames.Add(name); - - // If our max count is > 1, we'll acquire the extra tickets such that any resolved semaphore - // functions as a mutex - for (var i = 0; i < this._maxCount - 1; ++i) - { - this._disposables.Add( - semaphore.TryAcquire() - ?? throw new InvalidOperationException($"Failed to take ticket {i} of {semaphore.GetType()} {name}") - ); - } + this._disposables.Add( + semaphore.TryAcquire() + ?? throw new InvalidOperationException($"Failed to take ticket {i} of {semaphore.GetType()} {name}") + ); } } - - return new SemaphoreAsMutex(semaphore); } - public override string GetSafeName(string name) => this._semaphoreProvider.GetSafeName(name); + return new SemaphoreAsMutex(semaphore); + } - public override void Dispose() - { - this._disposables.Dispose(); - base.Dispose(); - } + public override string GetSafeName(string name) => this._semaphoreProvider.GetSafeName(name); - private class SemaphoreAsMutex : IDistributedLock - { - private readonly IDistributedSemaphore _semaphore; + public override void Dispose() + { + this._disposables.Dispose(); + base.Dispose(); + } - public SemaphoreAsMutex(IDistributedSemaphore semaphore) - { - this._semaphore = semaphore; - } + private class SemaphoreAsMutex : IDistributedLock + { + private readonly IDistributedSemaphore _semaphore; - string IDistributedLock.Name => this._semaphore.Name; + public SemaphoreAsMutex(IDistributedSemaphore semaphore) + { + this._semaphore = semaphore; + } - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this._semaphore.Acquire(timeout, cancellationToken); + string IDistributedLock.Name => this._semaphore.Name; - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this._semaphore.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this._semaphore.Acquire(timeout, cancellationToken); - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this._semaphore.TryAcquire(timeout, cancellationToken); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this._semaphore.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this._semaphore.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - } - } + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this._semaphore.TryAcquire(timeout, cancellationToken); - [SupportsContinuousIntegration] - public sealed class TestingSemaphore1AsMutexProvider : TestingSemaphoreAsMutexProvider - where TSemaphoreProvider : TestingSemaphoreProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - public TestingSemaphore1AsMutexProvider() : base(maxCount: 1) { } + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this._semaphore.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); } +} - [SupportsContinuousIntegration] - public sealed class TestingSemaphore5AsMutexProvider : TestingSemaphoreAsMutexProvider - where TSemaphoreProvider : TestingSemaphoreProvider, new() - where TStrategy : TestingSynchronizationStrategy, new() - { - public TestingSemaphore5AsMutexProvider() : base(maxCount: 5) { } +[SupportsContinuousIntegration] +public sealed class TestingSemaphore1AsMutexProvider : TestingSemaphoreAsMutexProvider + where TSemaphoreProvider : TestingSemaphoreProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() +{ + public TestingSemaphore1AsMutexProvider() : base(maxCount: 1) { } +} - public override bool SupportsCrossProcessAbandonment => this.Strategy.SupportsCrossProcessSingleSemaphoreTicketAbandonment; - } +[SupportsContinuousIntegration] +public sealed class TestingSemaphore5AsMutexProvider : TestingSemaphoreAsMutexProvider + where TSemaphoreProvider : TestingSemaphoreProvider, new() + where TStrategy : TestingSynchronizationStrategy, new() +{ + public TestingSemaphore5AsMutexProvider() : base(maxCount: 5) { } + + public override bool SupportsCrossProcessAbandonment => this.Strategy.SupportsCrossProcessSingleSemaphoreTicketAbandonment; } diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs index 2e7e63e4..4e58bcd8 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs @@ -2,25 +2,24 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +public abstract class TestingSemaphoreProvider : ITestingNameProvider, IDisposable + where TStrategy : TestingSynchronizationStrategy, new() { - public abstract class TestingSemaphoreProvider : ITestingNameProvider, IDisposable - where TStrategy : TestingSynchronizationStrategy, new() - { - public TStrategy Strategy { get; } = new TStrategy(); + public TStrategy Strategy { get; } = new TStrategy(); - public abstract IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount); - public abstract string GetSafeName(string name); + public abstract IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount); + public abstract string GetSafeName(string name); - public virtual string GetCrossProcessLockType() => - this.CreateSemaphore(string.Empty, maxCount: 1).GetType().Name; + public virtual string GetCrossProcessLockType() => + this.CreateSemaphore(string.Empty, maxCount: 1).GetType().Name; - /// - /// Returns a semaphore whose name is based on - /// - public IDistributedSemaphore CreateSemaphore(string baseName, int maxCount) => - this.CreateSemaphoreWithExactName(this.GetUniqueSafeName(baseName), maxCount); + /// + /// Returns a semaphore whose name is based on + /// + public IDistributedSemaphore CreateSemaphore(string baseName, int maxCount) => + this.CreateSemaphoreWithExactName(this.GetUniqueSafeName(baseName), maxCount); - public void Dispose() => this.Strategy.Dispose(); - } + public void Dispose() => this.Strategy.Dispose(); } diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 4b5a5a2d..76dc05d3 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -2,24 +2,23 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +/// +/// Manages the underlying approach to synchronization. Having this class allows us to parameterize tests by +/// synchronization strategy (e. g. only connection string-based strategies) +/// +public abstract class TestingSynchronizationStrategy : IDisposable { /// - /// Manages the underlying approach to synchronization. Having this class allows us to parameterize tests by - /// synchronization strategy (e. g. only connection string-based strategies) + /// Whether or not abandoning a ticket held in another process will cause that ticket + /// to be released if tickets are still held elsewhere /// - public abstract class TestingSynchronizationStrategy : IDisposable - { - /// - /// Whether or not abandoning a ticket held in another process will cause that ticket - /// to be released if tickets are still held elsewhere - /// - public virtual bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => true; + public virtual bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => true; - public virtual void PrepareForHandleAbandonment() { } - public virtual void PerformAdditionalCleanupForHandleAbandonment() { } - public virtual IDisposable? PrepareForHandleLost() => null; - public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } - public virtual void Dispose() { } - } + public virtual void PrepareForHandleAbandonment() { } + public virtual void PerformAdditionalCleanupForHandleAbandonment() { } + public virtual IDisposable? PrepareForHandleLost() => null; + public virtual void PrepareForHighContention(ref int maxConcurrentAcquires) { } + public virtual void Dispose() { } } diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index e0ac215e..6596072e 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -3,21 +3,20 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles; + +[SupportsContinuousIntegration(WindowsOnly = true)] +public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockProvider { - [SupportsContinuousIntegration(WindowsOnly = true)] - public sealed class TestingEventWaitHandleDistributedLockProvider : TestingLockProvider - { - public override IDistributedLock CreateLockWithExactName(string name) => new EventWaitHandleDistributedLock(name, exactName: true); + public override IDistributedLock CreateLockWithExactName(string name) => new EventWaitHandleDistributedLock(name, exactName: true); - public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); - } + public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); +} - [SupportsContinuousIntegration(WindowsOnly = true)] - public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider - { - public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); +[SupportsContinuousIntegration(WindowsOnly = true)] +public sealed class TestingWaitHandleDistributedSemaphoreProvider : TestingSemaphoreProvider +{ + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => new WaitHandleDistributedSemaphore(name, maxCount, exactName: true); - public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); - } + public override string GetSafeName(string name) => DistributedWaitHandleHelpers.GetSafeName(name); } diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs index 0df45e61..494ee725 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs @@ -2,13 +2,12 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles; + +[SupportsContinuousIntegration] +public sealed class TestingWaitHandleSynchronizationStrategy : TestingSynchronizationStrategy { - [SupportsContinuousIntegration] - public sealed class TestingWaitHandleSynchronizationStrategy : TestingSynchronizationStrategy - { - // since the wait handle won't be collected by the system until all instances of it are closed, - // we won't see abandoned handles release their tickets until the semaphore is fully abandoned - public override bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => false; - } + // since the wait handle won't be collected by the system until all instances of it are closed, + // we won't see abandoned handles release their tickets until the semaphore is fully abandoned + public override bool SupportsCrossProcessSingleSemaphoreTicketAbandonment => false; } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs index 51dd1247..b715ea12 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs @@ -3,41 +3,40 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public sealed class TestingZooKeeperDistributedLockProvider : TestingLockProvider { - public sealed class TestingZooKeeperDistributedLockProvider : TestingLockProvider + public override IDistributedLock CreateLockWithExactName(string name) { - public override IDistributedLock CreateLockWithExactName(string name) - { - var @lock = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); - this.Strategy.TrackPath(name); - return @lock; - } - - public override string GetSafeName(string name) => new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); + var @lock = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); + return @lock; } - public sealed class TestingZooKeeperDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider - { - public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) - { - var @lock = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); - this.Strategy.TrackPath(name); - return @lock; - } + public override string GetSafeName(string name) => new ZooKeeperDistributedLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); +} - public override string GetSafeName(string name) => new ZooKeeperDistributedReaderWriterLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); +public sealed class TestingZooKeeperDistributedReaderWriterLockProvider : TestingReaderWriterLockProvider +{ + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) + { + var @lock = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); + return @lock; } - public sealed class TestingZooKeeperDistributedSemaphoreProvider : TestingSemaphoreProvider - { - public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) - { - var semaphore = new ZooKeeperDistributedSemaphore(new ZooKeeperPath(name), maxCount, ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); - this.Strategy.TrackPath(name); - return semaphore; - } + public override string GetSafeName(string name) => new ZooKeeperDistributedReaderWriterLock(name, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); +} - public override string GetSafeName(string name) => new ZooKeeperDistributedSemaphore(name, maxCount: 1, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); +public sealed class TestingZooKeeperDistributedSemaphoreProvider : TestingSemaphoreProvider +{ + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) + { + var semaphore = new ZooKeeperDistributedSemaphore(new ZooKeeperPath(name), maxCount, ZooKeeperPorts.DefaultConnectionString, this.Strategy.AssumeNodeExists, this.Strategy.Options); + this.Strategy.TrackPath(name); + return semaphore; } + + public override string GetSafeName(string name) => new ZooKeeperDistributedSemaphore(name, maxCount: 1, ZooKeeperPorts.DefaultConnectionString).Path.ToString(); } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs index 6c6eb7de..58f7a135 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs @@ -5,56 +5,55 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public sealed class TestingZooKeeperSynchronizationStrategy : TestingSynchronizationStrategy { - public sealed class TestingZooKeeperSynchronizationStrategy : TestingSynchronizationStrategy - { - private List? _trackedPaths; + private List? _trackedPaths; - public bool AssumeNodeExists { get; set; } + public bool AssumeNodeExists { get; set; } - public Action? Options { get; set; } + public Action? Options { get; set; } - public void TrackPath(string path) => this._trackedPaths?.Add(path); + public void TrackPath(string path) => this._trackedPaths?.Add(path); - public override IDisposable? PrepareForHandleLost() - { - if (this._trackedPaths != null) { throw new InvalidOperationException("Already in handle lost mode"); } + public override IDisposable? PrepareForHandleLost() + { + if (this._trackedPaths != null) { throw new InvalidOperationException("Already in handle lost mode"); } + + this._trackedPaths = new List(); + return new HandleLostScope(this); + } - this._trackedPaths = new List(); - return new HandleLostScope(this); + private class HandleLostScope : IDisposable + { + private readonly TestingZooKeeperSynchronizationStrategy _strategy; + + public HandleLostScope(TestingZooKeeperSynchronizationStrategy strategy) + { + this._strategy = strategy; } - private class HandleLostScope : IDisposable + public void Dispose() { - private readonly TestingZooKeeperSynchronizationStrategy _strategy; + var trackedPaths = Interlocked.Exchange(ref this._strategy._trackedPaths, null); + if (trackedPaths == null) { return; } // already disposed - public HandleLostScope(TestingZooKeeperSynchronizationStrategy strategy) - { - this._strategy = strategy; - } + using var connection = ZooKeeperConnection.DefaultPool.ConnectAsync( + new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), + CancellationToken.None + ) + .Result; - public void Dispose() + // delete the newest child of the node (other children may be extra semaphore ticket holders) + foreach (var trackedPath in trackedPaths) { - var trackedPaths = Interlocked.Exchange(ref this._strategy._trackedPaths, null); - if (trackedPaths == null) { return; } // already disposed - - using var connection = ZooKeeperConnection.DefaultPool.ConnectAsync( - new ZooKeeperConnectionInfo(ZooKeeperPorts.DefaultConnectionString, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30), new EquatableReadOnlyList(Array.Empty())), - CancellationToken.None - ) - .Result; - - // delete the newest child of the node (other children may be extra semaphore ticket holders) - foreach (var trackedPath in trackedPaths) - { - var childrenResult = connection.ZooKeeper.getChildrenAsync(trackedPath).Result; - var toDelete = childrenResult.Children.Select(ch => $"{trackedPath.TrimEnd(ZooKeeperPath.Separator)}{ZooKeeperPath.Separator}{ch}") - .Select(p => (Path: p, CreationTime: connection.ZooKeeper.existsAsync(p).Result?.getCtime() ?? -1)) - .OrderByDescending(t => t.CreationTime) - .First(); - connection.ZooKeeper.deleteAsync(toDelete.Path).Wait(); - } + var childrenResult = connection.ZooKeeper.getChildrenAsync(trackedPath).Result; + var toDelete = childrenResult.Children.Select(ch => $"{trackedPath.TrimEnd(ZooKeeperPath.Separator)}{ZooKeeperPath.Separator}{ch}") + .Select(p => (Path: p, CreationTime: connection.ZooKeeper.existsAsync(p).Result?.getCtime() ?? -1)) + .OrderByDescending(t => t.CreationTime) + .First(); + connection.ZooKeeper.deleteAsync(toDelete.Path).Wait(); } } } diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs index 916a7df5..f101eba9 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -6,90 +6,89 @@ using System.Net.Sockets; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +[SetUpFixture] +public class ZooKeeperSetUpFixture { - [SetUpFixture] - public class ZooKeeperSetUpFixture - { - private Command? _zooKeeperCommand; + private Command? _zooKeeperCommand; - [OneTimeSetUp] - public void OneTimeSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (Environment.GetEnvironmentVariable("APPVEYOR") != null) { - if (Environment.GetEnvironmentVariable("APPVEYOR") != null) - { - Console.WriteLine("Running on AppVeyor; will not attempt to launch ZooKeeper"); - } - else if (IsZooKeeperRunning()) - { - Console.WriteLine("ZooKeeper already running"); - } - else - { - // based on Windows install as per https://medium.com/@shaaslam/installing-apache-zookeeper-on-windows-45eda303e835 + Console.WriteLine("Running on AppVeyor; will not attempt to launch ZooKeeper"); + } + else if (IsZooKeeperRunning()) + { + Console.WriteLine("ZooKeeper already running"); + } + else + { + // based on Windows install as per https://medium.com/@shaaslam/installing-apache-zookeeper-on-windows-45eda303e835 - const string ZooKeeperHomeEnvironmentVariable = "ZOOKEEPER_HOME"; - var zooKeeperHome = Environment.GetEnvironmentVariable(ZooKeeperHomeEnvironmentVariable); - if (zooKeeperHome == null) { throw new InvalidOperationException($"Environment variable '{ZooKeeperHomeEnvironmentVariable}' is not set"); } + const string ZooKeeperHomeEnvironmentVariable = "ZOOKEEPER_HOME"; + var zooKeeperHome = Environment.GetEnvironmentVariable(ZooKeeperHomeEnvironmentVariable); + if (zooKeeperHome == null) { throw new InvalidOperationException($"Environment variable '{ZooKeeperHomeEnvironmentVariable}' is not set"); } - var zooKeeperPath = Path.Combine(zooKeeperHome, "bin", "zkServer.cmd"); + var zooKeeperPath = Path.Combine(zooKeeperHome, "bin", "zkServer.cmd"); - var command = Command.Run(zooKeeperPath, options: o => o.StartInfo(i => i.RedirectStandardInput = false)) - .RedirectTo(Console.Out) - .RedirectStandardErrorTo(Console.Error); - Console.WriteLine($"Launched ZooKeeper ({zooKeeperPath}; PID={command.ProcessId})"); - this._zooKeeperCommand = command; - } + var command = Command.Run(zooKeeperPath, options: o => o.StartInfo(i => i.RedirectStandardInput = false)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error); + Console.WriteLine($"Launched ZooKeeper ({zooKeeperPath}; PID={command.ProcessId})"); + this._zooKeeperCommand = command; } + } + + private static bool IsZooKeeperRunning() + { + // based loosely on https://stackoverflow.com/questions/29106546/how-to-check-if-zookeeper-is-running-or-up-from-command-prompt - private static bool IsZooKeeperRunning() + try { - // based loosely on https://stackoverflow.com/questions/29106546/how-to-check-if-zookeeper-is-running-or-up-from-command-prompt + using var tcpClient = new TcpClient("localhost", ZooKeeperPorts.DefaultPort); + using var tcpStream = tcpClient.GetStream(); + var message = Encoding.UTF8.GetBytes("ruok"); + tcpStream.Write(message, 0, message.Length); - try + tcpStream.ReadTimeout = 500; // ms + var readBuffer = new byte[1024]; + var bytesRead = tcpStream.Read(readBuffer, 0, readBuffer.Length); + var response = Encoding.UTF8.GetString(readBuffer, 0, bytesRead).Trim(); + if (response == "imok" || response == "ruok is not executed because it is not in the whitelist.") { - using var tcpClient = new TcpClient("localhost", ZooKeeperPorts.DefaultPort); - using var tcpStream = tcpClient.GetStream(); - var message = Encoding.UTF8.GetBytes("ruok"); - tcpStream.Write(message, 0, message.Length); - - tcpStream.ReadTimeout = 500; // ms - var readBuffer = new byte[1024]; - var bytesRead = tcpStream.Read(readBuffer, 0, readBuffer.Length); - var response = Encoding.UTF8.GetString(readBuffer, 0, bytesRead).Trim(); - if (response == "imok" || response == "ruok is not executed because it is not in the whitelist.") - { - return true; - } - - throw new InvalidOperationException($"Received unexpected response '{response}' from application running at port {ZooKeeperPorts.DefaultPort}"); + return true; } - catch (SocketException) { } - catch (IOException) { } - return false; + throw new InvalidOperationException($"Received unexpected response '{response}' from application running at port {ZooKeeperPorts.DefaultPort}"); } + catch (SocketException) { } + catch (IOException) { } + + return false; + } - [OneTimeTearDown] - public void OneTimeTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() + { + if (this._zooKeeperCommand != null) { - if (this._zooKeeperCommand != null) + if (this._zooKeeperCommand.Task.IsCompleted) { - if (this._zooKeeperCommand.Task.IsCompleted) - { - throw new InvalidOperationException($"ZooKeeper exited unexpectedly with error code {this._zooKeeperCommand.Result.ExitCode}"); - } - - if (this._zooKeeperCommand.TrySignalAsync(CommandSignal.ControlC).Result - && this._zooKeeperCommand.Task.Wait(TimeSpan.FromSeconds(2))) - { - return; // graceful shutdown - } + throw new InvalidOperationException($"ZooKeeper exited unexpectedly with error code {this._zooKeeperCommand.Result.ExitCode}"); + } - Console.WriteLine("ZooKeeper graceful shutdown failed: killing"); - this._zooKeeperCommand.Kill(); - this._zooKeeperCommand.Wait(); + if (this._zooKeeperCommand.TrySignalAsync(CommandSignal.ControlC).Result + && this._zooKeeperCommand.Task.Wait(TimeSpan.FromSeconds(2))) + { + return; // graceful shutdown } + + Console.WriteLine("ZooKeeper graceful shutdown failed: killing"); + this._zooKeeperCommand.Kill(); + this._zooKeeperCommand.Wait(); } } } diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 9488c8a2..68986451 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -8,170 +8,169 @@ using System.IO; using System.Text.RegularExpressions; -namespace Medallion.Threading.Tests -{ - [Category("CI")] - public class ApiTest - { - private static object[] DistributedLockAssemblies => typeof(ApiTest).Assembly - .GetReferencedAssemblies() - .Where(a => a.Name!.StartsWith("DistributedLock.")) - .ToArray(); +namespace Medallion.Threading.Tests; - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestPublicNamespaces(AssemblyName assemblyName) - { - var expectedNamespace = assemblyName.Name!.Replace("DistributedLock", "Medallion.Threading") - .Replace(".Core", string.Empty); - foreach (var type in GetPublicTypes(Assembly.Load(assemblyName))) - { - type.Namespace.ShouldEqual(expectedNamespace, $"{type} in {assemblyName}"); - } - } +[Category("CI")] +public class ApiTest +{ + private static object[] DistributedLockAssemblies => typeof(ApiTest).Assembly + .GetReferencedAssemblies() + .Where(a => a.Name!.StartsWith("DistributedLock.")) + .ToArray(); - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestPublicApisAreSealed(AssemblyName assemblyName) + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicNamespaces(AssemblyName assemblyName) + { + var expectedNamespace = assemblyName.Name!.Replace("DistributedLock", "Medallion.Threading") + .Replace(".Core", string.Empty); + foreach (var type in GetPublicTypes(Assembly.Load(assemblyName))) { - foreach (var type in GetPublicTypes(Assembly.Load(assemblyName)).Where(t => t.IsClass)) - { - if (!type.IsAbstract) - { - Assert.IsTrue(type.IsSealed, $"{type} should be sealed"); - } - else - { - Assert.IsEmpty( - type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) - .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)) - ); - } - } + type.Namespace.ShouldEqual(expectedNamespace, $"{type} in {assemblyName}"); } + } - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestProviderApisAreAvailable(AssemblyName assemblyName) + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicApisAreSealed(AssemblyName assemblyName) + { + foreach (var type in GetPublicTypes(Assembly.Load(assemblyName)).Where(t => t.IsClass)) { - var providerTypesToProvidedTypes = typeof(IDistributedLockProvider).Assembly - .GetTypes() - .Where(t => t.IsInterface && t.IsPublic && t.Name.EndsWith("Provider")) - .ToDictionary(t => t, t => t.GetMethods().Single(m => m.Name.StartsWith("Create")).ReturnType); - - var types = GetPublicTypes(Assembly.Load(assemblyName)); - - foreach (var kvp in providerTypesToProvidedTypes) + if (!type.IsAbstract) { - var providers = types.Where(t => !t.IsInterface && kvp.Key.IsAssignableFrom(t)).ToArray(); - var provided = types.Where(t => !t.IsInterface && kvp.Value.IsAssignableFrom(t)).ToArray(); - CollectionAssert.AreEquivalent( - provided, - providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType)); - - foreach (var provider in providers) - { - Assert.That(provider.Name, Does.EndWith("DistributedSynchronizationProvider")); - } + Assert.IsTrue(type.IsSealed, $"{type} should be sealed"); } - } - - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestPublicHandleTypesDoNotHaveVisibleConstructors(AssemblyName assemblyName) - { - var publicHandleTypes = GetPublicTypes(Assembly.Load(assemblyName)) - .Where(t => typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t)) - .ToArray(); - Assert.IsNotEmpty(publicHandleTypes); // sanity check - - foreach (var publicHandleType in publicHandleTypes) + else { Assert.IsEmpty( - publicHandleType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) - .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly) + type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) + .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)) ); } } + } + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestProviderApisAreAvailable(AssemblyName assemblyName) + { + var providerTypesToProvidedTypes = typeof(IDistributedLockProvider).Assembly + .GetTypes() + .Where(t => t.IsInterface && t.IsPublic && t.Name.EndsWith("Provider")) + .ToDictionary(t => t, t => t.GetMethods().Single(m => m.Name.StartsWith("Create")).ReturnType); - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) + var types = GetPublicTypes(Assembly.Load(assemblyName)); + + foreach (var kvp in providerTypesToProvidedTypes) { - var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath())!, "..", "..", assemblyName.Name!)); - var codeFiles = Directory.GetFiles(projectDirectory, "*.cs", SearchOption.AllDirectories); - Assert.IsNotEmpty(codeFiles); + var providers = types.Where(t => !t.IsInterface && kvp.Key.IsAssignableFrom(t)).ToArray(); + var provided = types.Where(t => !t.IsInterface && kvp.Value.IsAssignableFrom(t)).ToArray(); + CollectionAssert.AreEquivalent( + provided, + providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType)); - var awaitRegex = new Regex(@"//.*|(?\bawait\s)"); - var configureAwaitRegex = new Regex(@"\.ConfigureAwait\(false\)|\.TryAwait\(\)"); - foreach (var codeFile in codeFiles) + foreach (var provider in providers) { - var code = File.ReadAllText(codeFile); - var awaitCount = awaitRegex.Matches(code).Cast().Count(m => m.Groups["await"].Success); - var configureAwaitCount = configureAwaitRegex.Matches(code).Count; - Assert.IsTrue(configureAwaitCount >= awaitCount, $"ConfigureAwait(false) count ({configureAwaitCount}) < await count ({awaitCount}) in {codeFile}"); + Assert.That(provider.Name, Does.EndWith("DistributedSynchronizationProvider")); } } + } + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestPublicHandleTypesDoNotHaveVisibleConstructors(AssemblyName assemblyName) + { + var publicHandleTypes = GetPublicTypes(Assembly.Load(assemblyName)) + .Where(t => typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t)) + .ToArray(); + Assert.IsNotEmpty(publicHandleTypes); // sanity check - [Test] - public void TestLibraryFilesDoNotWriteToConsole() + foreach (var publicHandleType in publicHandleTypes) { - var projectDirectory = Path.GetDirectoryName(Path.GetDirectoryName(CurrentFilePath())); - var solutionDirectory = Path.GetDirectoryName(projectDirectory!); - var libraryCsFiles = Directory.GetFiles(solutionDirectory, "*.cs", SearchOption.AllDirectories) - .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); Assert.IsEmpty( - libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) - .Select(Path.GetFileName) + publicHandleType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) + .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly) ); } + } + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) + { + var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath())!, "..", "..", assemblyName.Name!)); + var codeFiles = Directory.GetFiles(projectDirectory, "*.cs", SearchOption.AllDirectories); + Assert.IsNotEmpty(codeFiles); - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestInternalNamedMembersAreInternal(AssemblyName assemblyName) + var awaitRegex = new Regex(@"//.*|(?\bawait\s)"); + var configureAwaitRegex = new Regex(@"\.ConfigureAwait\(false\)|\.TryAwait\(\)"); + foreach (var codeFile in codeFiles) { - var assembly = Assembly.Load(assemblyName); - var publicTypes = GetPublicTypes(assembly); - foreach (var publicType in publicTypes) - { - Assert.IsEmpty( - publicType.GetMembers(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance) - .Where(m => m.Name.Contains("Internal")) - ); - } + var code = File.ReadAllText(codeFile); + var awaitCount = awaitRegex.Matches(code).Cast().Count(m => m.Groups["await"].Success); + var configureAwaitCount = configureAwaitRegex.Matches(code).Count; + Assert.IsTrue(configureAwaitCount >= awaitCount, $"ConfigureAwait(false) count ({configureAwaitCount}) < await count ({awaitCount}) in {codeFile}"); } + } + + [Test] + public void TestLibraryFilesDoNotWriteToConsole() + { + var projectDirectory = Path.GetDirectoryName(Path.GetDirectoryName(CurrentFilePath())); + var solutionDirectory = Path.GetDirectoryName(projectDirectory!); + var libraryCsFiles = Directory.GetFiles(solutionDirectory, "*.cs", SearchOption.AllDirectories) + .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); + Assert.IsEmpty( + libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) + .Select(Path.GetFileName) + ); + } - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestInternalNamedMembersAreInternal(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + var publicTypes = GetPublicTypes(assembly); + foreach (var publicType in publicTypes) { - var assembly = Assembly.Load(assemblyName); - var publicTypes = GetPublicTypes(assembly); - foreach (var publicType in publicTypes) - { - Assert.IsNull(publicType.GetMethod("GetSafeName", BindingFlags.Public | BindingFlags.Static)); - Assert.IsNull(publicType.GetProperty("MaxNameLength", BindingFlags.Public | BindingFlags.Static)); - } + Assert.IsEmpty( + publicType.GetMembers(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance) + .Where(m => m.Name.Contains("Internal")) + ); } + } - [TestCaseSource(nameof(DistributedLockAssemblies))] - public void TestAssemblyVersioning(AssemblyName assemblyName) + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + var publicTypes = GetPublicTypes(assembly); + foreach (var publicType in publicTypes) { - var assembly = Assembly.Load(assemblyName); - Assert.IsNotNull(assembly.GetName().GetPublicKeyToken(), "Should be signed"); - - // scheme based on https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/ - var version = assembly.GetName().Version; - version!.Minor.ShouldEqual(0); - version.Revision.ShouldEqual(0); - version.Build.ShouldEqual(0); - var informationalVersion = assembly.GetCustomAttribute(); - Assert.That(informationalVersion?.InformationalVersion, Does.StartWith($"{version.Major}.")); + Assert.IsNull(publicType.GetMethod("GetSafeName", BindingFlags.Public | BindingFlags.Static)); + Assert.IsNull(publicType.GetProperty("MaxNameLength", BindingFlags.Public | BindingFlags.Static)); } + } + + [TestCaseSource(nameof(DistributedLockAssemblies))] + public void TestAssemblyVersioning(AssemblyName assemblyName) + { + var assembly = Assembly.Load(assemblyName); + Assert.IsNotNull(assembly.GetName().GetPublicKeyToken(), "Should be signed"); + + // scheme based on https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/ + var version = assembly.GetName().Version; + version!.Minor.ShouldEqual(0); + version.Revision.ShouldEqual(0); + version.Build.ShouldEqual(0); + var informationalVersion = assembly.GetCustomAttribute(); + Assert.That(informationalVersion?.InformationalVersion, Does.StartWith($"{version.Major}.")); + } - private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() - .Where(IsInPublicApi) + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() + .Where(IsInPublicApi) #if DEBUG - .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) + .Where(t => !(t.Namespace!.Contains(".Internal") && assembly.GetName().Name == "DistributedLock.Core")) #endif - ; + ; - private static string CurrentFilePath([CallerFilePath] string filePath = "") => filePath; + private static string CurrentFilePath([CallerFilePath] string filePath = "") => filePath; - private static bool IsInPublicApi(Type type) => type.IsPublic - || ((type.IsNestedPublic || type.IsNestedFamily || type.IsNestedFamORAssem) && IsInPublicApi(type.DeclaringType!)); - } + private static bool IsInPublicApi(Type type) => type.IsPublic + || ((type.IsNestedPublic || type.IsNestedFamily || type.IsNestedFamORAssem) && IsInPublicApi(type.DeclaringType!)); } diff --git a/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs index 80e355d0..4add37ae 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs @@ -9,94 +9,93 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +/// +/// Demonstrates various behaviors of Azure blob storage that our implementation relies upon or takes into account +/// +public class AzureBehaviorTest { - /// - /// Demonstrates various behaviors of Azure blob storage that our implementation relies upon or takes into account - /// - public class AzureBehaviorTest + [Test] + public void TestAttemptToLeaseBlobIfDoesNotExist() { - [Test] - public void TestAttemptToLeaseBlobIfDoesNotExist() + var blobClient = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, Guid.NewGuid().ToString()); + + Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) + .ErrorCode.ShouldEqual(AzureErrors.BlobNotFound); + + blobClient = new BlobClient(AzureCredentials.ConnectionString, "dne-container", Guid.NewGuid().ToString()); + Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) + .ErrorCode.ShouldEqual("ContainerNotFound"); + } + + [Test] + public void TestUploadToWrongBlobType([Values("block", "page", "append")] string actualType) + { + var blobName = Guid.NewGuid().ToString(); + + var createFunctions = new Dictionary { - var blobClient = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, Guid.NewGuid().ToString()); - - Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) - .ErrorCode.ShouldEqual(AzureErrors.BlobNotFound); + ["block"] = () => new BlockBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).Upload(Stream.Null), + ["page"] = () => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists(size: 0), + ["append"] = () => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists() + }; - blobClient = new BlobClient(AzureCredentials.ConnectionString, "dne-container", Guid.NewGuid().ToString()); - Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) - .ErrorCode.ShouldEqual("ContainerNotFound"); + // right now append blobs aren't fully supported, so we can't fully test this + if (actualType == "append") + { + Assert.Throws(() => createFunctions[actualType]()) + .ErrorCode.ShouldEqual("FeatureNotSupportedByEmulator"); + return; } - - [Test] - public void TestUploadToWrongBlobType([Values("block", "page", "append")] string actualType) + else { - var blobName = Guid.NewGuid().ToString(); + createFunctions.Remove("append"); // to prevent it from failing below + } - var createFunctions = new Dictionary - { - ["block"] = () => new BlockBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).Upload(Stream.Null), - ["page"] = () => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists(size: 0), - ["append"] = () => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists() - }; + var baseClient = new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName); - // right now append blobs aren't fully supported, so we can't fully test this - if (actualType == "append") + Assert.IsFalse(baseClient.Exists()); + createFunctions[actualType](); + Assert.IsTrue(baseClient.Exists()); + + foreach (var kvp in createFunctions) + { + if (kvp.Key == actualType) { - Assert.Throws(() => createFunctions[actualType]()) - .ErrorCode.ShouldEqual("FeatureNotSupportedByEmulator"); - return; + Assert.DoesNotThrow(() => kvp.Value()); } else { - createFunctions.Remove("append"); // to prevent it from failing below - } - - var baseClient = new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName); - - Assert.IsFalse(baseClient.Exists()); - createFunctions[actualType](); - Assert.IsTrue(baseClient.Exists()); - - foreach (var kvp in createFunctions) - { - if (kvp.Key == actualType) - { - Assert.DoesNotThrow(() => kvp.Value()); - } - else - { - Assert.Throws(() => kvp.Value()) - .ErrorCode.ShouldEqual("InvalidBlobType"); - } + Assert.Throws(() => kvp.Value()) + .ErrorCode.ShouldEqual("InvalidBlobType"); } } + } - [Test] - public void TestSlashEquivalence() - { - var name = Guid.NewGuid() + "/a"; + [Test] + public void TestSlashEquivalence() + { + var name = Guid.NewGuid() + "/a"; - var blobClient1 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); - Assert.IsFalse(blobClient1.Exists()); - blobClient1.Upload(Stream.Null); - Assert.IsTrue(blobClient1.Exists()); + var blobClient1 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); + Assert.IsFalse(blobClient1.Exists()); + blobClient1.Upload(Stream.Null); + Assert.IsTrue(blobClient1.Exists()); - var blobClient2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name.Replace('/', '\\')); - Assert.IsTrue(blobClient2.Exists()); - } + var blobClient2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name.Replace('/', '\\')); + Assert.IsTrue(blobClient2.Exists()); + } - [Test] - public void TestThrowsIfLeaseAlreadyHeld() - { - var name = nameof(TestThrowsIfLeaseAlreadyHeld) + Guid.NewGuid(); - var client1 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); - client1.Upload(Stream.Null); - var client2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); - Assert.DoesNotThrow(() => client1.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))); - Assert.Throws(() => client2.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))) - .ErrorCode.ShouldEqual("LeaseAlreadyPresent"); - } + [Test] + public void TestThrowsIfLeaseAlreadyHeld() + { + var name = nameof(TestThrowsIfLeaseAlreadyHeld) + Guid.NewGuid(); + var client1 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); + client1.Upload(Stream.Null); + var client2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); + Assert.DoesNotThrow(() => client1.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))); + Assert.Throws(() => client2.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))) + .ErrorCode.ShouldEqual("LeaseAlreadyPresent"); } } diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index c8808bf2..597eaaa6 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -13,232 +13,231 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +public class AzureBlobLeaseDistributedLockTest { - public class AzureBlobLeaseDistributedLockTest + [Test] + public void TestSafeNaming() { - [Test] - public void TestSafeNaming() + var names = new[] { - var names = new[] - { - string.Empty, - new string('a', 2000), - "a/", - "a\\", - string.Join("/", Enumerable.Repeat("a", 254)), - string.Join(@"\", Enumerable.Repeat("b", 254)), - new string('/', 254), - new string('\\', 254) - }; - - var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName); - foreach (var name in names) - { - var @lock = new AzureBlobLeaseDistributedLock(containerClient, name); - Assert.DoesNotThrow(() => @lock.Acquire()); - } - } + string.Empty, + new string('a', 2000), + "a/", + "a\\", + string.Join("/", Enumerable.Repeat("a", 254)), + string.Join(@"\", Enumerable.Repeat("b", 254)), + new string('/', 254), + new string('\\', 254) + }; - [Test] - public async Task TestLockOnDifferentBlobClientTypes( - [Values] BlobClientType type, - [Values] bool isAsync) + var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName); + foreach (var name in names) { - if (isAsync) - { - await TestAsync(); - } - else - { - SyncViaAsync.Run(_ => TestAsync(), default(object)); - } + var @lock = new AzureBlobLeaseDistributedLock(containerClient, name); + Assert.DoesNotThrow(() => @lock.Acquire()); + } + } - async ValueTask TestAsync() - { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - var name = provider.GetUniqueSafeName(); - var client = CreateClient(type, name); - - if (client is AppendBlobClient appendClient) - { - Assert.That( - Assert.Throws(() => appendClient.CreateIfNotExists()).ToString(), - Does.Contain("This feature is not currently supported by the Storage Emulator") - ); - return; - } - if (client.GetType() == typeof(BlobBaseClient)) - { - // work around inability to do CreateIfNotExists for the base client - new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name).Upload(Stream.Null); - } - - var @lock = new AzureBlobLeaseDistributedLock(client); - await using var handle = await @lock.TryAcquireAsync(); - Assert.IsNotNull(handle); - await using var nestedHandle = await @lock.TryAcquireAsync(); - Assert.IsNull(nestedHandle); - } + [Test] + public async Task TestLockOnDifferentBlobClientTypes( + [Values] BlobClientType type, + [Values] bool isAsync) + { + if (isAsync) + { + await TestAsync(); + } + else + { + SyncViaAsync.Run(_ => TestAsync(), default(object)); } - [Test] - public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) + async ValueTask TestAsync() { using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); var name = provider.GetUniqueSafeName(); var client = CreateClient(type, name); - var wrapper = new BlobClientWrapper(client); - - var metadata = new Dictionary { ["abc"] = "123" }; - if (client is AppendBlobClient) + if (client is AppendBlobClient appendClient) { Assert.That( - Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), + Assert.Throws(() => appendClient.CreateIfNotExists()).ToString(), Does.Contain("This feature is not currently supported by the Storage Emulator") ); return; } if (client.GetType() == typeof(BlobBaseClient)) { - Assert.That( - Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), - Does.Contain("Either ensure that the blob exists or use a non-base client type") - ); - return; + // work around inability to do CreateIfNotExists for the base client + new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name).Upload(Stream.Null); } - await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None); - Assert.IsTrue((await client.ExistsAsync()).Value); - CollectionAssert.AreEqual(metadata, (await client.GetPropertiesAsync()).Value.Metadata); - - Assert.DoesNotThrowAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)); - Assert.IsTrue((await client.ExistsAsync()).Value); + var @lock = new AzureBlobLeaseDistributedLock(client); + await using var handle = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle); + await using var nestedHandle = await @lock.TryAcquireAsync(); + Assert.IsNull(nestedHandle); } + } - [Test] - public void TestCanUseLeaseIdForBlobOperations() - { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - var name = provider.GetUniqueSafeName(); - var client = new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); - const int BlobSize = 512; - client.Create(size: BlobSize); - var @lock = new AzureBlobLeaseDistributedLock(client); + [Test] + public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + var name = provider.GetUniqueSafeName(); + var client = CreateClient(type, name); + var wrapper = new BlobClientWrapper(client); - using var handle = @lock.Acquire(); - Assert.Throws(() => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0)) - .ErrorCode.ShouldEqual(AzureErrors.LeaseIdMissing); + var metadata = new Dictionary { ["abc"] = "123" }; - Assert.DoesNotThrow( - () => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0, conditions: new PageBlobRequestConditions { LeaseId = handle.LeaseId }) + if (client is AppendBlobClient) + { + Assert.That( + Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), + Does.Contain("This feature is not currently supported by the Storage Emulator") ); - - handle.Dispose(); - Assert.Throws(() => handle.LeaseId.ToString()); + return; } - - [Test] - public void TestThrowsIfContainerDoesNotExist() + if (client.GetType() == typeof(BlobBaseClient)) { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - provider.Strategy.ContainerName = "does-not-exist"; - var @lock = provider.CreateLock(nameof(TestThrowsIfContainerDoesNotExist)); - - Assert.Throws(() => @lock.TryAcquire()?.Dispose()) - .ErrorCode.ShouldEqual("ContainerNotFound"); + Assert.That( + Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), + Does.Contain("Either ensure that the blob exists or use a non-base client type") + ); + return; } - [Test] - public void TestCanAcquireIfContainerLeased() - { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - provider.Strategy.ContainerName = "leased-container" + TargetFramework.Current.Replace('.', '-'); + await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None); + Assert.IsTrue((await client.ExistsAsync()).Value); + CollectionAssert.AreEqual(metadata, (await client.GetPropertiesAsync()).Value.Metadata); - var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, provider.Strategy.ContainerName); - var containerLeaseClient = new BlobLeaseClient(containerClient); - try - { - containerClient.CreateIfNotExists(); - containerLeaseClient.Acquire(TimeSpan.FromSeconds(60)); + Assert.DoesNotThrowAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)); + Assert.IsTrue((await client.ExistsAsync()).Value); + } - var @lock = provider.CreateLock(nameof(TestCanAcquireIfContainerLeased)); + [Test] + public void TestCanUseLeaseIdForBlobOperations() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + var name = provider.GetUniqueSafeName(); + var client = new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); + const int BlobSize = 512; + client.Create(size: BlobSize); + var @lock = new AzureBlobLeaseDistributedLock(client); + + using var handle = @lock.Acquire(); + Assert.Throws(() => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0)) + .ErrorCode.ShouldEqual(AzureErrors.LeaseIdMissing); + + Assert.DoesNotThrow( + () => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0, conditions: new PageBlobRequestConditions { LeaseId = handle.LeaseId }) + ); + + handle.Dispose(); + Assert.Throws(() => handle.LeaseId.ToString()); + } - using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); - } - finally - { - try { containerLeaseClient.Release(); } - finally { containerClient.DeleteIfExists(); } - } - } + [Test] + public void TestThrowsIfContainerDoesNotExist() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + provider.Strategy.ContainerName = "does-not-exist"; + var @lock = provider.CreateLock(nameof(TestThrowsIfContainerDoesNotExist)); - [Test] - public async Task TestSuccessfulRenewal() + Assert.Throws(() => @lock.TryAcquire()?.Dispose()) + .ErrorCode.ShouldEqual("ContainerNotFound"); + } + + [Test] + public void TestCanAcquireIfContainerLeased() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + provider.Strategy.ContainerName = "leased-container" + TargetFramework.Current.Replace('.', '-'); + + var containerClient = new BlobContainerClient(AzureCredentials.ConnectionString, provider.Strategy.ContainerName); + var containerLeaseClient = new BlobLeaseClient(containerClient); + try { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - provider.Strategy.Options = o => o.RenewalCadence(TimeSpan.FromSeconds(.05)); - var @lock = provider.CreateLock(nameof(TestSuccessfulRenewal)); + containerClient.CreateIfNotExists(); + containerLeaseClient.Acquire(TimeSpan.FromSeconds(60)); - using var handle = @lock.Acquire(); - await Task.Delay(TimeSpan.FromSeconds(.2)); // long enough for renewal to run - Assert.DoesNotThrow(handle.Dispose); // observes the result of the renewal task - } + var @lock = provider.CreateLock(nameof(TestCanAcquireIfContainerLeased)); - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public void TestTriggersHandleLostIfLeaseExpiresNaturally() + using var handle = @lock.TryAcquire(); + Assert.IsNotNull(handle); + } + finally { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - provider.Strategy.Options = o => o.RenewalCadence(Timeout.InfiniteTimeSpan).Duration(TimeSpan.FromSeconds(15)); - var @lock = provider.CreateLock(nameof(TestTriggersHandleLostIfLeaseExpiresNaturally)); + try { containerLeaseClient.Release(); } + finally { containerClient.DeleteIfExists(); } + } + } - using var handle = @lock.Acquire(); - using var @event = new ManualResetEventSlim(initialState: false); - using var registration = handle.HandleLostToken.Register(@event.Set); - using var faultingRegistration = handle.HandleLostToken.Register(() => throw new TimeZoneNotFoundException()); + [Test] + public async Task TestSuccessfulRenewal() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + provider.Strategy.Options = o => o.RenewalCadence(TimeSpan.FromSeconds(.05)); + var @lock = provider.CreateLock(nameof(TestSuccessfulRenewal)); - Assert.IsTrue(@event.Wait(TimeSpan.FromSeconds(15.1))); + using var handle = @lock.Acquire(); + await Task.Delay(TimeSpan.FromSeconds(.2)); // long enough for renewal to run + Assert.DoesNotThrow(handle.Dispose); // observes the result of the renewal task + } - Assert.Throws(handle.Dispose) - .ErrorCode.ShouldEqual("LeaseLost"); - } + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public void TestTriggersHandleLostIfLeaseExpiresNaturally() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + provider.Strategy.Options = o => o.RenewalCadence(Timeout.InfiniteTimeSpan).Duration(TimeSpan.FromSeconds(15)); + var @lock = provider.CreateLock(nameof(TestTriggersHandleLostIfLeaseExpiresNaturally)); - [Test] - public void TestExitsDespiteLongSleepTime() - { - using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); - provider.Strategy.Options = o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(1)); - var @lock = provider.CreateLock(nameof(TestExitsDespiteLongSleepTime)); + using var handle = @lock.Acquire(); + using var @event = new ManualResetEventSlim(initialState: false); + using var registration = handle.HandleLostToken.Register(@event.Set); + using var faultingRegistration = handle.HandleLostToken.Register(() => throw new TimeZoneNotFoundException()); - using var handle1 = @lock.Acquire(); + Assert.IsTrue(@event.Wait(TimeSpan.FromSeconds(15.1))); - var handle2Task = @lock.TryAcquireAsync(TimeSpan.FromSeconds(2)).AsTask(); - Assert.IsFalse(handle2Task.Wait(TimeSpan.FromSeconds(.05))); + Assert.Throws(handle.Dispose) + .ErrorCode.ShouldEqual("LeaseLost"); + } - handle1.Dispose(); - Assert.IsTrue(handle2Task.Wait(TimeSpan.FromSeconds(5))); - } + [Test] + public void TestExitsDespiteLongSleepTime() + { + using var provider = new TestingAzureBlobLeaseDistributedLockProvider(); + provider.Strategy.Options = o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(1)); + var @lock = provider.CreateLock(nameof(TestExitsDespiteLongSleepTime)); - private static BlobBaseClient CreateClient([Values] BlobClientType type, string name) => type switch - { - BlobClientType.Basic => new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - BlobClientType.Block => new BlockBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - BlobClientType.Page => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - BlobClientType.Append => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - BlobClientType.Base => new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - _ => throw new ArgumentException(nameof(type)), - }; + using var handle1 = @lock.Acquire(); - public enum BlobClientType - { - Basic, - Block, - Page, - Append, - Base - } + var handle2Task = @lock.TryAcquireAsync(TimeSpan.FromSeconds(2)).AsTask(); + Assert.IsFalse(handle2Task.Wait(TimeSpan.FromSeconds(.05))); + + handle1.Dispose(); + Assert.IsTrue(handle2Task.Wait(TimeSpan.FromSeconds(5))); + } + + private static BlobBaseClient CreateClient([Values] BlobClientType type, string name) => type switch + { + BlobClientType.Basic => new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + BlobClientType.Block => new BlockBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + BlobClientType.Page => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + BlobClientType.Append => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + BlobClientType.Base => new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + _ => throw new ArgumentException(nameof(type)), + }; + + public enum BlobClientType + { + Basic, + Block, + Page, + Append, + Base } } diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs index df77a770..7010aa18 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs @@ -6,28 +6,27 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +public class AzureBlobLeaseDistributedSynchronizationProviderTest { - public class AzureBlobLeaseDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() - { - Assert.Throws(() => new AzureBlobLeaseDistributedSynchronizationProvider(null!)); - } + Assert.Throws(() => new AzureBlobLeaseDistributedSynchronizationProvider(null!)); + } - [Test] - public async Task BasicTest() - { - const string LockName = TargetFramework.Current + "ProviderBasicTest"; + [Test] + public async Task BasicTest() + { + const string LockName = TargetFramework.Current + "ProviderBasicTest"; - var container = new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName); - var provider = new AzureBlobLeaseDistributedSynchronizationProvider(container); - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); - } + var container = new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName); + var provider = new AzureBlobLeaseDistributedSynchronizationProvider(container); + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); } } } diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs index 3b961e68..95cd2bdc 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs @@ -6,61 +6,60 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Azure +namespace Medallion.Threading.Tests.Azure; + +public class AzureBlobLeaseOptionsBuilderTest { - public class AzureBlobLeaseOptionsBuilderTest + [Test] + public void TestValidatesDuration() { - [Test] - public void TestValidatesDuration() - { - var builder = new AzureBlobLeaseOptionsBuilder(); + var builder = new AzureBlobLeaseOptionsBuilder(); - Assert.DoesNotThrow(() => builder.Duration(TimeSpan.FromSeconds(15))); - Assert.DoesNotThrow(() => builder.Duration(TimeSpan.FromSeconds(60))); - Assert.DoesNotThrow(() => builder.Duration(Timeout.InfiniteTimeSpan)); - Assert.Throws(() => builder.Duration(TimeSpan.FromSeconds(14))); - Assert.Throws(() => builder.Duration(TimeSpan.FromSeconds(61))); - } + Assert.DoesNotThrow(() => builder.Duration(TimeSpan.FromSeconds(15))); + Assert.DoesNotThrow(() => builder.Duration(TimeSpan.FromSeconds(60))); + Assert.DoesNotThrow(() => builder.Duration(Timeout.InfiniteTimeSpan)); + Assert.Throws(() => builder.Duration(TimeSpan.FromSeconds(14))); + Assert.Throws(() => builder.Duration(TimeSpan.FromSeconds(61))); + } - [Test] - public void TestValidatesRenewalCadence() - { - Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(-1)))); - Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.Zero))); + [Test] + public void TestValidatesRenewalCadence() + { + Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(-1)))); + Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.Zero))); - Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(30)))); - Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(3)))); - Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(30)))); + Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(TimeSpan.FromSeconds(3)))); + Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.RenewalCadence(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(TimeSpan.FromSeconds(60)).RenewalCadence(TimeSpan.FromSeconds(60.1)))); - Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(TimeSpan.FromSeconds(60)).RenewalCadence(TimeSpan.FromSeconds(59.9)))); + Assert.Throws(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(TimeSpan.FromSeconds(60)).RenewalCadence(TimeSpan.FromSeconds(60.1)))); + Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(TimeSpan.FromSeconds(60)).RenewalCadence(TimeSpan.FromSeconds(59.9)))); - Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(Timeout.InfiniteTimeSpan).RenewalCadence(Timeout.InfiniteTimeSpan))); - } + Assert.DoesNotThrow(() => AzureBlobLeaseOptionsBuilder.GetOptions(o => o.Duration(Timeout.InfiniteTimeSpan).RenewalCadence(Timeout.InfiniteTimeSpan))); + } - [Test] - public void TestValidatesBusyWaitSleepTime() - { - var builder = new AzureBlobLeaseOptionsBuilder(); + [Test] + public void TestValidatesBusyWaitSleepTime() + { + var builder = new AzureBlobLeaseOptionsBuilder(); - Assert.Throws(() => builder.BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1))); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(-1), TimeSpan.FromSeconds(1))); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.MaxValue, TimeSpan.FromSeconds(1))); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan)); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(-1))); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.MaxValue)); + Assert.Throws(() => builder.BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1))); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(-1), TimeSpan.FromSeconds(1))); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.MaxValue, TimeSpan.FromSeconds(1))); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan)); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(-1))); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.MaxValue)); - Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1.1), TimeSpan.FromSeconds(1))); + Assert.Throws(() => builder.BusyWaitSleepTime(TimeSpan.FromSeconds(1.1), TimeSpan.FromSeconds(1))); - Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero)); - Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4))); - } + Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero)); + Assert.DoesNotThrow(() => builder.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4))); + } - [Test] - public void TestDisablesAutoRenewalIfDurationIsInfinite() - { - var options = AzureBlobLeaseOptionsBuilder.GetOptions(b => b.Duration(Timeout.InfiniteTimeSpan)); - Assert.IsTrue(options.renewalCadence.IsInfinite); - } + [Test] + public void TestDisablesAutoRenewalIfDurationIsInfinite() + { + var options = AzureBlobLeaseOptionsBuilder.GetOptions(b => b.Duration(Timeout.InfiniteTimeSpan)); + Assert.IsTrue(options.renewalCadence.IsInfinite); } } diff --git a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs index 823dc27a..24db466b 100644 --- a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs @@ -10,29 +10,28 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Core.Data +namespace Medallion.Threading.Tests.Core.Data; + +public class DatabaseConnectionTest { - public class DatabaseConnectionTest + /// + /// Reproduces the root cause of https://github.com/madelson/DistributedLock/issues/133 + /// + [Test] + public async Task TestConnectionMonitorStaysSubscribedAfterClose() { - /// - /// Reproduces the root cause of https://github.com/madelson/DistributedLock/issues/133 - /// - [Test] - public async Task TestConnectionMonitorStaysSubscribedAfterClose() - { - var db = new TestingSqlServerDb { ApplicationName = nameof(TestConnectionMonitorStaysSubscribedAfterClose) }; + var db = new TestingSqlServerDb { ApplicationName = nameof(TestConnectionMonitorStaysSubscribedAfterClose) }; - await using var connection = new SqlDatabaseConnection(db.ConnectionString); + await using var connection = new SqlDatabaseConnection(db.ConnectionString); - await connection.OpenAsync(CancellationToken.None); - connection.ConnectionMonitor.GetMonitoringHandle().Dispose(); // initialize monitoring - await connection.CloseAsync(); + await connection.OpenAsync(CancellationToken.None); + connection.ConnectionMonitor.GetMonitoringHandle().Dispose(); // initialize monitoring + await connection.CloseAsync(); - await connection.OpenAsync(CancellationToken.None); - using var handle = connection.ConnectionMonitor.GetMonitoringHandle(); - Assert.IsFalse(handle.ConnectionLostToken.IsCancellationRequested); - await db.KillSessionsAsync(db.ApplicationName, idleSince: null); - Assert.IsTrue(await TestHelper.WaitForAsync(() => new(handle.ConnectionLostToken.IsCancellationRequested), timeout: TimeSpan.FromSeconds(5))); - } + await connection.OpenAsync(CancellationToken.None); + using var handle = connection.ConnectionMonitor.GetMonitoringHandle(); + Assert.IsFalse(handle.ConnectionLostToken.IsCancellationRequested); + await db.KillSessionsAsync(db.ApplicationName, idleSince: null); + Assert.IsTrue(await TestHelper.WaitForAsync(() => new(handle.ConnectionLostToken.IsCancellationRequested), timeout: TimeSpan.FromSeconds(5))); } } diff --git a/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs b/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs index 85b3f164..7e771f1f 100644 --- a/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs +++ b/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs @@ -3,26 +3,25 @@ using System.IO; using System.Runtime.Serialization.Formatters.Binary; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +[Category("CI")] +public class DeadlockExceptionTest { - [Category("CI")] - public class DeadlockExceptionTest + [Test] + public void TestDeadlockExceptionSerialization() { - [Test] - public void TestDeadlockExceptionSerialization() - { - void ThrowDeadlockException() => throw new DeadlockException(nameof(TestDeadlockExceptionSerialization), new InvalidOperationException("foo")); - var deadlockException = Assert.Throws(ThrowDeadlockException); + void ThrowDeadlockException() => throw new DeadlockException(nameof(TestDeadlockExceptionSerialization), new InvalidOperationException("foo")); + var deadlockException = Assert.Throws(ThrowDeadlockException); - var formatter = new BinaryFormatter(); - var stream = new MemoryStream(); - formatter.Serialize(stream, deadlockException); + var formatter = new BinaryFormatter(); + var stream = new MemoryStream(); + formatter.Serialize(stream, deadlockException); - stream.Position = 0; - var deserialized = (DeadlockException)formatter.Deserialize(stream); - deserialized.Message.ShouldEqual(deadlockException.Message); - deserialized.StackTrace.ShouldEqual(deadlockException.StackTrace); - (deserialized.InnerException?.Message).ShouldEqual(deadlockException.InnerException?.Message); - } + stream.Position = 0; + var deserialized = (DeadlockException)formatter.Deserialize(stream); + deserialized.Message.ShouldEqual(deadlockException.Message); + deserialized.StackTrace.ShouldEqual(deadlockException.StackTrace); + (deserialized.InnerException?.Message).ShouldEqual(deadlockException.InnerException?.Message); } } diff --git a/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index 4c66befc..dfa05fd0 100644 --- a/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs +++ b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -3,61 +3,60 @@ using System; using System.Linq.Expressions; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +// Note: we don't bother testing the extensions for the other providers since they are all auto-generated by the same component. +public class DistributedLockProviderExtensionsTest { - // Note: we don't bother testing the extensions for the other providers since they are all auto-generated by the same component. - public class DistributedLockProviderExtensionsTest + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLockAsync(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLock(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireLockAsync(null!, "name")); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireLock(null!, "name")); + } + + [Test, Combinatorial] + public void TestCallThrough([Values] bool isTry, [Values] bool isAsync) { - [Test] - public void TestArgumentValidation() + var mockLock = new Mock(); + var mockProvider = new Mock(); + mockProvider.Setup(p => p.CreateLock("name")) + .Returns(mockLock.Object) + .Verifiable(); + + if (isTry) { - Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLockAsync(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireLock(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.AcquireLockAsync(null!, "name")); - Assert.Throws(() => DistributedLockProviderExtensions.AcquireLock(null!, "name")); + if (isAsync) + { + Test(p => p.TryAcquireLockAsync("name", default, default), l => l.TryAcquireAsync(default, default)); + } + else + { + Test(p => p.TryAcquireLock("name", default, default), l => l.TryAcquire(default, default)); + } } - - [Test, Combinatorial] - public void TestCallThrough([Values] bool isTry, [Values] bool isAsync) + else { - var mockLock = new Mock(); - var mockProvider = new Mock(); - mockProvider.Setup(p => p.CreateLock("name")) - .Returns(mockLock.Object) - .Verifiable(); - - if (isTry) + if (isAsync) { - if (isAsync) - { - Test(p => p.TryAcquireLockAsync("name", default, default), l => l.TryAcquireAsync(default, default)); - } - else - { - Test(p => p.TryAcquireLock("name", default, default), l => l.TryAcquire(default, default)); - } + Test(p => p.AcquireLockAsync("name", default, default), l => l.AcquireAsync(default, default)); } else { - if (isAsync) - { - Test(p => p.AcquireLockAsync("name", default, default), l => l.AcquireAsync(default, default)); - } - else - { - Test(p => p.AcquireLock("name", default, default), l => l.Acquire(default, default)); - } + Test(p => p.AcquireLock("name", default, default), l => l.Acquire(default, default)); } + } - void Test( - Expression> providerFunction, - Expression> lockFunction) - { - providerFunction.Compile()(mockProvider.Object); + void Test( + Expression> providerFunction, + Expression> lockFunction) + { + providerFunction.Compile()(mockProvider.Object); - mockProvider.Verify(p => p.CreateLock("name"), Times.Once); - mockLock.Verify(lockFunction, Times.Once()); - } + mockProvider.Verify(p => p.CreateLock("name"), Times.Once); + mockLock.Verify(lockFunction, Times.Once()); } } } diff --git a/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/DistributedLock.Tests/Tests/Core/HelpersTest.cs index 2e2a6ed3..c9687305 100644 --- a/DistributedLock.Tests/Tests/Core/HelpersTest.cs +++ b/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -5,34 +5,33 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +[Category("CI")] +public class HelpersTest { - [Category("CI")] - public class HelpersTest + [Test] + public void TestSafeCreateTaskPassesThroughSafeTasks() { - [Test] - public void TestSafeCreateTaskPassesThroughSafeTasks() - { - var tasks = new[] { Task.FromResult(14), Task.FromResult(24) }; - var safeTask = Helpers.SafeCreateTask(state => tasks[state], 1); - Assert.AreSame(tasks[1], safeTask); + var tasks = new[] { Task.FromResult(14), Task.FromResult(24) }; + var safeTask = Helpers.SafeCreateTask(state => tasks[state], 1); + Assert.AreSame(tasks[1], safeTask); - var safeNonGenericTask = Helpers.SafeCreateTask(state => tasks[state], 1); - Assert.AreSame(safeNonGenericTask, tasks[1]); - } + var safeNonGenericTask = Helpers.SafeCreateTask(state => tasks[state], 1); + Assert.AreSame(safeNonGenericTask, tasks[1]); + } - [Test] - public void TestSafeCreateTaskReturnsCaughtExceptionAsFaultedTask() - { - var safeTask = Helpers.SafeCreateTask(state => GetTask(state), "m1"); - Assert.IsInstanceOf(safeTask.Exception!.InnerException); - safeTask.Exception.InnerException!.Message.ShouldEqual("m1"); + [Test] + public void TestSafeCreateTaskReturnsCaughtExceptionAsFaultedTask() + { + var safeTask = Helpers.SafeCreateTask(state => GetTask(state), "m1"); + Assert.IsInstanceOf(safeTask.Exception!.InnerException); + safeTask.Exception.InnerException!.Message.ShouldEqual("m1"); - var safeNonGenericTask = Helpers.SafeCreateTask(state => GetTask(state), "m2"); - Assert.IsInstanceOf(safeNonGenericTask.Exception!.InnerException); - safeNonGenericTask.Exception.InnerException!.Message.ShouldEqual("m2"); + var safeNonGenericTask = Helpers.SafeCreateTask(state => GetTask(state), "m2"); + Assert.IsInstanceOf(safeNonGenericTask.Exception!.InnerException); + safeNonGenericTask.Exception.InnerException!.Message.ShouldEqual("m2"); - static Task GetTask(string message) => throw new TimeZoneNotFoundException(message); - } + static Task GetTask(string message) => throw new TimeZoneNotFoundException(message); } } diff --git a/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs b/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs index 9a79b2f4..f6bc5459 100644 --- a/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs +++ b/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs @@ -1,22 +1,21 @@ using NUnit.Framework; using System.Linq; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +[Category("CI")] +public class InternalVisibilityTest { - [Category("CI")] - public class InternalVisibilityTest + [Test] + public void TestInternalNamespaceMethodsHaveCorrectVisibility() { - [Test] - public void TestInternalNamespaceMethodsHaveCorrectVisibility() - { - var internalNamespaceTypes = typeof(IDistributedLock).Assembly.GetTypes() - .Where(t => t.Namespace?.Contains(".Internal") ?? false) - .ToList(); - Assert.IsNotEmpty(internalNamespaceTypes); + var internalNamespaceTypes = typeof(IDistributedLock).Assembly.GetTypes() + .Where(t => t.Namespace?.Contains(".Internal") ?? false) + .ToList(); + Assert.IsNotEmpty(internalNamespaceTypes); #if !DEBUG - Assert.IsEmpty(internalNamespaceTypes.Where(t => t.IsPublic)); + Assert.IsEmpty(internalNamespaceTypes.Where(t => t.IsPublic)); #endif - } } } diff --git a/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs index e3e73fb2..5d3b7040 100644 --- a/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs +++ b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs @@ -3,47 +3,46 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +[Category("CI")] +public class SyncViaAsyncTest { - [Category("CI")] - public class SyncViaAsyncTest + [Test] + public void TestSyncOverAsyncVoid() { - [Test] - public void TestSyncOverAsyncVoid() - { - var currentThread = Thread.CurrentThread; - SyncViaAsync.Run<(int a, int b, Thread startingThread, bool expectAsync)>( - async state => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), - (1, 2, currentThread, false) - ); - } + var currentThread = Thread.CurrentThread; + SyncViaAsync.Run<(int a, int b, Thread startingThread, bool expectAsync)>( + async state => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), + (1, 2, currentThread, false) + ); + } - [Test] - public void TestSyncOverAsyncWithResult() - { - var currentThread = Thread.CurrentThread; - var result = SyncViaAsync.Run( - async ((int a, int b, Thread startingThread, bool expectAsync) state) => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), - (1, 2, currentThread, false) - ); - Assert.AreEqual(3, result); - } + [Test] + public void TestSyncOverAsyncWithResult() + { + var currentThread = Thread.CurrentThread; + var result = SyncViaAsync.Run( + async ((int a, int b, Thread startingThread, bool expectAsync) state) => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), + (1, 2, currentThread, false) + ); + Assert.AreEqual(3, result); + } - private async ValueTask AddAsync(int a, int b, Thread startingThread, bool expectAsync) - { - var result = await AddHelperAsync(a, expectAsync) + await AddHelperAsync(b, expectAsync); - Assert.AreEqual(expectAsync, Thread.CurrentThread != startingThread); - return result; - } + private async ValueTask AddAsync(int a, int b, Thread startingThread, bool expectAsync) + { + var result = await AddHelperAsync(a, expectAsync) + await AddHelperAsync(b, expectAsync); + Assert.AreEqual(expectAsync, Thread.CurrentThread != startingThread); + return result; + } - private async ValueTask AddHelperAsync(int a, bool expectAsync) - { - Assert.AreNotEqual(expectAsync, SyncViaAsync.IsSynchronous); + private async ValueTask AddHelperAsync(int a, bool expectAsync) + { + Assert.AreNotEqual(expectAsync, SyncViaAsync.IsSynchronous); - if (expectAsync) { await Task.Delay(1); } - else { Thread.Sleep(1); } + if (expectAsync) { await Task.Delay(1); } + else { Thread.Sleep(1); } - return a; - } + return a; } } diff --git a/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs b/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs index 96bc4325..feddcb8f 100644 --- a/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs +++ b/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs @@ -4,97 +4,96 @@ using System.Linq; using System.Threading; -namespace Medallion.Threading.Tests.Core +namespace Medallion.Threading.Tests.Core; + +[Category("CI")] +public class TimeoutValueTest { - [Category("CI")] - public class TimeoutValueTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() - { - Assert.Throws(() => new TimeoutValue(TimeSpan.FromMilliseconds(-2))); - Assert.Throws(() => new TimeoutValue(TimeSpan.FromMilliseconds((long)int.MaxValue + 1))); - } + Assert.Throws(() => new TimeoutValue(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => new TimeoutValue(TimeSpan.FromMilliseconds((long)int.MaxValue + 1))); + } - [Test] - public void TestProperties() - { - Assert.IsTrue(default(TimeoutValue).IsZero); - Assert.IsFalse(default(TimeoutValue).IsInfinite); - Assert.AreEqual(0, default(TimeoutValue).InMilliseconds); - Assert.AreEqual(0, default(TimeoutValue).InSeconds); + [Test] + public void TestProperties() + { + Assert.IsTrue(default(TimeoutValue).IsZero); + Assert.IsFalse(default(TimeoutValue).IsInfinite); + Assert.AreEqual(0, default(TimeoutValue).InMilliseconds); + Assert.AreEqual(0, default(TimeoutValue).InSeconds); - TimeoutValue infinite = Timeout.InfiniteTimeSpan; - Assert.IsFalse(infinite.IsZero); - Assert.IsTrue(infinite.IsInfinite); - Assert.AreEqual(-1, infinite.InMilliseconds); - Assert.Throws(() => infinite.InSeconds.ToString()); + TimeoutValue infinite = Timeout.InfiniteTimeSpan; + Assert.IsFalse(infinite.IsZero); + Assert.IsTrue(infinite.IsInfinite); + Assert.AreEqual(-1, infinite.InMilliseconds); + Assert.Throws(() => infinite.InSeconds.ToString()); - TimeoutValue normal = TimeSpan.FromSeconds(10.4); - Assert.IsFalse(normal.IsZero); - Assert.IsFalse(normal.IsInfinite); - Assert.AreEqual(10400, normal.InMilliseconds); - Assert.AreEqual(10, normal.InSeconds); - } + TimeoutValue normal = TimeSpan.FromSeconds(10.4); + Assert.IsFalse(normal.IsZero); + Assert.IsFalse(normal.IsInfinite); + Assert.AreEqual(10400, normal.InMilliseconds); + Assert.AreEqual(10, normal.InSeconds); + } - [Test] - public void TestConversion() - { - Assert.AreEqual((TimeoutValue)default(TimeSpan?), new TimeoutValue(Timeout.InfiniteTimeSpan)); + [Test] + public void TestConversion() + { + Assert.AreEqual((TimeoutValue)default(TimeSpan?), new TimeoutValue(Timeout.InfiniteTimeSpan)); - CheckEquality(Timeout.InfiniteTimeSpan); - CheckEquality(TimeSpan.FromSeconds(101.3)); - CheckEquality(TimeSpan.FromTicks(1)); - CheckEquality(TimeSpan.Zero); + CheckEquality(Timeout.InfiniteTimeSpan); + CheckEquality(TimeSpan.FromSeconds(101.3)); + CheckEquality(TimeSpan.FromTicks(1)); + CheckEquality(TimeSpan.Zero); - static void CheckEquality(TimeSpan value) => Assert.AreEqual((int)value.TotalMilliseconds, ((TimeoutValue)value).InMilliseconds); - } + static void CheckEquality(TimeSpan value) => Assert.AreEqual((int)value.TotalMilliseconds, ((TimeoutValue)value).InMilliseconds); + } - [Test] - public void TestEquality() - { - var timeSpans = new double[] { Timeout.Infinite, 0, 1, 1000, 10101 }.Select(TimeSpan.FromMilliseconds) - .ToArray(); + [Test] + public void TestEquality() + { + var timeSpans = new double[] { Timeout.Infinite, 0, 1, 1000, 10101 }.Select(TimeSpan.FromMilliseconds) + .ToArray(); - foreach (var a in timeSpans) + foreach (var a in timeSpans) + { + foreach (var b in timeSpans) { - foreach (var b in timeSpans) - { - TimeoutValue aValue = a, bValue = b; + TimeoutValue aValue = a, bValue = b; - if (a == b) - { - Assert.IsTrue(aValue == bValue); - Assert.IsFalse(aValue != bValue); - Assert.IsTrue(aValue.Equals(bValue)); - Assert.IsTrue(aValue.Equals((object)bValue)); - Assert.IsTrue(Equals(aValue, bValue)); - Assert.AreEqual(aValue.GetHashCode(), bValue.GetHashCode()); - } - else - { - Assert.IsFalse(aValue == bValue); - Assert.IsTrue(aValue != bValue); - Assert.IsFalse(aValue.Equals(bValue)); - Assert.IsFalse(aValue.Equals((object)bValue)); - Assert.IsFalse(Equals(aValue, bValue)); - Assert.AreNotEqual(aValue.GetHashCode(), bValue.GetHashCode()); - } + if (a == b) + { + Assert.IsTrue(aValue == bValue); + Assert.IsFalse(aValue != bValue); + Assert.IsTrue(aValue.Equals(bValue)); + Assert.IsTrue(aValue.Equals((object)bValue)); + Assert.IsTrue(Equals(aValue, bValue)); + Assert.AreEqual(aValue.GetHashCode(), bValue.GetHashCode()); + } + else + { + Assert.IsFalse(aValue == bValue); + Assert.IsTrue(aValue != bValue); + Assert.IsFalse(aValue.Equals(bValue)); + Assert.IsFalse(aValue.Equals((object)bValue)); + Assert.IsFalse(Equals(aValue, bValue)); + Assert.AreNotEqual(aValue.GetHashCode(), bValue.GetHashCode()); } } } + } - [Test] - public void TestComparison() - { - new TimeoutValue(Timeout.InfiniteTimeSpan).CompareTo(Timeout.InfiniteTimeSpan).ShouldEqual(0); - new TimeoutValue(TimeSpan.FromSeconds(1)).CompareTo(TimeSpan.FromSeconds(1)).ShouldEqual(0); + [Test] + public void TestComparison() + { + new TimeoutValue(Timeout.InfiniteTimeSpan).CompareTo(Timeout.InfiniteTimeSpan).ShouldEqual(0); + new TimeoutValue(TimeSpan.FromSeconds(1)).CompareTo(TimeSpan.FromSeconds(1)).ShouldEqual(0); - new TimeoutValue(Timeout.InfiniteTimeSpan).CompareTo(TimeSpan.FromMilliseconds(int.MaxValue)).ShouldEqual(1); - new TimeoutValue(TimeSpan.FromMilliseconds(int.MaxValue)).CompareTo(Timeout.InfiniteTimeSpan).ShouldEqual(-1); + new TimeoutValue(Timeout.InfiniteTimeSpan).CompareTo(TimeSpan.FromMilliseconds(int.MaxValue)).ShouldEqual(1); + new TimeoutValue(TimeSpan.FromMilliseconds(int.MaxValue)).CompareTo(Timeout.InfiniteTimeSpan).ShouldEqual(-1); - new TimeoutValue(TimeSpan.Zero).CompareTo(TimeSpan.FromSeconds(1)).ShouldEqual(-1); - new TimeoutValue(TimeSpan.FromSeconds(1)).CompareTo(TimeSpan.Zero).ShouldEqual(1); - } + new TimeoutValue(TimeSpan.Zero).CompareTo(TimeSpan.FromSeconds(1)).ShouldEqual(-1); + new TimeoutValue(TimeSpan.FromSeconds(1)).CompareTo(TimeSpan.Zero).ShouldEqual(1); } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 159f5a50..769172ad 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -10,504 +10,503 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.FileSystem -{ - [Category("CI")] - public class FileDistributedLockTest - { - private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedLockTest), TargetFramework.Current); - private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); +namespace Medallion.Threading.Tests.FileSystem; - [OneTimeSetUp] - public void OneTimeSetUp() - { - if (Directory.Exists(LockFileDirectory)) - { - Directory.Delete(LockFileDirectory, recursive: true); - } - } +[Category("CI")] +public class FileDistributedLockTest +{ + private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedLockTest), TargetFramework.Current); + private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); - [Test] - public void TestValidatesConstructorArguments() + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (Directory.Exists(LockFileDirectory)) { - Assert.Throws(() => new FileDistributedLock(default!)); - Assert.Throws(() => new FileDistributedLock(new FileInfo(LockFileDirectory + Path.DirectorySeparatorChar))); - - Assert.Throws(() => new FileDistributedLock(default!, "name")); - Assert.Throws(() => new FileDistributedLock(LockFileDirectoryInfo, default!)); + Directory.Delete(LockFileDirectory, recursive: true); } + } - [Test, Combinatorial] - public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDeleted( - [Values("nothing", "directory", "file")] string alreadyExists, - [Values] bool constructFromFileInfo) - { - var directoryName = Path.Combine(LockFileDirectory, Hash("directory")); - var fileName = Path.Combine(directoryName, Hash("file")); - - switch (alreadyExists) - { - case "nothing": - if (Directory.Exists(directoryName)) - { - Directory.Delete(directoryName, recursive: true); - } - break; - case "directory": - Directory.CreateDirectory(directoryName); - File.Delete(fileName); - break; - case "file": - Directory.CreateDirectory(directoryName); - File.WriteAllText(fileName, "text"); - break; - default: - throw new InvalidOperationException("should never get here"); - } - - var @lock = constructFromFileInfo - ? new FileDistributedLock(new FileInfo(fileName)) - : new FileDistributedLock(new DirectoryInfo(directoryName), Path.GetFileName(fileName)); - if (constructFromFileInfo) - { - @lock.Name.ShouldEqual(fileName); - } - - Directory.Exists(directoryName).ShouldEqual(alreadyExists != "nothing"); - File.Exists(fileName).ShouldEqual(alreadyExists == "file"); + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => new FileDistributedLock(default!)); + Assert.Throws(() => new FileDistributedLock(new FileInfo(LockFileDirectory + Path.DirectorySeparatorChar))); - using (@lock.Acquire()) - { - Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsTrue(File.Exists(@lock.Name)); - } + Assert.Throws(() => new FileDistributedLock(default!, "name")); + Assert.Throws(() => new FileDistributedLock(LockFileDirectoryInfo, default!)); + } - Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsFalse(File.Exists(@lock.Name)); + [Test, Combinatorial] + public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDeleted( + [Values("nothing", "directory", "file")] string alreadyExists, + [Values] bool constructFromFileInfo) + { + var directoryName = Path.Combine(LockFileDirectory, Hash("directory")); + var fileName = Path.Combine(directoryName, Hash("file")); - static string Hash(string text) - { - using var md5 = MD5.Create(); - var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes($"{text}_{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}")); - return BitConverter.ToString(hashBytes).Replace("-", string.Empty); - } - } - - [Test] - public void TestFileCannotBeModifiedOrDeletedWhileHeld() + switch (alreadyExists) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestFileCannotBeModifiedOrDeletedWhileHeld)); - using (@lock.Acquire()) - { - Assert.Throws(() => File.WriteAllText(@lock.Name, "contents"), "write"); - Assert.Throws(() => File.ReadAllText(@lock.Name), "read"); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Assert.Throws(() => File.Delete(@lock.Name), "delete"); - } - else + case "nothing": + if (Directory.Exists(directoryName)) { - // on unix, locking a file doesn't prevent unliking, so deletion effectively unlocks - // https://stackoverflow.com/questions/2028874/what-happens-to-an-open-file-handle-on-linux-if-the-pointed-file-gets-moved-or-d - Assert.DoesNotThrow(() => File.Delete(@lock.Name)); - using var reaquireHandle = @lock.TryAcquire(); - Assert.IsNotNull(reaquireHandle); + Directory.Delete(directoryName, recursive: true); } - } + break; + case "directory": + Directory.CreateDirectory(directoryName); + File.Delete(fileName); + break; + case "file": + Directory.CreateDirectory(directoryName); + File.WriteAllText(fileName, "text"); + break; + default: + throw new InvalidOperationException("should never get here"); } - [Test] - public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() + var @lock = constructFromFileInfo + ? new FileDistributedLock(new FileInfo(fileName)) + : new FileDistributedLock(new DirectoryInfo(directoryName), Path.GetFileName(fileName)); + if (constructFromFileInfo) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestThrowsIfProvidedFileNameIsAlreadyADirectory)); - Directory.CreateDirectory(@lock.Name); - - var exception = Assert.Throws(() => @lock.Acquire().Dispose()); - Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); + @lock.Name.ShouldEqual(fileName); } - [Test] - public void TestEmptyNameIsAllowed() => AssertCanUseName(string.Empty); + Directory.Exists(directoryName).ShouldEqual(alreadyExists != "nothing"); + File.Exists(fileName).ShouldEqual(alreadyExists == "file"); - [Test] - public void TestLongNamesAreAllowed() => AssertCanUseName(new string('a', ushort.MaxValue)); + using (@lock.Acquire()) + { + Assert.IsTrue(Directory.Exists(directoryName)); + Assert.IsTrue(File.Exists(@lock.Name)); + } + + Assert.IsTrue(Directory.Exists(directoryName)); + Assert.IsFalse(File.Exists(@lock.Name)); - [Test] - public void TestHandlesLongDirectoryNames() + static string Hash(string text) { - DirectoryInfo tooLongDirectory; + using var md5 = MD5.Create(); + var hashBytes = md5.ComputeHash(Encoding.UTF8.GetBytes($"{text}_{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}")); + return BitConverter.ToString(hashBytes).Replace("-", string.Empty); + } + } + + [Test] + public void TestFileCannotBeModifiedOrDeletedWhileHeld() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestFileCannotBeModifiedOrDeletedWhileHeld)); + using (@lock.Acquire()) + { + Assert.Throws(() => File.WriteAllText(@lock.Name, "contents"), "write"); + Assert.Throws(() => File.ReadAllText(@lock.Name), "read"); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - tooLongDirectory = AppContext.TryGetSwitch("Switch.System.IO.UseLegacyPathHandling", out var useLegacyPathHandling) && useLegacyPathHandling - ? BuildLongDirectory(259 - (FileNameValidationHelper.MinFileNameLength - 1)) - : BuildLongDirectory(short.MaxValue - (FileNameValidationHelper.MinFileNameLength - 1)); - - // we only check this on Windows currently since AppVeyor linux does not see to have a length restriction - Assert.Throws(() => new FileDistributedLock(tooLongDirectory, new string('a', FileNameValidationHelper.MinFileNameLength))); + Assert.Throws(() => File.Delete(@lock.Name), "delete"); } - else + else { - tooLongDirectory = BuildLongDirectory(4096 - (FileNameValidationHelper.MinFileNameLength - 1)); + // on unix, locking a file doesn't prevent unliking, so deletion effectively unlocks + // https://stackoverflow.com/questions/2028874/what-happens-to-an-open-file-handle-on-linux-if-the-pointed-file-gets-moved-or-d + Assert.DoesNotThrow(() => File.Delete(@lock.Name)); + using var reaquireHandle = @lock.TryAcquire(); + Assert.IsNotNull(reaquireHandle); } + } + } - var almostTooLongDirectory = new DirectoryInfo(tooLongDirectory.FullName.Substring(0, tooLongDirectory.FullName.Length - 1)); - AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); - AssertCanUseName(new string('a', 100 * FileNameValidationHelper.MinFileNameLength)); + [Test] + public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestThrowsIfProvidedFileNameIsAlreadyADirectory)); + Directory.CreateDirectory(@lock.Name); - var almostTooLongBytesDirectory = new DirectoryInfo(almostTooLongDirectory.FullName.Replace("aaaa", "🦉")); - Encoding.UTF8.GetByteCount(almostTooLongBytesDirectory.FullName).ShouldEqual(Encoding.UTF8.GetByteCount(almostTooLongDirectory.FullName)); - AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); - AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength + 1)); + var exception = Assert.Throws(() => @lock.Acquire().Dispose()); + Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); + } - static DirectoryInfo BuildLongDirectory(int length) - { - var name = new StringBuilder(LockFileDirectory); - while (name.Length < length) - { - name.Append(Path.DirectorySeparatorChar) - .Append('a', 100); // shorter than 255 max name lengths - } - name.Length = length; - // make sure we don't have separators near the end that block trimming - name[name.Length - 1] = 'b'; - name[name.Length - 2] = 'b'; - return new DirectoryInfo(name.ToString()); - } + [Test] + public void TestEmptyNameIsAllowed() => AssertCanUseName(string.Empty); + + [Test] + public void TestLongNamesAreAllowed() => AssertCanUseName(new string('a', ushort.MaxValue)); + + [Test] + public void TestHandlesLongDirectoryNames() + { + DirectoryInfo tooLongDirectory; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + tooLongDirectory = AppContext.TryGetSwitch("Switch.System.IO.UseLegacyPathHandling", out var useLegacyPathHandling) && useLegacyPathHandling + ? BuildLongDirectory(259 - (FileNameValidationHelper.MinFileNameLength - 1)) + : BuildLongDirectory(short.MaxValue - (FileNameValidationHelper.MinFileNameLength - 1)); + + // we only check this on Windows currently since AppVeyor linux does not see to have a length restriction + Assert.Throws(() => new FileDistributedLock(tooLongDirectory, new string('a', FileNameValidationHelper.MinFileNameLength))); } + else + { + tooLongDirectory = BuildLongDirectory(4096 - (FileNameValidationHelper.MinFileNameLength - 1)); + } + + var almostTooLongDirectory = new DirectoryInfo(tooLongDirectory.FullName.Substring(0, tooLongDirectory.FullName.Length - 1)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); + AssertCanUseName(new string('a', 100 * FileNameValidationHelper.MinFileNameLength)); - [TestCase(".")] - [TestCase("..")] - [TestCase("...")] - [TestCase("....")] - [TestCase("A.")] - [TestCase("A..")] - [TestCase(".A")] - [TestCase("..A")] - [TestCase(" ")] - [TestCase(" ")] - [TestCase(" ")] - [TestCase("A ")] - [TestCase(" A")] - [TestCase(" .")] - [TestCase(". ")] - [TestCase(". .")] - [TestCase(" .. ")] - [TestCase("\t.")] - [TestCase(" \t")] - public void TestStrangePaths(string name) => AssertCanUseName(name); - - [TestCase("a.")] - [TestCase("a ")] - public void TestTrailingWhitespaceOrDotDoesNotCauseCollision(string name) + var almostTooLongBytesDirectory = new DirectoryInfo(almostTooLongDirectory.FullName.Replace("aaaa", "🦉")); + Encoding.UTF8.GetByteCount(almostTooLongBytesDirectory.FullName).ShouldEqual(Encoding.UTF8.GetByteCount(almostTooLongDirectory.FullName)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength)); + AssertCanUseName(new string('a', FileNameValidationHelper.MinFileNameLength + 1)); + + static DirectoryInfo BuildLongDirectory(int length) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); - using (@lock.Acquire()) + var name = new StringBuilder(LockFileDirectory); + while (name.Length < length) { - using var handle = new FileDistributedLock(LockFileDirectoryInfo, name.Trim('.').Trim(' ')).TryAcquire(); - Assert.IsNotNull(handle); + name.Append(Path.DirectorySeparatorChar) + .Append('a', 100); // shorter than 255 max name lengths } + name.Length = length; + // make sure we don't have separators near the end that block trimming + name[name.Length - 1] = 'b'; + name[name.Length - 2] = 'b'; + return new DirectoryInfo(name.ToString()); } + } - [TestCase("CON")] - [TestCase("PRN")] - [TestCase("AUX")] - [TestCase("NUL")] - [TestCase("COM1")] - [TestCase("COM2")] - [TestCase("COM3")] - [TestCase("COM4")] - [TestCase("COM5")] - [TestCase("COM6")] - [TestCase("COM7")] - [TestCase("COM8")] - [TestCase("COM9")] - [TestCase("CONIN$")] - [TestCase("CONOUT$")] - [TestCase("LPT1")] - [TestCase("LPT2")] - [TestCase("LPT3")] - [TestCase("LPT4")] - [TestCase("LPT5")] - [TestCase("LPT6")] - [TestCase("LPT7")] - [TestCase("LPT8")] - [TestCase("LPT9")] - public void TestReservedWindowsNamesAreAllowed(string name) + [TestCase(".")] + [TestCase("..")] + [TestCase("...")] + [TestCase("....")] + [TestCase("A.")] + [TestCase("A..")] + [TestCase(".A")] + [TestCase("..A")] + [TestCase(" ")] + [TestCase(" ")] + [TestCase(" ")] + [TestCase("A ")] + [TestCase(" A")] + [TestCase(" .")] + [TestCase(". ")] + [TestCase(". .")] + [TestCase(" .. ")] + [TestCase("\t.")] + [TestCase(" \t")] + public void TestStrangePaths(string name) => AssertCanUseName(name); + + [TestCase("a.")] + [TestCase("a ")] + public void TestTrailingWhitespaceOrDotDoesNotCauseCollision(string name) + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + using (@lock.Acquire()) { - var variants = new[] - { - name, - name.ToLowerInvariant() + ".txt", - name[0] + name.Substring(1).ToLowerInvariant(), - }; - foreach (var variant in variants) - { - AssertCanUseName(variant); - - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Assert.IsFalse(CanCreateFileWithName(variant), variant); - Assert.AreNotEqual(name, Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), variant); - } - } + using var handle = new FileDistributedLock(LockFileDirectoryInfo, name.Trim('.').Trim(' ')).TryAcquire(); + Assert.IsNotNull(handle); } + } - [Test] - public void TestEscapesBadCharactersInName() + [TestCase("CON")] + [TestCase("PRN")] + [TestCase("AUX")] + [TestCase("NUL")] + [TestCase("COM1")] + [TestCase("COM2")] + [TestCase("COM3")] + [TestCase("COM4")] + [TestCase("COM5")] + [TestCase("COM6")] + [TestCase("COM7")] + [TestCase("COM8")] + [TestCase("COM9")] + [TestCase("CONIN$")] + [TestCase("CONOUT$")] + [TestCase("LPT1")] + [TestCase("LPT2")] + [TestCase("LPT3")] + [TestCase("LPT4")] + [TestCase("LPT5")] + [TestCase("LPT6")] + [TestCase("LPT7")] + [TestCase("LPT8")] + [TestCase("LPT9")] + public void TestReservedWindowsNamesAreAllowed(string name) + { + var variants = new[] { - Check("A", shouldEscape: false); - Check("A_B", shouldEscape: false); - Check(string.Empty, shouldEscape: false); - Check(".", shouldEscape: true); - Check("..", shouldEscape: true); - Check("/A/", shouldEscape: true); - Check(@"\A\", shouldEscape: true); - Check("<", shouldEscape: true); - Check(">", shouldEscape: true); - Check("\0", shouldEscape: true); - - foreach (var invalidChar in Path.GetInvalidFileNameChars()) - { - Check("_" + invalidChar, shouldEscape: true); - } + name, + name.ToLowerInvariant() + ".txt", + name[0] + name.Substring(1).ToLowerInvariant(), + }; + foreach (var variant in variants) + { + AssertCanUseName(variant); - static void Check(string name, bool shouldEscape) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); - // ordinal required for null char comparison (see https://github.com/dotnet/runtime/issues/4673) - @lock.Name.StartsWith(LockFileDirectory + Path.DirectorySeparatorChar + name, StringComparison.Ordinal) - .ShouldEqual(!shouldEscape, $"'{name}', {@lock.Name}"); + Assert.IsFalse(CanCreateFileWithName(variant), variant); + Assert.AreNotEqual(name, Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), variant); } } + } - [Test] - public void TestForcesCaseSensitivity() + [Test] + public void TestEscapesBadCharactersInName() + { + Check("A", shouldEscape: false); + Check("A_B", shouldEscape: false); + Check(string.Empty, shouldEscape: false); + Check(".", shouldEscape: true); + Check("..", shouldEscape: true); + Check("/A/", shouldEscape: true); + Check(@"\A\", shouldEscape: true); + Check("<", shouldEscape: true); + Check(">", shouldEscape: true); + Check("\0", shouldEscape: true); + + foreach (var invalidChar in Path.GetInvalidFileNameChars()) { - Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, "lower").Name) - .ShouldEqual("lowerPRE5SHQAMC324P4C6UKD4R4VMGGJMF6T.lock"); + Check("_" + invalidChar, shouldEscape: true); } - [TestCase("", ExpectedResult = "P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA.lock")] - [TestCase(".", ExpectedResult = "_LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y.lock")] - [TestCase("..", ExpectedResult = "__G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6.lock")] - [TestCase("...", ExpectedResult = "___2ZDJLYOT376KUA5OQFR2OERKUXIH4A7R.lock")] - [TestCase("LPT1", ExpectedResult = "LPT1VUGMI6NJVPIYUGXMY4K6ETA3232OR2B5.lock")] - [TestCase(" ", ExpectedResult = "_ZPD253R4AYXN6RS7UP6A3FYDCXHBXKUY.lock")] - [TestCase("_", ExpectedResult = "_3VP7XSELHOF3DU4D257KSSAQD3WR4SSL.lock")] - [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool_____x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L.lock")] - [TestCase( - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - ExpectedResult = "aaaaaaaaaaaaaaaaaaaaaaaaaaaXTSAJQWFKOYRBNXC6DV3HRZWQJANRKCX.lock" - )] - [TestCase("ABC", ExpectedResult = "ABCZJ4QR6TVN4A3KMGQ4BUKHOWQYFRLXSB3.lock")] - [TestCase("abc", ExpectedResult = "abc56LLTQOSBT6ULGHITLS4KQEIRREMO53J.lock")] - // 255 UTF8 bytes - [TestCase( - "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉123", - ExpectedResult = "___________________________VA7XJG3JUQKTL6AU2KWPHVQFK43N4DVW.lock" - )] - // 256 UTF8 bytes - [TestCase( - "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉1234", - ExpectedResult = "___________________________NOLT44QRLWYINT53TY2I4H34X4AU4O46.lock" - )] - public string TestSafeNameCompatibility(string name) + static void Check(string name, bool shouldEscape) { - // meant to be consistent length across platforms - var consistentDirectory = Path.Combine(LockFileDirectory, new string('b', 100)).Substring(0, 100); - var @lock = new FileDistributedLock(new DirectoryInfo(consistentDirectory), name); - Assert.That(@lock.Name, Does.StartWith(consistentDirectory + Path.DirectorySeparatorChar)); - return @lock.Name.Substring(consistentDirectory.Length + 1); + var @lock = new FileDistributedLock(LockFileDirectoryInfo, name); + // ordinal required for null char comparison (see https://github.com/dotnet/runtime/issues/4673) + @lock.Name.StartsWith(LockFileDirectory + Path.DirectorySeparatorChar + name, StringComparison.Ordinal) + .ShouldEqual(!shouldEscape, $"'{name}', {@lock.Name}"); } + } - [Test] - public void TestBase32Hashing() - { - const int Iterations = 100000; + [Test] + public void TestForcesCaseSensitivity() + { + Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, "lower").Name) + .ShouldEqual("lowerPRE5SHQAMC324P4C6UKD4R4VMGGJMF6T.lock"); + } - var charCounts = new int[128]; + [TestCase("", ExpectedResult = "P6AD62YPPHO33YTKIBUM5WBQHQVBCSXA.lock")] + [TestCase(".", ExpectedResult = "_LIYISOQPXAPX3NYVHPC2EK4WEOU6OW7Y.lock")] + [TestCase("..", ExpectedResult = "__G2H2MVGLQK7QVO2MAWVKSVSKM26KX5S6.lock")] + [TestCase("...", ExpectedResult = "___2ZDJLYOT376KUA5OQFR2OERKUXIH4A7R.lock")] + [TestCase("LPT1", ExpectedResult = "LPT1VUGMI6NJVPIYUGXMY4K6ETA3232OR2B5.lock")] + [TestCase(" ", ExpectedResult = "_ZPD253R4AYXN6RS7UP6A3FYDCXHBXKUY.lock")] + [TestCase("_", ExpectedResult = "_3VP7XSELHOF3DU4D257KSSAQD3WR4SSL.lock")] + [TestCase(@"cool<>!/:x\zzz", ExpectedResult = "cool_____x_zzzATJSHZSADXN7WTL4DBU6JULFTEDVFF3L.lock")] + [TestCase( + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + ExpectedResult = "aaaaaaaaaaaaaaaaaaaaaaaaaaaXTSAJQWFKOYRBNXC6DV3HRZWQJANRKCX.lock" + )] + [TestCase("ABC", ExpectedResult = "ABCZJ4QR6TVN4A3KMGQ4BUKHOWQYFRLXSB3.lock")] + [TestCase("abc", ExpectedResult = "abc56LLTQOSBT6ULGHITLS4KQEIRREMO53J.lock")] + // 255 UTF8 bytes + [TestCase( + "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉123", + ExpectedResult = "___________________________VA7XJG3JUQKTL6AU2KWPHVQFK43N4DVW.lock" + )] + // 256 UTF8 bytes + [TestCase( + "🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉🦉1234", + ExpectedResult = "___________________________NOLT44QRLWYINT53TY2I4H34X4AU4O46.lock" + )] + public string TestSafeNameCompatibility(string name) + { + // meant to be consistent length across platforms + var consistentDirectory = Path.Combine(LockFileDirectory, new string('b', 100)).Substring(0, 100); + var @lock = new FileDistributedLock(new DirectoryInfo(consistentDirectory), name); + Assert.That(@lock.Name, Does.StartWith(consistentDirectory + Path.DirectorySeparatorChar)); + return @lock.Name.Substring(consistentDirectory.Length + 1); + } - var nameChars = new char[] { default, default, Path.GetInvalidFileNameChars()[0] }; - var directoryInfo = LockFileDirectoryInfo; - for (var i = 0; i < Iterations; ++i) - { - if (++nameChars[0] == 0) - { - ++nameChars[1]; - } + [Test] + public void TestBase32Hashing() + { + const int Iterations = 100000; - var @lock = new FileDistributedLock(directoryInfo, new string(nameChars)); - var lockFileNameWithoutExtension = Path.GetFileNameWithoutExtension(@lock.Name); - var hashStart = lockFileNameWithoutExtension.Length - FileNameValidationHelper.HashLengthInChars; + var charCounts = new int[128]; - for (var j = hashStart; j < lockFileNameWithoutExtension.Length; ++j) - { - ++charCounts[lockFileNameWithoutExtension[j]]; - } + var nameChars = new char[] { default, default, Path.GetInvalidFileNameChars()[0] }; + var directoryInfo = LockFileDirectoryInfo; + for (var i = 0; i < Iterations; ++i) + { + if (++nameChars[0] == 0) + { + ++nameChars[1]; } - // for debugging - //for (var i = 0; i < charCounts.Length; ++i) - //{ - // Console.WriteLine($"{(char.IsLetterOrDigit((char)i) ? ((char)i).ToString() : i.ToString())}: {charCounts[i]}"); - //} + var @lock = new FileDistributedLock(directoryInfo, new string(nameChars)); + var lockFileNameWithoutExtension = Path.GetFileNameWithoutExtension(@lock.Name); + var hashStart = lockFileNameWithoutExtension.Length - FileNameValidationHelper.HashLengthInChars; - var expectedCount = (Iterations * FileNameValidationHelper.HashLengthInChars) / 32; - for (var @char = default(char); @char < charCounts.Length; ++@char) + for (var j = hashStart; j < lockFileNameWithoutExtension.Length; ++j) { - if ((@char >= '2' && @char <= '7') || (@char >= 'A' && @char <= 'Z')) - { - Assert.AreEqual(actual: charCounts[@char], expected: expectedCount, delta: .1 * expectedCount); - } - else - { - charCounts[@char].ShouldEqual(0); - } + ++charCounts[lockFileNameWithoutExtension[j]]; } } - /// - /// Reproduces https://github.com/madelson/DistributedLock/issues/109 - /// - /// Basically, there is a small window where concurrent file creation/deletion throws - /// despite there being no access permission errors. - /// See also https://github.com/dotnet/runtime/issues/61395. - /// - /// This test shows that we are not vulnerable to this. - /// - [Test] - public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnFileCreation() + // for debugging + //for (var i = 0; i < charCounts.Length; ++i) + //{ + // Console.WriteLine($"{(char.IsLetterOrDigit((char)i) ? ((char)i).ToString() : i.ToString())}: {charCounts[i]}"); + //} + + var expectedCount = (Iterations * FileNameValidationHelper.HashLengthInChars) / 32; + for (var @char = default(char); @char < charCounts.Length; ++@char) { - Directory.CreateDirectory(LockFileDirectory); - var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + if ((@char >= '2' && @char <= '7') || (@char >= 'A' && @char <= 'Z')) + { + Assert.AreEqual(actual: charCounts[@char], expected: expectedCount, delta: .1 * expectedCount); + } + else + { + charCounts[@char].ShouldEqual(0); + } + } + } - const int TaskCount = 20; + /// + /// Reproduces https://github.com/madelson/DistributedLock/issues/109 + /// + /// Basically, there is a small window where concurrent file creation/deletion throws + /// despite there being no access permission errors. + /// See also https://github.com/dotnet/runtime/issues/61395. + /// + /// This test shows that we are not vulnerable to this. + /// + [Test] + public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnFileCreation() + { + Directory.CreateDirectory(LockFileDirectory); + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); - using var barrier = new Barrier(TaskCount); + const int TaskCount = 20; - var tasks = Enumerable.Range(0, TaskCount) - .Select(_ => Task.Factory.StartNew(() => - { - barrier.SignalAndWait(); + using var barrier = new Barrier(TaskCount); - for (var i = 0; i < 500; ++i) - { - @lock.TryAcquire()?.Dispose(); - } - }, TaskCreationOptions.LongRunning)) - .ToArray(); + var tasks = Enumerable.Range(0, TaskCount) + .Select(_ => Task.Factory.StartNew(() => + { + barrier.SignalAndWait(); - Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); - } + for (var i = 0; i < 500; ++i) + { + @lock.TryAcquire()?.Dispose(); + } + }, TaskCreationOptions.LongRunning)) + .ToArray(); - /// - /// Reproduces https://github.com/madelson/DistributedLock/issues/106 - /// - /// Basically, there is a small window where concurrent creation/deletion of directories - /// throws even though there are no access permission errors. - /// - /// This test confirms that we recover from such errors. - /// - [Test] - public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnDirectoryCreation() - { - var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); + } + + /// + /// Reproduces https://github.com/madelson/DistributedLock/issues/106 + /// + /// Basically, there is a small window where concurrent creation/deletion of directories + /// throws even though there are no access permission errors. + /// + /// This test confirms that we recover from such errors. + /// + [Test] + public void TestDoesNotFailDueToUnauthorizedAccessExceptionOnDirectoryCreation() + { + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); - const int TaskCount = 20; + const int TaskCount = 20; - using var barrier = new Barrier(TaskCount); - using var cancelationTokenSource = new CancellationTokenSource(); + using var barrier = new Barrier(TaskCount); + using var cancelationTokenSource = new CancellationTokenSource(); - var tasks = Enumerable.Range(0, TaskCount) - .Select(task => Task.Factory.StartNew(() => + var tasks = Enumerable.Range(0, TaskCount) + .Select(task => Task.Factory.StartNew(() => + { + for (var i = 0; i < 1000; ++i) { - for (var i = 0; i < 1000; ++i) - { - // line up all the threads - try { barrier.SignalAndWait(cancelationTokenSource.Token); } - catch when (cancelationTokenSource.Token.IsCancellationRequested) { return; } + // line up all the threads + try { barrier.SignalAndWait(cancelationTokenSource.Token); } + catch when (cancelationTokenSource.Token.IsCancellationRequested) { return; } - // have one thread clear the directory - if (task == 0 && Directory.Exists(LockFileDirectory)) { Directory.Delete(LockFileDirectory, recursive: true); } + // have one thread clear the directory + if (task == 0 && Directory.Exists(LockFileDirectory)) { Directory.Delete(LockFileDirectory, recursive: true); } - // line up all the threads - if (!barrier.SignalAndWait(TimeSpan.FromSeconds(3))) { throw new TimeoutException("should never get here"); } + // line up all the threads + if (!barrier.SignalAndWait(TimeSpan.FromSeconds(3))) { throw new TimeoutException("should never get here"); } - // have half the threads just create and delete the directory, catching any errors - if (task % 2 == 0) + // have half the threads just create and delete the directory, catching any errors + if (task % 2 == 0) + { + try { - try - { - Directory.CreateDirectory(LockFileDirectory); - Directory.Delete(LockFileDirectory); - } - catch { } + Directory.CreateDirectory(LockFileDirectory); + Directory.Delete(LockFileDirectory); } - // the other half will attempt to acquire the lock - else + catch { } + } + // the other half will attempt to acquire the lock + else + { + try { @lock.TryAcquire()?.Dispose(); } + catch { - try { @lock.TryAcquire()?.Dispose(); } - catch - { - cancelationTokenSource.Cancel(); // exception found: exit - throw; - } + cancelationTokenSource.Cancel(); // exception found: exit + throw; } } - }, TaskCreationOptions.LongRunning)) - .ToArray(); + } + }, TaskCreationOptions.LongRunning)) + .ToArray(); - Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); - } + Assert.DoesNotThrowAsync(() => Task.WhenAll(tasks)); + } - /// - /// Documents a limitation we've imposed for now to keep the code simpler - /// - [Test] - public void TestLockingReadOnlyFileIsNotSupportedOnWindows() - { - // File.SetAttributes is failing on Ubuntu with FileNotFoundException even though File.Exists - // returns true. Likely some platform compat issue with that method - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { return; } + /// + /// Documents a limitation we've imposed for now to keep the code simpler + /// + [Test] + public void TestLockingReadOnlyFileIsNotSupportedOnWindows() + { + // File.SetAttributes is failing on Ubuntu with FileNotFoundException even though File.Exists + // returns true. Likely some platform compat issue with that method + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { return; } - Directory.CreateDirectory(LockFileDirectory); - var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); - File.Create(@lock.Name).Dispose(); + Directory.CreateDirectory(LockFileDirectory); + var @lock = new FileDistributedLock(LockFileDirectoryInfo, Guid.NewGuid().ToString()); + File.Create(@lock.Name).Dispose(); - try - { - File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); + try + { + File.SetAttributes(@lock.Name, FileAttributes.ReadOnly); - Assert.Throws(() => @lock.TryAcquire()?.Dispose()); - } - finally - { - File.SetAttributes(@lock.Name, FileAttributes.Normal); - } + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); } - - private static void AssertCanUseName(string name, DirectoryInfo? directory = null) + finally { - var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); - IDistributedSynchronizationHandle? handle = null; - Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); - Assert.IsNotNull(handle, name); - handle!.Dispose(); + File.SetAttributes(@lock.Name, FileAttributes.Normal); } + } - private static bool CanCreateFileWithName(string name) + private static void AssertCanUseName(string name, DirectoryInfo? directory = null) + { + var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); + IDistributedSynchronizationHandle? handle = null; + Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); + Assert.IsNotNull(handle, name); + handle!.Dispose(); + } + + private static bool CanCreateFileWithName(string name) + { + try { - try - { - var path = Path.Combine(LockFileDirectory, name); - File.OpenWrite(path).Dispose(); - File.Delete(path); - return true; - } - catch - { - return false; - } + var path = Path.Combine(LockFileDirectory, name); + File.OpenWrite(path).Dispose(); + File.Delete(path); + return true; + } + catch + { + return false; } } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs index 6cec4b18..923be383 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -5,32 +5,31 @@ using System.IO; using System.Text; -namespace Medallion.Threading.Tests.FileSystem +namespace Medallion.Threading.Tests.FileSystem; + +public class FileDistributedLockWindowsTest { - public class FileDistributedLockWindowsTest + /// + /// Example of where always ignoring during file creation + /// would be problematic. + /// + [Test] + public void TestThrowsUnauthorizedAccessExceptionInCaseOfFilePermissionViolation() { - /// - /// Example of where always ignoring during file creation - /// would be problematic. - /// - [Test] - public void TestThrowsUnauthorizedAccessExceptionInCaseOfFilePermissionViolation() - { - var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows"), Guid.NewGuid().ToString()); - Assert.Throws(() => @lock.TryAcquire()?.Dispose()); - } + var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows"), Guid.NewGuid().ToString()); + Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + } - /// - /// Example of where always ignoring during directory creation - /// would be problematic. - /// - [Test] - public void TestThrowsUnauthorizedAccessExceptionInCaseOfDirectoryPermissionViolation() - { - var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows\MedallionDistributedLock"), Guid.NewGuid().ToString()); - var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose()); - Assert.IsInstanceOf(exception.InnerException); - Assert.IsFalse(Directory.Exists(Path.GetDirectoryName(@lock.Name))); - } + /// + /// Example of where always ignoring during directory creation + /// would be problematic. + /// + [Test] + public void TestThrowsUnauthorizedAccessExceptionInCaseOfDirectoryPermissionViolation() + { + var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows\MedallionDistributedLock"), Guid.NewGuid().ToString()); + var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + Assert.IsInstanceOf(exception.InnerException); + Assert.IsFalse(Directory.Exists(Path.GetDirectoryName(@lock.Name))); } } diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs index ca2252ad..a78e618a 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs @@ -6,37 +6,36 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.FileSystem +namespace Medallion.Threading.Tests.FileSystem; + +public class FileDistributedSynchronizationProviderTest { - public class FileDistributedSynchronizationProviderTest - { - private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedSynchronizationProviderTest), TargetFramework.Current); - private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); + private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedSynchronizationProviderTest), TargetFramework.Current); + private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); - [OneTimeSetUp] - public void OneTimeSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() + { + if (Directory.Exists(LockFileDirectory)) { - if (Directory.Exists(LockFileDirectory)) - { - Directory.Delete(LockFileDirectory, recursive: true); - } + Directory.Delete(LockFileDirectory, recursive: true); } + } - [Test] - public void TestArgumentValidation() - { - Assert.Throws(() => new FileDistributedSynchronizationProvider(null!)); - } + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new FileDistributedSynchronizationProvider(null!)); + } - [Test] - public async Task BasicTest() + [Test] + public async Task BasicTest() + { + var provider = new FileDistributedSynchronizationProvider(LockFileDirectoryInfo); + await using (await provider.AcquireLockAsync("ProviderBasicTest")) { - var provider = new FileDistributedSynchronizationProvider(LockFileDirectoryInfo); - await using (await provider.AcquireLockAsync("ProviderBasicTest")) - { - await using var handle = await provider.TryAcquireLockAsync("ProviderBasicTest"); - Assert.IsNull(handle); - } + await using var handle = await provider.TryAcquireLockAsync("ProviderBasicTest"); + Assert.IsNull(handle); } } } diff --git a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs index ea428d44..957f0c11 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs @@ -4,26 +4,25 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.MySql +namespace Medallion.Threading.Tests.MySql; + +[Category("CI")] +public class MySqlConnectionOptionsBuilderTest { - [Category("CI")] - public class MySqlConnectionOptionsBuilderTest + [Test] + public void TestValidatesArguments() { - [Test] - public void TestValidatesArguments() - { - var builder = new MySqlConnectionOptionsBuilder(); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); - } + var builder = new MySqlConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + } - [Test] - public void TestDefaults() - { - var options = MySqlConnectionOptionsBuilder.GetOptions(null); - options.keepaliveCadence.ShouldEqual(TimeSpan.FromHours(3.5)); - Assert.IsTrue(options.useMultiplexing); - options.ShouldEqual(MySqlConnectionOptionsBuilder.GetOptions(o => { })); - } + [Test] + public void TestDefaults() + { + var options = MySqlConnectionOptionsBuilder.GetOptions(null); + options.keepaliveCadence.ShouldEqual(TimeSpan.FromHours(3.5)); + Assert.IsTrue(options.useMultiplexing); + options.ShouldEqual(MySqlConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs index accde245..263b7689 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -8,70 +8,69 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.MySql +namespace Medallion.Threading.Tests.MySql; + +public class MySqlDistributedLockTest { - public class MySqlDistributedLockTest - { - private static readonly string ConnectionString = new TestingMySqlDb().ConnectionStringBuilder.ConnectionString; + private static readonly string ConnectionString = new TestingMySqlDb().ConnectionStringBuilder.ConnectionString; - [Test] - public void TestValidatesConstructorArguments() - { - Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString)); - Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString, exactName: true)); - Assert.Catch(() => new MySqlDistributedLock("a", default(string)!)); - Assert.Catch(() => new MySqlDistributedLock("a", default(IDbTransaction)!)); - Assert.Catch(() => new MySqlDistributedLock("a", default(IDbConnection)!)); - Assert.Catch(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength + 1), ConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength), ConnectionString, exactName: true)); - } + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString)); + Assert.Catch(() => new MySqlDistributedLock(null!, ConnectionString, exactName: true)); + Assert.Catch(() => new MySqlDistributedLock("a", default(string)!)); + Assert.Catch(() => new MySqlDistributedLock("a", default(IDbTransaction)!)); + Assert.Catch(() => new MySqlDistributedLock("a", default(IDbConnection)!)); + Assert.Catch(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength + 1), ConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new MySqlDistributedLock(new string('a', MySqlDistributedLock.MaxNameLength), ConnectionString, exactName: true)); + } - [Test] - public void TestGetSafeLockNameCompat() - { - GetSafeName(string.Empty).ShouldEqual("__empty__p6ad62yppho33ytkibum5wbqhqvbcsxa"); - GetSafeName("abc").ShouldEqual("abc"); - GetSafeName("ABC").ShouldEqual("abczj4qr6tvn4a3kmgq4bukhowqyfrlxsb3"); - GetSafeName("\\").ShouldEqual("\\"); - GetSafeName(new string('a', MySqlDistributedLock.MaxNameLength)).ShouldEqual(new string('a', MySqlDistributedLock.MaxNameLength)); - GetSafeName(new string('\\', MySqlDistributedLock.MaxNameLength)).ShouldEqual(@"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"); - GetSafeName(new string('x', MySqlDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgkd2zq6c6ey6mhs45clqg7vij6ycgo43"); + [Test] + public void TestGetSafeLockNameCompat() + { + GetSafeName(string.Empty).ShouldEqual("__empty__p6ad62yppho33ytkibum5wbqhqvbcsxa"); + GetSafeName("abc").ShouldEqual("abc"); + GetSafeName("ABC").ShouldEqual("abczj4qr6tvn4a3kmgq4bukhowqyfrlxsb3"); + GetSafeName("\\").ShouldEqual("\\"); + GetSafeName(new string('a', MySqlDistributedLock.MaxNameLength)).ShouldEqual(new string('a', MySqlDistributedLock.MaxNameLength)); + GetSafeName(new string('\\', MySqlDistributedLock.MaxNameLength)).ShouldEqual(@"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"); + GetSafeName(new string('x', MySqlDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxgkd2zq6c6ey6mhs45clqg7vij6ycgo43"); - static string GetSafeName(string name) => new MySqlDistributedLock(name, ConnectionString).Name; - } + static string GetSafeName(string name) => new MySqlDistributedLock(name, ConnectionString).Name; + } - /// - /// This test justifies why we have constructors for MySQL locks that take in a . - /// Otherwise, you can't have a lock use the same connection as a transaction you're working on. Compare to - /// - /// - [TestCase(typeof(TestingMySqlDb))] - [TestCase(typeof(TestingMariaDbDb))] - public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type testingDbType) - { - var db = (TestingDb)Activator.CreateInstance(testingDbType)!; + /// + /// This test justifies why we have constructors for MySQL locks that take in a . + /// Otherwise, you can't have a lock use the same connection as a transaction you're working on. Compare to + /// + /// + [TestCase(typeof(TestingMySqlDb))] + [TestCase(typeof(TestingMariaDbDb))] + public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type testingDbType) + { + var db = (TestingDb)Activator.CreateInstance(testingDbType)!; - using var connection = new MySqlConnection(db.ConnectionStringBuilder.ConnectionString); - await connection.OpenAsync(); + using var connection = new MySqlConnection(db.ConnectionStringBuilder.ConnectionString); + await connection.OpenAsync(); - using var createTableCommand = connection.CreateCommand(); - createTableCommand.CommandText = "CREATE TEMPORARY TABLE world.temp (id INT)"; - await createTableCommand.ExecuteNonQueryAsync(); + using var createTableCommand = connection.CreateCommand(); + createTableCommand.CommandText = "CREATE TEMPORARY TABLE world.temp (id INT)"; + await createTableCommand.ExecuteNonQueryAsync(); - using var transaction = connection.BeginTransaction(); + using var transaction = connection.BeginTransaction(); - using var commandInTransaction = connection.CreateCommand(); - commandInTransaction.Transaction = transaction; - commandInTransaction.CommandText = @"INSERT INTO world.temp (id) VALUES (1), (2)"; - await commandInTransaction.ExecuteNonQueryAsync(); + using var commandInTransaction = connection.CreateCommand(); + commandInTransaction.Transaction = transaction; + commandInTransaction.CommandText = @"INSERT INTO world.temp (id) VALUES (1), (2)"; + await commandInTransaction.ExecuteNonQueryAsync(); - using var commandOutsideTransaction = connection.CreateCommand(); - commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; - var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); - Assert.That(exception.Message, Does.Contain("The transaction associated with this command is not the connection's active transaction")); + using var commandOutsideTransaction = connection.CreateCommand(); + commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); + Assert.That(exception.Message, Does.Contain("The transaction associated with this command is not the connection's active transaction")); - commandInTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(2); - } + commandInTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(2); } } diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs index c8e76074..f099b878 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs @@ -6,31 +6,30 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.MySql +namespace Medallion.Threading.Tests.MySql; + +public class MySqlDistributedSynchronizationProviderTest { - public class MySqlDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() - { - Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(string)!)); - Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbConnection)!)); - Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbTransaction)!)); - } + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbConnection)!)); + Assert.Throws(() => new MySqlDistributedSynchronizationProvider(default(IDbTransaction)!)); + } - [Test] - public async Task BasicTest() + [Test] + public async Task BasicTest() + { + foreach (var db in new[] { new TestingMySqlDb(), new TestingMariaDbDb() }) { - foreach (var db in new[] { new TestingMySqlDb(), new TestingMariaDbDb() }) - { - var provider = new MySqlDistributedSynchronizationProvider(db.ConnectionString); + var provider = new MySqlDistributedSynchronizationProvider(db.ConnectionString); - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle, db.GetType().Name); - } + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle, db.GetType().Name); } } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs index b7039f1f..46a2b0cf 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs @@ -5,28 +5,27 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +public class OracleBehaviorTest { - public class OracleBehaviorTest + [Test] + public async Task BasicConnectivityTest() { - [Test] - public async Task BasicConnectivityTest() - { - using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); - await connection.OpenAsync(); - using var command = connection.CreateCommand(); - command.CommandText = "SELECT 10 FROM DUAL"; - (await command.ExecuteScalarAsync()).ShouldEqual(10); - } + using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + await connection.OpenAsync(); + using var command = connection.CreateCommand(); + command.CommandText = "SELECT 10 FROM DUAL"; + (await command.ExecuteScalarAsync()).ShouldEqual(10); + } - [Test] - public async Task TestCommandImplicitlyParticipatesInTransaction() - { - using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); - await connection.OpenAsync(); - using var transaction = connection.BeginTransaction(); - using var command = connection.CreateCommand(); - command.Transaction.ShouldEqual(transaction); - } + [Test] + public async Task TestCommandImplicitlyParticipatesInTransaction() + { + using var connection = new OracleConnection(OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)); + await connection.OpenAsync(); + using var transaction = connection.BeginTransaction(); + using var command = connection.CreateCommand(); + command.Transaction.ShouldEqual(transaction); } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs index 806e79a9..a13ebc38 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs @@ -5,26 +5,25 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +[Category("CI")] +public class OracleConnectionOptionsBuilderTest { - [Category("CI")] - public class OracleConnectionOptionsBuilderTest + [Test] + public void TestValidatesArguments() { - [Test] - public void TestValidatesArguments() - { - var builder = new OracleConnectionOptionsBuilder(); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); - } + var builder = new OracleConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + } - [Test] - public void TestDefaults() - { - var options = OracleConnectionOptionsBuilder.GetOptions(null); - options.keepaliveCadence.ShouldEqual(Timeout.InfiniteTimeSpan); - Assert.IsTrue(options.useMultiplexing); - options.ShouldEqual(OracleConnectionOptionsBuilder.GetOptions(o => { })); - } + [Test] + public void TestDefaults() + { + var options = OracleConnectionOptionsBuilder.GetOptions(null); + options.keepaliveCadence.ShouldEqual(Timeout.InfiniteTimeSpan); + Assert.IsTrue(options.useMultiplexing); + options.ShouldEqual(OracleConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs index 9fb988cd..6d488352 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs @@ -5,33 +5,32 @@ using System.Data; using System.Text; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +public class OracleDistributedLockTest { - public class OracleDistributedLockTest + [Test] + public void TestValidatesConstructorArguments() { - [Test] - public void TestValidatesConstructorArguments() - { - Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString)); - Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); - Assert.Catch(() => new OracleDistributedLock("a", default(string)!)); - Assert.Catch(() => new OracleDistributedLock("a", default(IDbConnection)!)); - Assert.Catch(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); - } + Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString)); + Assert.Catch(() => new OracleDistributedLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new OracleDistributedLock("a", default(string)!)); + Assert.Catch(() => new OracleDistributedLock("a", default(IDbConnection)!)); + Assert.Catch(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new OracleDistributedLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); + } - [Test] - public void TestGetSafeLockNameCompat() - { - GetSafeName(string.Empty).ShouldEqual("EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); - GetSafeName("abc").ShouldEqual("abc"); - GetSafeName("ABC").ShouldEqual("ABC"); - GetSafeName("\\").ShouldEqual("\\"); - GetSafeName(new string('a', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('a', OracleDistributedLock.MaxNameLength)); - GetSafeName(new string('\\', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('\\', OracleDistributedLock.MaxNameLength)); - GetSafeName(new string('x', OracleDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGQFUg+qZ+nRyj9exOtumtynPpKt8OIVz76JkHSrwV38k3VGsuu7EGnoR0Q9sTmijuQ57I0jGeEhqQ2XJ2RAc3Q=="); + [Test] + public void TestGetSafeLockNameCompat() + { + GetSafeName(string.Empty).ShouldEqual("EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + GetSafeName("abc").ShouldEqual("abc"); + GetSafeName("ABC").ShouldEqual("ABC"); + GetSafeName("\\").ShouldEqual("\\"); + GetSafeName(new string('a', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('a', OracleDistributedLock.MaxNameLength)); + GetSafeName(new string('\\', OracleDistributedLock.MaxNameLength)).ShouldEqual(new string('\\', OracleDistributedLock.MaxNameLength)); + GetSafeName(new string('x', OracleDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGQFUg+qZ+nRyj9exOtumtynPpKt8OIVz76JkHSrwV38k3VGsuu7EGnoR0Q9sTmijuQ57I0jGeEhqQ2XJ2RAc3Q=="); - static string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; - } + static string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs index 77fc0d35..dc9fb0b0 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs @@ -5,40 +5,39 @@ using System.Data; using System.Text; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +public class OracleDistributedReaderWriterLockTest { - public class OracleDistributedReaderWriterLockTest + [Test] + public void TestValidatesConstructorArguments() { - [Test] - public void TestValidatesConstructorArguments() - { - Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString)); - Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); - Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(string)!)); - Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(IDbConnection)!)); - Assert.Catch(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); - } + Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString)); + Assert.Catch(() => new OracleDistributedReaderWriterLock(null!, TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(string)!)); + Assert.Catch(() => new OracleDistributedReaderWriterLock("a", default(IDbConnection)!)); + Assert.Catch(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength + 1), TestingOracleDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new OracleDistributedReaderWriterLock(new string('a', OracleDistributedLock.MaxNameLength), TestingOracleDb.DefaultConnectionString, exactName: true)); + } - [Test] - public void TestGetSafeLockNameCompat() + [Test] + public void TestGetSafeLockNameCompat() + { + var cases = new[] { - var cases = new[] - { - string.Empty, - "abc", - "\\", - new string('a', OracleDistributedLock.MaxNameLength), - new string('\\', OracleDistributedLock.MaxNameLength), - new string('x', OracleDistributedLock.MaxNameLength + 1) - }; + string.Empty, + "abc", + "\\", + new string('a', OracleDistributedLock.MaxNameLength), + new string('\\', OracleDistributedLock.MaxNameLength), + new string('x', OracleDistributedLock.MaxNameLength + 1) + }; - foreach (var lockName in cases) - { - // should be compatible with OracleDistributedLock - new OracleDistributedReaderWriterLock(lockName, TestingOracleDb.DefaultConnectionString).Name - .ShouldEqual(new OracleDistributedLock(lockName, TestingOracleDb.DefaultConnectionString).Name); - } + foreach (var lockName in cases) + { + // should be compatible with OracleDistributedLock + new OracleDistributedReaderWriterLock(lockName, TestingOracleDb.DefaultConnectionString).Name + .ShouldEqual(new OracleDistributedLock(lockName, TestingOracleDb.DefaultConnectionString).Name); } } } diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs index 49e8b376..6aa5b59a 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs @@ -6,44 +6,43 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Oracle +namespace Medallion.Threading.Tests.Oracle; + +public class OracleDistributedSynchronizationProviderTest { - public class OracleDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(IDbConnection)!)); + } + + [Test] + public async Task BasicTest() { - [Test] - public void TestArgumentValidation() + var provider = new OracleDistributedSynchronizationProvider(TestingOracleDb.DefaultConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + + await using (await provider.AcquireLockAsync(LockName)) { - Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(string)!)); - Assert.Throws(() => new OracleDistributedSynchronizationProvider(default(IDbConnection)!)); + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); } - [Test] - public async Task BasicTest() + await using (await provider.AcquireReadLockAsync(LockName)) { - var provider = new OracleDistributedSynchronizationProvider(TestingOracleDb.DefaultConnectionString); + await using var readHandle = await provider.TryAcquireReadLockAsync(LockName); + Assert.IsNotNull(readHandle); - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - - await using (await provider.AcquireLockAsync(LockName)) + await using (var upgradeHandle = await provider.TryAcquireUpgradeableReadLockAsync(LockName)) { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.IsNotNull(upgradeHandle); + Assert.IsFalse(await upgradeHandle!.TryUpgradeToWriteLockAsync()); } - await using (await provider.AcquireReadLockAsync(LockName)) - { - await using var readHandle = await provider.TryAcquireReadLockAsync(LockName); - Assert.IsNotNull(readHandle); - - await using (var upgradeHandle = await provider.TryAcquireUpgradeableReadLockAsync(LockName)) - { - Assert.IsNotNull(upgradeHandle); - Assert.IsFalse(await upgradeHandle!.TryUpgradeToWriteLockAsync()); - } - - await using var writeHandle = await provider.TryAcquireWriteLockAsync(LockName); - Assert.IsNull(writeHandle); - } + await using var writeHandle = await provider.TryAcquireWriteLockAsync(LockName); + Assert.IsNull(writeHandle); } } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs index 386fa050..8c9470ac 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs @@ -4,150 +4,149 @@ using System.Collections.Generic; using System.Linq; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public class PostgresAdvisoryLockKeyTest { - public class PostgresAdvisoryLockKeyTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() - { - Assert.Throws(() => new PostgresAdvisoryLockKey(null!)); - Assert.Throws(() => new PostgresAdvisoryLockKey(new string('A', PostgresAdvisoryLockKey.MaxAsciiLength + 1))); - Assert.Throws(() => new PostgresAdvisoryLockKey("漢字")); - } + Assert.Throws(() => new PostgresAdvisoryLockKey(null!)); + Assert.Throws(() => new PostgresAdvisoryLockKey(new string('A', PostgresAdvisoryLockKey.MaxAsciiLength + 1))); + Assert.Throws(() => new PostgresAdvisoryLockKey("漢字")); + } - [Test] - public void TestDefault() - { - Assert.AreEqual(new string('0', 16), default(PostgresAdvisoryLockKey).ToString()); - Assert.IsTrue(default(PostgresAdvisoryLockKey).HasSingleKey); - Assert.AreEqual(0, default(PostgresAdvisoryLockKey).Key); - AssertEquality(new PostgresAdvisoryLockKey(0), default); - } + [Test] + public void TestDefault() + { + Assert.AreEqual(new string('0', 16), default(PostgresAdvisoryLockKey).ToString()); + Assert.IsTrue(default(PostgresAdvisoryLockKey).HasSingleKey); + Assert.AreEqual(0, default(PostgresAdvisoryLockKey).Key); + AssertEquality(new PostgresAdvisoryLockKey(0), default); + } - [Test] - public void TestAscii() - { - var emptyKey = AssertRoundTrips(string.Empty); - Assert.IsFalse(emptyKey.HasSingleKey); + [Test] + public void TestAscii() + { + var emptyKey = AssertRoundTrips(string.Empty); + Assert.IsFalse(emptyKey.HasSingleKey); - var keys = new HashSet<(int, int)> { emptyKey.Keys }; - for (var i = (char)1; i < 128; ++i) + var keys = new HashSet<(int, int)> { emptyKey.Keys }; + for (var i = (char)1; i < 128; ++i) + { + for (var j = 1; j <= PostgresAdvisoryLockKey.MaxAsciiLength; ++j) { - for (var j = 1; j <= PostgresAdvisoryLockKey.MaxAsciiLength; ++j) - { - var key = AssertRoundTrips(new string(i, j)); - Assert.IsFalse(key.HasSingleKey); - Assert.IsTrue(keys.Add(key.Keys)); - } + var key = AssertRoundTrips(new string(i, j)); + Assert.IsFalse(key.HasSingleKey); + Assert.IsTrue(keys.Add(key.Keys)); } } + } - [Test] - public void TestInt64Construction() - { - var key = new PostgresAdvisoryLockKey(1); - Assert.IsTrue(key.HasSingleKey); - Assert.AreEqual(1L, key.Key); - Assert.AreEqual("0000000000000001", key.ToString()); - AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); - } - - [Test] - public void TestInt32PairConstruction() - { - var key = new PostgresAdvisoryLockKey(3, -1); - Assert.IsFalse(key.HasSingleKey); - Assert.AreEqual((3, -1), key.Keys); - Assert.AreEqual("00000003,ffffffff", key.ToString()); - AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); - } + [Test] + public void TestInt64Construction() + { + var key = new PostgresAdvisoryLockKey(1); + Assert.IsTrue(key.HasSingleKey); + Assert.AreEqual(1L, key.Key); + Assert.AreEqual("0000000000000001", key.ToString()); + AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); + } - [Test] - public void TestNameHashing() - { - var key = new PostgresAdvisoryLockKey(new string('漢', 2 * PostgresAdvisoryLockKey.MaxAsciiLength), allowHashing: true); - Assert.IsTrue(key.HasSingleKey); - Assert.AreEqual(-5707277204051710361, key.Key); - AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); - } + [Test] + public void TestInt32PairConstruction() + { + var key = new PostgresAdvisoryLockKey(3, -1); + Assert.IsFalse(key.HasSingleKey); + Assert.AreEqual((3, -1), key.Keys); + Assert.AreEqual("00000003,ffffffff", key.ToString()); + AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); + } - [Test] - public void TestEquality() - { - AssertEquality(new PostgresAdvisoryLockKey(long.MinValue), new PostgresAdvisoryLockKey(long.MinValue)); - AssertInequality(new PostgresAdvisoryLockKey(long.MinValue), new PostgresAdvisoryLockKey(long.MinValue + 1)); + [Test] + public void TestNameHashing() + { + var key = new PostgresAdvisoryLockKey(new string('漢', 2 * PostgresAdvisoryLockKey.MaxAsciiLength), allowHashing: true); + Assert.IsTrue(key.HasSingleKey); + Assert.AreEqual(-5707277204051710361, key.Key); + AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); + } - AssertEquality(new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue), new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue)); - AssertInequality(new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue), new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue - 1)); + [Test] + public void TestEquality() + { + AssertEquality(new PostgresAdvisoryLockKey(long.MinValue), new PostgresAdvisoryLockKey(long.MinValue)); + AssertInequality(new PostgresAdvisoryLockKey(long.MinValue), new PostgresAdvisoryLockKey(long.MinValue + 1)); - AssertEquality(new PostgresAdvisoryLockKey("base38"), new PostgresAdvisoryLockKey("base38")); - AssertInequality(new PostgresAdvisoryLockKey("base38"), new PostgresAdvisoryLockKey("base37")); + AssertEquality(new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue), new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue)); + AssertInequality(new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue), new PostgresAdvisoryLockKey(int.MinValue, int.MaxValue - 1)); - AssertEquality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCII")); - AssertInequality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCIi")); + AssertEquality(new PostgresAdvisoryLockKey("base38"), new PostgresAdvisoryLockKey("base38")); + AssertInequality(new PostgresAdvisoryLockKey("base38"), new PostgresAdvisoryLockKey("base37")); - AssertInequality(new PostgresAdvisoryLockKey(string.Empty), new PostgresAdvisoryLockKey("\0")); - AssertInequality(new PostgresAdvisoryLockKey("\0"), new PostgresAdvisoryLockKey("a")); + AssertEquality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCII")); + AssertInequality(new PostgresAdvisoryLockKey("ASCII"), new PostgresAdvisoryLockKey("ASCIi")); - AssertEquality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("some very long name", allowHashing: true)); - AssertInequality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("same very long name", allowHashing: true)); + AssertInequality(new PostgresAdvisoryLockKey(string.Empty), new PostgresAdvisoryLockKey("\0")); + AssertInequality(new PostgresAdvisoryLockKey("\0"), new PostgresAdvisoryLockKey("a")); - var names = new[] { "base38", "base37", "ASCII", "ASCIi", "some very long name", "same very long name" }; - foreach (var name1 in names) - foreach (var name2 in names.Where(n => n != name1)) - { - AssertInequality(new PostgresAdvisoryLockKey(name1, allowHashing: true), new PostgresAdvisoryLockKey(name2, allowHashing: true)); - } + AssertEquality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("some very long name", allowHashing: true)); + AssertInequality(new PostgresAdvisoryLockKey("some very long name", allowHashing: true), new PostgresAdvisoryLockKey("same very long name", allowHashing: true)); - AssertEquality(new PostgresAdvisoryLockKey(new string('0', 16)), new PostgresAdvisoryLockKey(0)); - AssertEquality(new PostgresAdvisoryLockKey("00000000,00000000"), new PostgresAdvisoryLockKey(0, 0)); - AssertEquality(new PostgresAdvisoryLockKey(new string('\0', PostgresAdvisoryLockKey.MaxAsciiLength)), new PostgresAdvisoryLockKey(0, 0)); - AssertInequality(new PostgresAdvisoryLockKey(0), new PostgresAdvisoryLockKey(0, 0)); + var names = new[] { "base38", "base37", "ASCII", "ASCIi", "some very long name", "same very long name" }; + foreach (var name1 in names) + foreach (var name2 in names.Where(n => n != name1)) + { + AssertInequality(new PostgresAdvisoryLockKey(name1, allowHashing: true), new PostgresAdvisoryLockKey(name2, allowHashing: true)); } - private static void AssertInequality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) + AssertEquality(new PostgresAdvisoryLockKey(new string('0', 16)), new PostgresAdvisoryLockKey(0)); + AssertEquality(new PostgresAdvisoryLockKey("00000000,00000000"), new PostgresAdvisoryLockKey(0, 0)); + AssertEquality(new PostgresAdvisoryLockKey(new string('\0', PostgresAdvisoryLockKey.MaxAsciiLength)), new PostgresAdvisoryLockKey(0, 0)); + AssertInequality(new PostgresAdvisoryLockKey(0), new PostgresAdvisoryLockKey(0, 0)); + } + + private static void AssertInequality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) + { + Assert.AreNotEqual(a, b); + Assert.IsFalse(a == b); + Assert.IsTrue(a != b); + Assert.AreNotEqual(a.GetHashCode(), b.GetHashCode()); + if (a.HasSingleKey && b.HasSingleKey) { - Assert.AreNotEqual(a, b); - Assert.IsFalse(a == b); - Assert.IsTrue(a != b); - Assert.AreNotEqual(a.GetHashCode(), b.GetHashCode()); - if (a.HasSingleKey && b.HasSingleKey) - { - Assert.AreNotEqual(a.Key, b.Key); - } - else if (!a.HasSingleKey && !b.HasSingleKey) - { - Assert.AreNotEqual(a.Keys, b.Keys); - } + Assert.AreNotEqual(a.Key, b.Key); } - - private static void AssertEquality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) + else if (!a.HasSingleKey && !b.HasSingleKey) { - Assert.AreEqual(a, b); - Assert.IsTrue(a == b); - Assert.IsFalse(a != b); - Assert.AreEqual(a.GetHashCode(), b.GetHashCode()); - if (a.HasSingleKey) - { - Assert.AreEqual(a.Key, b.Key); - } - else - { - Assert.AreEqual(a.Keys, b.Keys); - } + Assert.AreNotEqual(a.Keys, b.Keys); } + } - private static PostgresAdvisoryLockKey AssertRoundTrips(string name) + private static void AssertEquality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) + { + Assert.AreEqual(a, b); + Assert.IsTrue(a == b); + Assert.IsFalse(a != b); + Assert.AreEqual(a.GetHashCode(), b.GetHashCode()); + if (a.HasSingleKey) + { + Assert.AreEqual(a.Key, b.Key); + } + else { - var key1 = new PostgresAdvisoryLockKey(name); - var key2 = new PostgresAdvisoryLockKey(key1.ToString()); - var key3 = new PostgresAdvisoryLockKey(name, allowHashing: true); - AssertEquality(key1, key2); - AssertEquality(key1, key3); - Assert.AreEqual(key1.ToString(), key2.ToString()); - Assert.AreEqual(key1.ToString(), key3.ToString()); - return key1; + Assert.AreEqual(a.Keys, b.Keys); } } + + private static PostgresAdvisoryLockKey AssertRoundTrips(string name) + { + var key1 = new PostgresAdvisoryLockKey(name); + var key2 = new PostgresAdvisoryLockKey(key1.ToString()); + var key3 = new PostgresAdvisoryLockKey(name, allowHashing: true); + AssertEquality(key1, key2); + AssertEquality(key1, key3); + Assert.AreEqual(key1.ToString(), key2.ToString()); + Assert.AreEqual(key1.ToString(), key3.ToString()); + return key1; + } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index eb8f8b07..afba2917 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -7,170 +7,169 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +/// +/// This class contains tests which demonstrate specific Postgres/Npgsql behaviors which our implementations +/// rely on or account for. These should be tested through the normal set of test cases, but having this here +/// is convenient as a demonstration / documentation +/// +public class PostgresBehaviorTest { /// - /// This class contains tests which demonstrate specific Postgres/Npgsql behaviors which our implementations - /// rely on or account for. These should be tested through the normal set of test cases, but having this here - /// is convenient as a demonstration / documentation + /// This test justifies why we do not need to have Postgres locks that take in a . + /// Compare this behavior to /// - public class PostgresBehaviorTest + [Test] + public async Task TestPostgresCommandAutomaticallyParticipatesInTransaction() { - /// - /// This test justifies why we do not need to have Postgres locks that take in a . - /// Compare this behavior to - /// - [Test] - public async Task TestPostgresCommandAutomaticallyParticipatesInTransaction() - { - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); - using var transaction = + using var transaction = #if NETCOREAPP3_1 - await connection.BeginTransactionAsync(); + await connection.BeginTransactionAsync(); #elif NET471 - connection.BeginTransaction(); + connection.BeginTransaction(); #endif - using var commandInTransaction = connection.CreateCommand(); - commandInTransaction.Transaction = transaction; - commandInTransaction.CommandText = @"SHOW statement_timeout; CREATE TABLE foo (id INT); SET LOCAL statement_timeout = 2020;"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual("0"); + using var commandInTransaction = connection.CreateCommand(); + commandInTransaction.Transaction = transaction; + commandInTransaction.CommandText = @"SHOW statement_timeout; CREATE TABLE foo (id INT); SET LOCAL statement_timeout = 2020;"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual("0"); - using var commandOutsideTransaction = connection.CreateCommand(); - Assert.IsNull(commandOutsideTransaction.Transaction); - commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM foo"; - (await commandOutsideTransaction.ExecuteScalarAsync()).ShouldEqual(0); + using var commandOutsideTransaction = connection.CreateCommand(); + Assert.IsNull(commandOutsideTransaction.Transaction); + commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM foo"; + (await commandOutsideTransaction.ExecuteScalarAsync()).ShouldEqual(0); - commandOutsideTransaction.CommandText = "SHOW statement_timeout"; - (await commandOutsideTransaction.ExecuteScalarAsync()).ShouldEqual("2020ms"); + commandOutsideTransaction.CommandText = "SHOW statement_timeout"; + (await commandOutsideTransaction.ExecuteScalarAsync()).ShouldEqual("2020ms"); - commandInTransaction.CommandText = "SELECT COUNT(*) FROM foo"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(0); + commandInTransaction.CommandText = "SELECT COUNT(*) FROM foo"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(0); - commandInTransaction.CommandText = "SHOW statement_timeout"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual("2020ms"); - } + commandInTransaction.CommandText = "SHOW statement_timeout"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual("2020ms"); + } - [Test] - public Task TestTransactionCancellationRecovery() => - this.TestTransactionCancellationOrTimeoutRecovery(useTimeout: false); + [Test] + public Task TestTransactionCancellationRecovery() => + this.TestTransactionCancellationOrTimeoutRecovery(useTimeout: false); - [Test] - public Task TestTransactionTimeoutRecovery() => - this.TestTransactionCancellationOrTimeoutRecovery(useTimeout: true); + [Test] + public Task TestTransactionTimeoutRecovery() => + this.TestTransactionCancellationOrTimeoutRecovery(useTimeout: true); + + /// + /// Demonstrates how we can leverage save points to recover from otherwise destroyed transactions + /// + private async Task TestTransactionCancellationOrTimeoutRecovery(bool useTimeout) + { + Assert.ThrowsAsync(() => RunTransactionWithAbortAsync(useSavePoint: false)); + await RunTransactionWithAbortAsync(useSavePoint: true); - /// - /// Demonstrates how we can leverage save points to recover from otherwise destroyed transactions - /// - private async Task TestTransactionCancellationOrTimeoutRecovery(bool useTimeout) + async Task RunTransactionWithAbortAsync(bool useSavePoint) { - Assert.ThrowsAsync(() => RunTransactionWithAbortAsync(useSavePoint: false)); - await RunTransactionWithAbortAsync(useSavePoint: true); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); - async Task RunTransactionWithAbortAsync(bool useSavePoint) + using (connection.BeginTransaction()) { - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); + var command = connection.CreateCommand(); - using (connection.BeginTransaction()) + if (useSavePoint) { - var command = connection.CreateCommand(); - - if (useSavePoint) - { - command.CommandText = "SAVEPOINT cancellationRecovery"; - await command.ExecuteNonQueryAsync(); - } - - command.CommandText = "SELECT pg_sleep(10)"; - using var cancellationTokenSource = new CancellationTokenSource(); - if (useTimeout) { command.CommandText = "SET LOCAL statement_timeout = 100; " + command.CommandText; } - else { cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(.5)); } - - var exception = Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token)); - Assert.IsInstanceOf(useTimeout ? typeof(PostgresException) : typeof(OperationCanceledException), exception); - - if (useSavePoint) - { - command.CommandText = "ROLLBACK TO SAVEPOINT cancellationRecovery"; - await command.ExecuteNonQueryAsync(); - } - - command.CommandText = "SHOW statement_timeout"; - (await command.ExecuteScalarAsync()).ShouldEqual("0"); + command.CommandText = "SAVEPOINT cancellationRecovery"; + await command.ExecuteNonQueryAsync(); } + + command.CommandText = "SELECT pg_sleep(10)"; + using var cancellationTokenSource = new CancellationTokenSource(); + if (useTimeout) { command.CommandText = "SET LOCAL statement_timeout = 100; " + command.CommandText; } + else { cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(.5)); } + + var exception = Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token)); + Assert.IsInstanceOf(useTimeout ? typeof(PostgresException) : typeof(OperationCanceledException), exception); + + if (useSavePoint) + { + command.CommandText = "ROLLBACK TO SAVEPOINT cancellationRecovery"; + await command.ExecuteNonQueryAsync(); + } + + command.CommandText = "SHOW statement_timeout"; + (await command.ExecuteScalarAsync()).ShouldEqual("0"); } } + } - [Test] - public async Task TestCanDetectTransactionWithBeginTransactionException() - { - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); + [Test] + public async Task TestCanDetectTransactionWithBeginTransactionException() + { + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); - Assert.DoesNotThrow(() => connection.BeginTransaction().Dispose()); + Assert.DoesNotThrow(() => connection.BeginTransaction().Dispose()); - using var transaction = connection.BeginTransaction(); + using var transaction = connection.BeginTransaction(); - var ex = Assert.Throws(() => connection.BeginTransaction().Dispose()); - Assert.That(ex.Message, Does.Contain("A transaction is already in progress")); - } + var ex = Assert.Throws(() => connection.BeginTransaction().Dispose()); + Assert.That(ex.Message, Does.Contain("A transaction is already in progress")); + } - [Test] - public async Task TestDoesNotDetectConnectionBreakViaState() - { - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); + [Test] + public async Task TestDoesNotDetectConnectionBreakViaState() + { + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); - using var getPidCommand = connection.CreateCommand(); - getPidCommand.CommandText = "SELECT pg_backend_pid()"; - var pid = (int)(await getPidCommand.ExecuteScalarAsync()); + using var getPidCommand = connection.CreateCommand(); + getPidCommand.CommandText = "SELECT pg_backend_pid()"; + var pid = (int)(await getPidCommand.ExecuteScalarAsync()); - var stateChangedEvent = new ManualResetEventSlim(initialState: false); - connection.StateChange += (_, _2) => stateChangedEvent.Set(); + var stateChangedEvent = new ManualResetEventSlim(initialState: false); + connection.StateChange += (_, _2) => stateChangedEvent.Set(); - // kill the connection from the back end - using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await killingConnection.OpenAsync(); - using var killCommand = killingConnection.CreateCommand(); - killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; - await killCommand.ExecuteNonQueryAsync(); + // kill the connection from the back end + using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await killingConnection.OpenAsync(); + using var killCommand = killingConnection.CreateCommand(); + killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; + await killCommand.ExecuteNonQueryAsync(); - Assert.IsFalse(stateChangedEvent.Wait(TimeSpan.FromSeconds(.1))); + Assert.IsFalse(stateChangedEvent.Wait(TimeSpan.FromSeconds(.1))); - Assert.Throws(() => getPidCommand.ExecuteScalar()); - Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); - } + Assert.Throws(() => getPidCommand.ExecuteScalar()); + Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); + } - // Effective test for https://github.com/npgsql/npgsql/issues/3442, which broke monitoring - [Test] - public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() - { - using var stateChangedEvent = new ManualResetEventSlim(initialState: false); + // Effective test for https://github.com/npgsql/npgsql/issues/3442, which broke monitoring + [Test] + public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() + { + using var stateChangedEvent = new ManualResetEventSlim(initialState: false); - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); - connection.StateChange += (o, e) => stateChangedEvent.Set(); + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); + connection.StateChange += (o, e) => stateChangedEvent.Set(); - using var getPidCommand = connection.CreateCommand(); - getPidCommand.CommandText = "SELECT pg_backend_pid()"; - var pid = (int)(await getPidCommand.ExecuteScalarAsync()); + using var getPidCommand = connection.CreateCommand(); + getPidCommand.CommandText = "SELECT pg_backend_pid()"; + var pid = (int)(await getPidCommand.ExecuteScalarAsync()); - Assert.AreEqual(ConnectionState.Open, connection.State); + Assert.AreEqual(ConnectionState.Open, connection.State); - // kill the connection from the back end - using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await killingConnection.OpenAsync(); - using var killCommand = killingConnection.CreateCommand(); - killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; - await killCommand.ExecuteNonQueryAsync(); + // kill the connection from the back end + using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await killingConnection.OpenAsync(); + using var killCommand = killingConnection.CreateCommand(); + killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; + await killCommand.ExecuteNonQueryAsync(); - Assert.ThrowsAsync(() => getPidCommand.ExecuteScalarAsync()); - Assert.AreNotEqual(ConnectionState.Open, connection.State); + Assert.ThrowsAsync(() => getPidCommand.ExecuteScalarAsync()); + Assert.AreNotEqual(ConnectionState.Open, connection.State); - Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); - } + Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs index 1bd14602..decee184 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs @@ -4,26 +4,25 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +[Category("CI")] +public class PostgresConnectionOptionsBuilderTest { - [Category("CI")] - public class PostgresConnectionOptionsBuilderTest + [Test] + public void TestValidatesArguments() { - [Test] - public void TestValidatesArguments() - { - var builder = new PostgresConnectionOptionsBuilder(); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); - } + var builder = new PostgresConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + } - [Test] - public void TestDefaults() - { - var options = PostgresConnectionOptionsBuilder.GetOptions(null); - Assert.IsTrue(options.keepaliveCadence.IsInfinite); - Assert.IsTrue(options.useMultiplexing); - options.ShouldEqual(PostgresConnectionOptionsBuilder.GetOptions(o => { })); - } + [Test] + public void TestDefaults() + { + var options = PostgresConnectionOptionsBuilder.GetOptions(null); + Assert.IsTrue(options.keepaliveCadence.IsInfinite); + Assert.IsTrue(options.useMultiplexing); + options.ShouldEqual(PostgresConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index 1e0ad977..cd49a091 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -10,74 +10,73 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public class PostgresDistributedLockTest { - public class PostgresDistributedLockTest + [Test] + public void TestValidatesConstructorArguments() { - [Test] - public void TestValidatesConstructorArguments() - { - Assert.Throws(() => new PostgresDistributedLock(new(0), default(string)!)); - Assert.Throws(() => new PostgresDistributedLock(new(0), default(IDbConnection)!)); - } + Assert.Throws(() => new PostgresDistributedLock(new(0), default(string)!)); + Assert.Throws(() => new PostgresDistributedLock(new(0), default(IDbConnection)!)); + } - [Test] - public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() - { - var connectionString = TestingPostgresDb.DefaultConnectionString; - var key1 = new PostgresAdvisoryLockKey(0); - var key2 = new PostgresAdvisoryLockKey(0, 0); - var @lock1 = new PostgresDistributedLock(key1, connectionString); - var @lock2 = new PostgresDistributedLock(key2, connectionString); + [Test] + public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() + { + var connectionString = TestingPostgresDb.DefaultConnectionString; + var key1 = new PostgresAdvisoryLockKey(0); + var key2 = new PostgresAdvisoryLockKey(0, 0); + var @lock1 = new PostgresDistributedLock(key1, connectionString); + var @lock2 = new PostgresDistributedLock(key2, connectionString); - using var handle1 = await lock1.TryAcquireAsync(); - Assert.IsNotNull(handle1); + using var handle1 = await lock1.TryAcquireAsync(); + Assert.IsNotNull(handle1); - using var handle2 = await lock2.TryAcquireAsync(); - Assert.IsNotNull(handle2); - } + using var handle2 = await lock2.TryAcquireAsync(); + Assert.IsNotNull(handle2); + } - [Test] - public async Task TestWorksWithAmbientTransaction() - { - using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); - await connection.OpenAsync(); + [Test] + public async Task TestWorksWithAmbientTransaction() + { + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); - var connectionLock = new PostgresDistributedLock(new PostgresAdvisoryLockKey("AmbTrans"), connection); - var otherLock = new PostgresDistributedLock(connectionLock.Key, TestingPostgresDb.DefaultConnectionString); - using var otherLockHandle = await otherLock.AcquireAsync(); + var connectionLock = new PostgresDistributedLock(new PostgresAdvisoryLockKey("AmbTrans"), connection); + var otherLock = new PostgresDistributedLock(connectionLock.Key, TestingPostgresDb.DefaultConnectionString); + using var otherLockHandle = await otherLock.AcquireAsync(); - using (var transaction = connection.BeginTransaction()) - { - using var transactionCommand = connection.CreateCommand(); - transactionCommand.Transaction = transaction; + using (var transaction = connection.BeginTransaction()) + { + using var transactionCommand = connection.CreateCommand(); + transactionCommand.Transaction = transaction; - transactionCommand.CommandText = "SET LOCAL statement_timeout = 1010"; - await transactionCommand.ExecuteNonQueryAsync(); + transactionCommand.CommandText = "SET LOCAL statement_timeout = 1010"; + await transactionCommand.ExecuteNonQueryAsync(); - using (var timedOutHandle = await connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(.2))) - { - Assert.IsNull(timedOutHandle); - } + using (var timedOutHandle = await connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(.2))) + { + Assert.IsNull(timedOutHandle); + } - (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); - var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(.3)); - var task = connectionLock.AcquireAsync(cancellationToken: cancellationTokenSource.Token).AsTask(); - task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)).ShouldEqual(true); - task.Status.ShouldEqual(TaskStatus.Canceled); + var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(.3)); + var task = connectionLock.AcquireAsync(cancellationToken: cancellationTokenSource.Token).AsTask(); + task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)).ShouldEqual(true); + task.Status.ShouldEqual(TaskStatus.Canceled); - (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); - } + (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); + } - using var connectionCommand = connection.CreateCommand(); - (await GetTimeoutAsync(connectionCommand)).ShouldEqual("0"); + using var connectionCommand = connection.CreateCommand(); + (await GetTimeoutAsync(connectionCommand)).ShouldEqual("0"); - static Task GetTimeoutAsync(NpgsqlCommand command) - { - command.CommandText = "SHOW statement_timeout"; - return command.ExecuteScalarAsync(); - } + static Task GetTimeoutAsync(NpgsqlCommand command) + { + command.CommandText = "SHOW statement_timeout"; + return command.ExecuteScalarAsync(); } } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs index 821f4662..5ed1be2b 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs @@ -7,15 +7,14 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public class PostgresDistributedReaderWriterLockTest { - public class PostgresDistributedReaderWriterLockTest + [Test] + public void TestValidatesConstructorArguments() { - [Test] - public void TestValidatesConstructorArguments() - { - Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(string)!)); - Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(IDbConnection)!)); - } + Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(string)!)); + Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(IDbConnection)!)); } } diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index 2e6044a5..ce2fe4b2 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -6,35 +6,34 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Postgres +namespace Medallion.Threading.Tests.Postgres; + +public class PostgresDistributedSynchronizationProviderTest { - public class PostgresDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() + { + Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(IDbConnection)!)); + } + + [Test] + public async Task BasicTest() { - [Test] - public void TestArgumentValidation() + var provider = new PostgresDistributedSynchronizationProvider(TestingPostgresDb.DefaultConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) { - Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(string)!)); - Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(IDbConnection)!)); + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); } - [Test] - public async Task BasicTest() + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { - var provider = new PostgresDistributedSynchronizationProvider(TestingPostgresDb.DefaultConnectionString); - - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); - } - - const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; - await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) - { - await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); - } + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); } } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index 9bcd2d08..b0cd929b 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -10,30 +10,29 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +[Category("CI")] +public class RedisDistributedLockTest { - [Category("CI")] - public class RedisDistributedLockTest + [Test] + public void TestName() { - [Test] - public void TestName() - { - const string Name = "\0🐉汉字\b\r\n\\"; - var @lock = new RedisDistributedLock(Name, new Mock(MockBehavior.Strict).Object); - @lock.Name.ShouldEqual(Name); - @lock.Key.ShouldEqual(new RedisKey(Name)); - } + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedLock(Name, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + @lock.Key.ShouldEqual(new RedisKey(Name)); + } - [Test] - public void TestValidatesConstructorParameters() - { - var database = new Mock(MockBehavior.Strict).Object; - Assert.Throws(() => new RedisDistributedLock(default, database)); - Assert.Throws(() => new RedisDistributedLock(default, new[] { database })); - Assert.Throws(() => new RedisDistributedLock("key", default(IDatabase)!)); - Assert.Throws(() => new RedisDistributedLock("key", default(IEnumerable)!)); - Assert.Throws(() => new RedisDistributedLock("key", new[] { database, null! })); - Assert.Throws(() => new RedisDistributedLock("key", Enumerable.Empty())); - } + [Test] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedLock(default, database)); + Assert.Throws(() => new RedisDistributedLock(default, new[] { database })); + Assert.Throws(() => new RedisDistributedLock("key", default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedLock("key", default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedLock("key", new[] { database, null! })); + Assert.Throws(() => new RedisDistributedLock("key", Enumerable.Empty())); } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index 3b4126a1..cebbd943 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -8,75 +8,74 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public class RedisDistributedReaderWriterLockTest { - public class RedisDistributedReaderWriterLockTest + [Test] + [Category("CI")] + public void TestName() { - [Test] - [Category("CI")] - public void TestName() - { - const string Name = "\0🐉汉字\b\r\n\\"; - var @lock = new RedisDistributedReaderWriterLock(Name, new Mock(MockBehavior.Strict).Object); - @lock.Name.ShouldEqual(Name); - } + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedReaderWriterLock(Name, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + } - [Test] - [Category("CI")] - public void TestValidatesConstructorParameters() - { - var database = new Mock(MockBehavior.Strict).Object; - Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, database)); - Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, new[] { database })); - Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IDatabase)!)); - Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IEnumerable)!)); - Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database, null! })); - Assert.Throws(() => new RedisDistributedReaderWriterLock("key", Enumerable.Empty())); - Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database }, o => o.Expiry(TimeSpan.FromSeconds(0.2)))); - } + [Test] + [Category("CI")] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, database)); + Assert.Throws(() => new RedisDistributedReaderWriterLock(default!, new[] { database })); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database, null! })); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", Enumerable.Empty())); + Assert.Throws(() => new RedisDistributedReaderWriterLock("key", new[] { database }, o => o.Expiry(TimeSpan.FromSeconds(0.2)))); + } - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestCanExtendReadLock() - { - var @lock = new RedisDistributedReaderWriterLock( - TestHelper.UniqueName, - RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), - o => o.Expiry(TimeSpan.FromSeconds(0.3)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5)) - ); + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestCanExtendReadLock() + { + var @lock = new RedisDistributedReaderWriterLock( + TestHelper.UniqueName, + RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), + o => o.Expiry(TimeSpan.FromSeconds(0.3)).BusyWaitSleepTime(TimeSpan.FromMilliseconds(1), TimeSpan.FromMilliseconds(5)) + ); - await using var readHandle = await @lock.AcquireReadLockAsync(); + await using var readHandle = await @lock.AcquireReadLockAsync(); - var writeHandleTask = @lock.AcquireWriteLockAsync().AsTask(); - _ = writeHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); + var writeHandleTask = @lock.AcquireWriteLockAsync().AsTask(); + _ = writeHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup + Assert.IsFalse(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); - await readHandle.DisposeAsync(); + await readHandle.DisposeAsync(); - Assert.IsTrue(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); - } + Assert.IsTrue(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + } - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestReadLockAbandonment() - { - var @lock = new RedisDistributedReaderWriterLock( - TestHelper.UniqueName, - RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), - o => o.Expiry(TimeSpan.FromSeconds(1)) - .ExtensionCadence(TimeSpan.FromSeconds(0.1)) - .BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(50)) - ); + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestReadLockAbandonment() + { + var @lock = new RedisDistributedReaderWriterLock( + TestHelper.UniqueName, + RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), + o => o.Expiry(TimeSpan.FromSeconds(1)) + .ExtensionCadence(TimeSpan.FromSeconds(0.1)) + .BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromMilliseconds(50)) + ); - await AcquireReadLockAsync(); - await Task.Delay(20); // seems to help ensure that the GC works - GC.Collect(); - GC.WaitForPendingFinalizers(); + await AcquireReadLockAsync(); + await Task.Delay(20); // seems to help ensure that the GC works + GC.Collect(); + GC.WaitForPendingFinalizers(); - await using var writeHandle = await @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(10)); - Assert.IsNotNull(writeHandle); // indicates read lock was released + await using var writeHandle = await @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(10)); + Assert.IsNotNull(writeHandle); // indicates read lock was released - async Task AcquireReadLockAsync() => await @lock.AcquireReadLockAsync(); - } + async Task AcquireReadLockAsync() => await @lock.AcquireReadLockAsync(); } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index 9f942fd4..101b8d8c 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -8,28 +8,27 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public class RedisDistributedSemaphoreTest { - public class RedisDistributedSemaphoreTest + [Test] + [Category("CI")] + public void TestName() { - [Test] - [Category("CI")] - public void TestName() - { - const string Name = "\0🐉汉字\b\r\n\\"; - var @lock = new RedisDistributedSemaphore(Name, 1, new Mock(MockBehavior.Strict).Object); - @lock.Name.ShouldEqual(Name); - } + const string Name = "\0🐉汉字\b\r\n\\"; + var @lock = new RedisDistributedSemaphore(Name, 1, new Mock(MockBehavior.Strict).Object); + @lock.Name.ShouldEqual(Name); + } - [Test] - [Category("CI")] - public void TestValidatesConstructorParameters() - { - var database = new Mock(MockBehavior.Strict).Object; - Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, database)); - Assert.Throws(() => new RedisDistributedSemaphore("key", 0, database)); - Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); - Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); - } + [Test] + [Category("CI")] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new RedisDistributedSemaphore(default!, 2, database)); + Assert.Throws(() => new RedisDistributedSemaphore("key", 0, database)); + Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); + Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs index 2634f9df..b462ce84 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs @@ -5,67 +5,66 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public class RedisDistributedSynchronizationOptionsBuilderTest { - public class RedisDistributedSynchronizationOptionsBuilderTest + [Test] + public void TestValidatesExpiry() { - [Test] - public void TestValidatesExpiry() - { - Assert.Throws(() => GetOptions(o => o.Expiry(TimeSpan.FromSeconds(-2)))); - Assert.Throws(() => GetOptions(o => o.Expiry(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan - TimeSpan.FromTicks(1)))); - Assert.DoesNotThrow(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan))); - } - - [Test] - public void TestValidatesMinValidityTime() - { - Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(-2)))); - Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.Zero))); - Assert.Throws(() => GetOptions(o => o.MinValidityTime(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan))); - Assert.DoesNotThrow(() => GetOptions( - o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan).Expiry(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan + TimeSpan.FromMilliseconds(1)) - )); - } + Assert.Throws(() => GetOptions(o => o.Expiry(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.Expiry(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan - TimeSpan.FromTicks(1)))); + Assert.DoesNotThrow(() => GetOptions(o => o.Expiry(RedisDistributedSynchronizationOptionsBuilder.MinimumExpiry.TimeSpan))); + } - [Test] - public void TestValidatesExtensionCadence() - { - Assert.Throws(() => GetOptions(o => o.ExtensionCadence(TimeSpan.FromSeconds(-2)))); - Assert.Throws(() => GetOptions(o => o.ExtensionCadence(Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(1)).ExtensionCadence(TimeSpan.FromSeconds(1)))); - } + [Test] + public void TestValidatesMinValidityTime() + { + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.Zero))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan))); + Assert.DoesNotThrow(() => GetOptions( + o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan).Expiry(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan + TimeSpan.FromMilliseconds(1)) + )); + } - [Test] - public void TestValidatesBusyWaitSleepTime() - { - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1)))); - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(-1), TimeSpan.FromSeconds(1)))); - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.MaxValue, TimeSpan.FromSeconds(1)))); - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan))); - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(-1)))); - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.MaxValue))); + [Test] + public void TestValidatesExtensionCadence() + { + Assert.Throws(() => GetOptions(o => o.ExtensionCadence(TimeSpan.FromSeconds(-2)))); + Assert.Throws(() => GetOptions(o => o.ExtensionCadence(Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.MinValidityTime(TimeSpan.FromSeconds(1)).ExtensionCadence(TimeSpan.FromSeconds(1)))); + } - Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1.1), TimeSpan.FromSeconds(1)))); + [Test] + public void TestValidatesBusyWaitSleepTime() + { + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(-1), TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.MaxValue, TimeSpan.FromSeconds(1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(-1)))); + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.MaxValue))); - Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero))); - Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4)))); - } + Assert.Throws(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromSeconds(1.1), TimeSpan.FromSeconds(1)))); - [Test] - public void TestDefaults() - { - var defaultOptions = RedisDistributedSynchronizationOptionsBuilder.GetOptions(null); - defaultOptions.RedLockTimeouts.Expiry.ShouldEqual(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry); - defaultOptions.RedLockTimeouts.MinValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); - defaultOptions.ExtensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); - defaultOptions.MinBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); - defaultOptions.MaxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); - } + Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.Zero, TimeSpan.Zero))); + Assert.DoesNotThrow(() => GetOptions(o => o.BusyWaitSleepTime(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(4)))); + } - private static void GetOptions(Action options) => - RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); + [Test] + public void TestDefaults() + { + var defaultOptions = RedisDistributedSynchronizationOptionsBuilder.GetOptions(null); + defaultOptions.RedLockTimeouts.Expiry.ShouldEqual(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry); + defaultOptions.RedLockTimeouts.MinValidityTime.ShouldEqual(TimeSpan.FromSeconds(27)); + defaultOptions.ExtensionCadence.ShouldEqual(TimeSpan.FromSeconds(9)); + defaultOptions.MinBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(10)); + defaultOptions.MaxBusyWaitSleepTime.ShouldEqual(TimeSpan.FromMilliseconds(800)); } + + private static void GetOptions(Action options) => + RedisDistributedSynchronizationOptionsBuilder.GetOptions(options); } diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs index 4134b41b..d64f90a0 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs @@ -6,47 +6,46 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +public class RedisDistributedSynchronizationProviderTest { - public class RedisDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() + Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IDatabase)!)); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IEnumerable)!)); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(new[] { default(IDatabase)! })); + Assert.Throws(() => new RedisDistributedSynchronizationProvider(Array.Empty())); + } + + [Test] + public async Task BasicTest() + { + var provider = new RedisDistributedSynchronizationProvider(RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase()); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) { - Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IDatabase)!)); - Assert.Throws(() => new RedisDistributedSynchronizationProvider(default(IEnumerable)!)); - Assert.Throws(() => new RedisDistributedSynchronizationProvider(new[] { default(IDatabase)! })); - Assert.Throws(() => new RedisDistributedSynchronizationProvider(Array.Empty())); + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); } - [Test] - public async Task BasicTest() + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { - var provider = new RedisDistributedSynchronizationProvider(RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase()); - - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); - } - - const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; - await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) - { - await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); - } + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); + } - const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; - await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) - { - await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); - await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); - } + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); } } } diff --git a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs index f28343f8..ee3e3ab2 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs @@ -7,24 +7,23 @@ using System.Runtime.CompilerServices; using System.Text; -namespace Medallion.Threading.Tests.Redis +namespace Medallion.Threading.Tests.Redis; + +[Category("CI")] +public class RedisLibraryTest { - [Category("CI")] - public class RedisLibraryTest + // ensures that we are caching the preparation of these + [Test] + public void TestAllRedisScriptFieldsAreStatic() { - // ensures that we are caching the preparation of these - [Test] - public void TestAllRedisScriptFieldsAreStatic() + var redisScriptFields = typeof(RedisScript<>).Assembly + .GetTypes() + .Where(t => t.GetCustomAttribute() == null) + .SelectMany(t => t.GetFields(BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)) + .Where(f => f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == typeof(RedisScript<>)); + foreach (var field in redisScriptFields) { - var redisScriptFields = typeof(RedisScript<>).Assembly - .GetTypes() - .Where(t => t.GetCustomAttribute() == null) - .SelectMany(t => t.GetFields(BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)) - .Where(f => f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == typeof(RedisScript<>)); - foreach (var field in redisScriptFields) - { - Assert.IsTrue(field.IsStatic, field.ToString()); - } + Assert.IsTrue(field.IsStatic, field.ToString()); } } } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs index a5a465f1..6e77d77d 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs @@ -4,29 +4,28 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +[Category("CI")] +public class SqlConnectionOptionsBuilderTest { - [Category("CI")] - public class SqlConnectionOptionsBuilderTest + [Test] + public void TestValidatesArguments() { - [Test] - public void TestValidatesArguments() - { - var builder = new SqlConnectionOptionsBuilder(); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); - Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + var builder = new SqlConnectionOptionsBuilder(); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); + Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); - Assert.Throws(() => SqlConnectionOptionsBuilder.GetOptions(o => o.UseMultiplexing().UseTransaction())); - } + Assert.Throws(() => SqlConnectionOptionsBuilder.GetOptions(o => o.UseMultiplexing().UseTransaction())); + } - [Test] - public void TestDefaults() - { - var options = SqlConnectionOptionsBuilder.GetOptions(null); - options.keepaliveCadence.ShouldEqual(TimeSpan.FromMinutes(10)); - Assert.IsTrue(options.useMultiplexing); - Assert.IsFalse(options.useTransaction); - options.ShouldEqual(SqlConnectionOptionsBuilder.GetOptions(o => { })); - } + [Test] + public void TestDefaults() + { + var options = SqlConnectionOptionsBuilder.GetOptions(null); + options.keepaliveCadence.ShouldEqual(TimeSpan.FromMinutes(10)); + Assert.IsTrue(options.useMultiplexing); + Assert.IsFalse(options.useTransaction); + options.ShouldEqual(SqlConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 9e67f78a..215c79e4 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -7,74 +7,73 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public class SqlDatabaseConnectionTest { - public class SqlDatabaseConnectionTest + [Test, Combinatorial] + public async Task TestExecuteNonQueryAlreadyCanceled( + [Values] bool isAsync, + [Values] bool isSystemDataSqlClient, + [Values] bool isFastQuery) { - [Test, Combinatorial] - public async Task TestExecuteNonQueryAlreadyCanceled( - [Values] bool isAsync, - [Values] bool isSystemDataSqlClient, - [Values] bool isFastQuery) - { - using var cancellationTokenSource = new CancellationTokenSource(); - cancellationTokenSource.Cancel(); + using var cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSource.Cancel(); - await using var connection = CreateConnection(isSystemDataSqlClient); - await connection.OpenAsync(CancellationToken.None); - using var command = connection.CreateCommand(); - command.SetCommandText( - isFastQuery - ? "SELECT 1" - : @"WHILE 1 = 1 + await using var connection = CreateConnection(isSystemDataSqlClient); + await connection.OpenAsync(CancellationToken.None); + using var command = connection.CreateCommand(); + command.SetCommandText( + isFastQuery + ? "SELECT 1" + : @"WHILE 1 = 1 BEGIN DECLARE @x INT = 1 END" - ); + ); - if (isAsync) - { - Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token).AsTask()); - } - else - { - Assert.Catch(() => SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0)); - } + if (isAsync) + { + Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token).AsTask()); } - - [Test, Combinatorial] - public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] bool isSystemDataSqlClient) + else { - using var cancellationTokenSource = new CancellationTokenSource(); + Assert.Catch(() => SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0)); + } + } - await using var connection = CreateConnection(isSystemDataSqlClient); - await connection.OpenAsync(CancellationToken.None); - using var command = connection.CreateCommand(); - command.SetCommandText(@" + [Test, Combinatorial] + public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] bool isSystemDataSqlClient) + { + using var cancellationTokenSource = new CancellationTokenSource(); + + await using var connection = CreateConnection(isSystemDataSqlClient); + await connection.OpenAsync(CancellationToken.None); + using var command = connection.CreateCommand(); + command.SetCommandText(@" WHILE 1 = 1 BEGIN DECLARE @x INT = 1 END" - ); - - var task = Task.Run(async () => - { - if (isAsync) { await command.ExecuteNonQueryAsync(cancellationTokenSource.Token, disallowAsyncCancellation: true); } - else { SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } - }); - Assert.IsFalse(task.Wait(TimeSpan.FromSeconds(.1))); - - cancellationTokenSource.Cancel(); - Assert.IsTrue(task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5))); - task.Status.ShouldEqual(TaskStatus.Canceled); - } + ); + + var task = Task.Run(async () => + { + if (isAsync) { await command.ExecuteNonQueryAsync(cancellationTokenSource.Token, disallowAsyncCancellation: true); } + else { SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } + }); + Assert.IsFalse(task.Wait(TimeSpan.FromSeconds(.1))); - private static SqlDatabaseConnection CreateConnection(bool isSystemDataSqlClient) => - new SqlDatabaseConnection( - isSystemDataSqlClient - ? new System.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString).As() - : new Microsoft.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString), - isExternallyOwned: false - ); + cancellationTokenSource.Cancel(); + Assert.IsTrue(task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5))); + task.Status.ShouldEqual(TaskStatus.Canceled); } + + private static SqlDatabaseConnection CreateConnection(bool isSystemDataSqlClient) => + new SqlDatabaseConnection( + isSystemDataSqlClient + ? new System.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString).As() + : new Microsoft.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString), + isExternallyOwned: false + ); } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs index 92bd89ae..e9b63bf9 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs @@ -5,58 +5,57 @@ using System.Data; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public class SqlDistributedLockTest { - public class SqlDistributedLockTest + [Test] + public void TestBadConstructorArguments() + { + Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedLock("a", default(string)!)); + Assert.Catch(() => new SqlDistributedLock("a", default(IDbTransaction)!)); + Assert.Catch(() => new SqlDistributedLock("a", default(IDbConnection)!)); + Assert.Catch(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + } + + [Test] + public void TestGetSafeLockNameCompat() { - [Test] - public void TestBadConstructorArguments() - { - Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString)); - Assert.Catch(() => new SqlDistributedLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); - Assert.Catch(() => new SqlDistributedLock("a", default(string)!)); - Assert.Catch(() => new SqlDistributedLock("a", default(IDbTransaction)!)); - Assert.Catch(() => new SqlDistributedLock("a", default(IDbConnection)!)); - Assert.Catch(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new SqlDistributedLock(new string('a', SqlDistributedLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); - } - - [Test] - public void TestGetSafeLockNameCompat() - { - SqlDistributedLock.GetSafeName("").ShouldEqual(""); - SqlDistributedLock.GetSafeName("abc").ShouldEqual("abc"); - SqlDistributedLock.GetSafeName("\\").ShouldEqual("\\"); - SqlDistributedLock.GetSafeName(new string('a', SqlDistributedLock.MaxNameLength)).ShouldEqual(new string('a', SqlDistributedLock.MaxNameLength)); - SqlDistributedLock.GetSafeName(new string('\\', SqlDistributedLock.MaxNameLength)).ShouldEqual(@"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"); - SqlDistributedLock.GetSafeName(new string('x', SqlDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxA3SOHbN+Zq/qt/fpO9dxauQ3kVj8wfeEbknAYembWJG1Xuf4CL0Dmx3u+dAWHzkFMdjQhlRnlAXtiH7ZMFjjsg=="); - } - - /// - /// This test justifies why we have constructors for SQL Server locks that take in a . - /// Otherwise, you can't have a lock use the same connection as a transaction you're working on. Compare to - /// - /// - [Test] - public async Task TestSqlCommandMustParticipateInTransaction() - { - using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); - await connection.OpenAsync(); - - using var transaction = connection.BeginTransaction(); - - using var commandInTransaction = connection.CreateCommand(); - commandInTransaction.Transaction = transaction; - commandInTransaction.CommandText = @"CREATE TABLE foo (id INT); SELECT 1"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(1); - - using var commandOutsideTransaction = connection.CreateCommand(); - commandOutsideTransaction.CommandText = "SELECT 2"; - var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); - Assert.That(exception.Message, Does.Contain("requires the command to have a transaction when the connection assigned to the command is in a pending local transaction")); - - commandInTransaction.CommandText = "SELECT COUNT(*) FROM foo"; - (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(0); - } + SqlDistributedLock.GetSafeName("").ShouldEqual(""); + SqlDistributedLock.GetSafeName("abc").ShouldEqual("abc"); + SqlDistributedLock.GetSafeName("\\").ShouldEqual("\\"); + SqlDistributedLock.GetSafeName(new string('a', SqlDistributedLock.MaxNameLength)).ShouldEqual(new string('a', SqlDistributedLock.MaxNameLength)); + SqlDistributedLock.GetSafeName(new string('\\', SqlDistributedLock.MaxNameLength)).ShouldEqual(@"\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"); + SqlDistributedLock.GetSafeName(new string('x', SqlDistributedLock.MaxNameLength + 1)).ShouldEqual("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxA3SOHbN+Zq/qt/fpO9dxauQ3kVj8wfeEbknAYembWJG1Xuf4CL0Dmx3u+dAWHzkFMdjQhlRnlAXtiH7ZMFjjsg=="); + } + + /// + /// This test justifies why we have constructors for SQL Server locks that take in a . + /// Otherwise, you can't have a lock use the same connection as a transaction you're working on. Compare to + /// + /// + [Test] + public async Task TestSqlCommandMustParticipateInTransaction() + { + using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); + await connection.OpenAsync(); + + using var transaction = connection.BeginTransaction(); + + using var commandInTransaction = connection.CreateCommand(); + commandInTransaction.Transaction = transaction; + commandInTransaction.CommandText = @"CREATE TABLE foo (id INT); SELECT 1"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(1); + + using var commandOutsideTransaction = connection.CreateCommand(); + commandOutsideTransaction.CommandText = "SELECT 2"; + var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); + Assert.That(exception.Message, Does.Contain("requires the command to have a transaction when the connection assigned to the command is in a pending local transaction")); + + commandInTransaction.CommandText = "SELECT COUNT(*) FROM foo"; + (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(0); } } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs index 358514d5..51c388f0 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs @@ -3,42 +3,41 @@ using System.Data.Common; using Medallion.Threading.SqlServer; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public sealed class SqlDistributedReaderWriterLockTest { - public sealed class SqlDistributedReaderWriterLockTest + [Test] + public void TestBadConstructorArguments() { - [Test] - public void TestBadConstructorArguments() - { - Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString)); - Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); - Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(string)!)); - Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbTransaction)!)); - Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbConnection)!)); - Assert.Catch(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); - Assert.DoesNotThrow(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); - } + Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedReaderWriterLock(null!, TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(string)!)); + Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbTransaction)!)); + Assert.Catch(() => new SqlDistributedReaderWriterLock("a", default(DbConnection)!)); + Assert.Catch(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength + 1), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + Assert.DoesNotThrow(() => new SqlDistributedReaderWriterLock(new string('a', SqlDistributedReaderWriterLock.MaxNameLength), TestingSqlServerDb.DefaultConnectionString, exactName: true)); + } - [Test] - public void TestGetSafeLockNameCompat() - { - SqlDistributedReaderWriterLock.MaxNameLength.ShouldEqual(SqlDistributedLock.MaxNameLength); + [Test] + public void TestGetSafeLockNameCompat() + { + SqlDistributedReaderWriterLock.MaxNameLength.ShouldEqual(SqlDistributedLock.MaxNameLength); - var cases = new[] - { - string.Empty, - "abc", - "\\", - new string('a', SqlDistributedLock.MaxNameLength), - new string('\\', SqlDistributedLock.MaxNameLength), - new string('x', SqlDistributedLock.MaxNameLength + 1) - }; + var cases = new[] + { + string.Empty, + "abc", + "\\", + new string('a', SqlDistributedLock.MaxNameLength), + new string('\\', SqlDistributedLock.MaxNameLength), + new string('x', SqlDistributedLock.MaxNameLength + 1) + }; - foreach (var lockName in cases) - { - // should be compatible with SqlDistributedLock - SqlDistributedReaderWriterLock.GetSafeName(lockName).ShouldEqual(SqlDistributedLock.GetSafeName(lockName)); - } + foreach (var lockName in cases) + { + // should be compatible with SqlDistributedLock + SqlDistributedReaderWriterLock.GetSafeName(lockName).ShouldEqual(SqlDistributedLock.GetSafeName(lockName)); } } } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs index b4b5677d..74449635 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs @@ -7,93 +7,92 @@ using System.Text; using System.Text.RegularExpressions; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public sealed class SqlDistributedSemaphoreTest { - public sealed class SqlDistributedSemaphoreTest + [Test] + public void TestBadConstructorArguments() { - [Test] - public void TestBadConstructorArguments() - { - Assert.Catch(() => new SqlDistributedSemaphore(null!, 1, TestingSqlServerDb.DefaultConnectionString)); - Assert.Catch(() => new SqlDistributedSemaphore("a", -1, TestingSqlServerDb.DefaultConnectionString)); - Assert.Catch(() => new SqlDistributedSemaphore("a", 0, TestingSqlServerDb.DefaultConnectionString)); - Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(string)!)); - Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbConnection)!)); - Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbTransaction)!)); + Assert.Catch(() => new SqlDistributedSemaphore(null!, 1, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore("a", -1, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore("a", 0, TestingSqlServerDb.DefaultConnectionString)); + Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(string)!)); + Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbConnection)!)); + Assert.Catch(() => new SqlDistributedSemaphore("a", 1, default(IDbTransaction)!)); - var random = new Random(1234); - var bytes = new byte[10000]; - random.NextBytes(bytes); - Assert.DoesNotThrow(() => new SqlDistributedSemaphore(Encoding.UTF8.GetString(bytes), int.MaxValue, TestingSqlServerDb.DefaultConnectionString)); - } + var random = new Random(1234); + var bytes = new byte[10000]; + random.NextBytes(bytes); + Assert.DoesNotThrow(() => new SqlDistributedSemaphore(Encoding.UTF8.GetString(bytes), int.MaxValue, TestingSqlServerDb.DefaultConnectionString)); + } - [Test] - public void TestNameMangling() + [Test] + public void TestNameMangling() + { + static string ToSafeNameChecked(string name) { - static string ToSafeNameChecked(string name) - { - var safeName = SqlSemaphore.ToSafeName(name); - (safeName.Length > 0).ShouldEqual(true, "was: " + safeName); - // max name length here based on constants in SqlSemaphore.cs - (safeName.Length <= (115 - 19)).ShouldEqual(true, "was: " + safeName); - Regex.IsMatch(safeName, @"^[a-zA-Z0-9]+$").ShouldEqual(true, "was: " + safeName); - return safeName; - } - - ToSafeNameChecked(string.Empty); - ToSafeNameChecked("a b"); - ToSafeNameChecked(new string('a', 1000)); - ToSafeNameChecked(string.Join(string.Empty, Enumerable.Range(0, byte.MaxValue).Select(i => (char)i))); + var safeName = SqlSemaphore.ToSafeName(name); + (safeName.Length > 0).ShouldEqual(true, "was: " + safeName); + // max name length here based on constants in SqlSemaphore.cs + (safeName.Length <= (115 - 19)).ShouldEqual(true, "was: " + safeName); + Regex.IsMatch(safeName, @"^[a-zA-Z0-9]+$").ShouldEqual(true, "was: " + safeName); + return safeName; + } - Assert.AreNotEqual(ToSafeNameChecked(new string('b', 500)), ToSafeNameChecked(new string('b', 499) + "B")); + ToSafeNameChecked(string.Empty); + ToSafeNameChecked("a b"); + ToSafeNameChecked(new string('a', 1000)); + ToSafeNameChecked(string.Join(string.Empty, Enumerable.Range(0, byte.MaxValue).Select(i => (char)i))); - ToSafeNameChecked(new string('x', 200)).Length.ShouldEqual(115 - 30); + Assert.AreNotEqual(ToSafeNameChecked(new string('b', 500)), ToSafeNameChecked(new string('b', 499) + "B")); - Enumerable.Range(0, 1000) - .Select(i => ToSafeNameChecked(i.ToString())) - .Distinct() - .Count() - .ShouldEqual(1000); - } + ToSafeNameChecked(new string('x', 200)).Length.ShouldEqual(115 - 30); - [Test] - public void TestNameManglingCompatibility() - { - SqlSemaphore.ToSafeName(string.Empty).ShouldEqual("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855semaphore"); - SqlSemaphore.ToSafeName("a_simple_name").ShouldEqual("a5fsimple5fn5becacaa1afce7173bf71d20caf31364c2b10c21f7490c942fdc45467aba2d2asemaphore"); - SqlSemaphore.ToSafeName("a").ShouldEqual("aca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bbsemaphore"); - SqlSemaphore.ToSafeName("A").ShouldEqual("A559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffdsemaphore"); - SqlSemaphore.ToSafeName("0").ShouldEqual("05feceb66ffc86f38d952786c6d696c79c2dbc239dd4e91b46729d73a27fb57e9semaphore"); - SqlSemaphore.ToSafeName("!?#").ShouldEqual("213f231be5b6313c68d3c674c3b17246eaaa3222fe5bc23d9173ac6f58319c6004d6bfsemaphore"); - SqlSemaphore.ToSafeName(string.Join(string.Empty, Enumerable.Range(0, byte.MaxValue).Select(i => (char)i))) - .ShouldEqual("0123456789ab7fb98786c16c175d232ab161b5e604c5792e6befd4e1e8d4ecac9d568a6db524semaphore"); - } + Enumerable.Range(0, 1000) + .Select(i => ToSafeNameChecked(i.ToString())) + .Distinct() + .Count() + .ShouldEqual(1000); + } - [Test] - public void TestTicketsTakenOnBothConnectionAndTransactionForThatConnection() - { - using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); - connection.Open(); + [Test] + public void TestNameManglingCompatibility() + { + SqlSemaphore.ToSafeName(string.Empty).ShouldEqual("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855semaphore"); + SqlSemaphore.ToSafeName("a_simple_name").ShouldEqual("a5fsimple5fn5becacaa1afce7173bf71d20caf31364c2b10c21f7490c942fdc45467aba2d2asemaphore"); + SqlSemaphore.ToSafeName("a").ShouldEqual("aca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bbsemaphore"); + SqlSemaphore.ToSafeName("A").ShouldEqual("A559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffdsemaphore"); + SqlSemaphore.ToSafeName("0").ShouldEqual("05feceb66ffc86f38d952786c6d696c79c2dbc239dd4e91b46729d73a27fb57e9semaphore"); + SqlSemaphore.ToSafeName("!?#").ShouldEqual("213f231be5b6313c68d3c674c3b17246eaaa3222fe5bc23d9173ac6f58319c6004d6bfsemaphore"); + SqlSemaphore.ToSafeName(string.Join(string.Empty, Enumerable.Range(0, byte.MaxValue).Select(i => (char)i))) + .ShouldEqual("0123456789ab7fb98786c16c175d232ab161b5e604c5792e6befd4e1e8d4ecac9d568a6db524semaphore"); + } - var semaphore1 = new SqlDistributedSemaphore( - UniqueSemaphoreName(nameof(TestTicketsTakenOnBothConnectionAndTransactionForThatConnection)), - 2, - connection - ); - var handle1 = semaphore1.Acquire(); + [Test] + public void TestTicketsTakenOnBothConnectionAndTransactionForThatConnection() + { + using var connection = new SqlConnection(TestingSqlServerDb.DefaultConnectionString); + connection.Open(); - using var transaction = connection.BeginTransaction(); - var semaphore2 = new SqlDistributedSemaphore( - UniqueSemaphoreName(nameof(TestTicketsTakenOnBothConnectionAndTransactionForThatConnection)), - 2, - transaction - ); - var handle2 = semaphore2.Acquire(); - semaphore2.TryAcquire().ShouldEqual(null); - var ex = Assert.Catch(() => semaphore2.Acquire()); - ex.Message.Contains("Deadlock").ShouldEqual(true, ex.ToString()); - } + var semaphore1 = new SqlDistributedSemaphore( + UniqueSemaphoreName(nameof(TestTicketsTakenOnBothConnectionAndTransactionForThatConnection)), + 2, + connection + ); + var handle1 = semaphore1.Acquire(); - private static string UniqueSemaphoreName(string baseName) => $"{baseName}_{TargetFramework.Current}"; + using var transaction = connection.BeginTransaction(); + var semaphore2 = new SqlDistributedSemaphore( + UniqueSemaphoreName(nameof(TestTicketsTakenOnBothConnectionAndTransactionForThatConnection)), + 2, + transaction + ); + var handle2 = semaphore2.Acquire(); + semaphore2.TryAcquire().ShouldEqual(null); + var ex = Assert.Catch(() => semaphore2.Acquire()); + ex.Message.Contains("Deadlock").ShouldEqual(true, ex.ToString()); } + + private static string UniqueSemaphoreName(string baseName) => $"{baseName}_{TargetFramework.Current}"; } diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs index e4fc9dbc..fa55da5b 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs @@ -6,46 +6,45 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.SqlServer +namespace Medallion.Threading.Tests.SqlServer; + +public class SqlDistributedSynchronizationProviderTest { - public class SqlDistributedSynchronizationProviderTest + [Test] + public void TestArgumentValidation() { - [Test] - public void TestArgumentValidation() + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(string)!)); + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbConnection)!)); + Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbTransaction)!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new SqlDistributedSynchronizationProvider(TestingSqlServerDb.DefaultConnectionString); + + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) { - Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(string)!)); - Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbConnection)!)); - Assert.Throws(() => new SqlDistributedSynchronizationProvider(default(IDbTransaction)!)); + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); } - [Test] - public async Task BasicTest() + const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; + await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { - var provider = new SqlDistributedSynchronizationProvider(TestingSqlServerDb.DefaultConnectionString); - - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); - } - - const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; - await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) - { - await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); - } + await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); + Assert.IsNull(handle); + } - const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; - await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) - { - await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); - await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); - } + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); } } } diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 47e06a3b..b2a8696f 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -6,30 +6,30 @@ using System.Reflection; using System.Text.RegularExpressions; -namespace Medallion.Threading.Tests +namespace Medallion.Threading.Tests; + +[Category("CI")] +public class TestSetupTest { - [Category("CI")] - public class TestSetupTest + [Test] + public void VerifyAllTestsAreCreated() { - [Test] - public void VerifyAllTestsAreCreated() - { - var testCaseClasses = this.GetType().Assembly - .GetTypes() - .Where( - t => t.IsAbstract - && t.IsClass - && t.IsGenericTypeDefinition - && t.GetMethods().Any(m => m.GetCustomAttributes(inherit: false).Any(a => a is TestAttribute)) - ) - .ToArray(); - - var expectedTestTypes = testCaseClasses.SelectMany(this.GetPossibleGenericInstantiations) - .ToArray(); - - var combinatorialTestsFile = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "Tests", "CombinatorialTests.cs")); - - var expectedTestContents = + var testCaseClasses = this.GetType().Assembly + .GetTypes() + .Where( + t => t.IsAbstract + && t.IsClass + && t.IsGenericTypeDefinition + && t.GetMethods().Any(m => m.GetCustomAttributes(inherit: false).Any(a => a is TestAttribute)) + ) + .ToArray(); + + var expectedTestTypes = testCaseClasses.SelectMany(this.GetPossibleGenericInstantiations) + .ToArray(); + + var combinatorialTestsFile = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "Tests", "CombinatorialTests.cs")); + + var expectedTestContents = $@"using Medallion.Threading.Tests.Data; using NUnit.Framework; using System; @@ -39,177 +39,176 @@ public void VerifyAllTestsAreCreated() using System.Threading.Tasks; {string.Join( - Environment.NewLine + Environment.NewLine, - expectedTestTypes.Select(GetTestClassDeclaration) - .GroupBy(t => t.@namespace, t => t.declaration) - .OrderBy(g => g.Key) - .Select(g => +Environment.NewLine + Environment.NewLine, +expectedTestTypes.Select(GetTestClassDeclaration) + .GroupBy(t => t.@namespace, t => t.declaration) + .OrderBy(g => g.Key) + .Select(g => $@"namespace {g.Key} {{ {string.Join(Environment.NewLine, g.OrderBy(s => s).Select(s => " " + s))} }}") )}"; - var existingContents = File.Exists(combinatorialTestsFile) ? File.ReadAllText(combinatorialTestsFile) : null; - if (NormalizeWhitespace(expectedTestContents) != NormalizeWhitespace(existingContents)) - { - File.WriteAllText(combinatorialTestsFile, expectedTestContents); - Assert.Fail("Updated " + combinatorialTestsFile - + $"**** EXPECTED **** \r\n{expectedTestContents}\r\n **** FOUND **** {existingContents ?? "NULL"}"); - } - - static string? NormalizeWhitespace(string? code) => code?.Trim().Replace("\r\n", "\n"); - } - - [Test] - public void TestTestNamespaces() + var existingContents = File.Exists(combinatorialTestsFile) ? File.ReadAllText(combinatorialTestsFile) : null; + if (NormalizeWhitespace(expectedTestContents) != NormalizeWhitespace(existingContents)) { - // these can be auto-added by VS but they can mess up our SetUpFixtures - var badNamespaceSegments = new[] { "Tests.Tests", "AbstractTestCases", "Infrastructure" }; - Assert.IsEmpty(this.GetType().Assembly.GetTypes().Where(t => t.Namespace != null && badNamespaceSegments.Any(s => t.Namespace.Contains(s)))); + File.WriteAllText(combinatorialTestsFile, expectedTestContents); + Assert.Fail("Updated " + combinatorialTestsFile + + $"**** EXPECTED **** \r\n{expectedTestContents}\r\n **** FOUND **** {existingContents ?? "NULL"}"); } - private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) - { - static string GetTestClassName(Type type) - { - return type.IsGenericType - ? $"{RemoveProviderSuffix(RemoveGenericMarkers(type.Name))}_{string.Join("_", type.GetGenericArguments().Select(GetTestClassName))}" - : RemoveProviderSuffix(type.Name); + static string? NormalizeWhitespace(string? code) => code?.Trim().Replace("\r\n", "\n"); + } + + [Test] + public void TestTestNamespaces() + { + // these can be auto-added by VS but they can mess up our SetUpFixtures + var badNamespaceSegments = new[] { "Tests.Tests", "AbstractTestCases", "Infrastructure" }; + Assert.IsEmpty(this.GetType().Assembly.GetTypes().Where(t => t.Namespace != null && badNamespaceSegments.Any(s => t.Namespace.Contains(s)))); + } - static string RemoveProviderSuffix(string name) - { - var ProviderSuffix = "Provider"; - return name.EndsWith(ProviderSuffix) ? name.Substring(0, name.Length - ProviderSuffix.Length) : name; - } - } + private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) + { + static string GetTestClassName(Type type) + { + return type.IsGenericType + ? $"{RemoveProviderSuffix(RemoveGenericMarkers(type.Name))}_{string.Join("_", type.GetGenericArguments().Select(GetTestClassName))}" + : RemoveProviderSuffix(type.Name); - static string GetCSharpName(Type type) + static string RemoveProviderSuffix(string name) { - return type.IsGenericType - ? $"{RemoveGenericMarkers(type.Name)}<{string.Join(", ", type.GetGenericArguments().Select(GetCSharpName))}>" - : type.Name; + var ProviderSuffix = "Provider"; + return name.EndsWith(ProviderSuffix) ? name.Substring(0, name.Length - ProviderSuffix.Length) : name; } - - // remove words that are very common and therefore don't add much to the name - var testClassName = Regex.Replace(GetTestClassName(testClassType), "Distributed|Lock|Testing|TestCases", string.Empty) + "Test"; - - var supportsContinuousIntegrationAttributes = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) - .Where(t => t != testClassType) - .Select(a => a.GetCustomAttribute()) - .ToArray(); - var categoryAttribute = supportsContinuousIntegrationAttributes.Any(a => a == null) ? string.Empty - : supportsContinuousIntegrationAttributes.Any(a => a!.WindowsOnly) ? "[Category(\"CIWindows\")] " - : "[Category(\"CI\")] "; - - var declaration = $@"{categoryAttribute}public class {testClassName} : {GetCSharpName(testClassType)} {{ }}"; - - var namespaces = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) - .Select(t => t.Namespace ?? string.Empty) - .Distinct() - .Where(ns => ns.StartsWith(typeof(TestSetupTest).Namespace!)) - .ToList(); - if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns == typeof(TestSetupTest).Namespace); } - if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns.EndsWith(".Data")); } - if (namespaces.Count > 1) { Assert.Fail(string.Join(", ", namespaces)); } - return (declaration, namespaces.Single()); } - private static string RemoveGenericMarkers(string name) => Regex.Replace(name, @"`\d+", string.Empty); - - private Type[] GetPossibleGenericInstantiations(Type genericTypeDefinition) + static string GetCSharpName(Type type) { - var genericParameterTypes = genericTypeDefinition.GetGenericArguments() - .Select(this.GetTypesForGenericParameter) - .ToArray(); - var allCombinations = TraverseDepthFirst( - root: (index: 0, value: Enumerable.Empty()), - children: t => t.index == genericParameterTypes.Length - ? Enumerable.Empty<(int index, IEnumerable value)>() - : genericParameterTypes[t.index].Select(type => (index: t.index + 1, value: t.value.Append(type))) - ) - .Where(t => t.index == genericParameterTypes.Length) - .Select(t => MakeGenericTypeOrDefault(genericTypeDefinition, t.value.ToArray())) - .Where(t => t != null).Select(t => t!) - .ToArray(); - return allCombinations; + return type.IsGenericType + ? $"{RemoveGenericMarkers(type.Name)}<{string.Join(", ", type.GetGenericArguments().Select(GetCSharpName))}>" + : type.Name; } - private Type[] GetTypesForGenericParameter(Type genericParameter) - { - var constraints = genericParameter.GetGenericParameterConstraints(); - return this.GetType().Assembly - .GetTypes() - // This doesn't support all fancy constraints like class or new() - // see https://stackoverflow.com/questions/4864496/checking-if-an-object-meets-a-generic-parameter-constraint. - // It also does attempt to enforce cross-constraint rules (e. g. T : Foo[V]). The idea is to identify cases - // that might match - .Where(t => !t.IsNestedPrivate && !t.IsAbstract && constraints.All(c => IsDerivedFromOrDerivedFromGenericOf(derived: t, @base: c))) - .SelectMany(t => t.IsGenericTypeDefinition ? this.GetPossibleGenericInstantiations(t) : new[] { t }) - .ToArray(); - } + // remove words that are very common and therefore don't add much to the name + var testClassName = Regex.Replace(GetTestClassName(testClassType), "Distributed|Lock|Testing|TestCases", string.Empty) + "Test"; - /// - /// Attempts to construct a generic type. While we do filter down the types we try based on the generic constraints, - /// we currently make no attempt to do cross-generic-parameter optimization such as when one generic constraint is - /// dependent on another generic parameter (e. g. T : Foo[V]). In these cases, we fall back to the native validation - /// - private static Type? MakeGenericTypeOrDefault(Type genericTypeDefininition, Type[] genericArguments) - { - try { return genericTypeDefininition.MakeGenericType(genericArguments); } - catch (ArgumentException) { return null; } - } + var supportsContinuousIntegrationAttributes = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) + .Where(t => t != testClassType) + .Select(a => a.GetCustomAttribute()) + .ToArray(); + var categoryAttribute = supportsContinuousIntegrationAttributes.Any(a => a == null) ? string.Empty + : supportsContinuousIntegrationAttributes.Any(a => a!.WindowsOnly) ? "[Category(\"CIWindows\")] " + : "[Category(\"CI\")] "; + + var declaration = $@"{categoryAttribute}public class {testClassName} : {GetCSharpName(testClassType)} {{ }}"; + + var namespaces = TraverseDepthFirst(testClassType, t => t.GetGenericArguments()) + .Select(t => t.Namespace ?? string.Empty) + .Distinct() + .Where(ns => ns.StartsWith(typeof(TestSetupTest).Namespace!)) + .ToList(); + if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns == typeof(TestSetupTest).Namespace); } + if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns.EndsWith(".Data")); } + if (namespaces.Count > 1) { Assert.Fail(string.Join(", ", namespaces)); } + return (declaration, namespaces.Single()); + } - private static bool IsDerivedFromOrDerivedFromGenericOf(Type derived, Type @base) - { - if (@base.IsAssignableFrom(derived)) { return true; } - if (!@base.IsGenericType) { return false; } + private static string RemoveGenericMarkers(string name) => Regex.Replace(name, @"`\d+", string.Empty); - var baseDefinition = @base.GetGenericTypeDefinition(); - return TraverseAlong(derived, t => t.BaseType) - .Concat(derived.GetInterfaces()) - .Any(t => t.IsConstructedGenericType && t.GetGenericTypeDefinition() == baseDefinition); - } + private Type[] GetPossibleGenericInstantiations(Type genericTypeDefinition) + { + var genericParameterTypes = genericTypeDefinition.GetGenericArguments() + .Select(this.GetTypesForGenericParameter) + .ToArray(); + var allCombinations = TraverseDepthFirst( + root: (index: 0, value: Enumerable.Empty()), + children: t => t.index == genericParameterTypes.Length + ? Enumerable.Empty<(int index, IEnumerable value)>() + : genericParameterTypes[t.index].Select(type => (index: t.index + 1, value: t.value.Append(type))) + ) + .Where(t => t.index == genericParameterTypes.Length) + .Select(t => MakeGenericTypeOrDefault(genericTypeDefinition, t.value.ToArray())) + .Where(t => t != null).Select(t => t!) + .ToArray(); + return allCombinations; + } - // simplified versions of Traverse methods since Traverse is not strong-named + private Type[] GetTypesForGenericParameter(Type genericParameter) + { + var constraints = genericParameter.GetGenericParameterConstraints(); + return this.GetType().Assembly + .GetTypes() + // This doesn't support all fancy constraints like class or new() + // see https://stackoverflow.com/questions/4864496/checking-if-an-object-meets-a-generic-parameter-constraint. + // It also does attempt to enforce cross-constraint rules (e. g. T : Foo[V]). The idea is to identify cases + // that might match + .Where(t => !t.IsNestedPrivate && !t.IsAbstract && constraints.All(c => IsDerivedFromOrDerivedFromGenericOf(derived: t, @base: c))) + .SelectMany(t => t.IsGenericTypeDefinition ? this.GetPossibleGenericInstantiations(t) : new[] { t }) + .ToArray(); + } - private static IEnumerable TraverseDepthFirst(T root, Func> children) - { - yield return root; + /// + /// Attempts to construct a generic type. While we do filter down the types we try based on the generic constraints, + /// we currently make no attempt to do cross-generic-parameter optimization such as when one generic constraint is + /// dependent on another generic parameter (e. g. T : Foo[V]). In these cases, we fall back to the native validation + /// + private static Type? MakeGenericTypeOrDefault(Type genericTypeDefininition, Type[] genericArguments) + { + try { return genericTypeDefininition.MakeGenericType(genericArguments); } + catch (ArgumentException) { return null; } + } + + private static bool IsDerivedFromOrDerivedFromGenericOf(Type derived, Type @base) + { + if (@base.IsAssignableFrom(derived)) { return true; } + if (!@base.IsGenericType) { return false; } + + var baseDefinition = @base.GetGenericTypeDefinition(); + return TraverseAlong(derived, t => t.BaseType) + .Concat(derived.GetInterfaces()) + .Any(t => t.IsConstructedGenericType && t.GetGenericTypeDefinition() == baseDefinition); + } + + // simplified versions of Traverse methods since Traverse is not strong-named - var stack = new Stack>(); - stack.Push(children(root).GetEnumerator()); + private static IEnumerable TraverseDepthFirst(T root, Func> children) + { + yield return root; + + var stack = new Stack>(); + stack.Push(children(root).GetEnumerator()); - try + try + { + while (true) { - while (true) + if (stack.Peek().MoveNext()) { - if (stack.Peek().MoveNext()) - { - yield return stack.Peek().Current; - stack.Push(children(stack.Peek().Current).GetEnumerator()); - } - else - { - stack.Peek().Dispose(); - stack.Pop(); - if (stack.Count == 0) { break; } - } + yield return stack.Peek().Current; + stack.Push(children(stack.Peek().Current).GetEnumerator()); + } + else + { + stack.Peek().Dispose(); + stack.Pop(); + if (stack.Count == 0) { break; } } - } - finally - { - while (stack.Count > 0) { stack.Pop().Dispose(); } } } + finally + { + while (stack.Count > 0) { stack.Pop().Dispose(); } + } + } - private static IEnumerable TraverseAlong(T? root, Func next) - where T : class + private static IEnumerable TraverseAlong(T? root, Func next) + where T : class + { + for (T? node = root; node != null; node = next(node)) { - for (T? node = root; node != null; node = next(node)) - { - yield return node; - } + yield return node; } } } diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index 0c4ab9ad..c9d37967 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -2,89 +2,88 @@ using NUnit.Framework; using System; -namespace Medallion.Threading.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles; + +[Category("CIWindows")] +public class EventWaitHandleDistributedLockTest { - [Category("CIWindows")] - public class EventWaitHandleDistributedLockTest + [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] + [TestCase(null, NameStyle.Safe, ExpectedResult = typeof(ArgumentNullException))] + [TestCase("abc", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"gLoBaL\weirdPrefixCasing", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"global\weirdPrefixCasing2", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase("", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + [TestCase(@"a\b", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + public Type TestBadName(string? name, NameStyle nameStyle) { - [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] - [TestCase(null, NameStyle.Safe, ExpectedResult = typeof(ArgumentNullException))] - [TestCase("abc", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase(@"gLoBaL\weirdPrefixCasing", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase(@"global\weirdPrefixCasing2", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase("", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] - [TestCase(@"a\b", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] - public Type TestBadName(string? name, NameStyle nameStyle) + if (name != null) { - if (name != null) - { - this.TestWorkingName(name, NameStyle.Safe); // should always work - } - - return Assert.Catch(() => CreateLock(name!, nameStyle)).GetType(); + this.TestWorkingName(name, NameStyle.Safe); // should always work } - [TestCase(" \t", NameStyle.AddPrefix)] - [TestCase("/a/b/c", NameStyle.AddPrefix)] - [TestCase("\r\n", NameStyle.AddPrefix)] - public void TestWorkingName(string name, NameStyle nameStyle) => - Assert.DoesNotThrow(() => CreateLock(name, nameStyle).Acquire().Dispose()); + return Assert.Catch(() => CreateLock(name!, nameStyle)).GetType(); + } - [Test] - public void TestMaxLengthNames() - { - var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix - + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); - this.TestWorkingName(maxLengthName, NameStyle.Exact); - this.TestBadName(maxLengthName + "a", NameStyle.Exact); - } + [TestCase(" \t", NameStyle.AddPrefix)] + [TestCase("/a/b/c", NameStyle.AddPrefix)] + [TestCase("\r\n", NameStyle.AddPrefix)] + public void TestWorkingName(string name, NameStyle nameStyle) => + Assert.DoesNotThrow(() => CreateLock(name, nameStyle).Acquire().Dispose()); - [Test] - public void TestGarbageCollection() - { - var @lock = CreateLock("gc_test", NameStyle.AddPrefix); - WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); + [Test] + public void TestMaxLengthNames() + { + var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix + + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); + this.TestWorkingName(maxLengthName, NameStyle.Exact); + this.TestBadName(maxLengthName + "a", NameStyle.Exact); + } - var weakHandle = AbandonLock(); - GC.Collect(); - GC.WaitForPendingFinalizers(); + [Test] + public void TestGarbageCollection() + { + var @lock = CreateLock("gc_test", NameStyle.AddPrefix); + WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); - weakHandle.IsAlive.ShouldEqual(false); - using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); - } + var weakHandle = AbandonLock(); + GC.Collect(); + GC.WaitForPendingFinalizers(); - [Test] - public void TestGetSafeLockNameCompat() - { - // stored separately for testing compat - const int MaxNameLengthWithoutGlobalPrefix = 253; - (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) - .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); + weakHandle.IsAlive.ShouldEqual(false); + using var handle = @lock.TryAcquire(); + Assert.IsNotNull(handle); + } - new EventWaitHandleDistributedLock("").Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); - new EventWaitHandleDistributedLock("abc").Name.ShouldEqual(@"Global\abc"); - new EventWaitHandleDistributedLock("\\").Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); - new EventWaitHandleDistributedLock(new string('a', MaxNameLengthWithoutGlobalPrefix)).Name - .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); - new EventWaitHandleDistributedLock(new string('\\', MaxNameLengthWithoutGlobalPrefix)).Name - .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); - new EventWaitHandleDistributedLock(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)).Name - .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); - } + [Test] + public void TestGetSafeLockNameCompat() + { + // stored separately for testing compat + const int MaxNameLengthWithoutGlobalPrefix = 253; + (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) + .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); - private static EventWaitHandleDistributedLock CreateLock(string name, NameStyle nameStyle) => - new EventWaitHandleDistributedLock( - (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), - abandonmentCheckCadence: TimeSpan.FromSeconds(.3), - exactName: nameStyle != NameStyle.Safe - ); + new EventWaitHandleDistributedLock("").Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + new EventWaitHandleDistributedLock("abc").Name.ShouldEqual(@"Global\abc"); + new EventWaitHandleDistributedLock("\\").Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); + new EventWaitHandleDistributedLock(new string('a', MaxNameLengthWithoutGlobalPrefix)).Name + .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); + new EventWaitHandleDistributedLock(new string('\\', MaxNameLengthWithoutGlobalPrefix)).Name + .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); + new EventWaitHandleDistributedLock(new string('x', MaxNameLengthWithoutGlobalPrefix + 1)).Name + .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); + } - public enum NameStyle - { - Exact, - AddPrefix, - Safe, - } + private static EventWaitHandleDistributedLock CreateLock(string name, NameStyle nameStyle) => + new EventWaitHandleDistributedLock( + (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), + abandonmentCheckCadence: TimeSpan.FromSeconds(.3), + exactName: nameStyle != NameStyle.Safe + ); + + public enum NameStyle + { + Exact, + AddPrefix, + Safe, } } diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 16f0dbab..6bd9b7ab 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -7,153 +7,152 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles; + +[Category("CIWindows")] +public class WaitHandleDistributedSemaphoreTest { - [Category("CIWindows")] - public class WaitHandleDistributedSemaphoreTest + [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] + [TestCase(null, NameStyle.Safe, ExpectedResult = typeof(ArgumentNullException))] + [TestCase("abc", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"gLoBaL\weirdPrefixCasing", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase(@"global\weirdPrefixCasing2", NameStyle.Exact, ExpectedResult = typeof(FormatException))] + [TestCase("", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + [TestCase(@"a\b", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] + public Type TestBadName(string? name, NameStyle nameStyle) { - [TestCase(null, NameStyle.Exact, ExpectedResult = typeof(ArgumentNullException))] - [TestCase(null, NameStyle.Safe, ExpectedResult = typeof(ArgumentNullException))] - [TestCase("abc", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase(@"gLoBaL\weirdPrefixCasing", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase(@"global\weirdPrefixCasing2", NameStyle.Exact, ExpectedResult = typeof(FormatException))] - [TestCase("", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] - [TestCase(@"a\b", NameStyle.AddPrefix, ExpectedResult = typeof(FormatException))] - public Type TestBadName(string? name, NameStyle nameStyle) + if (name != null) { - if (name != null) - { - this.TestWorkingName(name, NameStyle.Safe); // should always work - } - - return Assert.Catch(() => CreateAsLock(name!, nameStyle)).GetType(); + this.TestWorkingName(name, NameStyle.Safe); // should always work } - [TestCase(" \t", NameStyle.AddPrefix)] - [TestCase("/a/b/c", NameStyle.AddPrefix)] - [TestCase("\r\n", NameStyle.AddPrefix)] - public void TestWorkingName(string name, NameStyle nameStyle) => - Assert.DoesNotThrow(() => CreateAsLock(name, nameStyle).Acquire().Dispose()); + return Assert.Catch(() => CreateAsLock(name!, nameStyle)).GetType(); + } - [Test] - public void TestMaxLengthNames() - { - var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix - + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); - this.TestWorkingName(maxLengthName, NameStyle.Exact); - this.TestBadName(maxLengthName + "a", NameStyle.Exact); - } + [TestCase(" \t", NameStyle.AddPrefix)] + [TestCase("/a/b/c", NameStyle.AddPrefix)] + [TestCase("\r\n", NameStyle.AddPrefix)] + public void TestWorkingName(string name, NameStyle nameStyle) => + Assert.DoesNotThrow(() => CreateAsLock(name, nameStyle).Acquire().Dispose()); - [Test] - public async Task TestGarbageCollection() - { - var @lock = CreateAsLock("gc_test", NameStyle.AddPrefix); - WeakReference AbandonLock() => new(@lock.Acquire()); + [Test] + public void TestMaxLengthNames() + { + var maxLengthName = DistributedWaitHandleHelpers.GlobalPrefix + + new string('a', DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length); + this.TestWorkingName(maxLengthName, NameStyle.Exact); + this.TestBadName(maxLengthName + "a", NameStyle.Exact); + } - var weakHandle = AbandonLock(); - GC.Collect(); - GC.WaitForPendingFinalizers(); - await ManagedFinalizerQueue.Instance.FinalizeAsync(); + [Test] + public async Task TestGarbageCollection() + { + var @lock = CreateAsLock("gc_test", NameStyle.AddPrefix); + WeakReference AbandonLock() => new(@lock.Acquire()); - weakHandle.IsAlive.ShouldEqual(false); - using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); - } + var weakHandle = AbandonLock(); + GC.Collect(); + GC.WaitForPendingFinalizers(); + await ManagedFinalizerQueue.Instance.FinalizeAsync(); - [Test] - public void TestGetSafeLockNameCompat() - { - // stored separately for testing compat - const int MaxNameLengthWithoutGlobalPrefix = 253; - (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) - .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); - - new WaitHandleDistributedSemaphore("", 1).Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); - new WaitHandleDistributedSemaphore("abc", 1).Name.ShouldEqual(@"Global\abc"); - new WaitHandleDistributedSemaphore("\\", 1).Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); - new WaitHandleDistributedSemaphore(new string('a', MaxNameLengthWithoutGlobalPrefix), 1).Name - .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); - new WaitHandleDistributedSemaphore(new string('\\', MaxNameLengthWithoutGlobalPrefix), 1).Name - .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); - new WaitHandleDistributedSemaphore(new string('x', MaxNameLengthWithoutGlobalPrefix + 1), 1).Name - .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); - } + weakHandle.IsAlive.ShouldEqual(false); + using var handle = @lock.TryAcquire(); + Assert.IsNotNull(handle); + } - /// - /// Attempts to reproduce https://github.com/madelson/DistributedLock/issues/120. - /// - /// NOTE: in practice this race condition is so slim that to reproduce with any reliability requires - /// adding a call to Thread.Sleep(1) at the start of WaitHandleExtensions.Resignal(). - /// - [Test] - public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) - { - var semaphore = new WaitHandleDistributedSemaphore(nameof(this.TestCancellationDoesNotLeadToLostSignal), 2); - await using var _ = await semaphore.AcquireAsync(TimeSpan.FromSeconds(1)); + [Test] + public void TestGetSafeLockNameCompat() + { + // stored separately for testing compat + const int MaxNameLengthWithoutGlobalPrefix = 253; + (DistributedWaitHandleHelpers.MaxNameLength - DistributedWaitHandleHelpers.GlobalPrefix.Length) + .ShouldEqual(MaxNameLengthWithoutGlobalPrefix); + + new WaitHandleDistributedSemaphore("", 1).Name.ShouldEqual(@"Global\EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="); + new WaitHandleDistributedSemaphore("abc", 1).Name.ShouldEqual(@"Global\abc"); + new WaitHandleDistributedSemaphore("\\", 1).Name.ShouldEqual(@"Global\_CgzRFsLFf7El/ZraEx9sqWRYeplYohSBSmI9sYIe1c4y2u7ECFoU4x2QCjV7HiVJMZsuDMLIz7r8akpKr+viAw=="); + new WaitHandleDistributedSemaphore(new string('a', MaxNameLengthWithoutGlobalPrefix), 1).Name + .ShouldEqual(@"Global\" + new string('a', MaxNameLengthWithoutGlobalPrefix)); + new WaitHandleDistributedSemaphore(new string('\\', MaxNameLengthWithoutGlobalPrefix), 1).Name + .ShouldEqual(@"Global\_____________________________________________________________________________________________________________________________________________________________________Y7DJXlpJeJjeX5XAOWV+ka/3ONBj5dHhKWcSH4pd5AC9YHFm+l1gBArGpBSBn3WcX00ArcDtKw7g24kJaHLifQ=="); + new WaitHandleDistributedSemaphore(new string('x', MaxNameLengthWithoutGlobalPrefix + 1), 1).Name + .ShouldEqual(@"Global\xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxsrCnXZ1XHiT//dOSBfAU0iC4Gtnlr0dQACBUK8Ev2OdRYJ9jcvbiqVCv/rjyPemTW9AvOonkdr0B2bG04gmeYA=="); + } - Random random = new(); - for (var i = 0; i < 50; ++i) - { - using var blockingHandle = semaphore.TryAcquire(TimeSpan.Zero); // claim the last slot on the semaphore - Assert.IsNotNull(blockingHandle); + /// + /// Attempts to reproduce https://github.com/madelson/DistributedLock/issues/120. + /// + /// NOTE: in practice this race condition is so slim that to reproduce with any reliability requires + /// adding a call to Thread.Sleep(1) at the start of WaitHandleExtensions.Resignal(). + /// + [Test] + public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) + { + var semaphore = new WaitHandleDistributedSemaphore(nameof(this.TestCancellationDoesNotLeadToLostSignal), 2); + await using var _ = await semaphore.AcquireAsync(TimeSpan.FromSeconds(1)); - using CancellationTokenSource source = new(); + Random random = new(); + for (var i = 0; i < 50; ++i) + { + using var blockingHandle = semaphore.TryAcquire(TimeSpan.Zero); // claim the last slot on the semaphore + Assert.IsNotNull(blockingHandle); - using SemaphoreSlim acquiringEvent = new(initialCount: 0, maxCount: 1); - var acquireTask = Task.Run(async () => + using CancellationTokenSource source = new(); + + using SemaphoreSlim acquiringEvent = new(initialCount: 0, maxCount: 1); + var acquireTask = Task.Run(async () => + { + try { - try + if (async) { - if (async) - { - var acquireHandleTask = semaphore.AcquireAsync(TimeSpan.FromSeconds(30), source.Token); - acquiringEvent.Release(); - (await acquireHandleTask).Dispose(); - } - else - { - acquiringEvent.Release(); - semaphore.Acquire(TimeSpan.FromSeconds(30), source.Token).Dispose(); - } + var acquireHandleTask = semaphore.AcquireAsync(TimeSpan.FromSeconds(30), source.Token); + acquiringEvent.Release(); + (await acquireHandleTask).Dispose(); } - catch (OperationCanceledException) { } - }); - await acquiringEvent.WaitAsync(); - Assert.IsFalse(acquireTask.IsCompleted); - - using Barrier barrier = new(participantCount: 2); - var releaseTask = Task.Run(() => - { - barrier.SignalAndWait(); - blockingHandle!.Dispose(); - }); - var cancelTask = Task.Run(() => - { - barrier.SignalAndWait(); - var yieldCount = random.Next(5, 25); - for (var i = 0; i < yieldCount; ++i) { Thread.Yield(); } - source.Cancel(); - }); - await Task.WhenAll(acquireTask, releaseTask, cancelTask); - } - - await using var handle = await semaphore.TryAcquireAsync(); - Assert.IsNotNull(handle); // if we lost even a single signal due to cancellation in the loop above, this will fail + else + { + acquiringEvent.Release(); + semaphore.Acquire(TimeSpan.FromSeconds(30), source.Token).Dispose(); + } + } + catch (OperationCanceledException) { } + }); + await acquiringEvent.WaitAsync(); + Assert.IsFalse(acquireTask.IsCompleted); + + using Barrier barrier = new(participantCount: 2); + var releaseTask = Task.Run(() => + { + barrier.SignalAndWait(); + blockingHandle!.Dispose(); + }); + var cancelTask = Task.Run(() => + { + barrier.SignalAndWait(); + var yieldCount = random.Next(5, 25); + for (var i = 0; i < yieldCount; ++i) { Thread.Yield(); } + source.Cancel(); + }); + await Task.WhenAll(acquireTask, releaseTask, cancelTask); } - private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => - new( - nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name, - maxCount: 1, - abandonmentCheckCadence: TimeSpan.FromSeconds(.3), - exactName: nameStyle != NameStyle.Safe - ); + await using var handle = await semaphore.TryAcquireAsync(); + Assert.IsNotNull(handle); // if we lost even a single signal due to cancellation in the loop above, this will fail + } + + private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => + new( + nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name, + maxCount: 1, + abandonmentCheckCadence: TimeSpan.FromSeconds(.3), + exactName: nameStyle != NameStyle.Safe + ); - public enum NameStyle - { - Exact, - AddPrefix, - Safe, - } + public enum NameStyle + { + Exact, + AddPrefix, + Safe, } } diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs index 47954c46..9b5a152e 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs @@ -5,31 +5,30 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.WaitHandles +namespace Medallion.Threading.Tests.WaitHandles; + +public class WaitHandleDistributedSynchronizationProviderTest { - public class WaitHandleDistributedSynchronizationProviderTest + [Test] + public async Task BasicTest() { - [Test] - public async Task BasicTest() - { - var provider = new WaitHandleDistributedSynchronizationProvider(); + var provider = new WaitHandleDistributedSynchronizationProvider(); - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); - } + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle); + } - const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; - await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) - { - await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; + await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) + { + await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNotNull(handle); - await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); - } + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); + Assert.IsNull(failedHandle); } } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs index 823d5cad..c977dcd2 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -6,35 +6,34 @@ using System.Reflection; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +[Category("CI")] +public class ZooKeeperApiTest { - [Category("CI")] - public class ZooKeeperApiTest + [Test] + public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() { - [Test] - public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() - { - Assert.IsEmpty( - GetPublicTypes().SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance)) - .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))) - ); - } + Assert.IsEmpty( + GetPublicTypes().SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance)) + .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))) + ); + } - [Test] - public void TestNamePropertyIsImplementedExplicitlyInFavorOfPath() + [Test] + public void TestNamePropertyIsImplementedExplicitlyInFavorOfPath() + { + Assert.IsEmpty(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null)); + foreach (var lockType in GetPublicTypes() + .Where(t => t.GetInterfaces().Any(i => i.GetProperty("Name") != null))) { - Assert.IsEmpty(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null)); - foreach (var lockType in GetPublicTypes() - .Where(t => t.GetInterfaces().Any(i => i.GetProperty("Name") != null))) - { - var pathProperty = lockType.GetProperty("Path"); - Assert.IsNotNull(pathProperty, $"{lockType} missing Path"); - pathProperty!.PropertyType.ShouldEqual(typeof(ZooKeeperPath)); - Assert.IsNull(lockType.GetProperty("Name")); - } + var pathProperty = lockType.GetProperty("Path"); + Assert.IsNotNull(pathProperty, $"{lockType} missing Path"); + pathProperty!.PropertyType.ShouldEqual(typeof(ZooKeeperPath)); + Assert.IsNull(lockType.GetProperty("Name")); } - - private static IEnumerable GetPublicTypes() => typeof(ZooKeeperDistributedLock).Assembly.GetTypes() - .Where(t => t.IsPublic || t.IsNestedPublic); } + + private static IEnumerable GetPublicTypes() => typeof(ZooKeeperDistributedLock).Assembly.GetTypes() + .Where(t => t.IsPublic || t.IsNestedPublic); } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs index ad9be77b..d4c0b815 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs @@ -4,38 +4,37 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +[Category("CI")] +public class ZooKeeperConnectionInfoTest { - [Category("CI")] - public class ZooKeeperConnectionInfoTest + [Test] + public void TestEquality() { - [Test] - public void TestEquality() - { - var connectionA = new ZooKeeperConnectionInfo( - "cs", - TimeSpan.FromSeconds(1), - TimeSpan.FromSeconds(2), - new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) - ); - var connectionB = new ZooKeeperConnectionInfo( - "cs", - TimeSpan.FromSeconds(1), - TimeSpan.FromSeconds(2), - new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) - ); - var connectionC = connectionA with { - AuthInfo = new EquatableReadOnlyList(new[] - { - new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })), - new ZooKeeperAuthInfo("s2", new EquatableReadOnlyList(new byte[] { 11 })), - }) - }; + var connectionA = new ZooKeeperConnectionInfo( + "cs", + TimeSpan.FromSeconds(1), + TimeSpan.FromSeconds(2), + new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) + ); + var connectionB = new ZooKeeperConnectionInfo( + "cs", + TimeSpan.FromSeconds(1), + TimeSpan.FromSeconds(2), + new EquatableReadOnlyList(new[] { new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })) }) + ); + var connectionC = connectionA with { + AuthInfo = new EquatableReadOnlyList(new[] + { + new ZooKeeperAuthInfo("s", new EquatableReadOnlyList(new byte[] { 10 })), + new ZooKeeperAuthInfo("s2", new EquatableReadOnlyList(new byte[] { 11 })), + }) + }; - Assert.IsTrue(connectionA == connectionB); - connectionA.GetHashCode().ShouldEqual(connectionB.GetHashCode()); - Assert.IsFalse(connectionA == connectionC); - Assert.AreNotEqual(connectionA.GetHashCode(), connectionC.GetHashCode()); - } + Assert.IsTrue(connectionA == connectionB); + connectionA.GetHashCode().ShouldEqual(connectionB.GetHashCode()); + Assert.IsFalse(connectionA == connectionC); + Assert.AreNotEqual(connectionA.GetHashCode(), connectionC.GetHashCode()); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs index a5b520c2..458b51b0 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -8,107 +8,106 @@ using System.Linq; using Medallion.Threading.Internal; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +using org.apache.zookeeper; + +public class ZooKeeperConnectionTest { - using org.apache.zookeeper; - - public class ZooKeeperConnectionTest + [Test] + public async Task TestSharesConnections() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + + Assert.AreNotSame(connection1, connection2); + Assert.AreSame(connection1.ZooKeeper, connection2.ZooKeeper); + + connection1.Dispose(); + connection2.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); + } + + [Test] + public async Task TestDoesNotShareDifferentConnections() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(30)), CancellationToken.None); + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(20)), CancellationToken.None); + + Assert.AreNotSame(connection1, connection2); + Assert.AreNotSame(connection1.ZooKeeper, connection2.ZooKeeper); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestConnectionIsClosedAndNotSharedAfterMaxAgeElapses() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); + + using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + var zooKeeper1 = connection1.ZooKeeper; + + connection1.Dispose(); + Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3))); + + using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + Assert.AreNotSame(zooKeeper1, connection2.ZooKeeper); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestConnectionCanBeHeldOpenAfterMaxAgeButDoesNotShareAndClosesAfterwards() { - [Test] - public async Task TestSharesConnections() - { - var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); - using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - - Assert.AreNotSame(connection1, connection2); - Assert.AreSame(connection1.ZooKeeper, connection2.ZooKeeper); - - connection1.Dispose(); - connection2.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); - } - - [Test] - public async Task TestDoesNotShareDifferentConnections() - { - var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); - using var connection1 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(30)), CancellationToken.None); - using var connection2 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(20)), CancellationToken.None); - - Assert.AreNotSame(connection1, connection2); - Assert.AreNotSame(connection1.ZooKeeper, connection2.ZooKeeper); - } - - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestConnectionIsClosedAndNotSharedAfterMaxAgeElapses() - { - var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); - - using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - var zooKeeper1 = connection1.ZooKeeper; - - connection1.Dispose(); - Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3))); - - using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - Assert.AreNotSame(zooKeeper1, connection2.ZooKeeper); - } - - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestConnectionCanBeHeldOpenAfterMaxAgeButDoesNotShareAndClosesAfterwards() - { - var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); - - using var connection = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - Assert.IsTrue(await TestHelper.WaitForAsync( - async () => - { - using var testConnectionInfo = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - return testConnectionInfo.ZooKeeper != connection.ZooKeeper; - }, - TimeSpan.FromSeconds(3) - )); - - connection.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); - var zooKeeper = connection.ZooKeeper; - connection.Dispose(); - Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper.getState() != ZooKeeper.States.CONNECTED).AsValueTask(), TimeSpan.FromSeconds(1))); - } - - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public void TestConnectTimeout() - { - var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); - Assert.ThrowsAsync(() => pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.Zero), CancellationToken.None)); - } - - [Test] - public void TestThreadSafety() - { - var connectionInfos = Enumerable.Range(1, 3) - .Select(i => GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(10 * i))) - .ToArray(); - var tasks = Enumerable.Range(0, 100) - .Select(i => Task.Run(async () => - { - using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(connectionInfos[i % connectionInfos.Length], CancellationToken.None); - await connection.ZooKeeper.existsAsync("/zookeeper"); - await Task.Delay(1); - await connection.ZooKeeper.existsAsync($"/{Guid.NewGuid()}"); - })) - .ToArray(); - Assert.DoesNotThrow(() => Task.WaitAll(tasks)); - } - - private static ZooKeeperConnectionInfo GetConnectionInfo(TimeoutValue? connectTimeout = null) => - new ZooKeeperConnectionInfo( - ZooKeeperPorts.DefaultConnectionString, - ConnectTimeout: connectTimeout ?? TimeSpan.FromSeconds(30), - SessionTimeout: TimeSpan.FromSeconds(30), - new EquatableReadOnlyList(Array.Empty()) - ); + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); + + using var connection = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + Assert.IsTrue(await TestHelper.WaitForAsync( + async () => + { + using var testConnectionInfo = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); + return testConnectionInfo.ZooKeeper != connection.ZooKeeper; + }, + TimeSpan.FromSeconds(3) + )); + + connection.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); + var zooKeeper = connection.ZooKeeper; + connection.Dispose(); + Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper.getState() != ZooKeeper.States.CONNECTED).AsValueTask(), TimeSpan.FromSeconds(1))); } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public void TestConnectTimeout() + { + var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(10)); + Assert.ThrowsAsync(() => pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.Zero), CancellationToken.None)); + } + + [Test] + public void TestThreadSafety() + { + var connectionInfos = Enumerable.Range(1, 3) + .Select(i => GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(10 * i))) + .ToArray(); + var tasks = Enumerable.Range(0, 100) + .Select(i => Task.Run(async () => + { + using var connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(connectionInfos[i % connectionInfos.Length], CancellationToken.None); + await connection.ZooKeeper.existsAsync("/zookeeper"); + await Task.Delay(1); + await connection.ZooKeeper.existsAsync($"/{Guid.NewGuid()}"); + })) + .ToArray(); + Assert.DoesNotThrow(() => Task.WaitAll(tasks)); + } + + private static ZooKeeperConnectionInfo GetConnectionInfo(TimeoutValue? connectTimeout = null) => + new ZooKeeperConnectionInfo( + ZooKeeperPorts.DefaultConnectionString, + ConnectTimeout: connectTimeout ?? TimeSpan.FromSeconds(30), + SessionTimeout: TimeSpan.FromSeconds(30), + new EquatableReadOnlyList(Array.Empty()) + ); } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs index d5d14198..77d31ba7 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs @@ -11,35 +11,34 @@ using org.apache.zookeeper; using org.apache.zookeeper.data; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public class ZooKeeperDistributedLockTest { - public class ZooKeeperDistributedLockTest + [Test, Category("CI")] + public void TestValidatesConstructorArguments() { - [Test, Category("CI")] - public void TestValidatesConstructorArguments() - { - Assert.Throws(() => new ZooKeeperDistributedLock(null!, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedLock("name", null!)); - Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/name"), null!)); - Assert.Throws(() => new ZooKeeperDistributedLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "name", default(string)!)); - } + Assert.Throws(() => new ZooKeeperDistributedLock(null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock("name", null!)); + Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/name"), null!)); + Assert.Throws(() => new ZooKeeperDistributedLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "name", default(string)!)); + } - [Test, Category("CI")] - public void TestNameReturnsPathString() - { - var @lock = new ZooKeeperDistributedLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); - @lock.As().Name.ShouldEqual(@lock.Path.ToString()); - } + [Test, Category("CI")] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } - [Test, Category("CI")] - public void TestProperlyCombinesDirectoryAndName() - { - new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); - Assert.That(new ZooKeeperDistributedLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); - } + [Test, Category("CI")] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs index 85a2ce1b..2ccad2e3 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs @@ -5,35 +5,34 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public class ZooKeeperDistributedReaderWriterLockTest { - public class ZooKeeperDistributedReaderWriterLockTest + [Test, Category("CI")] + public void TestValidatesConstructorArguments() { - [Test, Category("CI")] - public void TestValidatesConstructorArguments() - { - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(null!, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock("name", null!)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/name"), null!)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "name", default(string)!)); - } + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock("name", null!)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/name"), null!)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(ZooKeeperPath.Root, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(default(ZooKeeperPath), "name", ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), null!, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "name", default(string)!)); + } - [Test, Category("CI")] - public void TestNameReturnsPathString() - { - var @lock = new ZooKeeperDistributedReaderWriterLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); - @lock.As().Name.ShouldEqual(@lock.Path.ToString()); - } + [Test, Category("CI")] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedReaderWriterLock("some/crazy/name", ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } - [Test, Category("CI")] - public void TestProperlyCombinesDirectoryAndName() - { - new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); - Assert.That(new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); - } + [Test, Category("CI")] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/dir"), "a", ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath("/a/b"), "c/d", ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs index 0381c760..d35476c5 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs @@ -5,37 +5,36 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public class ZooKeeperDistributedSemaphoreTest { - public class ZooKeeperDistributedSemaphoreTest + [Test, Category("CI")] + public void TestValidatesConstructorArguments() { - [Test, Category("CI")] - public void TestValidatesConstructorArguments() - { - Assert.Throws(() => new ZooKeeperDistributedSemaphore(null!, 2, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", -1, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 0, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 2, null!)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), 2, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/name"), 2, null!)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(ZooKeeperPath.Root, 2, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), "name", 2, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), null!, 2, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "name", 2, default(string)!)); - } + Assert.Throws(() => new ZooKeeperDistributedSemaphore(null!, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", -1, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 0, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore("name", 2, null!)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/name"), 2, null!)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(ZooKeeperPath.Root, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(default(ZooKeeperPath), "name", 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), null!, 2, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "name", 2, default(string)!)); + } - [Test, Category("CI")] - public void TestNameReturnsPathString() - { - var @lock = new ZooKeeperDistributedSemaphore("some/crazy/name", 2, ZooKeeperPorts.DefaultConnectionString); - @lock.As().Name.ShouldEqual(@lock.Path.ToString()); - } + [Test, Category("CI")] + public void TestNameReturnsPathString() + { + var @lock = new ZooKeeperDistributedSemaphore("some/crazy/name", 2, ZooKeeperPorts.DefaultConnectionString); + @lock.As().Name.ShouldEqual(@lock.Path.ToString()); + } - [Test, Category("CI")] - public void TestProperlyCombinesDirectoryAndName() - { - new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "a", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); - Assert.That(new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/a/b"), "c/d", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); - } + [Test, Category("CI")] + public void TestProperlyCombinesDirectoryAndName() + { + new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/dir"), "a", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString().ShouldEqual("/dir/a"); + Assert.That(new ZooKeeperDistributedSemaphore(new ZooKeeperPath("/a/b"), "c/d", 2, ZooKeeperPorts.DefaultConnectionString).Path.ToString(), Does.StartWith("/a/b/")); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs index e190805c..11090c46 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs @@ -5,25 +5,24 @@ using System.Text; using System.Threading; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +[Category("CI")] +public class ZooKeeperDistributedSynchronizationOptionsBuilderTest { - [Category("CI")] - public class ZooKeeperDistributedSynchronizationOptionsBuilderTest + [Test] + public void TestValidatesArguments() { - [Test] - public void TestValidatesArguments() - { - Assert.Throws(Create(b => b.ConnectTimeout(TimeSpan.FromSeconds(-2)))); - Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.FromSeconds(-2)))); - Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.Zero))); - Assert.Throws(Create(b => b.SessionTimeout(Timeout.InfiniteTimeSpan))); - Assert.Throws(Create(b => b.AddAuthInfo(null!, Array.Empty()))); - Assert.Throws(Create(b => b.AddAuthInfo("scheme", null!))); - Assert.Throws(Create(b => b.AddAccessControl(null!, "id", 0x1f))); - Assert.Throws(Create(b => b.AddAccessControl("scheme", null!, 0x1f))); + Assert.Throws(Create(b => b.ConnectTimeout(TimeSpan.FromSeconds(-2)))); + Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.FromSeconds(-2)))); + Assert.Throws(Create(b => b.SessionTimeout(TimeSpan.Zero))); + Assert.Throws(Create(b => b.SessionTimeout(Timeout.InfiniteTimeSpan))); + Assert.Throws(Create(b => b.AddAuthInfo(null!, Array.Empty()))); + Assert.Throws(Create(b => b.AddAuthInfo("scheme", null!))); + Assert.Throws(Create(b => b.AddAccessControl(null!, "id", 0x1f))); + Assert.Throws(Create(b => b.AddAccessControl("scheme", null!, 0x1f))); - static TestDelegate Create(Action action) => - () => ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(action); - } + static TestDelegate Create(Action action) => + () => ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(action); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs index 72a54070..4e79457e 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs @@ -5,79 +5,78 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +public class ZooKeeperDistributedSynchronizationProviderTest { - public class ZooKeeperDistributedSynchronizationProviderTest + [Test, Category("CI")] + public void TestArgumentValidation() { - [Test, Category("CI")] - public void TestArgumentValidation() + Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(default, ZooKeeperPorts.DefaultConnectionString)); + Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(null!)); + } + + [Test] + public async Task BasicTest() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); + + var lockName = TestHelper.UniqueName + "Lock"; + await using (await provider.AcquireLockAsync(lockName)) { - Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(default, ZooKeeperPorts.DefaultConnectionString)); - Assert.Throws(() => new ZooKeeperDistributedSynchronizationProvider(null!)); + await using var handle = await provider.TryAcquireLockAsync(lockName); + Assert.IsNull(handle); } - [Test] - public async Task BasicTest() + var readerWriterLockName = TestHelper.UniqueName + "ReaderWriterLock"; + await using (await provider.AcquireReadLockAsync(readerWriterLockName)) { - var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); - - var lockName = TestHelper.UniqueName + "Lock"; - await using (await provider.AcquireLockAsync(lockName)) - { - await using var handle = await provider.TryAcquireLockAsync(lockName); - Assert.IsNull(handle); - } - - var readerWriterLockName = TestHelper.UniqueName + "ReaderWriterLock"; - await using (await provider.AcquireReadLockAsync(readerWriterLockName)) - { - await using var handle = await provider.TryAcquireWriteLockAsync(readerWriterLockName); - Assert.IsNull(handle); - } - - var semaphoreName = TestHelper.UniqueName + "Semaphore"; - await using (await provider.AcquireSemaphoreAsync(semaphoreName, 2)) - { - await using var handle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); - Assert.IsNotNull(handle); - - await using var failedHandle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); - Assert.IsNull(failedHandle); - } + await using var handle = await provider.TryAcquireWriteLockAsync(readerWriterLockName); + Assert.IsNull(handle); } - [Test] - public async Task TestDifferentPrimitivesDoNotCollide() + var semaphoreName = TestHelper.UniqueName + "Semaphore"; + await using (await provider.AcquireSemaphoreAsync(semaphoreName, 2)) { - var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); - - var name = TestHelper.UniqueName; - var @lock = provider.CreateLock(name); - var readerWriterLock = provider.CreateReaderWriterLock(name); - var semaphore = provider.CreateSemaphore(name, maxCount: 1); + await using var handle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); + Assert.IsNotNull(handle); - @lock.Path.ShouldEqual(readerWriterLock.Path); - @lock.Path.ShouldEqual(semaphore.Path); + await using var failedHandle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); + Assert.IsNull(failedHandle); + } + } - await using var lockHandle = await @lock.TryAcquireAsync(); - Assert.IsNotNull(lockHandle); - await using var readLockHandle = await readerWriterLock.TryAcquireReadLockAsync(); - Assert.IsNotNull(readLockHandle); - await using var semaphoreHandle = await semaphore.TryAcquireAsync(); - Assert.IsNotNull(semaphoreHandle); + [Test] + public async Task TestDifferentPrimitivesDoNotCollide() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(ZooKeeperPorts.DefaultConnectionString); + + var name = TestHelper.UniqueName; + var @lock = provider.CreateLock(name); + var readerWriterLock = provider.CreateReaderWriterLock(name); + var semaphore = provider.CreateSemaphore(name, maxCount: 1); - await readLockHandle!.DisposeAsync(); - await using var writeLockHandle = await readerWriterLock.TryAcquireWriteLockAsync(); - Assert.IsNotNull(writeLockHandle); - } + @lock.Path.ShouldEqual(readerWriterLock.Path); + @lock.Path.ShouldEqual(semaphore.Path); - [Test, Category("CI")] - public void TestIncorporatesDirectoryNameIfProvided() - { - var provider = new ZooKeeperDistributedSynchronizationProvider(new ZooKeeperPath("/foo"), ZooKeeperPorts.DefaultConnectionString); - provider.CreateLock("bar").Path.ToString().ShouldEqual("/foo/bar"); - provider.CreateReaderWriterLock("baz").Path.ToString().ShouldEqual("/foo/baz"); - provider.CreateSemaphore("qux", 1).Path.ToString().ShouldEqual("/foo/qux"); - } + await using var lockHandle = await @lock.TryAcquireAsync(); + Assert.IsNotNull(lockHandle); + await using var readLockHandle = await readerWriterLock.TryAcquireReadLockAsync(); + Assert.IsNotNull(readLockHandle); + await using var semaphoreHandle = await semaphore.TryAcquireAsync(); + Assert.IsNotNull(semaphoreHandle); + + await readLockHandle!.DisposeAsync(); + await using var writeLockHandle = await readerWriterLock.TryAcquireWriteLockAsync(); + Assert.IsNotNull(writeLockHandle); } + + [Test, Category("CI")] + public void TestIncorporatesDirectoryNameIfProvided() + { + var provider = new ZooKeeperDistributedSynchronizationProvider(new ZooKeeperPath("/foo"), ZooKeeperPorts.DefaultConnectionString); + provider.CreateLock("bar").Path.ToString().ShouldEqual("/foo/bar"); + provider.CreateReaderWriterLock("baz").Path.ToString().ShouldEqual("/foo/baz"); + provider.CreateSemaphore("qux", 1).Path.ToString().ShouldEqual("/foo/qux"); + } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index 7e1f0632..d7349f24 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -5,102 +5,101 @@ using System.Linq; using System.Text; -namespace Medallion.Threading.Tests.ZooKeeper +namespace Medallion.Threading.Tests.ZooKeeper; + +[Category("CI")] +public class ZooKeeperPathTest { - [Category("CI")] - public class ZooKeeperPathTest - { - [Test] - public void TestRejectsNull() => Assert.Throws(() => new ZooKeeperPath(null!)); + [Test] + public void TestRejectsNull() => Assert.Throws(() => new ZooKeeperPath(null!)); - [TestCase("")] - [TestCase("a")] - [TestCase("/a/")] - [TestCase("/x\0b")] - [TestCase("/.")] - [TestCase("/b/./a")] - [TestCase("/x/..")] - [TestCase("/../r")] - public void TestRejectsInvalidPaths(string path) => Assert.Throws(() => new ZooKeeperPath(path)); + [TestCase("")] + [TestCase("a")] + [TestCase("/a/")] + [TestCase("/x\0b")] + [TestCase("/.")] + [TestCase("/b/./a")] + [TestCase("/x/..")] + [TestCase("/../r")] + public void TestRejectsInvalidPaths(string path) => Assert.Throws(() => new ZooKeeperPath(path)); - [Test] - public void TestRejectsPathsWithControlCharacters() - { - // these can't be test cases because the control characters confuse the test explorer - this.TestRejectsInvalidPaths("/\u0000a"); - this.TestRejectsInvalidPaths("/a/\u007f"); - this.TestRejectsInvalidPaths("/a\uf8ff/b"); - this.TestRejectsInvalidPaths("/a\uffff"); - } + [Test] + public void TestRejectsPathsWithControlCharacters() + { + // these can't be test cases because the control characters confuse the test explorer + this.TestRejectsInvalidPaths("/\u0000a"); + this.TestRejectsInvalidPaths("/a/\u007f"); + this.TestRejectsInvalidPaths("/a\uf8ff/b"); + this.TestRejectsInvalidPaths("/a\uffff"); + } - [TestCase("/a.js")] - [TestCase("/...m")] - [TestCase("/...")] - [TestCase("/..foo")] - [TestCase("/a..")] - [TestCase("/.x")] - public void TestAllowsDotInNonRelativePath(string path) => Assert.DoesNotThrow(() => new ZooKeeperPath(path)); + [TestCase("/a.js")] + [TestCase("/...m")] + [TestCase("/...")] + [TestCase("/..foo")] + [TestCase("/a..")] + [TestCase("/.x")] + public void TestAllowsDotInNonRelativePath(string path) => Assert.DoesNotThrow(() => new ZooKeeperPath(path)); - [TestCase("/", "abc", ExpectedResult = "/abc")] - [TestCase("/xyz/foo", "bar", ExpectedResult = "/xyz/foo/bar")] - [TestCase("/", "...", ExpectedResult = "/...")] - [TestCase("/", "", ExpectedResult = "/EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg_SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==")] - [TestCase("/", "/", ExpectedResult = "/_XIbwNE7SSUJciq0_Jytyos4P84h5HzFJfq8lf6cmKUh_qv1_0n6w3WNV1VCeLz+vdnEQFc2SB9JI1VD96hUnTw==")] - [TestCase("/", "a/", ExpectedResult = "/a__H_H9kmjf3WHGaL30_9h_RNn+GipsxwkovtbOR9nXFUa9lT++YHfmM7FomA2RoilE23u5yCsImr8ImvgukZ3lQ==")] - [TestCase("/bar", "\0", ExpectedResult = "/bar/_uCRNAomB1pOve0Vq+O+kytY9KC4Z_xSULCRuUNk1HSJwSoAqccNYC2Nw3kzrKTwySoQjNCVX1OXDhDjw42kQ7g==")] - [TestCase("/a.a", ".", ExpectedResult = "/a.a/._C2EkHXwXvLsbrucJTRS3xFHv7Mf_y9klmKDxPTE8yevCoH5h8Ae69Y+_lP+ahpW91crnzgO78elOk2E6APJfIQ==")] - [TestCase("/b..b/a", "..", ExpectedResult = "/b..b/a/.._Rh_NqllQfVidZsBWJatUTHt1u_RuBCeYLhNba59jtMe0u1rD7QNtp2QKxdN3Ohz1E1VnJ_yfFMevOUWeSrtxxw==")] - [TestCase("/a/b", "/..", ExpectedResult = "/a/b/_..p0p_PzMVsjkHpwCrL63ktSqk0bLNJX9_X+7BtDMfHWr5usgqZ3n5VVI3FSGJ0YPNrps_Pf7f9yxeCzz+AiD0sw==")] - [TestCase("/", "zookeeper", ExpectedResult = "/zookeeper_yX0zkYBzsEZ1VDADNUx54LUSt9VL9M9lOPoez38tnk4FrBtllVz+ksFllir7N2yla_wy22pIOnbpcfRkcVXBag==")] - [TestCase("/", "zooKeeper", ExpectedResult = "/zooKeeper")] - [TestCase("/a", "zookeeper", ExpectedResult = "/a/zookeeper")] - public string TestGetChildNodePathWithSafeName(string path, string name) - { - var result = new ZooKeeperPath(path).GetChildNodePathWithSafeName(name); - Assert.DoesNotThrow(() => new ZooKeeperPath(result.ToString()), "should pass path validation"); - return result.ToString(); - } + [TestCase("/", "abc", ExpectedResult = "/abc")] + [TestCase("/xyz/foo", "bar", ExpectedResult = "/xyz/foo/bar")] + [TestCase("/", "...", ExpectedResult = "/...")] + [TestCase("/", "", ExpectedResult = "/EMPTYz4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg_SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==")] + [TestCase("/", "/", ExpectedResult = "/_XIbwNE7SSUJciq0_Jytyos4P84h5HzFJfq8lf6cmKUh_qv1_0n6w3WNV1VCeLz+vdnEQFc2SB9JI1VD96hUnTw==")] + [TestCase("/", "a/", ExpectedResult = "/a__H_H9kmjf3WHGaL30_9h_RNn+GipsxwkovtbOR9nXFUa9lT++YHfmM7FomA2RoilE23u5yCsImr8ImvgukZ3lQ==")] + [TestCase("/bar", "\0", ExpectedResult = "/bar/_uCRNAomB1pOve0Vq+O+kytY9KC4Z_xSULCRuUNk1HSJwSoAqccNYC2Nw3kzrKTwySoQjNCVX1OXDhDjw42kQ7g==")] + [TestCase("/a.a", ".", ExpectedResult = "/a.a/._C2EkHXwXvLsbrucJTRS3xFHv7Mf_y9klmKDxPTE8yevCoH5h8Ae69Y+_lP+ahpW91crnzgO78elOk2E6APJfIQ==")] + [TestCase("/b..b/a", "..", ExpectedResult = "/b..b/a/.._Rh_NqllQfVidZsBWJatUTHt1u_RuBCeYLhNba59jtMe0u1rD7QNtp2QKxdN3Ohz1E1VnJ_yfFMevOUWeSrtxxw==")] + [TestCase("/a/b", "/..", ExpectedResult = "/a/b/_..p0p_PzMVsjkHpwCrL63ktSqk0bLNJX9_X+7BtDMfHWr5usgqZ3n5VVI3FSGJ0YPNrps_Pf7f9yxeCzz+AiD0sw==")] + [TestCase("/", "zookeeper", ExpectedResult = "/zookeeper_yX0zkYBzsEZ1VDADNUx54LUSt9VL9M9lOPoez38tnk4FrBtllVz+ksFllir7N2yla_wy22pIOnbpcfRkcVXBag==")] + [TestCase("/", "zooKeeper", ExpectedResult = "/zooKeeper")] + [TestCase("/a", "zookeeper", ExpectedResult = "/a/zookeeper")] + public string TestGetChildNodePathWithSafeName(string path, string name) + { + var result = new ZooKeeperPath(path).GetChildNodePathWithSafeName(name); + Assert.DoesNotThrow(() => new ZooKeeperPath(result.ToString()), "should pass path validation"); + return result.ToString(); + } - [Test] - public void TestGetChildNodePathWithSafeNameHandlesControlCharacters() => - this.TestGetChildNodePathWithSafeName("/", "\u0000\u007f\uf8ff\uffff").ShouldEqual("/____7A++E8vPxbYKJmhCX1bUTCwjqJqW1POHfCeBk62R9hqB0Fd_uTUBIpv9mssG7K68FHZ_7wJ70UNRKsVH8CrngA=="); + [Test] + public void TestGetChildNodePathWithSafeNameHandlesControlCharacters() => + this.TestGetChildNodePathWithSafeName("/", "\u0000\u007f\uf8ff\uffff").ShouldEqual("/____7A++E8vPxbYKJmhCX1bUTCwjqJqW1POHfCeBk62R9hqB0Fd_uTUBIpv9mssG7K68FHZ_7wJ70UNRKsVH8CrngA=="); - [Test] - public void TestEquality() + [Test] + public void TestEquality() + { + var paths = new[] { null, "/", "/a", "/A" }.Select(p => p == null ? default : new ZooKeeperPath(p)).ToArray(); + for (var i = 0; i < paths.Length; ++i) { - var paths = new[] { null, "/", "/a", "/A" }.Select(p => p == null ? default : new ZooKeeperPath(p)).ToArray(); - for (var i = 0; i < paths.Length; ++i) + for (var j = 0; j < paths.Length; ++j) { - for (var j = 0; j < paths.Length; ++j) + if (i == j) + { + Assert.IsTrue(paths[i] == paths[j]); + Assert.IsFalse(paths[i] != paths[j]); + Assert.IsTrue(paths[i].Equals(paths[j])); + Assert.IsTrue(Equals(paths[i], paths[j])); + } + else { - if (i == j) - { - Assert.IsTrue(paths[i] == paths[j]); - Assert.IsFalse(paths[i] != paths[j]); - Assert.IsTrue(paths[i].Equals(paths[j])); - Assert.IsTrue(Equals(paths[i], paths[j])); - } - else - { - Assert.IsFalse(paths[i] == paths[j]); - Assert.IsTrue(paths[i] != paths[j]); - Assert.IsFalse(paths[i].Equals(paths[j])); - Assert.IsFalse(Equals(paths[i], paths[j])); - Assert.AreNotEqual(paths[i].GetHashCode(), paths[j].GetHashCode()); - } + Assert.IsFalse(paths[i] == paths[j]); + Assert.IsTrue(paths[i] != paths[j]); + Assert.IsFalse(paths[i].Equals(paths[j])); + Assert.IsFalse(Equals(paths[i], paths[j])); + Assert.AreNotEqual(paths[i].GetHashCode(), paths[j].GetHashCode()); } } } + } - [Test] - public void TestExposesMinimalApi() - { - var publicMembers = typeof(ZooKeeperPath).GetMembers() - .Where(m => m.DeclaringType == typeof(ZooKeeperPath)); - CollectionAssert.AreEquivalent( - new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" }, - publicMembers.Select(m => m.Name) - ); - } + [Test] + public void TestExposesMinimalApi() + { + var publicMembers = typeof(ZooKeeperPath).GetMembers() + .Where(m => m.DeclaringType == typeof(ZooKeeperPath)); + CollectionAssert.AreEquivalent( + new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" }, + publicMembers.Select(m => m.Name) + ); } } diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs index 1c9e6a42..e79e290c 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs @@ -6,213 +6,212 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.Tests.ZooKeeper -{ - [Category("CI")] - public class ZooKeeperSequentialPathHelperTest - { - [TestCase("/", "a", ExpectedResult = null)] - [TestCase("/ba0000000002", "a", ExpectedResult = null)] - [TestCase("/ba0000000002", "ba", ExpectedResult = 2)] - [TestCase("/ba000000002", "ba", ExpectedResult = null)] - [TestCase("/ba00000000112", "ba", ExpectedResult = null)] - [TestCase("/ba-000000002", "ba", ExpectedResult = -2)] - [TestCase("/ba0000000002", "/ba", ExpectedResult = null)] - [TestCase("/c/d/ba0000000402", "ba", ExpectedResult = 402)] - [TestCase("lock-2147483647", "lock-", ExpectedResult = int.MaxValue)] - [TestCase("read--000000001", "read-", ExpectedResult = -1)] - [TestCase("write--2147483648", "write-", ExpectedResult = int.MinValue)] - [TestCase("x 000000002", "x", ExpectedResult = null)] - [TestCase("x000000002 ", "x", ExpectedResult = null)] - public int? TestGetSequenceNumberOrDefault(string pathOrName, string prefix) => - ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(pathOrName, prefix); - - [Test] - public Task TestFilterAndSortLowPositiveNumbers() => TestFilterAndSortHelper( - new[] { 5, 3, 1 }, - expectedSequenceNumbers: new[] { 1, 3, 5 } - ); - - [Test] - public Task TestFilterAndSortMediumNegativeNumbers() => TestFilterAndSortHelper( - new[] { -1000000000, -1000000050, -1000000500 }, - expectedSequenceNumbers: new[] { -1000000500, -1000000050, -1000000000 } - ); - - [Test] - public Task TestFilterAndSortHighPositiveAndLowNegativeNumbers() => TestFilterAndSortHelper( - new[] { int.MaxValue, int.MaxValue - 1, int.MaxValue - 100, int.MinValue, int.MinValue + 9, int.MinValue + 90 }, - expectedSequenceNumbers: new[] { int.MaxValue - 100, int.MaxValue - 1, int.MaxValue, int.MinValue, int.MinValue + 9, int.MinValue + 90 } - ); - - [Test] - public Task TestFilterAndSortHighNegativeAndLowPositiveNumbers() => TestFilterAndSortHelper( - new[] { 1, 15, 6, -1, -3 }, - expectedSequenceNumbers: new[] { -3, -1, 1, 6, 15 } - ); - - [Test] - public Task TestFilterAndSortLowAndHighPositiveNumbersLowsOlder() => TestFilterAndSortHelper( - new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, - expectedSequenceNumbers: new[] { 0, 2, 4, int.MaxValue - 5, int.MaxValue - 3, int.MaxValue }, - creationTimes: new Dictionary - { - [0] = 1, - [2] = 1, - [4] = 2, - [int.MaxValue - 5] = 3, - [int.MaxValue - 3] = 4, - [int.MaxValue] = 5, - } - ); +namespace Medallion.Threading.Tests.ZooKeeper; - [Test] - public Task TestFilterAndSortLowAndHighPositiveNumbersHighsOlder() => TestFilterAndSortHelper( - new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, - expectedSequenceNumbers: new[] { int.MaxValue - 5, int.MaxValue - 3, int.MaxValue, 0, 2, 4 }, - creationTimes: new Dictionary - { - [0] = 3, - [2] = 4, - [4] = 5, - [int.MaxValue - 5] = 1, - [int.MaxValue - 3] = 1, - [int.MaxValue] = 2, - } - ); - - [Test] - public Task TestFilterAndSortLowAndHighNegativeNumbersLowsOlder() => TestFilterAndSortHelper( - new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, - expectedSequenceNumbers: new[] { int.MinValue, int.MinValue + 10, int.MinValue + 100, -302, -301, -300 }, - creationTimes: new Dictionary - { - [-302] = 300, - [-301] = 300, - [-300] = 300, - [int.MinValue] = 100, - [int.MinValue + 10] = 100, - [int.MinValue + 100] = 100, - } - ); +[Category("CI")] +public class ZooKeeperSequentialPathHelperTest +{ + [TestCase("/", "a", ExpectedResult = null)] + [TestCase("/ba0000000002", "a", ExpectedResult = null)] + [TestCase("/ba0000000002", "ba", ExpectedResult = 2)] + [TestCase("/ba000000002", "ba", ExpectedResult = null)] + [TestCase("/ba00000000112", "ba", ExpectedResult = null)] + [TestCase("/ba-000000002", "ba", ExpectedResult = -2)] + [TestCase("/ba0000000002", "/ba", ExpectedResult = null)] + [TestCase("/c/d/ba0000000402", "ba", ExpectedResult = 402)] + [TestCase("lock-2147483647", "lock-", ExpectedResult = int.MaxValue)] + [TestCase("read--000000001", "read-", ExpectedResult = -1)] + [TestCase("write--2147483648", "write-", ExpectedResult = int.MinValue)] + [TestCase("x 000000002", "x", ExpectedResult = null)] + [TestCase("x000000002 ", "x", ExpectedResult = null)] + public int? TestGetSequenceNumberOrDefault(string pathOrName, string prefix) => + ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(pathOrName, prefix); + + [Test] + public Task TestFilterAndSortLowPositiveNumbers() => TestFilterAndSortHelper( + new[] { 5, 3, 1 }, + expectedSequenceNumbers: new[] { 1, 3, 5 } + ); + + [Test] + public Task TestFilterAndSortMediumNegativeNumbers() => TestFilterAndSortHelper( + new[] { -1000000000, -1000000050, -1000000500 }, + expectedSequenceNumbers: new[] { -1000000500, -1000000050, -1000000000 } + ); + + [Test] + public Task TestFilterAndSortHighPositiveAndLowNegativeNumbers() => TestFilterAndSortHelper( + new[] { int.MaxValue, int.MaxValue - 1, int.MaxValue - 100, int.MinValue, int.MinValue + 9, int.MinValue + 90 }, + expectedSequenceNumbers: new[] { int.MaxValue - 100, int.MaxValue - 1, int.MaxValue, int.MinValue, int.MinValue + 9, int.MinValue + 90 } + ); + + [Test] + public Task TestFilterAndSortHighNegativeAndLowPositiveNumbers() => TestFilterAndSortHelper( + new[] { 1, 15, 6, -1, -3 }, + expectedSequenceNumbers: new[] { -3, -1, 1, 6, 15 } + ); + + [Test] + public Task TestFilterAndSortLowAndHighPositiveNumbersLowsOlder() => TestFilterAndSortHelper( + new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, + expectedSequenceNumbers: new[] { 0, 2, 4, int.MaxValue - 5, int.MaxValue - 3, int.MaxValue }, + creationTimes: new Dictionary + { + [0] = 1, + [2] = 1, + [4] = 2, + [int.MaxValue - 5] = 3, + [int.MaxValue - 3] = 4, + [int.MaxValue] = 5, + } + ); - [Test] - public Task TestFilterAndSortLowAndHighNegativeNumbersHighsOlder() => TestFilterAndSortHelper( - new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, - expectedSequenceNumbers: new[] { -302, -301, -300, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, - creationTimes: new Dictionary - { - [-302] = 30, - [-301] = 30, - [-300] = 30, - [int.MinValue] = 100, - [int.MinValue + 10] = 100, - [int.MinValue + 100] = 100, - } - ); + [Test] + public Task TestFilterAndSortLowAndHighPositiveNumbersHighsOlder() => TestFilterAndSortHelper( + new[] { 4, 2, 0, int.MaxValue, int.MaxValue - 3, int.MaxValue - 5 }, + expectedSequenceNumbers: new[] { int.MaxValue - 5, int.MaxValue - 3, int.MaxValue, 0, 2, 4 }, + creationTimes: new Dictionary + { + [0] = 3, + [2] = 4, + [4] = 5, + [int.MaxValue - 5] = 1, + [int.MaxValue - 3] = 1, + [int.MaxValue] = 2, + } + ); - [Test] - public Task TestFilterAndSortHighNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( - new[] { int.MaxValue, -1000 }, - expectedSequenceNumbers: new[] { int.MaxValue, -1000 }, - creationTimes: new Dictionary - { - [int.MaxValue] = 1, - [-1000] = 2000, - } - ); + [Test] + public Task TestFilterAndSortLowAndHighNegativeNumbersLowsOlder() => TestFilterAndSortHelper( + new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + expectedSequenceNumbers: new[] { int.MinValue, int.MinValue + 10, int.MinValue + 100, -302, -301, -300 }, + creationTimes: new Dictionary + { + [-302] = 300, + [-301] = 300, + [-300] = 300, + [int.MinValue] = 100, + [int.MinValue + 10] = 100, + [int.MinValue + 100] = 100, + } + ); - [Test] - public Task TestFilterAndSortHighNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( - new[] { int.MaxValue, -1000 }, - expectedSequenceNumbers: new[] { -1000, int.MaxValue }, - creationTimes: new Dictionary - { - [int.MaxValue] = long.MaxValue, - [-1000] = long.MaxValue - 1, - } - ); + [Test] + public Task TestFilterAndSortLowAndHighNegativeNumbersHighsOlder() => TestFilterAndSortHelper( + new[] { -300, -301, -302, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + expectedSequenceNumbers: new[] { -302, -301, -300, int.MinValue, int.MinValue + 10, int.MinValue + 100 }, + creationTimes: new Dictionary + { + [-302] = 30, + [-301] = 30, + [-300] = 30, + [int.MinValue] = 100, + [int.MinValue + 10] = 100, + [int.MinValue + 100] = 100, + } + ); - [Test] - public Task TestFilterAndSortLowNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( - new[] { int.MinValue, 2_000_000 }, - expectedSequenceNumbers: new[] { 2_000_000, int.MinValue }, - creationTimes: new Dictionary - { - [int.MinValue] = 10, - [2_000_000] = 1, - } - ); + [Test] + public Task TestFilterAndSortHighNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( + new[] { int.MaxValue, -1000 }, + expectedSequenceNumbers: new[] { int.MaxValue, -1000 }, + creationTimes: new Dictionary + { + [int.MaxValue] = 1, + [-1000] = 2000, + } + ); - [Test] - public Task TestFilterAndSortLowNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( - new[] { int.MinValue, 2_000_000 }, - expectedSequenceNumbers: new[] { int.MinValue, 2_000_000 }, - creationTimes: new Dictionary - { - [int.MinValue] = 1, - [2_000_000] = 10, - } - ); + [Test] + public Task TestFilterAndSortHighNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( + new[] { int.MaxValue, -1000 }, + expectedSequenceNumbers: new[] { -1000, int.MaxValue }, + creationTimes: new Dictionary + { + [int.MaxValue] = long.MaxValue, + [-1000] = long.MaxValue - 1, + } + ); - [Test] - public Task TestFilterAndSortEmpty() => TestFilterAndSortHelper(Array.Empty(), expectedSequenceNumbers: Array.Empty()); + [Test] + public Task TestFilterAndSortLowNegativeAndPositiveNumbersPositivesOlder() => TestFilterAndSortHelper( + new[] { int.MinValue, 2_000_000 }, + expectedSequenceNumbers: new[] { 2_000_000, int.MinValue }, + creationTimes: new Dictionary + { + [int.MinValue] = 10, + [2_000_000] = 1, + } + ); - [Test] - public Task TestFilterAndSortEmptyAfterChecking() => TestFilterAndSortHelper( - Enumerable.Range(1, 100).Concat(new[] { int.MaxValue }).ToArray(), - expectedSequenceNumbers: Array.Empty(), - creationTimes: new Dictionary { [-1] = 1 } - ); + [Test] + public Task TestFilterAndSortLowNegativeAndPositiveNumbersNegativesOlder() => TestFilterAndSortHelper( + new[] { int.MinValue, 2_000_000 }, + expectedSequenceNumbers: new[] { int.MinValue, 2_000_000 }, + creationTimes: new Dictionary + { + [int.MinValue] = 1, + [2_000_000] = 10, + } + ); + + [Test] + public Task TestFilterAndSortEmpty() => TestFilterAndSortHelper(Array.Empty(), expectedSequenceNumbers: Array.Empty()); + + [Test] + public Task TestFilterAndSortEmptyAfterChecking() => TestFilterAndSortHelper( + Enumerable.Range(1, 100).Concat(new[] { int.MaxValue }).ToArray(), + expectedSequenceNumbers: Array.Empty(), + creationTimes: new Dictionary { [-1] = 1 } + ); + + [Test] + public Task TestFilterAndSortFilteredAfterChecking() => TestFilterAndSortHelper( + new[] { 1, 2, 3, int.MaxValue - 10, int.MaxValue }, + expectedSequenceNumbers: new[] { int.MaxValue - 10, 2 }, + creationTimes: new Dictionary + { + [int.MaxValue - 10] = long.MinValue, + [2] = long.MaxValue + } + ); - [Test] - public Task TestFilterAndSortFilteredAfterChecking() => TestFilterAndSortHelper( - new[] { 1, 2, 3, int.MaxValue - 10, int.MaxValue }, - expectedSequenceNumbers: new[] { int.MaxValue - 10, 2 }, - creationTimes: new Dictionary - { - [int.MaxValue - 10] = long.MinValue, - [2] = long.MaxValue - } + private static async Task TestFilterAndSortHelper( + IReadOnlyList sequenceNumbers, + IReadOnlyList expectedSequenceNumbers, + Dictionary? creationTimes = null) + { + var random = new Random(12345); + var paths = sequenceNumbers.Select(n => MakeName(random.Next(2) == 0 ? "a" : "b", n)) + .Concat(new[] { MakeName("c", 0), MakeName("d", 1), "a", "b" }) + .OrderBy(_ => random.Next()) + .ToArray(); + var parentNode = $"/parent{random.Next()}"; + + var result = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( + parentNode, + paths, + n => Task.FromResult( + (creationTimes ?? throw new AssertionException("Shouldn't check creation time")).TryGetValue(GetSequenceNumber(n), out var creationTime) + ? creationTime + : default(long?) + ), + prefix: "a", + alternatePrefix: "b" ); - private static async Task TestFilterAndSortHelper( - IReadOnlyList sequenceNumbers, - IReadOnlyList expectedSequenceNumbers, - Dictionary? creationTimes = null) + CollectionAssert.AreEqual(expectedSequenceNumbers, result.Select(t => t.SequenceNumber)); + foreach (var info in result) { - var random = new Random(12345); - var paths = sequenceNumbers.Select(n => MakeName(random.Next(2) == 0 ? "a" : "b", n)) - .Concat(new[] { MakeName("c", 0), MakeName("d", 1), "a", "b" }) - .OrderBy(_ => random.Next()) - .ToArray(); - var parentNode = $"/parent{random.Next()}"; - - var result = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( - parentNode, - paths, - n => Task.FromResult( - (creationTimes ?? throw new AssertionException("Shouldn't check creation time")).TryGetValue(GetSequenceNumber(n), out var creationTime) - ? creationTime - : default(long?) - ), - prefix: "a", - alternatePrefix: "b" - ); - - CollectionAssert.AreEqual(expectedSequenceNumbers, result.Select(t => t.SequenceNumber)); - foreach (var info in result) - { - info.Path.ShouldEqual($"{parentNode}/{MakeName(info.Prefix, info.SequenceNumber)}"); - } - - int GetSequenceNumber(string name) => ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "a") - ?? ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "b") - ?? throw new AssertionException($"Can't get sequence number for '{name}'"); + info.Path.ShouldEqual($"{parentNode}/{MakeName(info.Prefix, info.SequenceNumber)}"); } - private static string MakeName(string prefix, int sequenceNumber) => $"{prefix}{sequenceNumber:0000000000}"; - - private static Task CannotGetNodeCreationTime(string node) => throw new AssertionException("Should not be called"); + int GetSequenceNumber(string name) => ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "a") + ?? ZooKeeperSequentialPathHelper.GetSequenceNumberOrDefault(name, "b") + ?? throw new AssertionException($"Can't get sequence number for '{name}'"); } + + private static string MakeName(string prefix, int sequenceNumber) => $"{prefix}{sequenceNumber:0000000000}"; + + private static Task CannotGetNodeCreationTime(string node) => throw new AssertionException("Should not be called"); } diff --git a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs index 2e761f28..ee74e447 100644 --- a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs +++ b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs @@ -5,180 +5,179 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +internal static class DistributedWaitHandleHelpers { - internal static class DistributedWaitHandleHelpers + internal const string GlobalPrefix = @"Global\"; + private static readonly TimeoutValue DefaultAbandonmentCheckCadence = TimeSpan.FromSeconds(2); + + // 260 based on LINQPad experimentation + public const int MaxNameLength = 260; + + public static string GetSafeName(string name) { - internal const string GlobalPrefix = @"Global\"; - private static readonly TimeoutValue DefaultAbandonmentCheckCadence = TimeSpan.FromSeconds(2); + if (name == null) { throw new ArgumentNullException(nameof(name)); } - // 260 based on LINQPad experimentation - public const int MaxNameLength = 260; + // Note: the reason we don't add GlobalPrefix inside the ToSafeLockName callback + // is for backwards compat with the SystemDistributedLock.GetSafeLockName in 1.0. + // In that version, the global prefix was not exposed as part of the name, and as + // such it was not accounted for in the hashing performed by ToSafeLockName. - public static string GetSafeName(string name) + if (name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - // Note: the reason we don't add GlobalPrefix inside the ToSafeLockName callback - // is for backwards compat with the SystemDistributedLock.GetSafeLockName in 1.0. - // In that version, the global prefix was not exposed as part of the name, and as - // such it was not accounted for in the hashing performed by ToSafeLockName. + var suffix = name.Substring(GlobalPrefix.Length); + var safeSuffix = ConvertToSafeSuffix(suffix); + return safeSuffix == suffix ? name : GlobalPrefix + safeSuffix; + } - if (name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) - { - var suffix = name.Substring(GlobalPrefix.Length); - var safeSuffix = ConvertToSafeSuffix(suffix); - return safeSuffix == suffix ? name : GlobalPrefix + safeSuffix; - } + return GlobalPrefix + ConvertToSafeSuffix(name); - return GlobalPrefix + ConvertToSafeSuffix(name); + static string ConvertToSafeSuffix(string suffix) => DistributedLockHelpers.ToSafeName( + suffix, + MaxNameLength - GlobalPrefix.Length, + s => s.Length == 0 ? "EMPTY" : s.Replace('\\', '_') + ); + } - static string ConvertToSafeSuffix(string suffix) => DistributedLockHelpers.ToSafeName( - suffix, - MaxNameLength - GlobalPrefix.Length, - s => s.Length == 0 ? "EMPTY" : s.Replace('\\', '_') - ); + public static string ValidateAndFinalizeName(string name, bool exactName) + { + if (exactName) + { + ValidateName(name); + return name; } - public static string ValidateAndFinalizeName(string name, bool exactName) - { - if (exactName) - { - ValidateName(name); - return name; - } + return GetSafeName(name); + } - return GetSafeName(name); - } + private static void ValidateName(string name) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } + if (!name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) { throw new FormatException($"{nameof(name)}: must start with '{GlobalPrefix}'"); } + if (name == GlobalPrefix) { throw new FormatException($"{nameof(name)} must not be exactly '{GlobalPrefix}'"); } + if (name.IndexOf('\\', startIndex: GlobalPrefix.Length) >= 0) { throw new FormatException(nameof(name) + @": must not contain '\'"); } + } - private static void ValidateName(string name) + public static TimeoutValue ValidateAndFinalizeAbandonmentCheckCadence(TimeSpan? abandonmentCheckCadence) + { + if (abandonmentCheckCadence.HasValue) { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - if (name.Length > MaxNameLength) { throw new FormatException($"{nameof(name)}: must be at most {MaxNameLength} characters"); } - if (!name.StartsWith(GlobalPrefix, StringComparison.Ordinal)) { throw new FormatException($"{nameof(name)}: must start with '{GlobalPrefix}'"); } - if (name == GlobalPrefix) { throw new FormatException($"{nameof(name)} must not be exactly '{GlobalPrefix}'"); } - if (name.IndexOf('\\', startIndex: GlobalPrefix.Length) >= 0) { throw new FormatException(nameof(name) + @": must not contain '\'"); } + var result = new TimeoutValue(abandonmentCheckCadence, nameof(abandonmentCheckCadence)); + if (result.IsZero) { throw new ArgumentOutOfRangeException(nameof(abandonmentCheckCadence), "must not be zero"); } + return result; } + return DefaultAbandonmentCheckCadence; + } + + public static TWaitHandle CreateDistributedWaitHandle( + Func createNew, + TryOpenExisting tryOpenExisting) + where TWaitHandle : WaitHandle + { + const int MaxTries = 3; + var tries = 0; - public static TimeoutValue ValidateAndFinalizeAbandonmentCheckCadence(TimeSpan? abandonmentCheckCadence) + while (true) { - if (abandonmentCheckCadence.HasValue) + ++tries; + try { - var result = new TimeoutValue(abandonmentCheckCadence, nameof(abandonmentCheckCadence)); - if (result.IsZero) { throw new ArgumentOutOfRangeException(nameof(abandonmentCheckCadence), "must not be zero"); } - return result; + return createNew(); } - return DefaultAbandonmentCheckCadence; - } - - public static TWaitHandle CreateDistributedWaitHandle( - Func createNew, - TryOpenExisting tryOpenExisting) - where TWaitHandle : WaitHandle - { - const int MaxTries = 3; - var tries = 0; - - while (true) + // fallback handling based on https://stackoverflow.com/questions/1784392/my-eventwaithandle-says-access-to-the-path-is-denied-but-its-not + catch (UnauthorizedAccessException) when (tries <= MaxTries) { - ++tries; - try + if (tryOpenExisting(out var existing)) { - return createNew(); + return existing; } - // fallback handling based on https://stackoverflow.com/questions/1784392/my-eventwaithandle-says-access-to-the-path-is-denied-but-its-not - catch (UnauthorizedAccessException) when (tries <= MaxTries) - { - if (tryOpenExisting(out var existing)) - { - return existing; - } - } - - // if we fail both, we might be in a race. Add in a small random sleep to attempt desynchronization - Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); } + + // if we fail both, we might be in a race. Add in a small random sleep to attempt desynchronization + Thread.Sleep(new Random(Guid.NewGuid().GetHashCode()).Next(10 * tries)); } + } - public delegate bool TryOpenExisting(out TWaitHandle existing) where TWaitHandle : WaitHandle; + public delegate bool TryOpenExisting(out TWaitHandle existing) where TWaitHandle : WaitHandle; - public static async ValueTask CreateAndWaitAsync( - Func createHandle, - TimeoutValue abandonmentCheckCadence, - TimeoutValue timeout, - CancellationToken cancellationToken) - where TWaitHandle : WaitHandle + public static async ValueTask CreateAndWaitAsync( + Func createHandle, + TimeoutValue abandonmentCheckCadence, + TimeoutValue timeout, + CancellationToken cancellationToken) + where TWaitHandle : WaitHandle + { + var handle = createHandle(); + var cleanup = true; + try { - var handle = createHandle(); - var cleanup = true; - try + if (abandonmentCheckCadence.IsInfinite) { - if (abandonmentCheckCadence.IsInfinite) - { - // no abandonment check: just acquire once - if (await handle.WaitOneAsync(timeout, cancellationToken).ConfigureAwait(false)) - { - cleanup = false; - return handle; - } - return null; - } - - if (timeout.IsInfinite) + // no abandonment check: just acquire once + if (await handle.WaitOneAsync(timeout, cancellationToken).ConfigureAwait(false)) { - // infinite timeout: just loop forever with the abandonment check - while (true) - { - if (await handle.WaitOneAsync(abandonmentCheckCadence, cancellationToken).ConfigureAwait(false)) - { - cleanup = false; - return handle; - } - - // refresh the event in case it was abandoned by the original owner - RefreshEvent(); - } + cleanup = false; + return handle; } + return null; + } - // fixed timeout: loop in abandonment check chunks - var elapsedMillis = 0; - do + if (timeout.IsInfinite) + { + // infinite timeout: just loop forever with the abandonment check + while (true) { - var nextWaitMillis = Math.Min(abandonmentCheckCadence.InMilliseconds, timeout.InMilliseconds - elapsedMillis); - if (await handle.WaitOneAsync(TimeSpan.FromMilliseconds(nextWaitMillis), cancellationToken).ConfigureAwait(false)) + if (await handle.WaitOneAsync(abandonmentCheckCadence, cancellationToken).ConfigureAwait(false)) { cleanup = false; return handle; } - elapsedMillis += nextWaitMillis; - // refresh the event in case it was abandoned by the original owner RefreshEvent(); } - while (elapsedMillis < timeout.InMilliseconds); - - return null; - } - catch - { - // just in case we fail to create a scope or something - cleanup = true; - throw; } - finally + + // fixed timeout: loop in abandonment check chunks + var elapsedMillis = 0; + do { - if (cleanup) + var nextWaitMillis = Math.Min(abandonmentCheckCadence.InMilliseconds, timeout.InMilliseconds - elapsedMillis); + if (await handle.WaitOneAsync(TimeSpan.FromMilliseconds(nextWaitMillis), cancellationToken).ConfigureAwait(false)) { - handle.Dispose(); + cleanup = false; + return handle; } + + elapsedMillis += nextWaitMillis; + + // refresh the event in case it was abandoned by the original owner + RefreshEvent(); } + while (elapsedMillis < timeout.InMilliseconds); - void RefreshEvent() + return null; + } + catch + { + // just in case we fail to create a scope or something + cleanup = true; + throw; + } + finally + { + if (cleanup) { handle.Dispose(); - handle = createHandle(); } } + + void RefreshEvent() + { + handle.Dispose(); + handle = createHandle(); + } } } diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs index e97a977b..af25c114 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +public partial class EventWaitHandleDistributedLock { - public partial class EventWaitHandleDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire the lock synchronously. Usage: - /// - /// using (var handle = myLock.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public EventWaitHandleDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public EventWaitHandleDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: - /// - /// using (myLock.Acquire(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public EventWaitHandleDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public EventWaitHandleDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// An which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// An which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index 843f751e..e1c8fd18 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -5,70 +5,69 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +/// +/// A distributed lock based on a global on Windows. +/// +public sealed partial class EventWaitHandleDistributedLock : IInternalDistributedLock { + private readonly TimeoutValue _abandonmentCheckCadence; + /// - /// A distributed lock based on a global on Windows. + /// Constructs a lock with the given . + /// + /// specifies how frequently we refresh our object in case it is abandoned by + /// its original owner. The default is 2s. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class EventWaitHandleDistributedLock : IInternalDistributedLock + public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) { - private readonly TimeoutValue _abandonmentCheckCadence; + this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); + this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); + } - /// - /// Constructs a lock with the given . - /// - /// specifies how frequently we refresh our object in case it is abandoned by - /// its original owner. The default is 2s. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public EventWaitHandleDistributedLock(string name, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) - { - this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); - this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); - } + /// + /// Implements + /// + public string Name { get; } - /// - /// Implements - /// - public string Name { get; } + async ValueTask IInternalDistributedLock.InternalTryAcquireAsync( + TimeoutValue timeout, + CancellationToken cancellationToken) + { + var @event = await DistributedWaitHandleHelpers.CreateAndWaitAsync( + createHandle: this.CreateEvent, + abandonmentCheckCadence: this._abandonmentCheckCadence, + timeout: timeout, + cancellationToken: cancellationToken + ).ConfigureAwait(false); + return @event != null ? new EventWaitHandleDistributedLockHandle(@event) : null; + } - async ValueTask IInternalDistributedLock.InternalTryAcquireAsync( - TimeoutValue timeout, - CancellationToken cancellationToken) + private EventWaitHandle CreateEvent() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( + createNew: () => { - var @event = await DistributedWaitHandleHelpers.CreateAndWaitAsync( - createHandle: this.CreateEvent, - abandonmentCheckCadence: this._abandonmentCheckCadence, - timeout: timeout, - cancellationToken: cancellationToken - ).ConfigureAwait(false); - return @event != null ? new EventWaitHandleDistributedLockHandle(@event) : null; - } - - private EventWaitHandle CreateEvent() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( - createNew: () => - { - // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle - var security = new EventWaitHandleSecurity(); - // allow anyone to wait on and signal this lock - security.AddAccessRule(new EventWaitHandleAccessRule( - new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), - EventWaitHandleRights.FullControl, // doesn't seem to work without this :-/ - AccessControlType.Allow - )); - var @event = new EventWaitHandle( - // if we create, start as unlocked - initialState: true, - // allow only one thread to hold the lock - mode: EventResetMode.AutoReset, - name: this.Name, - createdNew: out var createdNew - ); - if (createdNew) { @event.SetAccessControl(security); } - return @event; - }, - tryOpenExisting: delegate (out EventWaitHandle existing) { return EventWaitHandle.TryOpenExisting(this.Name, out existing); } - ); - } + // based on http://stackoverflow.com/questions/2590334/creating-a-cross-process-eventwaithandle + var security = new EventWaitHandleSecurity(); + // allow anyone to wait on and signal this lock + security.AddAccessRule(new EventWaitHandleAccessRule( + new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), + EventWaitHandleRights.FullControl, // doesn't seem to work without this :-/ + AccessControlType.Allow + )); + var @event = new EventWaitHandle( + // if we create, start as unlocked + initialState: true, + // allow only one thread to hold the lock + mode: EventResetMode.AutoReset, + name: this.Name, + createdNew: out var createdNew + ); + if (createdNew) { @event.SetAccessControl(security); } + return @event; + }, + tryOpenExisting: delegate (out EventWaitHandle existing) { return EventWaitHandle.TryOpenExisting(this.Name, out existing); } + ); } diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs index 0d446d80..6e2e03e7 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs @@ -3,43 +3,42 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +/// +/// Implements +/// +public sealed class EventWaitHandleDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class EventWaitHandleDistributedLockHandle : IDistributedSynchronizationHandle - { - private EventWaitHandle? _event; + private EventWaitHandle? _event; - internal EventWaitHandleDistributedLockHandle(EventWaitHandle @event) - { - this._event = @event; - } + internal EventWaitHandleDistributedLockHandle(EventWaitHandle @event) + { + this._event = @event; + } - CancellationToken IDistributedSynchronizationHandle.HandleLostToken => - Volatile.Read(ref this._event) != null ? CancellationToken.None : throw this.ObjectDisposed(); + CancellationToken IDistributedSynchronizationHandle.HandleLostToken => + Volatile.Read(ref this._event) != null ? CancellationToken.None : throw this.ObjectDisposed(); - /// - /// Releases the lock - /// - public void Dispose() + /// + /// Releases the lock + /// + public void Dispose() + { + var @event = Interlocked.Exchange(ref this._event, null); + if (@event != null) { - var @event = Interlocked.Exchange(ref this._event, null); - if (@event != null) - { - @event.Set(); // signal - @event.Dispose(); - } + @event.Set(); // signal + @event.Dispose(); } + } - /// - /// Releases the lock asynchronously - /// - public ValueTask DisposeAsync() - { - this.Dispose(); - return default; - } + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; } } diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs index 0454e3fc..9fb1b6bd 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs @@ -3,83 +3,82 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +public partial class WaitHandleDistributedSemaphore { - public partial class WaitHandleDistributedSemaphore - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - /// - /// Attempts to acquire a semaphore ticket synchronously. Usage: - /// - /// using (var handle = mySemaphore.TryAcquire(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public WaitHandleDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket synchronously. Usage: + /// + /// using (var handle = mySemaphore.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public WaitHandleDistributedSemaphoreHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - /// - /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: - /// - /// using (mySemaphore.Acquire(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public WaitHandleDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + /// + /// Acquires a semaphore ticket synchronously, failing with if the attempt times out. Usage: + /// + /// using (mySemaphore.Acquire(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public WaitHandleDistributedSemaphoreHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs index 256e2377..f45437c9 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -7,68 +7,67 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +/// +/// Implements a distributed semaphore based on a global +/// +public sealed partial class WaitHandleDistributedSemaphore : IInternalDistributedSemaphore { + private readonly TimeoutValue _abandonmentCheckCadence; + /// - /// Implements a distributed semaphore based on a global + /// Constructs a lock with the given . + /// + /// specifies how frequently we refresh our object in case it is abandoned by + /// its original owner. The default is 2s. + /// + /// Unless is specified, will be escaped/hashed to ensure name validity. /// - public sealed partial class WaitHandleDistributedSemaphore : IInternalDistributedSemaphore + public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) { - private readonly TimeoutValue _abandonmentCheckCadence; + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } - /// - /// Constructs a lock with the given . - /// - /// specifies how frequently we refresh our object in case it is abandoned by - /// its original owner. The default is 2s. - /// - /// Unless is specified, will be escaped/hashed to ensure name validity. - /// - public WaitHandleDistributedSemaphore(string name, int maxCount, TimeSpan? abandonmentCheckCadence = null, bool exactName = false) - { - if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); + this.MaxCount = maxCount; + this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); + } - this.Name = DistributedWaitHandleHelpers.ValidateAndFinalizeName(name, exactName); - this.MaxCount = maxCount; - this._abandonmentCheckCadence = DistributedWaitHandleHelpers.ValidateAndFinalizeAbandonmentCheckCadence(abandonmentCheckCadence); - } + /// + /// Implements + /// + public string Name { get; } - /// - /// Implements - /// - public string Name { get; } + /// + /// Implements + /// + public int MaxCount { get; } - /// - /// Implements - /// - public int MaxCount { get; } + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var semaphore = await DistributedWaitHandleHelpers.CreateAndWaitAsync( + createHandle: this.CreateSemaphore, + abandonmentCheckCadence: this._abandonmentCheckCadence, + timeout: timeout, + cancellationToken: cancellationToken + ).ConfigureAwait(false); + return semaphore != null ? new WaitHandleDistributedSemaphoreHandle(semaphore) : null; + } - async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + private Semaphore CreateSemaphore() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( + createNew: () => { - var semaphore = await DistributedWaitHandleHelpers.CreateAndWaitAsync( - createHandle: this.CreateSemaphore, - abandonmentCheckCadence: this._abandonmentCheckCadence, - timeout: timeout, - cancellationToken: cancellationToken - ).ConfigureAwait(false); - return semaphore != null ? new WaitHandleDistributedSemaphoreHandle(semaphore) : null; - } - - private Semaphore CreateSemaphore() => DistributedWaitHandleHelpers.CreateDistributedWaitHandle( - createNew: () => - { - var security = new SemaphoreSecurity(); - // allow anyone to wait on and signal this semaphore - security.AddAccessRule(new SemaphoreAccessRule( - new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), - SemaphoreRights.FullControl, - AccessControlType.Allow - )); - var semaphore = new Semaphore(initialCount: this.MaxCount, maximumCount: this.MaxCount, name: this.Name, createdNew: out var createdNew); - if (createdNew) { semaphore.SetAccessControl(security); } - return semaphore; - }, - tryOpenExisting: delegate (out Semaphore existing) { return Semaphore.TryOpenExisting(this.Name, out existing); } - ); - } + var security = new SemaphoreSecurity(); + // allow anyone to wait on and signal this semaphore + security.AddAccessRule(new SemaphoreAccessRule( + new SecurityIdentifier(WellKnownSidType.WorldSid, domainSid: null), + SemaphoreRights.FullControl, + AccessControlType.Allow + )); + var semaphore = new Semaphore(initialCount: this.MaxCount, maximumCount: this.MaxCount, name: this.Name, createdNew: out var createdNew); + if (createdNew) { semaphore.SetAccessControl(security); } + return semaphore; + }, + tryOpenExisting: delegate (out Semaphore existing) { return Semaphore.TryOpenExisting(this.Name, out existing); } + ); } diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs index 73cc9ecf..e8b630d2 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs @@ -5,72 +5,71 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +/// +/// Implements +/// +public sealed class WaitHandleDistributedSemaphoreHandle : IDistributedSynchronizationHandle { + private readonly SemaphoreReleaser _semaphoreReleaser; + private IDisposable? _finalizerRegistration; + + internal WaitHandleDistributedSemaphoreHandle(Semaphore semaphore) + { + this._semaphoreReleaser = new SemaphoreReleaser(semaphore); + // We need a managed finalizer here because an abandoned Semaphore instance won't release its tickets unless + // all instances of that Semaphore are also abandoned (any one live instance tracks the current ticket count). + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, this._semaphoreReleaser); + } + + /// + /// Implements + /// + public CancellationToken HandleLostToken => + Volatile.Read(ref this._finalizerRegistration) != null ? CancellationToken.None : throw this.ObjectDisposed(); + /// - /// Implements + /// Releases the semaphore ticket /// - public sealed class WaitHandleDistributedSemaphoreHandle : IDistributedSynchronizationHandle + public void Dispose() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + this._semaphoreReleaser.Dispose(); + } + + /// + /// Releases the semaphore ticket + /// + public ValueTask DisposeAsync() + { + this.Dispose(); + return default; + } + + private class SemaphoreReleaser : IDisposable, IAsyncDisposable { - private readonly SemaphoreReleaser _semaphoreReleaser; - private IDisposable? _finalizerRegistration; + private Semaphore? _semaphore; - internal WaitHandleDistributedSemaphoreHandle(Semaphore semaphore) + public SemaphoreReleaser(Semaphore semaphore) { - this._semaphoreReleaser = new SemaphoreReleaser(semaphore); - // We need a managed finalizer here because an abandoned Semaphore instance won't release its tickets unless - // all instances of that Semaphore are also abandoned (any one live instance tracks the current ticket count). - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, this._semaphoreReleaser); + this._semaphore = semaphore; } - /// - /// Implements - /// - public CancellationToken HandleLostToken => - Volatile.Read(ref this._finalizerRegistration) != null ? CancellationToken.None : throw this.ObjectDisposed(); - - /// - /// Releases the semaphore ticket - /// public void Dispose() { - Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); - this._semaphoreReleaser.Dispose(); + var semaphore = Interlocked.Exchange(ref this._semaphore, null); + if (semaphore != null) + { + try { semaphore.Release(); } + finally { semaphore.Dispose(); } + } } - /// - /// Releases the semaphore ticket - /// public ValueTask DisposeAsync() { this.Dispose(); return default; } - - private class SemaphoreReleaser : IDisposable, IAsyncDisposable - { - private Semaphore? _semaphore; - - public SemaphoreReleaser(Semaphore semaphore) - { - this._semaphore = semaphore; - } - - public void Dispose() - { - var semaphore = Interlocked.Exchange(ref this._semaphore, null); - if (semaphore != null) - { - try { semaphore.Release(); } - finally { semaphore.Dispose(); } - } - } - - public ValueTask DisposeAsync() - { - this.Dispose(); - return default; - } - } } } diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs index dc86f8fa..3324076d 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs @@ -2,42 +2,41 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +/// +/// Implements for +/// and for . +/// +public sealed class WaitHandleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedSemaphoreProvider { + private readonly TimeSpan? _abandonmentCheckCadence; + /// - /// Implements for - /// and for . + /// Constructs a using the provided . /// - public sealed class WaitHandleDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedSemaphoreProvider + public WaitHandleDistributedSynchronizationProvider(TimeSpan? abandonmentCheckCadence = null) { - private readonly TimeSpan? _abandonmentCheckCadence; - - /// - /// Constructs a using the provided . - /// - public WaitHandleDistributedSynchronizationProvider(TimeSpan? abandonmentCheckCadence = null) - { - this._abandonmentCheckCadence = abandonmentCheckCadence; - } + this._abandonmentCheckCadence = abandonmentCheckCadence; + } - /// - /// Creates a with the given . Unless - /// is specified, invalid wait handle names will be escaped/hashed. - /// - public EventWaitHandleDistributedLock CreateLock(string name, bool exactName = false) => - new EventWaitHandleDistributedLock(name, this._abandonmentCheckCadence, exactName); + /// + /// Creates a with the given . Unless + /// is specified, invalid wait handle names will be escaped/hashed. + /// + public EventWaitHandleDistributedLock CreateLock(string name, bool exactName = false) => + new EventWaitHandleDistributedLock(name, this._abandonmentCheckCadence, exactName); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - /// - /// Creates a with the given - /// and . Unless is specified, invalid wait - /// handle names will be escaped/hashed. - /// - public WaitHandleDistributedSemaphore CreateSemaphore(string name, int maxCount, bool exactName = false) => - new WaitHandleDistributedSemaphore(name, maxCount, this._abandonmentCheckCadence, exactName); + /// + /// Creates a with the given + /// and . Unless is specified, invalid wait + /// handle names will be escaped/hashed. + /// + public WaitHandleDistributedSemaphore CreateSemaphore(string name, int maxCount, bool exactName = false) => + new WaitHandleDistributedSemaphore(name, maxCount, this._abandonmentCheckCadence, exactName); - IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => - this.CreateSemaphore(name, maxCount); - } + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => + this.CreateSemaphore(name, maxCount); } diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/DistributedLock.WaitHandles/WaitHandleExtensions.cs index 1fe7a7f6..98493dcf 100644 --- a/DistributedLock.WaitHandles/WaitHandleExtensions.cs +++ b/DistributedLock.WaitHandles/WaitHandleExtensions.cs @@ -3,136 +3,135 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.WaitHandles +namespace Medallion.Threading.WaitHandles; + +internal static class WaitHandleExtensions { - internal static class WaitHandleExtensions + public static async ValueTask WaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) { - public static async ValueTask WaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) + if (timeout.IsZero || SyncViaAsync.IsSynchronous) { - if (timeout.IsZero || SyncViaAsync.IsSynchronous) - { - return waitHandle.InternalWaitOne(timeout, cancellationToken); - } - - // when doing an async wait, still do a quick sync check first with timeout zero to optimize the already-signaled case - return waitHandle.InternalWaitOne(TimeSpan.Zero, cancellationToken) - || await waitHandle.InternalWaitOneAsync(timeout, cancellationToken).ConfigureAwait(false); + return waitHandle.InternalWaitOne(timeout, cancellationToken); } - private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) + // when doing an async wait, still do a quick sync check first with timeout zero to optimize the already-signaled case + return waitHandle.InternalWaitOne(TimeSpan.Zero, cancellationToken) + || await waitHandle.InternalWaitOneAsync(timeout, cancellationToken).ConfigureAwait(false); + } + + private static bool InternalWaitOne(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) + { + if (!cancellationToken.CanBeCanceled) { - if (!cancellationToken.CanBeCanceled) - { - return waitHandle.WaitOne(timeout.InMilliseconds); - } + return waitHandle.WaitOne(timeout.InMilliseconds); + } - // if, upon entering the method we are already both canceled and signaled, this check - // ensures that we cancel - cancellationToken.ThrowIfCancellationRequested(); + // if, upon entering the method we are already both canceled and signaled, this check + // ensures that we cancel + cancellationToken.ThrowIfCancellationRequested(); - // optimize the already-signaled case - if (waitHandle.WaitOne(TimeSpan.Zero)) - { - return true; - } - if (timeout.IsZero) - { - return false; - } - - // cancellable wait based on - // http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ - var index = WaitHandle.WaitAny(new[] { waitHandle, cancellationToken.WaitHandle }, timeout.InMilliseconds); - return index switch - { - // timeout - WaitHandle.WaitTimeout => false, - // event - 0 => true, - // canceled - _ => throw new OperationCanceledException(cancellationToken), - }; + // optimize the already-signaled case + if (waitHandle.WaitOne(TimeSpan.Zero)) + { + return true; + } + if (timeout.IsZero) + { + return false; } - // based on http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ - private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) + // cancellable wait based on + // http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ + var index = WaitHandle.WaitAny(new[] { waitHandle, cancellationToken.WaitHandle }, timeout.InMilliseconds); + return index switch { - Invariant.Require(!cancellationToken.CanBeCanceled || waitHandle is EventWaitHandle or Semaphore); // keep in sync with Resignal() + // timeout + WaitHandle.WaitTimeout => false, + // event + 0 => true, + // canceled + _ => throw new OperationCanceledException(cancellationToken), + }; + } - var taskCompletionSource = new TaskCompletionSource(); + // based on http://www.thomaslevesque.com/2015/06/04/async-and-cancellation-support-for-wait-handles/ + private static async ValueTask InternalWaitOneAsync(this WaitHandle waitHandle, TimeoutValue timeout, CancellationToken cancellationToken) + { + Invariant.Require(!cancellationToken.CanBeCanceled || waitHandle is EventWaitHandle or Semaphore); // keep in sync with Resignal() - RegisteredWaitHandle? registeredHandle = null; - CancellationTokenRegistration tokenRegistration = default; - try - { - // if, upon entering the method we are already both canceled and signaled, - // putting this first ensures that we cancel - tokenRegistration = cancellationToken.Register( - static state => ((TaskCompletionSource)state).TrySetCanceled(), - state: taskCompletionSource - ); - registeredHandle = ThreadPool.RegisterWaitForSingleObject( - waitHandle, - static (state, timedOut) => OnSignaled(state, timedOut), - state: Tuple.Create(taskCompletionSource, waitHandle), - millisecondsTimeOutInterval: timeout.InMilliseconds, - executeOnlyOnce: true - ); - return await taskCompletionSource.Task.ConfigureAwait(false); - } - finally + var taskCompletionSource = new TaskCompletionSource(); + + RegisteredWaitHandle? registeredHandle = null; + CancellationTokenRegistration tokenRegistration = default; + try + { + // if, upon entering the method we are already both canceled and signaled, + // putting this first ensures that we cancel + tokenRegistration = cancellationToken.Register( + static state => ((TaskCompletionSource)state).TrySetCanceled(), + state: taskCompletionSource + ); + registeredHandle = ThreadPool.RegisterWaitForSingleObject( + waitHandle, + static (state, timedOut) => OnSignaled(state, timedOut), + state: Tuple.Create(taskCompletionSource, waitHandle), + millisecondsTimeOutInterval: timeout.InMilliseconds, + executeOnlyOnce: true + ); + return await taskCompletionSource.Task.ConfigureAwait(false); + } + finally + { + if (registeredHandle != null) { - if (registeredHandle != null) + if (taskCompletionSource.Task.IsCanceled) + { + // If the task got canceled, then there is a slim chance of a race condition where + // the wait callback is still running, and hasn't re-signaled the handle yet. If we + // return before that point then we might dispose the handle, before getting to re-signal + // it. To prevent that, we pass in an MRE which will be signaled when the reservation fully + // completes and we wait for that signal before returning. + using ManualResetEvent unregisterCompleteEvent = new(initialState: false); + registeredHandle.Unregister(unregisterCompleteEvent); + await unregisterCompleteEvent.WaitOneAsync(Timeout.InfiniteTimeSpan, CancellationToken.None).ConfigureAwait(false); + } + else { - if (taskCompletionSource.Task.IsCanceled) - { - // If the task got canceled, then there is a slim chance of a race condition where - // the wait callback is still running, and hasn't re-signaled the handle yet. If we - // return before that point then we might dispose the handle, before getting to re-signal - // it. To prevent that, we pass in an MRE which will be signaled when the reservation fully - // completes and we wait for that signal before returning. - using ManualResetEvent unregisterCompleteEvent = new(initialState: false); - registeredHandle.Unregister(unregisterCompleteEvent); - await unregisterCompleteEvent.WaitOneAsync(Timeout.InfiniteTimeSpan, CancellationToken.None).ConfigureAwait(false); - } - else - { - registeredHandle.Unregister(null); - } + registeredHandle.Unregister(null); } - tokenRegistration.Dispose(); } + tokenRegistration.Dispose(); + } - static void OnSignaled(object state, bool timedOut) + static void OnSignaled(object state, bool timedOut) + { + var (taskCompletionSource, waitHandle) = (Tuple, WaitHandle>)state; + if (!taskCompletionSource.TrySetResult(!timedOut) && !timedOut && taskCompletionSource.Task.IsCanceled) { - var (taskCompletionSource, waitHandle) = (Tuple, WaitHandle>)state; - if (!taskCompletionSource.TrySetResult(!timedOut) && !timedOut && taskCompletionSource.Task.IsCanceled) - { - // If we received a signal (not a timeout) and we lost the race with cancellation, resignal - // the handle to avoid the signal being lost. See https://github.com/madelson/DistributedLock/issues/120 - Resignal(waitHandle); - } + // If we received a signal (not a timeout) and we lost the race with cancellation, resignal + // the handle to avoid the signal being lost. See https://github.com/madelson/DistributedLock/issues/120 + Resignal(waitHandle); } } + } - private static void Resignal(WaitHandle waitHandle) + private static void Resignal(WaitHandle waitHandle) + { + try { - try + if (waitHandle is EventWaitHandle @event) { - if (waitHandle is EventWaitHandle @event) - { - @event.Set(); - } - else if (waitHandle is Semaphore semaphore) - { - semaphore.Release(); - } + @event.Set(); } - catch + else if (waitHandle is Semaphore semaphore) { - // Since this method runs in a threadpool thread, we don't want it to throw - // even if the methods above fail (e.g. with SemaphoreFullException). + semaphore.Release(); } } + catch + { + // Since this method runs in a threadpool thread, we don't want it to throw + // even if the methods above fail (e.g. with SemaphoreFullException). + } } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs index a2377ba0..bc3952ee 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs @@ -2,264 +2,263 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +using Medallion.Threading.Internal; +using org.apache.zookeeper; +using System.Collections; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +/// +/// We don't want to use one session () per lock because "The creation and closing of sessions are +/// costly in ZooKeeper because they need quorum confirmations, they become the bottleneck of a ZooKeeper ensemble when it needs to handle +/// thousands of client connections" (https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html). +/// +/// However, ZooKeeper sessions do "leak" watches over time (see https://issues.apache.org/jira/browse/ZOOKEEPER-442). +/// +/// This class attempts to balance those two concerns by managing a pool of cached sessions that live for a while but not forever. +/// +internal class ZooKeeperConnection : IDisposable { - using Medallion.Threading.Internal; - using org.apache.zookeeper; - using System.Collections; - using System.Linq; - using System.Threading; - using System.Threading.Tasks; - /// - /// We don't want to use one session () per lock because "The creation and closing of sessions are - /// costly in ZooKeeper because they need quorum confirmations, they become the bottleneck of a ZooKeeper ensemble when it needs to handle - /// thousands of client connections" (https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html). - /// - /// However, ZooKeeper sessions do "leak" watches over time (see https://issues.apache.org/jira/browse/ZOOKEEPER-442). - /// - /// This class attempts to balance those two concerns by managing a pool of cached sessions that live for a while but not forever. + /// Hopefully, 10m prevents leaks from ever getting too bad while granting efficiencies by allowing us to re-use + /// sessions under load. /// - internal class ZooKeeperConnection : IDisposable - { - /// - /// Hopefully, 10m prevents leaks from ever getting too bad while granting efficiencies by allowing us to re-use - /// sessions under load. - /// - public static readonly Pool DefaultPool = new Pool(maxAge: TimeSpan.FromMinutes(10)); + public static readonly Pool DefaultPool = new Pool(maxAge: TimeSpan.FromMinutes(10)); - private readonly InternalConnection _internalConnection; - private Action? _releaseToPool; + private readonly InternalConnection _internalConnection; + private Action? _releaseToPool; - private ZooKeeperConnection(InternalConnection internalConnection, Action releaseToPool) - { - this._internalConnection = internalConnection; - this._releaseToPool = releaseToPool; - } + private ZooKeeperConnection(InternalConnection internalConnection, Action releaseToPool) + { + this._internalConnection = internalConnection; + this._releaseToPool = releaseToPool; + } + + public ZooKeeper ZooKeeper => this._internalConnection.ZooKeeper; - public ZooKeeper ZooKeeper => this._internalConnection.ZooKeeper; + public CancellationToken ConnectionLostToken => this._internalConnection.ConnectionLostToken; - public CancellationToken ConnectionLostToken => this._internalConnection.ConnectionLostToken; + public void Dispose() => Interlocked.Exchange(ref this._releaseToPool, null)?.Invoke(); - public void Dispose() => Interlocked.Exchange(ref this._releaseToPool, null)?.Invoke(); + public sealed class Pool + { + private readonly Dictionary Connections = new Dictionary(); + private readonly TimeoutValue _maxAge; - public sealed class Pool + public Pool(TimeoutValue maxAge) { - private readonly Dictionary Connections = new Dictionary(); - private readonly TimeoutValue _maxAge; + Invariant.Require(!maxAge.IsInfinite); + this._maxAge = maxAge.TimeSpan; + } - public Pool(TimeoutValue maxAge) - { - Invariant.Require(!maxAge.IsInfinite); - this._maxAge = maxAge.TimeSpan; - } + private object PoolLock => Connections.As().SyncRoot; - private object PoolLock => Connections.As().SyncRoot; + public Task ConnectAsync(ZooKeeperConnectionInfo connectionInfo, CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); - public Task ConnectAsync(ZooKeeperConnectionInfo connectionInfo, CancellationToken cancellationToken) + lock (this.PoolLock) { - cancellationToken.ThrowIfCancellationRequested(); - - lock (this.PoolLock) + // if we have an entry in the pool, use that + if (this.Connections.TryGetValue(connectionInfo, out var entry)) { - // if we have an entry in the pool, use that - if (this.Connections.TryGetValue(connectionInfo, out var entry)) - { - ++entry.UserCount; - return ToResultAsync(entry); - } - - // create a new connection - var newConnectionTask = this.InternalConnectAsync(connectionInfo); - var newEntry = new ConnectionEntry(newConnectionTask) - { - // 2 because we have both the current request and the timeout task we're about to create - UserCount = 2 - }; - this.Connections.Add(connectionInfo, newEntry); - newConnectionTask.ContinueWith(OnConnectionTaskCompleted); - return ToResultAsync(newEntry); - - void OnConnectionTaskCompleted(Task internalConnectionTask) - { - // if we never connected, just release our hold on the task - if (internalConnectionTask.Status != TaskStatus.RanToCompletion) - { - this.ReleaseEntry(connectionInfo, newEntry, remove: true); - } - // Otherwise, wait until either max age has elapsed or the connection is lost to release our hold. This - // ensures both that the connection won't be removed from the pool prematurely as well as that it will be - // eventually removed even if it stops being used - else - { - Task.Delay(this._maxAge.TimeSpan, internalConnectionTask.Result.ConnectionLostToken) - .ContinueWith(_ => this.ReleaseEntry(connectionInfo, newEntry, remove: true)); - } - } + ++entry.UserCount; + return ToResultAsync(entry); } - async Task ToResultAsync(ConnectionEntry entry) + // create a new connection + var newConnectionTask = this.InternalConnectAsync(connectionInfo); + var newEntry = new ConnectionEntry(newConnectionTask) + { + // 2 because we have both the current request and the timeout task we're about to create + UserCount = 2 + }; + this.Connections.Add(connectionInfo, newEntry); + newConnectionTask.ContinueWith(OnConnectionTaskCompleted); + return ToResultAsync(newEntry); + + void OnConnectionTaskCompleted(Task internalConnectionTask) { - try + // if we never connected, just release our hold on the task + if (internalConnectionTask.Status != TaskStatus.RanToCompletion) { - var internalConnection = await entry.ConnectionTask.ConfigureAwait(false); - return new ZooKeeperConnection(internalConnection, releaseToPool: () => this.ReleaseEntry(connectionInfo, entry, remove: false)); + this.ReleaseEntry(connectionInfo, newEntry, remove: true); } - catch + // Otherwise, wait until either max age has elapsed or the connection is lost to release our hold. This + // ensures both that the connection won't be removed from the pool prematurely as well as that it will be + // eventually removed even if it stops being used + else { - // if we fail to construct a connection, still release our hold on the entry to allow cleanup - this.ReleaseEntry(connectionInfo, entry, remove: false); - throw; + Task.Delay(this._maxAge.TimeSpan, internalConnectionTask.Result.ConnectionLostToken) + .ContinueWith(_ => this.ReleaseEntry(connectionInfo, newEntry, remove: true)); } } } - private async Task InternalConnectAsync(ZooKeeperConnectionInfo connectionInfo) + async Task ToResultAsync(ConnectionEntry entry) { - var watcher = new ConnectionWatcher(connectionInfo.SessionTimeout); - var zooKeeper = new ZooKeeper( - connectstring: connectionInfo.ConnectionString, - sessionTimeout: connectionInfo.SessionTimeout.InMilliseconds, - watcher: watcher - ); - - using var timeoutSource = new CancellationTokenSource(connectionInfo.ConnectTimeout.TimeSpan); - using var timeoutRegistration = timeoutSource.Token.Register( - () => watcher.TaskCompletionSource.TrySetException(new TimeoutException($"Timed out connecting to ZooKeeper after {connectionInfo.ConnectTimeout.InMilliseconds}ms")) - ); - - foreach (var authInfo in connectionInfo.AuthInfo) - { - zooKeeper.addAuthInfo(authInfo.Scheme, authInfo.Auth.ToArray()); - } - try { - await watcher.TaskCompletionSource.Task.ConfigureAwait(false); - return new InternalConnection(zooKeeper, watcher); + var internalConnection = await entry.ConnectionTask.ConfigureAwait(false); + return new ZooKeeperConnection(internalConnection, releaseToPool: () => this.ReleaseEntry(connectionInfo, entry, remove: false)); } catch { - // on failure, clean up the instance we created - try { await zooKeeper.closeAsync().ConfigureAwait(false); } - finally { watcher.Dispose(); } + // if we fail to construct a connection, still release our hold on the entry to allow cleanup + this.ReleaseEntry(connectionInfo, entry, remove: false); throw; } } + } - private void ReleaseEntry(ZooKeeperConnectionInfo connectionInfo, ConnectionEntry entry, bool remove) + private async Task InternalConnectAsync(ZooKeeperConnectionInfo connectionInfo) + { + var watcher = new ConnectionWatcher(connectionInfo.SessionTimeout); + var zooKeeper = new ZooKeeper( + connectstring: connectionInfo.ConnectionString, + sessionTimeout: connectionInfo.SessionTimeout.InMilliseconds, + watcher: watcher + ); + + using var timeoutSource = new CancellationTokenSource(connectionInfo.ConnectTimeout.TimeSpan); + using var timeoutRegistration = timeoutSource.Token.Register( + () => watcher.TaskCompletionSource.TrySetException(new TimeoutException($"Timed out connecting to ZooKeeper after {connectionInfo.ConnectTimeout.InMilliseconds}ms")) + ); + + foreach (var authInfo in connectionInfo.AuthInfo) { - bool shouldDispose; - lock (this.PoolLock) - { - if (remove) - { - this.Connections.As>>() - .Remove(new KeyValuePair(connectionInfo, entry)); - } - - shouldDispose = --entry.UserCount == 0; - // this guarantee is upheld by the fact that we include the timeout watcher task as a "user" - Invariant.Require( - !shouldDispose || !(this.Connections.TryGetValue(connectionInfo, out var registeredEntry) && registeredEntry == entry), - "If we're disposing then the entry must be removed from the pool" - ); - } + zooKeeper.addAuthInfo(authInfo.Scheme, authInfo.Auth.ToArray()); + } - if (shouldDispose) - { - // kick off connection disposal in the background to - // avoid blocking/throwing and to handle the case where the task hasn't yet completed - entry.ConnectionTask.ContinueWith( - t => { var ignored = t.Result.DisposeAsync(); }, - TaskContinuationOptions.OnlyOnRanToCompletion - ); - } + try + { + await watcher.TaskCompletionSource.Task.ConfigureAwait(false); + return new InternalConnection(zooKeeper, watcher); } + catch + { + // on failure, clean up the instance we created + try { await zooKeeper.closeAsync().ConfigureAwait(false); } + finally { watcher.Dispose(); } + throw; + } + } - private class ConnectionEntry + private void ReleaseEntry(ZooKeeperConnectionInfo connectionInfo, ConnectionEntry entry, bool remove) + { + bool shouldDispose; + lock (this.PoolLock) { - public ConnectionEntry(Task connectionTask) + if (remove) { - this.ConnectionTask = connectionTask; + this.Connections.As>>() + .Remove(new KeyValuePair(connectionInfo, entry)); } - public Task ConnectionTask { get; } - // protected by the pool's lock - public int UserCount { get; set; } + shouldDispose = --entry.UserCount == 0; + // this guarantee is upheld by the fact that we include the timeout watcher task as a "user" + Invariant.Require( + !shouldDispose || !(this.Connections.TryGetValue(connectionInfo, out var registeredEntry) && registeredEntry == entry), + "If we're disposing then the entry must be removed from the pool" + ); + } + + if (shouldDispose) + { + // kick off connection disposal in the background to + // avoid blocking/throwing and to handle the case where the task hasn't yet completed + entry.ConnectionTask.ContinueWith( + t => { var ignored = t.Result.DisposeAsync(); }, + TaskContinuationOptions.OnlyOnRanToCompletion + ); } } - private class InternalConnection : IAsyncDisposable + private class ConnectionEntry { - private readonly ConnectionWatcher _watcher; - - public InternalConnection(ZooKeeper zooKeeper, ConnectionWatcher watcher) + public ConnectionEntry(Task connectionTask) { - this.ZooKeeper = zooKeeper; - this._watcher = watcher; + this.ConnectionTask = connectionTask; } - public ZooKeeper ZooKeeper { get; } + public Task ConnectionTask { get; } + // protected by the pool's lock + public int UserCount { get; set; } + } + } - public CancellationToken ConnectionLostToken => this._watcher.ConnectionLost; + private class InternalConnection : IAsyncDisposable + { + private readonly ConnectionWatcher _watcher; + + public InternalConnection(ZooKeeper zooKeeper, ConnectionWatcher watcher) + { + this.ZooKeeper = zooKeeper; + this._watcher = watcher; + } - public async ValueTask DisposeAsync() - { - try { await this.ZooKeeper.closeAsync().ConfigureAwait(false); } - finally { this._watcher.Dispose(); } - } + public ZooKeeper ZooKeeper { get; } + + public CancellationToken ConnectionLostToken => this._watcher.ConnectionLost; + + public async ValueTask DisposeAsync() + { + try { await this.ZooKeeper.closeAsync().ConfigureAwait(false); } + finally { this._watcher.Dispose(); } } + } - private class ConnectionWatcher : Watcher, IDisposable + private class ConnectionWatcher : Watcher, IDisposable + { + private readonly CancellationTokenSource _connectionLostSource = new CancellationTokenSource(); + private readonly TimeoutValue _sessionTimeout; + private int _isWaitingForReconnect; + + public ConnectionWatcher(TimeoutValue sessionTimeout) { - private readonly CancellationTokenSource _connectionLostSource = new CancellationTokenSource(); - private readonly TimeoutValue _sessionTimeout; - private int _isWaitingForReconnect; + this._sessionTimeout = sessionTimeout; + } - public ConnectionWatcher(TimeoutValue sessionTimeout) + public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); + public CancellationToken ConnectionLost => this._connectionLostSource.Token; + + public override Task process(WatchedEvent @event) + { + if (@event.getState() == Event.KeeperState.SyncConnected) { - this._sessionTimeout = sessionTimeout; + if (!this.TaskCompletionSource.TrySetResult(default)) + { + // if we're reconnecting, clear any scheduled cancellation + this._connectionLostSource.CancelAfter(Timeout.Infinite); + Volatile.Write(ref this._isWaitingForReconnect, 0); + } } - - public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); - public CancellationToken ConnectionLost => this._connectionLostSource.Token; - - public override Task process(WatchedEvent @event) + else { - if (@event.getState() == Event.KeeperState.SyncConnected) + if (!this.TaskCompletionSource.TrySetException(new InvalidOperationException($"Failed to connect to ZooKeeper. State: {@event.getState()}"))) { - if (!this.TaskCompletionSource.TrySetResult(default)) + // if we see the expired event (which might not come if we never reconnect), just fire connection lost + if (@event.getState() == Event.KeeperState.Expired) { - // if we're reconnecting, clear any scheduled cancellation - this._connectionLostSource.CancelAfter(Timeout.Infinite); - Volatile.Write(ref this._isWaitingForReconnect, 0); + this._connectionLostSource.Cancel(); } - } - else - { - if (!this.TaskCompletionSource.TrySetException(new InvalidOperationException($"Failed to connect to ZooKeeper. State: {@event.getState()}"))) + // Otherwise, zookeeper will be attempting reconnection. Give it up to the session timeout to + // do so before we fire. See https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html + else if (Interlocked.Exchange(ref this._isWaitingForReconnect, 1) == 0) { - // if we see the expired event (which might not come if we never reconnect), just fire connection lost - if (@event.getState() == Event.KeeperState.Expired) - { - this._connectionLostSource.Cancel(); - } - // Otherwise, zookeeper will be attempting reconnection. Give it up to the session timeout to - // do so before we fire. See https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html - else if (Interlocked.Exchange(ref this._isWaitingForReconnect, 1) == 0) - { - // Only do this if we changed from !reconnecting to reconnecting; otherwise if we get multiple - // failure events we'll keep re-upping the timer - this._connectionLostSource.CancelAfter(this._sessionTimeout.TimeSpan); - } + // Only do this if we changed from !reconnecting to reconnecting; otherwise if we get multiple + // failure events we'll keep re-upping the timer + this._connectionLostSource.CancelAfter(this._sessionTimeout.TimeSpan); } } - - return Task.CompletedTask; } - public void Dispose() => this._connectionLostSource.Dispose(); + return Task.CompletedTask; } + + public void Dispose() => this._connectionLostSource.Dispose(); } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs index ba18c09a..a6cc961b 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs @@ -5,41 +5,40 @@ using System.Linq; using System.Text; -namespace Medallion.Threading.ZooKeeper -{ - internal sealed record ZooKeeperAuthInfo(string Scheme, EquatableReadOnlyList Auth); +namespace Medallion.Threading.ZooKeeper; - internal sealed record ZooKeeperConnectionInfo(string ConnectionString, TimeoutValue ConnectTimeout, TimeoutValue SessionTimeout, EquatableReadOnlyList AuthInfo); +internal sealed record ZooKeeperAuthInfo(string Scheme, EquatableReadOnlyList Auth); - internal readonly struct EquatableReadOnlyList : IReadOnlyList, IEquatable> - { - private readonly T[] _array; +internal sealed record ZooKeeperConnectionInfo(string ConnectionString, TimeoutValue ConnectTimeout, TimeoutValue SessionTimeout, EquatableReadOnlyList AuthInfo); - public EquatableReadOnlyList(IEnumerable items) - { - this._array = items.ToArray(); - } +internal readonly struct EquatableReadOnlyList : IReadOnlyList, IEquatable> +{ + private readonly T[] _array; - public T this[int index] => this._array[index]; + public EquatableReadOnlyList(IEnumerable items) + { + this._array = items.ToArray(); + } + + public T this[int index] => this._array[index]; - public int Count => this._array.Length; + public int Count => this._array.Length; - public bool Equals(EquatableReadOnlyList other) => this._array.SequenceEqual(other._array); + public bool Equals(EquatableReadOnlyList other) => this._array.SequenceEqual(other._array); - public override bool Equals(object obj) => obj is EquatableReadOnlyList that && this.Equals(that); + public override bool Equals(object obj) => obj is EquatableReadOnlyList that && this.Equals(that); - public override int GetHashCode() + public override int GetHashCode() + { + var hash = 0; + foreach (var item in this._array) { - var hash = 0; - foreach (var item in this._array) - { - hash = (hash, item).GetHashCode(); - } - return hash; + hash = (hash, item).GetHashCode(); } + return hash; + } - public IEnumerator GetEnumerator() => this._array.As>().GetEnumerator(); + public IEnumerator GetEnumerator() => this._array.As>().GetEnumerator(); - IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator(); } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs index fd3ae2d8..8a8794e3 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs @@ -3,57 +3,56 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +public partial class ZooKeeperDistributedLock { - public partial class ZooKeeperDistributedLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.As>().TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.As>().Acquire(timeout, cancellationToken); - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ZooKeeperDistributedLockHandle? IInternalDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + ZooKeeperDistributedLockHandle? IInternalDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - ZooKeeperDistributedLockHandle IInternalDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + ZooKeeperDistributedLockHandle IInternalDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire the lock asynchronously. Usage: - /// - /// await using (var handle = await myLock.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the lock! */ } - /// } - /// // dispose releases the lock if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await myLock.AcquireAsync(...)) - /// { - /// /* we have the lock! */ - /// } - /// // dispose releases the lock - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs index 63f4b2da..85bf88da 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs @@ -6,94 +6,93 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// An implementation of based on ZooKeeper. Uses the lock recipe described in +/// https://zookeeper.apache.org/doc/r3.1.2/recipes.html +/// +public sealed partial class ZooKeeperDistributedLock : IInternalDistributedLock { + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + /// - /// An implementation of based on ZooKeeper. Uses the lock recipe described in - /// https://zookeeper.apache.org/doc/r3.1.2/recipes.html + /// Constructs a new lock based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). /// - public sealed partial class ZooKeeperDistributedLock : IInternalDistributedLock + public ZooKeeperDistributedLock( + ZooKeeperPath path, + string connectionString, + bool assumePathExists = false, + Action? options = null) + : this(path, assumePathExists: assumePathExists, connectionString, options) { - private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; - - /// - /// Constructs a new lock based on the provided , , and . - /// - /// If is specified, then the node will not be created as part of acquiring nor will it be - /// deleted after releasing (defaults to false). - /// - public ZooKeeperDistributedLock( - ZooKeeperPath path, - string connectionString, - bool assumePathExists = false, - Action? options = null) - : this(path, assumePathExists: assumePathExists, connectionString, options) - { - if (path == default) { throw new ArgumentNullException(nameof(path)); } - if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } - } + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } + } - /// - /// Constructs a new lock based on the provided , , and . - /// - /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) - : this(ZooKeeperPath.Root, name, connectionString, options) - { - } + /// + /// Constructs a new lock based on the provided , , and . + /// + /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedLock(string name, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, connectionString, options) + { + } - /// - /// Constructs a new lock based on the provided , , , and . - /// - /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) - : this( - (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), - assumePathExists: false, - connectionString, - options) - { - } + /// + /// Constructs a new lock based on the provided , , , and . + /// + /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) + : this( + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + assumePathExists: false, + connectionString, + options) + { + } - private ZooKeeperDistributedLock(ZooKeeperPath path, bool assumePathExists, string connectionString, Action? optionsBuilder) => - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(path, assumePathExists, connectionString, optionsBuilder); + private ZooKeeperDistributedLock(ZooKeeperPath path, bool assumePathExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(path, assumePathExists, connectionString, optionsBuilder); - /// - /// The zookeeper node path - /// - public ZooKeeperPath Path => this._synchronizationHelper.Path; + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path => this._synchronizationHelper.Path; - /// - /// Implements . Implemented explicitly to avoid confusion with the fact - /// that this will include the leading "/" and base directory alongside the passed-in name. - /// - string IDistributedLock.Name => this.Path.ToString(); + /// + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. + /// + string IDistributedLock.Name => this.Path.ToString(); - async ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( - hasAcquired: state => state.SortedChildren[0].Path == state.EphemeralNodePath, - waitAsync: async (zooKeeper, state, watcher) => - { - var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); - var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; - // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that - // node so that we'll be notified when it changes (we can't acquire the lock before then) - return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; - }, - timeout, - cancellationToken, - nodePrefix: "lock-" - ) - // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - .AwaitSyncOverAsync() - .ConfigureAwait(false); + async ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( + hasAcquired: state => state.SortedChildren[0].Path == state.EphemeralNodePath, + waitAsync: async (zooKeeper, state, watcher) => + { + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; + // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; + }, + timeout, + cancellationToken, + nodePrefix: "lock-" + ) + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + .AwaitSyncOverAsync() + .ConfigureAwait(false); - return nodeHandle != null ? new ZooKeeperDistributedLockHandle(nodeHandle) : null; - } + return nodeHandle != null ? new ZooKeeperDistributedLockHandle(nodeHandle) : null; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs index 2d67b7c9..5a365e3b 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs @@ -5,41 +5,40 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Implements +/// +public sealed class ZooKeeperDistributedLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class ZooKeeperDistributedLockHandle : IDistributedSynchronizationHandle - { - private ZooKeeperNodeHandle? _innerHandle; - private IDisposable? _finalizerRegistration; + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; - internal ZooKeeperDistributedLockHandle(ZooKeeperNodeHandle innerHandle) - { - this._innerHandle = innerHandle; - // If the process exits, the fact that we use ephemeral nodes gives us guaranteed - // abandonment protection. Until that point, though, we're vulnerable to abandonment because - // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit - // so long as a handle to them remains open - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); - } + internal ZooKeeperDistributedLockHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + /// + /// Implements + /// + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; - // explicit because this is sync-over-async - void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); - /// - /// Releases the lock - /// - public ValueTask DisposeAsync() - { - Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); - return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock + /// + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index 539bfc74..026c84c8 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -3,28 +3,28 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +public partial class ZooKeeperDistributedReaderWriterLock { - public partial class ZooKeeperDistributedReaderWriterLock - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.As>().TryAcquireReadLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.As>().AcquireReadLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => - this.As>().TryAcquireWriteLock(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => - this.As>().AcquireWriteLock(timeout, cancellationToken); - ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquireReadLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireReadLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().AcquireReadLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireReadLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireReadLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireReadLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedReaderWriterLock.TryAcquireWriteLock(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquireWriteLock(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedReaderWriterLock.AcquireWriteLock(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().AcquireWriteLock(timeout, cancellationToken); + ValueTask IDistributedReaderWriterLock.TryAcquireWriteLockAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedReaderWriterLock.AcquireWriteLockAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireWriteLockAsync(timeout, cancellationToken).Convert(To.ValueTask); ZooKeeperDistributedReaderWriterLockHandle? IInternalDistributedReaderWriterLock.TryAcquireReadLock(TimeSpan timeout, CancellationToken cancellationToken) => DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken, isWrite: false); @@ -102,5 +102,4 @@ ZooKeeperDistributedReaderWriterLockHandle IInternalDistributedReaderWriterLock< public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken, isWrite: true); - } } \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs index aaa6bbbc..92c73628 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -6,111 +6,110 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +using org.apache.zookeeper; + +/// +/// A distributed reader-writer lock based on the ZooKeeper shared lock recipe (https://zookeeper.apache.org/doc/current/recipes.html). +/// +public sealed partial class ZooKeeperDistributedReaderWriterLock : IInternalDistributedReaderWriterLock { - using org.apache.zookeeper; + private const string ReadNodePrefix = "read-", + WriteNodePrefix = "write-"; + + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + + /// + /// Constructs a new lock based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). + /// + public ZooKeeperDistributedReaderWriterLock( + ZooKeeperPath path, + string connectionString, + bool assumePathExists = false, + Action? options = null) + : this(path, assumePathExists: assumePathExists, connectionString, options) + { + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } + } + + /// + /// Constructs a new lock based on the provided , , and . + /// + /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedReaderWriterLock(string name, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, connectionString, options) + { + } + + /// + /// Constructs a new lock based on the provided , , , and . + /// + /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedReaderWriterLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) + : this( + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + assumePathExists: false, + connectionString, + options) + { + } + + private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assumePathExists, string connectionString, Action? optionsBuilder) => + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder); + + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path => this._synchronizationHelper.Path; /// - /// A distributed reader-writer lock based on the ZooKeeper shared lock recipe (https://zookeeper.apache.org/doc/current/recipes.html). + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. /// - public sealed partial class ZooKeeperDistributedReaderWriterLock : IInternalDistributedReaderWriterLock + string IDistributedReaderWriterLock.Name => this.Path.ToString(); + + async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken, bool isWrite) + { + var nodeHandleTask = isWrite + ? this._synchronizationHelper.TryAcquireAsync(HasAcquiredWriteLock, WaitForWriteLockAcquiredOrChange, timeout, cancellationToken, WriteNodePrefix, alternateNodePrefix: ReadNodePrefix) + : this._synchronizationHelper.TryAcquireAsync(HasAcquiredReadLock, WaitForReadLockAcquiredOrChange, timeout, cancellationToken, ReadNodePrefix, alternateNodePrefix: WriteNodePrefix); + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + var nodeHandle = await nodeHandleTask.AwaitSyncOverAsync().ConfigureAwait(false); + + return nodeHandle != null ? new ZooKeeperDistributedReaderWriterLockHandle(nodeHandle) : null; + } + + private static bool HasAcquiredReadLock(ZooKeeperSynchronizationHelper.State state) => + // We have the read lock if there are no writers ahead of us + state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath).All(t => t.Prefix != WriteNodePrefix); + + private static async Task WaitForReadLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) + { + var nextLowestWriteNode = state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath) + .Last(t => t.Prefix == WriteNodePrefix); + // If the next lowest write node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestWriteNode.Path, watcher).ConfigureAwait(false) == null; + } + + private static bool HasAcquiredWriteLock(ZooKeeperSynchronizationHelper.State state) => + state.SortedChildren[0].Path == state.EphemeralNodePath; + + private async Task WaitForWriteLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) { - private const string ReadNodePrefix = "read-", - WriteNodePrefix = "write-"; - - private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; - - /// - /// Constructs a new lock based on the provided , , and . - /// - /// If is specified, then the node will not be created as part of acquiring nor will it be - /// deleted after releasing (defaults to false). - /// - public ZooKeeperDistributedReaderWriterLock( - ZooKeeperPath path, - string connectionString, - bool assumePathExists = false, - Action? options = null) - : this(path, assumePathExists: assumePathExists, connectionString, options) - { - if (path == default) { throw new ArgumentNullException(nameof(path)); } - if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } - } - - /// - /// Constructs a new lock based on the provided , , and . - /// - /// The lock's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedReaderWriterLock(string name, string connectionString, Action? options = null) - : this(ZooKeeperPath.Root, name, connectionString, options) - { - } - - /// - /// Constructs a new lock based on the provided , , , and . - /// - /// The lock's path will be a parent node of . If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedReaderWriterLock(ZooKeeperPath directoryPath, string name, string connectionString, Action? options = null) - : this( - (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), - assumePathExists: false, - connectionString, - options) - { - } - - private ZooKeeperDistributedReaderWriterLock(ZooKeeperPath nodePath, bool assumePathExists, string connectionString, Action? optionsBuilder) => - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder); - - /// - /// The zookeeper node path - /// - public ZooKeeperPath Path => this._synchronizationHelper.Path; - - /// - /// Implements . Implemented explicitly to avoid confusion with the fact - /// that this will include the leading "/" and base directory alongside the passed-in name. - /// - string IDistributedReaderWriterLock.Name => this.Path.ToString(); - - async ValueTask IInternalDistributedReaderWriterLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken, bool isWrite) - { - var nodeHandleTask = isWrite - ? this._synchronizationHelper.TryAcquireAsync(HasAcquiredWriteLock, WaitForWriteLockAcquiredOrChange, timeout, cancellationToken, WriteNodePrefix, alternateNodePrefix: ReadNodePrefix) - : this._synchronizationHelper.TryAcquireAsync(HasAcquiredReadLock, WaitForReadLockAcquiredOrChange, timeout, cancellationToken, ReadNodePrefix, alternateNodePrefix: WriteNodePrefix); - // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - var nodeHandle = await nodeHandleTask.AwaitSyncOverAsync().ConfigureAwait(false); - - return nodeHandle != null ? new ZooKeeperDistributedReaderWriterLockHandle(nodeHandle) : null; - } - - private static bool HasAcquiredReadLock(ZooKeeperSynchronizationHelper.State state) => - // We have the read lock if there are no writers ahead of us - state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath).All(t => t.Prefix != WriteNodePrefix); - - private static async Task WaitForReadLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) - { - var nextLowestWriteNode = state.SortedChildren.TakeWhile(t => t.Path != state.EphemeralNodePath) - .Last(t => t.Prefix == WriteNodePrefix); - // If the next lowest write node is already gone, then the wait is done. Otherwise, leave the watcher on that - // node so that we'll be notified when it changes (we can't acquire the lock before then) - return await zooKeeper.existsAsync(nextLowestWriteNode.Path, watcher).ConfigureAwait(false) == null; - } - - private static bool HasAcquiredWriteLock(ZooKeeperSynchronizationHelper.State state) => - state.SortedChildren[0].Path == state.EphemeralNodePath; - - private async Task WaitForWriteLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) - { - var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); - var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; - // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that - // node so that we'll be notified when it changes (we can't acquire the lock before then) - return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; - } + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; + // If the next lowest child node is already gone, then the wait is done. Otherwise, leave the watcher on that + // node so that we'll be notified when it changes (we can't acquire the lock before then) + return await zooKeeper.existsAsync(nextLowestChildNode, watcher).ConfigureAwait(false) == null; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs index a803b601..5829541f 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs @@ -5,41 +5,40 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Implements +/// +public sealed class ZooKeeperDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class ZooKeeperDistributedReaderWriterLockHandle : IDistributedSynchronizationHandle - { - private ZooKeeperNodeHandle? _innerHandle; - private IDisposable? _finalizerRegistration; + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; - internal ZooKeeperDistributedReaderWriterLockHandle(ZooKeeperNodeHandle innerHandle) - { - this._innerHandle = innerHandle; - // If the process exits, the fact that we use ephemeral nodes gives us guaranteed - // abandonment protection. Until that point, though, we're vulnerable to abandonment because - // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit - // so long as a handle to them remains open - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); - } + internal ZooKeeperDistributedReaderWriterLockHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + /// + /// Implements + /// + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; - // explicit because this is sync-over-async - void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); - /// - /// Releases the lock - /// - public ValueTask DisposeAsync() - { - Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); - return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the lock + /// + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs index a8a50fb2..4fce986a 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs @@ -3,57 +3,56 @@ using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +public partial class ZooKeeperDistributedSemaphore { - public partial class ZooKeeperDistributedSemaphore - { - // AUTO-GENERATED + // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - this.As>().TryAcquire(timeout, cancellationToken); - IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - this.As>().Acquire(timeout, cancellationToken); - ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => - this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => - this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + IDistributedSynchronizationHandle? IDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.As>().TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.As>().Acquire(timeout, cancellationToken); + ValueTask IDistributedSemaphore.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedSemaphore.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - ZooKeeperDistributedSemaphoreHandle? IInternalDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + ZooKeeperDistributedSemaphoreHandle? IInternalDistributedSemaphore.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - ZooKeeperDistributedSemaphoreHandle IInternalDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + ZooKeeperDistributedSemaphoreHandle IInternalDistributedSemaphore.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - /// - /// Attempts to acquire a semaphore ticket asynchronously. Usage: - /// - /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) - /// { - /// if (handle != null) { /* we have the ticket! */ } - /// } - /// // dispose releases the ticket if we took it - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to 0 - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + /// + /// Attempts to acquire a semaphore ticket asynchronously. Usage: + /// + /// await using (var handle = await mySemaphore.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the ticket! */ } + /// } + /// // dispose releases the ticket if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - /// - /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: - /// - /// await using (await mySemaphore.AcquireAsync(...)) - /// { - /// /* we have the ticket! */ - /// } - /// // dispose releases the ticket - /// - /// - /// How long to wait before giving up on the acquisition attempt. Defaults to - /// Specifies a token by which the wait can be canceled - /// A which can be used to release the ticket - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// + /// Acquires a semaphore ticket asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await mySemaphore.AcquireAsync(...)) + /// { + /// /* we have the ticket! */ + /// } + /// // dispose releases the ticket + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the ticket + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs index ce9eb249..98d11547 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs @@ -6,119 +6,118 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// An implementation of based on ZooKeeper. Uses an approach similar to . +/// +public sealed partial class ZooKeeperDistributedSemaphore : IInternalDistributedSemaphore { + private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + /// - /// An implementation of based on ZooKeeper. Uses an approach similar to . + /// Constructs a new semaphore based on the provided , , and . + /// + /// If is specified, then the node will not be created as part of acquiring nor will it be + /// deleted after releasing (defaults to false). /// - public sealed partial class ZooKeeperDistributedSemaphore : IInternalDistributedSemaphore + public ZooKeeperDistributedSemaphore( + ZooKeeperPath path, + int maxCount, + string connectionString, + bool assumePathExists = false, + Action? options = null) + : this(path, maxCount, assumePathExists: assumePathExists, connectionString, options) { - private readonly ZooKeeperSynchronizationHelper _synchronizationHelper; + if (path == default) { throw new ArgumentNullException(nameof(path)); } + if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } + } - /// - /// Constructs a new semaphore based on the provided , , and . - /// - /// If is specified, then the node will not be created as part of acquiring nor will it be - /// deleted after releasing (defaults to false). - /// - public ZooKeeperDistributedSemaphore( - ZooKeeperPath path, - int maxCount, - string connectionString, - bool assumePathExists = false, - Action? options = null) - : this(path, maxCount, assumePathExists: assumePathExists, connectionString, options) - { - if (path == default) { throw new ArgumentNullException(nameof(path)); } - if (path == ZooKeeperPath.Root) { throw new ArgumentException("Cannot be the root", nameof(path)); } - } + /// + /// Constructs a new semaphore based on the provided , , and . + /// + /// The semaphore's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, name, maxCount, connectionString, options) + { + } - /// - /// Constructs a new semaphore based on the provided , , and . - /// - /// The semaphore's path will be a parent node of the root directory '/'. If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedSemaphore(string name, int maxCount, string connectionString, Action? options = null) - : this(ZooKeeperPath.Root, name, maxCount, connectionString, options) - { - } + /// + /// Constructs a new semaphore based on the provided , , , and . + /// + /// The semaphore's path will be a parent node of . If is not a valid node name, it will be transformed to ensure + /// validity. + /// + public ZooKeeperDistributedSemaphore(ZooKeeperPath directoryPath, string name, int maxCount, string connectionString, Action? options = null) + : this( + (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), + maxCount, + assumePathExists: false, + connectionString, + options) + { + } - /// - /// Constructs a new semaphore based on the provided , , , and . - /// - /// The semaphore's path will be a parent node of . If is not a valid node name, it will be transformed to ensure - /// validity. - /// - public ZooKeeperDistributedSemaphore(ZooKeeperPath directoryPath, string name, int maxCount, string connectionString, Action? options = null) - : this( - (directoryPath == default ? throw new ArgumentNullException(nameof(directoryPath)) : directoryPath).GetChildNodePathWithSafeName(name), - maxCount, - assumePathExists: false, - connectionString, - options) - { - } + private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool assumePathExists, string connectionString, Action? optionsBuilder) + { + if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } + this.MaxCount = maxCount; + // setAcquiredMarker is needed because we use data changes as part of our wait procedure below + this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder, setAcquiredMarker: true); + } - private ZooKeeperDistributedSemaphore(ZooKeeperPath nodePath, int maxCount, bool assumePathExists, string connectionString, Action? optionsBuilder) - { - if (maxCount < 1) { throw new ArgumentOutOfRangeException(nameof(maxCount), maxCount, "must be positive"); } - this.MaxCount = maxCount; - // setAcquiredMarker is needed because we use data changes as part of our wait procedure below - this._synchronizationHelper = new ZooKeeperSynchronizationHelper(nodePath, assumePathExists, connectionString, optionsBuilder, setAcquiredMarker: true); - } + /// + /// The zookeeper node path + /// + public ZooKeeperPath Path => this._synchronizationHelper.Path; - /// - /// The zookeeper node path - /// - public ZooKeeperPath Path => this._synchronizationHelper.Path; + /// + /// Implements . Implemented explicitly to avoid confusion with the fact + /// that this will include the leading "/" and base directory alongside the passed-in name. + /// + string IDistributedSemaphore.Name => this.Path.ToString(); - /// - /// Implements . Implemented explicitly to avoid confusion with the fact - /// that this will include the leading "/" and base directory alongside the passed-in name. - /// - string IDistributedSemaphore.Name => this.Path.ToString(); + /// + /// Implements + /// + public int MaxCount { get; } - /// - /// Implements - /// - public int MaxCount { get; } + async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( + hasAcquired: state => Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath) < this.MaxCount, + waitAsync: async (zooKeeper, state, watcher) => + { + var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); + Invariant.Require(ephemeralNodeIndex >= this.MaxCount); - async ValueTask IInternalDistributedSemaphore.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - var nodeHandle = await this._synchronizationHelper.TryAcquireAsync( - hasAcquired: state => Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath) < this.MaxCount, - waitAsync: async (zooKeeper, state, watcher) => + // if we're the next node in line for a ticket, wait for any changes in the collection of children + if (ephemeralNodeIndex == this.MaxCount) { - var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); - Invariant.Require(ephemeralNodeIndex >= this.MaxCount); - - // if we're the next node in line for a ticket, wait for any changes in the collection of children - if (ephemeralNodeIndex == this.MaxCount) - { - var childNames = new HashSet((await zooKeeper.getChildrenAsync(this.Path.ToString(), watcher).ConfigureAwait(false)).Children); - // If any of the children in front of us are missing, then the wait is done. Otherwise, - // let the watcher notify us when there is any change to the set of children - return state.SortedChildren.Take(ephemeralNodeIndex) - .Any(t => !childNames.Contains(t.Path.Substring(t.Path.LastIndexOf(ZooKeeperPath.Separator) + 1))); - } + var childNames = new HashSet((await zooKeeper.getChildrenAsync(this.Path.ToString(), watcher).ConfigureAwait(false)).Children); + // If any of the children in front of us are missing, then the wait is done. Otherwise, + // let the watcher notify us when there is any change to the set of children + return state.SortedChildren.Take(ephemeralNodeIndex) + .Any(t => !childNames.Contains(t.Path.Substring(t.Path.LastIndexOf(ZooKeeperPath.Separator) + 1))); + } - // Otherwise, we just watch for the node ahead of us in line to have its data changed to the acquired marker. While we could - // watch all children in this case as well, that approach is less efficient because it will generate a herd effect where each - // new waiter or released waiter wakes up everyone else. - var nextLowestChildData = await zooKeeper.getDataAsync(state.SortedChildren[ephemeralNodeIndex - 1].Path, watcher).ConfigureAwait(false); - // If it's already acquired, then the wait is done. Otherwise, the watcher will notify us on any data change or on deletion of that node - return nextLowestChildData.Data.SequenceEqual(ZooKeeperSynchronizationHelper.AcquiredMarker); - }, - timeout, - cancellationToken, - nodePrefix: "semaphore-" - ) - // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - .AwaitSyncOverAsync() - .ConfigureAwait(false); + // Otherwise, we just watch for the node ahead of us in line to have its data changed to the acquired marker. While we could + // watch all children in this case as well, that approach is less efficient because it will generate a herd effect where each + // new waiter or released waiter wakes up everyone else. + var nextLowestChildData = await zooKeeper.getDataAsync(state.SortedChildren[ephemeralNodeIndex - 1].Path, watcher).ConfigureAwait(false); + // If it's already acquired, then the wait is done. Otherwise, the watcher will notify us on any data change or on deletion of that node + return nextLowestChildData.Data.SequenceEqual(ZooKeeperSynchronizationHelper.AcquiredMarker); + }, + timeout, + cancellationToken, + nodePrefix: "semaphore-" + ) + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + .AwaitSyncOverAsync() + .ConfigureAwait(false); - return nodeHandle != null ? new ZooKeeperDistributedSemaphoreHandle(nodeHandle) : null; - } + return nodeHandle != null ? new ZooKeeperDistributedSemaphoreHandle(nodeHandle) : null; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs index 48d6b149..da16c121 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs @@ -5,41 +5,40 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Implements +/// +public sealed class ZooKeeperDistributedSemaphoreHandle : IDistributedSynchronizationHandle { - /// - /// Implements - /// - public sealed class ZooKeeperDistributedSemaphoreHandle : IDistributedSynchronizationHandle - { - private ZooKeeperNodeHandle? _innerHandle; - private IDisposable? _finalizerRegistration; + private ZooKeeperNodeHandle? _innerHandle; + private IDisposable? _finalizerRegistration; - internal ZooKeeperDistributedSemaphoreHandle(ZooKeeperNodeHandle innerHandle) - { - this._innerHandle = innerHandle; - // If the process exits, the fact that we use ephemeral nodes gives us guaranteed - // abandonment protection. Until that point, though, we're vulnerable to abandonment because - // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit - // so long as a handle to them remains open - this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); - } + internal ZooKeeperDistributedSemaphoreHandle(ZooKeeperNodeHandle innerHandle) + { + this._innerHandle = innerHandle; + // If the process exits, the fact that we use ephemeral nodes gives us guaranteed + // abandonment protection. Until that point, though, we're vulnerable to abandonment because + // we pool zookeeper sessions. While those sessions have a max age, they won't be able to exit + // so long as a handle to them remains open + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); + } - /// - /// Implements - /// - public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; + /// + /// Implements + /// + public CancellationToken HandleLostToken => (Volatile.Read(ref this._innerHandle) ?? throw this.ObjectDisposed()).HandleLostToken; - // explicit because this is sync-over-async - void IDisposable.Dispose() => this.DisposeSyncViaAsync(); + // explicit because this is sync-over-async + void IDisposable.Dispose() => this.DisposeSyncViaAsync(); - /// - /// Releases the semaphore - /// - public ValueTask DisposeAsync() - { - Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); - return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; - } + /// + /// Releases the semaphore + /// + public ValueTask DisposeAsync() + { + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs index 580ddf0a..53ae0e11 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs @@ -4,100 +4,99 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Options for configuring ZooKeeper-based synchronization primitives +/// +public sealed class ZooKeeperDistributedSynchronizationOptionsBuilder { + private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperNodeCreator.PublicAcl }; + /// - /// Options for configuring ZooKeeper-based synchronization primitives + /// According to https://bowenli86.github.io/2016/09/15/distributed%20system/zookeeper/ZooKeeper-Sessions-and-Session-Management/, + /// timeout can be a minimum of 2x the tick time and a maximum of 20x the tick time. The default tick time is 2s, so this default + /// is set to be high enough to require relatively few heartbeats but also low enough to support either a 2s or 1s tick time by default. /// - public sealed class ZooKeeperDistributedSynchronizationOptionsBuilder - { - private static readonly IReadOnlyList DefaultAcl = new[] { ZooKeeperNodeCreator.PublicAcl }; - - /// - /// According to https://bowenli86.github.io/2016/09/15/distributed%20system/zookeeper/ZooKeeper-Sessions-and-Session-Management/, - /// timeout can be a minimum of 2x the tick time and a maximum of 20x the tick time. The default tick time is 2s, so this default - /// is set to be high enough to require relatively few heartbeats but also low enough to support either a 2s or 1s tick time by default. - /// - private TimeoutValue _sessionTimeout = TimeSpan.FromSeconds(20); + private TimeoutValue _sessionTimeout = TimeSpan.FromSeconds(20); - /// - /// Default value (arbitrarily) matches the default connection timeout for SQL Server - /// - private TimeoutValue _connectTimeout = TimeSpan.FromSeconds(15); + /// + /// Default value (arbitrarily) matches the default connection timeout for SQL Server + /// + private TimeoutValue _connectTimeout = TimeSpan.FromSeconds(15); - private readonly List _authInfo = new List(); - private readonly List _acl = new List(); - - private ZooKeeperDistributedSynchronizationOptionsBuilder() - { - } + private readonly List _authInfo = new(); + private readonly List _acl = new(); + + private ZooKeeperDistributedSynchronizationOptionsBuilder() + { + } - /// - /// Configures the for connections to ZooKeeper. Because the underlying ZooKeeper client periodically renews - /// the session, this value generally will not impact behavior. Lower values mean that locks will be released more quickly following a crash - /// of the lock-holding process, but also increase the risk that transient connection issues will result in a dropped lock. - /// - /// Defaults to 20s. - /// - public ZooKeeperDistributedSynchronizationOptionsBuilder SessionTimeout(TimeSpan sessionTimeout) - { - var sessionTimeoutValue = new TimeoutValue(sessionTimeout, nameof(sessionTimeout)); - if (sessionTimeoutValue.IsZero) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must be positive"); } - if (sessionTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must not be infinite"); } + /// + /// Configures the for connections to ZooKeeper. Because the underlying ZooKeeper client periodically renews + /// the session, this value generally will not impact behavior. Lower values mean that locks will be released more quickly following a crash + /// of the lock-holding process, but also increase the risk that transient connection issues will result in a dropped lock. + /// + /// Defaults to 20s. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder SessionTimeout(TimeSpan sessionTimeout) + { + var sessionTimeoutValue = new TimeoutValue(sessionTimeout, nameof(sessionTimeout)); + if (sessionTimeoutValue.IsZero) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must be positive"); } + if (sessionTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(sessionTimeout), "must not be infinite"); } - this._sessionTimeout = sessionTimeoutValue; - return this; - } + this._sessionTimeout = sessionTimeoutValue; + return this; + } - /// - /// Configures how long to wait to establish a connection to ZooKeeper before failing with a . - /// - /// Defaults to 15s. - /// - public ZooKeeperDistributedSynchronizationOptionsBuilder ConnectTimeout(TimeSpan connectTimeout) - { - this._connectTimeout = new TimeoutValue(connectTimeout, nameof(connectTimeout)); - return this; - } + /// + /// Configures how long to wait to establish a connection to ZooKeeper before failing with a . + /// + /// Defaults to 15s. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder ConnectTimeout(TimeSpan connectTimeout) + { + this._connectTimeout = new TimeoutValue(connectTimeout, nameof(connectTimeout)); + return this; + } - /// - /// Specifies authentication info to be added to the Zookeeper connection with . Each call - /// to this method adds another entry to the list of auth info. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more - /// information on ZooKeeper auth. - /// - /// By default, no auth info is added. - /// - public ZooKeeperDistributedSynchronizationOptionsBuilder AddAuthInfo(string scheme, IReadOnlyList auth) - { - this._authInfo.Add(new ZooKeeperAuthInfo( - scheme ?? throw new ArgumentNullException(nameof(scheme)), - new EquatableReadOnlyList(auth ?? throw new ArgumentNullException(nameof(auth))) - )); - return this; - } + /// + /// Specifies authentication info to be added to the Zookeeper connection with . Each call + /// to this method adds another entry to the list of auth info. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more + /// information on ZooKeeper auth. + /// + /// By default, no auth info is added. + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder AddAuthInfo(string scheme, IReadOnlyList auth) + { + this._authInfo.Add(new ZooKeeperAuthInfo( + scheme ?? throw new ArgumentNullException(nameof(scheme)), + new EquatableReadOnlyList(auth ?? throw new ArgumentNullException(nameof(auth))) + )); + return this; + } - /// - /// Configures the access control list (ACL) for any created ZooKeeper nodes. Each call to this method adds another entry to the access control - /// list. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more information on ZooKeeper ACLs. - /// - /// If no ACL entries are specified, the ACL used will be a singleton list that grants all permissions to (world, anyone). - /// - public ZooKeeperDistributedSynchronizationOptionsBuilder AddAccessControl(string scheme, string id, int permissionFlags) - { - this._acl.Add(new ACL(permissionFlags, new Id(scheme ?? throw new ArgumentNullException(nameof(scheme)), id ?? throw new ArgumentNullException(nameof(id))))); - return this; - } + /// + /// Configures the access control list (ACL) for any created ZooKeeper nodes. Each call to this method adds another entry to the access control + /// list. See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html for more information on ZooKeeper ACLs. + /// + /// If no ACL entries are specified, the ACL used will be a singleton list that grants all permissions to (world, anyone). + /// + public ZooKeeperDistributedSynchronizationOptionsBuilder AddAccessControl(string scheme, string id, int permissionFlags) + { + this._acl.Add(new ACL(permissionFlags, new Id(scheme ?? throw new ArgumentNullException(nameof(scheme)), id ?? throw new ArgumentNullException(nameof(id))))); + return this; + } - internal static (TimeoutValue SessionTimeout, TimeoutValue ConnectTimeout, EquatableReadOnlyList AuthInfo, IReadOnlyList Acl) GetOptions(Action? options) - { - var builder = new ZooKeeperDistributedSynchronizationOptionsBuilder(); - options?.Invoke(builder); - return ( - SessionTimeout: builder._sessionTimeout, - ConnectTimeout: builder._connectTimeout, - AuthInfo: new EquatableReadOnlyList(builder._authInfo), - Acl: builder._acl.Count != 0 ? builder._acl.ToArray() : DefaultAcl - ); - } + internal static (TimeoutValue SessionTimeout, TimeoutValue ConnectTimeout, EquatableReadOnlyList AuthInfo, IReadOnlyList Acl) GetOptions(Action? options) + { + var builder = new ZooKeeperDistributedSynchronizationOptionsBuilder(); + options?.Invoke(builder); + return ( + SessionTimeout: builder._sessionTimeout, + ConnectTimeout: builder._connectTimeout, + AuthInfo: new EquatableReadOnlyList(builder._authInfo), + Acl: builder._acl.Count != 0 ? builder._acl.ToArray() : DefaultAcl + ); } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs index 7e6b510e..c29b5682 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs @@ -2,59 +2,58 @@ using System.Collections.Generic; using System.Text; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Implements for , +/// for , +/// and for . +/// +public sealed class ZooKeeperDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider { + private readonly ZooKeeperPath _directoryPath; + private readonly string _connectionString; + private readonly Action? _options; + + /// + /// Constructs a provider which uses and . Lock and semaphore nodes will be created + /// in the root directory '/'. + /// + public ZooKeeperDistributedSynchronizationProvider(string connectionString, Action? options = null) + : this(ZooKeeperPath.Root, connectionString, options) { } + /// - /// Implements for , - /// for , - /// and for . + /// Constructs a provider which uses and . Lock and semaphore nodes will be created + /// in . /// - public sealed class ZooKeeperDistributedSynchronizationProvider : IDistributedLockProvider, IDistributedReaderWriterLockProvider, IDistributedSemaphoreProvider + public ZooKeeperDistributedSynchronizationProvider(ZooKeeperPath directoryPath, string connectionString, Action? options = null) { - private readonly ZooKeeperPath _directoryPath; - private readonly string _connectionString; - private readonly Action? _options; - - /// - /// Constructs a provider which uses and . Lock and semaphore nodes will be created - /// in the root directory '/'. - /// - public ZooKeeperDistributedSynchronizationProvider(string connectionString, Action? options = null) - : this(ZooKeeperPath.Root, connectionString, options) { } - - /// - /// Constructs a provider which uses and . Lock and semaphore nodes will be created - /// in . - /// - public ZooKeeperDistributedSynchronizationProvider(ZooKeeperPath directoryPath, string connectionString, Action? options = null) - { - this._directoryPath = directoryPath != default ? directoryPath : throw new ArgumentNullException(nameof(directoryPath)); - this._connectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString)); - this._options = options; - } - - /// - /// Creates a using the given . - /// - public ZooKeeperDistributedLock CreateLock(string name) => - new ZooKeeperDistributedLock(this._directoryPath, name, this._connectionString, this._options); - - IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); - - /// - /// Creates a using the given . - /// - public ZooKeeperDistributedReaderWriterLock CreateReaderWriterLock(string name) => - new ZooKeeperDistributedReaderWriterLock(this._directoryPath, name, this._connectionString, this._options); - - IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(name); - - /// - /// Creates a using the given and . - /// - public ZooKeeperDistributedSemaphore CreateSemaphore(string name, int maxCount) => - new ZooKeeperDistributedSemaphore(this._directoryPath, name, maxCount, this._connectionString, this._options); - - IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); + this._directoryPath = directoryPath != default ? directoryPath : throw new ArgumentNullException(nameof(directoryPath)); + this._connectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString)); + this._options = options; } + + /// + /// Creates a using the given . + /// + public ZooKeeperDistributedLock CreateLock(string name) => + new ZooKeeperDistributedLock(this._directoryPath, name, this._connectionString, this._options); + + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); + + /// + /// Creates a using the given . + /// + public ZooKeeperDistributedReaderWriterLock CreateReaderWriterLock(string name) => + new ZooKeeperDistributedReaderWriterLock(this._directoryPath, name, this._connectionString, this._options); + + IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(name); + + /// + /// Creates a using the given and . + /// + public ZooKeeperDistributedSemaphore CreateSemaphore(string name, int maxCount) => + new ZooKeeperDistributedSemaphore(this._directoryPath, name, maxCount, this._connectionString, this._options); + + IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); } diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs index 6c707bc1..d9698edb 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs @@ -3,116 +3,115 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +using org.apache.zookeeper; +using org.apache.zookeeper.data; +using System.Linq; + +internal static class ZooKeeperNodeCreator { - using org.apache.zookeeper; - using org.apache.zookeeper.data; - using System.Linq; - - internal static class ZooKeeperNodeCreator + /// + /// See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html under "Builtin ACL Schemes" + /// + public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); + + public static async Task CreateEphemeralSequentialNode( + this ZooKeeperConnection connection, + ZooKeeperPath directory, + string namePrefix, + IEnumerable aclEnumerable, + bool ensureDirectoryExists) { - /// - /// See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html under "Builtin ACL Schemes" - /// - public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); + // If we are in charge of ensuring the directory, this algorithm loops until either we EnsureDirectory fails or we hit an error other than the directory + // not existing. This supports concurrent node creation and directory creation as well as node creation and directory deletion. - public static async Task CreateEphemeralSequentialNode( - this ZooKeeperConnection connection, - ZooKeeperPath directory, - string namePrefix, - IEnumerable aclEnumerable, - bool ensureDirectoryExists) + var acl = aclEnumerable.ToList(); + while (true) { - // If we are in charge of ensuring the directory, this algorithm loops until either we EnsureDirectory fails or we hit an error other than the directory - // not existing. This supports concurrent node creation and directory creation as well as node creation and directory deletion. + var createdDirectories = ensureDirectoryExists + ? await EnsureDirectoryAndGetCreatedPathsAsync().ConfigureAwait(false) + : Array.Empty(); - var acl = aclEnumerable.ToList(); - while (true) + try + { + return await connection.ZooKeeper.createAsync($"{directory}{ZooKeeperPath.Separator}{namePrefix}", data: Array.Empty(), acl, CreateMode.EPHEMERAL_SEQUENTIAL).ConfigureAwait(false); + } + catch (KeeperException.NoNodeException ex) + { + // If we're not ensuring the directory, rethrow a more helpful error message. Otherwise, + // swallow the error and go around the loop again + if (!ensureDirectoryExists) + { + throw new InvalidOperationException($"Node '{directory}' does not exist", ex); + } + } + catch { - var createdDirectories = ensureDirectoryExists - ? await EnsureDirectoryAndGetCreatedPathsAsync().ConfigureAwait(false) - : Array.Empty(); + // on an unhandled error, clean up any directories we created + await TryCleanUpCreatedDirectoriesAsync(createdDirectories).ConfigureAwait(false); + + throw; + } + } + + async Task> EnsureDirectoryAndGetCreatedPathsAsync() + { + // This algorithm loops until either the directory exists or our creation attempt fails with something other + // than NoNodeException or NodeExistsException. This supports concurrent directory creation as well as concurrent + // creation and deletion via optimistic concurrency + + var toCreate = new Stack(); + toCreate.Push(directory); + List? created = null; + do + { + var directoryToCreate = toCreate.Peek(); + if (directoryToCreate == ZooKeeperPath.Root) + { + throw new InvalidOperationException($"Received {typeof(KeeperException.NoNodeException)} when creating child node of directory '{ZooKeeperPath.Root}'"); + } try { - return await connection.ZooKeeper.createAsync($"{directory}{ZooKeeperPath.Separator}{namePrefix}", data: Array.Empty(), acl, CreateMode.EPHEMERAL_SEQUENTIAL).ConfigureAwait(false); + await connection.ZooKeeper.createAsync(directoryToCreate.ToString(), data: Array.Empty(), acl, CreateMode.PERSISTENT).ConfigureAwait(false); + toCreate.Pop(); + (created ??= new List()).Add(directoryToCreate); + } + catch (KeeperException.NodeExistsException) // someone else created it + { + toCreate.Pop(); } - catch (KeeperException.NoNodeException ex) + catch (KeeperException.NoNodeException) // parent needs to be created { - // If we're not ensuring the directory, rethrow a more helpful error message. Otherwise, - // swallow the error and go around the loop again - if (!ensureDirectoryExists) - { - throw new InvalidOperationException($"Node '{directory}' does not exist", ex); - } + toCreate.Push(directoryToCreate.GetDirectory()!.Value); } catch { - // on an unhandled error, clean up any directories we created - await TryCleanUpCreatedDirectoriesAsync(createdDirectories).ConfigureAwait(false); - + // on an unhandled failure, attempt to clean up our work + if (created != null) { await TryCleanUpCreatedDirectoriesAsync(created).ConfigureAwait(false); } + throw; } } + while (toCreate.Count != 0); - async Task> EnsureDirectoryAndGetCreatedPathsAsync() - { - // This algorithm loops until either the directory exists or our creation attempt fails with something other - // than NoNodeException or NodeExistsException. This supports concurrent directory creation as well as concurrent - // creation and deletion via optimistic concurrency + return created ?? (IReadOnlyList)Array.Empty(); + } - var toCreate = new Stack(); - toCreate.Push(directory); - List? created = null; - do + async Task TryCleanUpCreatedDirectoriesAsync(IReadOnlyList createdDirectories) + { + try + { + // delete in reverse order of creation + for (var i = createdDirectories.Count - 1; i >= 0; --i) { - var directoryToCreate = toCreate.Peek(); - if (directoryToCreate == ZooKeeperPath.Root) - { - throw new InvalidOperationException($"Received {typeof(KeeperException.NoNodeException)} when creating child node of directory '{ZooKeeperPath.Root}'"); - } - - try - { - await connection.ZooKeeper.createAsync(directoryToCreate.ToString(), data: Array.Empty(), acl, CreateMode.PERSISTENT).ConfigureAwait(false); - toCreate.Pop(); - (created ??= new List()).Add(directoryToCreate); - } - catch (KeeperException.NodeExistsException) // someone else created it - { - toCreate.Pop(); - } - catch (KeeperException.NoNodeException) // parent needs to be created - { - toCreate.Push(directoryToCreate.GetDirectory()!.Value); - } - catch - { - // on an unhandled failure, attempt to clean up our work - if (created != null) { await TryCleanUpCreatedDirectoriesAsync(created).ConfigureAwait(false); } - - throw; - } + await connection.ZooKeeper.deleteAsync(createdDirectories[i].ToString()).ConfigureAwait(false); } - while (toCreate.Count != 0); - - return created ?? (IReadOnlyList)Array.Empty(); } - - async Task TryCleanUpCreatedDirectoriesAsync(IReadOnlyList createdDirectories) + catch { - try - { - // delete in reverse order of creation - for (var i = createdDirectories.Count - 1; i >= 0; --i) - { - await connection.ZooKeeper.deleteAsync(createdDirectories[i].ToString()).ConfigureAwait(false); - } - } - catch - { - // swallow errors, since there's a good chance this cleanup fails the same way that the creation did - } + // swallow errors, since there's a good chance this cleanup fails the same way that the creation did } } } diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs index caaff911..877cc591 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs @@ -6,159 +6,158 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// implementation where holding the primitive +/// is based on the existence of an ephemeral zookeeper node +/// +internal sealed class ZooKeeperNodeHandle : IDistributedSynchronizationHandle { - /// - /// implementation where holding the primitive - /// is based on the existence of an ephemeral zookeeper node - /// - internal sealed class ZooKeeperNodeHandle : IDistributedSynchronizationHandle - { - private readonly ZooKeeperConnection _connection; - private readonly ZooKeeperPath _nodePath; - private readonly bool _shouldDeleteParent; - private readonly Lazy _handleLostState; + private readonly ZooKeeperConnection _connection; + private readonly ZooKeeperPath _nodePath; + private readonly bool _shouldDeleteParent; + private readonly Lazy _handleLostState; - private volatile bool _disposed; + private volatile bool _disposed; - public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool shouldDeleteParent) - { - this._connection = connection; - this._nodePath = new ZooKeeperPath(nodePath); - this._shouldDeleteParent = shouldDeleteParent; + public ZooKeeperNodeHandle(ZooKeeperConnection connection, string nodePath, bool shouldDeleteParent) + { + this._connection = connection; + this._nodePath = new ZooKeeperPath(nodePath); + this._shouldDeleteParent = shouldDeleteParent; - this._handleLostState = new Lazy(() => + this._handleLostState = new Lazy(() => + { + var handleLostSource = CancellationTokenSource.CreateLinkedTokenSource(this._connection.ConnectionLostToken); + var handleLostToken = handleLostSource.Token; // grab this now before the source is disposed + var disposalSource = new CancellationTokenSource(); + var disposalSourceToken = disposalSource.Token; + var monitoringTask = Task.Run(async () => { - var handleLostSource = CancellationTokenSource.CreateLinkedTokenSource(this._connection.ConnectionLostToken); - var handleLostToken = handleLostSource.Token; // grab this now before the source is disposed - var disposalSource = new CancellationTokenSource(); - var disposalSourceToken = disposalSource.Token; - var monitoringTask = Task.Run(async () => + try { - try + while (true) { - while (true) + var result = await WaitForNotExistsOrChangedAsync( + this._connection, + this._nodePath.ToString(), + timeoutToken: disposalSource.Token + ).ConfigureAwait(false); + switch (result) { - var result = await WaitForNotExistsOrChangedAsync( - this._connection, - this._nodePath.ToString(), - timeoutToken: disposalSource.Token - ).ConfigureAwait(false); - switch (result) - { - case false: // disposalSource triggered - return; - case true: // node no longer exists - handleLostSource.Cancel(); - return; - default: // something changed - break; // continue looping - } + case false: // disposalSource triggered + return; + case true: // node no longer exists + handleLostSource.Cancel(); + return; + default: // something changed + break; // continue looping } } - finally - { - handleLostSource.Dispose(); - } - }); - return new HandleLostState(handleLostToken, disposalSource, monitoringTask); + } + finally + { + handleLostSource.Dispose(); + } }); - } + return new HandleLostState(handleLostToken, disposalSource, monitoringTask); + }); + } - public CancellationToken HandleLostToken => this._disposed ? throw this.ObjectDisposed() : this._handleLostState.Value.Token; + public CancellationToken HandleLostToken => this._disposed ? throw this.ObjectDisposed() : this._handleLostState.Value.Token; - public void Dispose() => this.DisposeSyncViaAsync(); + public void Dispose() => this.DisposeSyncViaAsync(); - public ValueTask DisposeAsync() => - // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs - this.InternalDisposeAsync().AwaitSyncOverAsync(); + public ValueTask DisposeAsync() => + // we're forced to use sync-over-async here because ZooKeeperNetEx doesn't have synchronous APIs + this.InternalDisposeAsync().AwaitSyncOverAsync(); - private async Task InternalDisposeAsync() - { - if (this._disposed) { return; } - this._disposed = true; + private async Task InternalDisposeAsync() + { + if (this._disposed) { return; } + this._disposed = true; + try + { + // clean up monitoring + if (this._handleLostState.IsValueCreated) + { + this._handleLostState.Value.DisposalSource.Cancel(); + this._handleLostState.Value.DisposalSource.Dispose(); + await this._handleLostState.Value.MonitoringTask.ConfigureAwait(false); + } + } + finally + { try { - // clean up monitoring - if (this._handleLostState.IsValueCreated) + // clean up the node + await this._connection.ZooKeeper.deleteAsync(this._nodePath.ToString()).ConfigureAwait(false); + + if (this._shouldDeleteParent) { - this._handleLostState.Value.DisposalSource.Cancel(); - this._handleLostState.Value.DisposalSource.Dispose(); - await this._handleLostState.Value.MonitoringTask.ConfigureAwait(false); + try { await this._connection.ZooKeeper.deleteAsync(this._nodePath.GetDirectory()!.Value.ToString()).ConfigureAwait(false); } + catch (KeeperException.NotEmptyException) { } // can't delete nodes which have other children + catch (KeeperException.NoNodeException) { } // can't delete nodes which don't exist (race condition) } } finally { - try - { - // clean up the node - await this._connection.ZooKeeper.deleteAsync(this._nodePath.ToString()).ConfigureAwait(false); - - if (this._shouldDeleteParent) - { - try { await this._connection.ZooKeeper.deleteAsync(this._nodePath.GetDirectory()!.Value.ToString()).ConfigureAwait(false); } - catch (KeeperException.NotEmptyException) { } // can't delete nodes which have other children - catch (KeeperException.NoNodeException) { } // can't delete nodes which don't exist (race condition) - } - } - finally - { - this._connection.Dispose(); - } + this._connection.Dispose(); } } + } - /// - /// Returns true when does not exist. - /// Returns null when we receive a watch event indicating that has changed. - /// Returns false if the fires. - /// - public static async Task WaitForNotExistsOrChangedAsync( - ZooKeeperConnection connection, - string path, - CancellationToken timeoutToken) - { - using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); - using var timeoutRegistration = timeoutToken.Register( - state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), - state: watcher - ); - // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification - using var connectionLostRegistration = connection.ConnectionLostToken.Register( - state => ((TaskWatcher)state).TaskCompletionSource.TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), - state: watcher - ); - - var exists = await connection.ZooKeeper.existsAsync(path, watcher).ConfigureAwait(false); - return exists == null ? true : await watcher.TaskCompletionSource.Task.ConfigureAwait(false); - } + /// + /// Returns true when does not exist. + /// Returns null when we receive a watch event indicating that has changed. + /// Returns false if the fires. + /// + public static async Task WaitForNotExistsOrChangedAsync( + ZooKeeperConnection connection, + string path, + CancellationToken timeoutToken) + { + using var watcher = new TaskWatcher((_, s) => s.TrySetResult(null)); + using var timeoutRegistration = timeoutToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetResult(false), + state: watcher + ); + // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification + using var connectionLostRegistration = connection.ConnectionLostToken.Register( + state => ((TaskWatcher)state).TaskCompletionSource.TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), + state: watcher + ); + + var exists = await connection.ZooKeeper.existsAsync(path, watcher).ConfigureAwait(false); + return exists == null ? true : await watcher.TaskCompletionSource.Task.ConfigureAwait(false); + } - private sealed class TaskWatcher : Watcher, IDisposable - { - private volatile Action>? _watchedEventHandler; + private sealed class TaskWatcher : Watcher, IDisposable + { + private volatile Action>? _watchedEventHandler; - public TaskWatcher(Action> watchedEventHandler) - { - this._watchedEventHandler = watchedEventHandler; - } + public TaskWatcher(Action> watchedEventHandler) + { + this._watchedEventHandler = watchedEventHandler; + } - public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); + public TaskCompletionSource TaskCompletionSource { get; } = new TaskCompletionSource(); - public void Dispose() => this._watchedEventHandler = null; + public void Dispose() => this._watchedEventHandler = null; - public override Task process(WatchedEvent @event) + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) { - // only care about connected state events; the ConnectionLostToken takes care of the other states for us - if (@event.getState() == Event.KeeperState.SyncConnected) - { - this._watchedEventHandler?.Invoke(@event, this.TaskCompletionSource); - } - - return Task.CompletedTask; + this._watchedEventHandler?.Invoke(@event, this.TaskCompletionSource); } - } - private record HandleLostState(CancellationToken Token, CancellationTokenSource DisposalSource, Task MonitoringTask); + return Task.CompletedTask; + } } + + private record HandleLostState(CancellationToken Token, CancellationTokenSource DisposalSource, Task MonitoringTask); } diff --git a/DistributedLock.ZooKeeper/ZooKeeperPath.cs b/DistributedLock.ZooKeeper/ZooKeeperPath.cs index e758048b..b1bdbd99 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperPath.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperPath.cs @@ -5,165 +5,164 @@ using System.Security.Cryptography; using System.Text; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +/// +/// Represents a path to a ZooKeeper node. The constructor validates that the input is a valid path. +/// Call to get the path value. +/// +public readonly struct ZooKeeperPath : IEquatable { - /// - /// Represents a path to a ZooKeeper node. The constructor validates that the input is a valid path. - /// Call to get the path value. - /// - public readonly struct ZooKeeperPath : IEquatable - { - internal const char Separator = '/'; + internal const char Separator = '/'; - internal static ZooKeeperPath Root { get; } = new ZooKeeperPath("/"); + internal static ZooKeeperPath Root { get; } = new ZooKeeperPath("/"); - private readonly string _path; - - /// - /// Constructs a new based on the given string. - /// - public ZooKeeperPath(string path) : this(path, checkPath: true) { } + private readonly string _path; - private ZooKeeperPath(string path, bool checkPath, string? paramName = null) - { - if (path == null) { throw new ArgumentNullException(paramName ?? nameof(path)); } - if (checkPath && ValidatePath(path) is { } error) - { - throw new FormatException($"{paramName ?? nameof(path)} {error.Reason}{(error.Index.HasValue ? $" (index {error.Index})" : string.Empty)}"); - } - this._path = path; - } + /// + /// Constructs a new based on the given string. + /// + public ZooKeeperPath(string path) : this(path, checkPath: true) { } - internal ZooKeeperPath? GetDirectory() + private ZooKeeperPath(string path, bool checkPath, string? paramName = null) + { + if (path == null) { throw new ArgumentNullException(paramName ?? nameof(path)); } + if (checkPath && ValidatePath(path) is { } error) { - if (this == Root) { return null; } - var lastSeparatorIndex = this._path.LastIndexOf(Separator); - return lastSeparatorIndex == 0 ? Root : new ZooKeeperPath(this._path.Substring(0, lastSeparatorIndex), checkPath: false); + throw new FormatException($"{paramName ?? nameof(path)} {error.Reason}{(error.Index.HasValue ? $" (index {error.Index})" : string.Empty)}"); } + this._path = path; + } - /// - /// Returns the path value as a string - /// - public override string ToString() => this._path; - - /// - /// Implements equality based on the path string - /// - public override bool Equals(object obj) => obj is ZooKeeperPath that && this.Equals(that); - - /// - /// Implements equality based on the path string - /// - public bool Equals(ZooKeeperPath that) => this._path == that._path; - - /// - /// Implements hashing based on the path string - /// - public override int GetHashCode() => this._path?.GetHashCode() ?? 0; - - /// - /// Implements equality based on the path string - /// - public static bool operator ==(ZooKeeperPath @this, ZooKeeperPath that) => @this.Equals(that); - - /// - /// Implements inequality based on the path string - /// - public static bool operator !=(ZooKeeperPath @this, ZooKeeperPath that) => !(@this == that); - - internal ZooKeeperPath GetChildNodePathWithSafeName(string name) - { - if (name == null) { throw new ArgumentNullException(nameof(name)); } - - var isRoot = this == Root; - var safeName = DistributedLockHelpers.ToSafeName( - name, - maxNameLength: int.MaxValue, // no max - convertToValidName: ConvertToValidNodeName - ) - // If ToSafeName adds a hash, it uses Base64 encoding which can include the separator character. We replace - // with '_' which is not in Base64 so that the output name remains safe without weakening the hash - .Replace(Separator, '_'); - return new ZooKeeperPath((this == Root ? this._path : (this._path + Separator)) + safeName, checkPath: false); - - string ConvertToValidNodeName(string name) - { - // in order to be a valid node name: + internal ZooKeeperPath? GetDirectory() + { + if (this == Root) { return null; } + var lastSeparatorIndex = this._path.LastIndexOf(Separator); + return lastSeparatorIndex == 0 ? Root : new ZooKeeperPath(this._path.Substring(0, lastSeparatorIndex), checkPath: false); + } - // must not be empty (special-case this because our generic conversion method will map empty to itself) - if (name.Length == 0) { return "EMPTY"; } + /// + /// Returns the path value as a string + /// + public override string ToString() => this._path; - // must not be ., .., or (this this is root), the reserved path "zookeeper" - // (see https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#ch_zkDataModel) - switch (name) - { - case ".": - case "..": - case "zookeeper" when isRoot: - return name + "_"; - default: - break; // keep going - } + /// + /// Implements equality based on the path string + /// + public override bool Equals(object obj) => obj is ZooKeeperPath that && this.Equals(that); - if (name.IndexOf(Separator) < 0 // must not contain the path separator - && !ValidatePath(Separator + name).HasValue) // "/name" must be a valid path - { - return name; - } + /// + /// Implements equality based on the path string + /// + public bool Equals(ZooKeeperPath that) => this._path == that._path; - var converted = name.ToCharArray(); - for (var i = 0; i < name.Length; ++i) - { - switch (name[i]) - { - // note: we don't have to replace '.' because it is only invalid if '.' or '..' is a full path - // segment. Since we'll be appending on a hash, that doesn't matter - case Separator: // separator cannot appear in names, only in paths - case '\0': - case char @char when IsNonNullInvalidPathChar(@char): - converted[i] = '_'; // replace with placeholder - break; - } - } + /// + /// Implements hashing based on the path string + /// + public override int GetHashCode() => this._path?.GetHashCode() ?? 0; - return new string(converted); - } - } + /// + /// Implements equality based on the path string + /// + public static bool operator ==(ZooKeeperPath @this, ZooKeeperPath that) => @this.Equals(that); - private static (string Reason, int? Index)? ValidatePath(string path) + /// + /// Implements inequality based on the path string + /// + public static bool operator !=(ZooKeeperPath @this, ZooKeeperPath that) => !(@this == that); + + internal ZooKeeperPath GetChildNodePathWithSafeName(string name) + { + if (name == null) { throw new ArgumentNullException(nameof(name)); } + + var isRoot = this == Root; + var safeName = DistributedLockHelpers.ToSafeName( + name, + maxNameLength: int.MaxValue, // no max + convertToValidName: ConvertToValidNodeName + ) + // If ToSafeName adds a hash, it uses Base64 encoding which can include the separator character. We replace + // with '_' which is not in Base64 so that the output name remains safe without weakening the hash + .Replace(Separator, '_'); + return new ZooKeeperPath((this == Root ? this._path : (this._path + Separator)) + safeName, checkPath: false); + + string ConvertToValidNodeName(string name) { - // logic based on https://github.com/apache/zookeeper/blob/master/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathUtils.java#L43 - // (cited in https://stackoverflow.com/questions/55463167/node-name-limitations-in-zookeeper) + // in order to be a valid node name: - if (path.Length == 0) { return ("may not be empty", null); } - if (path[0] != Separator) { return ("must start with the '/' character", null); } - if (path.Length == 1) { return null; } - if (path[path.Length - 1] == Separator) { return ("must not end with the '/' character", path.Length - 1); } + // must not be empty (special-case this because our generic conversion method will map empty to itself) + if (name.Length == 0) { return "EMPTY"; } - for (var i = 1; i < path.Length; ++i) + // must not be ., .., or (this this is root), the reserved path "zookeeper" + // (see https://zookeeper.apache.org/doc/current/zookeeperProgrammers.html#ch_zkDataModel) + switch (name) { - // keep in sync with ConvertToValidNodeName() + case ".": + case "..": + case "zookeeper" when isRoot: + return name + "_"; + default: + break; // keep going + } - switch (path[i]) + if (name.IndexOf(Separator) < 0 // must not contain the path separator + && !ValidatePath(Separator + name).HasValue) // "/name" must be a valid path + { + return name; + } + + var converted = name.ToCharArray(); + for (var i = 0; i < name.Length; ++i) + { + switch (name[i]) { + // note: we don't have to replace '.' because it is only invalid if '.' or '..' is a full path + // segment. Since we'll be appending on a hash, that doesn't matter + case Separator: // separator cannot appear in names, only in paths case '\0': - return ("may not contain the null character", i); - case Separator when path[i - 1] == Separator: - return ("may not contain empty segments", i); - case '.' when path[i - (path[i - 1] == '.' ? 2 : 1)] == Separator && ((i + 1 == path.Length) || path[i + 1] == Separator): - return ("may not be a relative path", i); case char @char when IsNonNullInvalidPathChar(@char): - return ("invalid character", i); + converted[i] = '_'; // replace with placeholder + break; } } - return null; + return new string(converted); } + } - private static bool IsNonNullInvalidPathChar(char @char) => - @char > '\u0000' && @char <= '\u001f' - || @char >= '\u007f' && @char <= '\u009F' - || @char >= '\ud800' && @char <= '\uf8ff' - || @char >= '\ufff0' && @char <= '\uffff'; + private static (string Reason, int? Index)? ValidatePath(string path) + { + // logic based on https://github.com/apache/zookeeper/blob/master/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathUtils.java#L43 + // (cited in https://stackoverflow.com/questions/55463167/node-name-limitations-in-zookeeper) + + if (path.Length == 0) { return ("may not be empty", null); } + if (path[0] != Separator) { return ("must start with the '/' character", null); } + if (path.Length == 1) { return null; } + if (path[path.Length - 1] == Separator) { return ("must not end with the '/' character", path.Length - 1); } + + for (var i = 1; i < path.Length; ++i) + { + // keep in sync with ConvertToValidNodeName() + + switch (path[i]) + { + case '\0': + return ("may not contain the null character", i); + case Separator when path[i - 1] == Separator: + return ("may not contain empty segments", i); + case '.' when path[i - (path[i - 1] == '.' ? 2 : 1)] == Separator && ((i + 1 == path.Length) || path[i + 1] == Separator): + return ("may not be a relative path", i); + case char @char when IsNonNullInvalidPathChar(@char): + return ("invalid character", i); + } + } + + return null; } + + private static bool IsNonNullInvalidPathChar(char @char) => + @char > '\u0000' && @char <= '\u001f' + || @char >= '\u007f' && @char <= '\u009F' + || @char >= '\ud800' && @char <= '\uf8ff' + || @char >= '\ufff0' && @char <= '\uffff'; } diff --git a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs index a2b7a21a..ede843de 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs @@ -6,142 +6,141 @@ using System.Text; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +internal static class ZooKeeperSequentialPathHelper { - internal static class ZooKeeperSequentialPathHelper + /// + /// Given a set of child node names (), filters them to include only sequential nodes + /// with the prefix or . + /// + /// Then, sorts the nodes from oldest to newest. In most, cases, this sort can be done purely using the sequence number. However, because sequence + /// numbers roll over at , more complex logic is needed to get a correct sort in certain scenarios. + /// + public static async ValueTask<(string Path, int SequenceNumber, string Prefix)[]> FilterAndSortAsync( + string parentNode, + IEnumerable childrenNames, + Func> getNodeCreationTimeAsync, + string prefix, + string? alternatePrefix = null) { - /// - /// Given a set of child node names (), filters them to include only sequential nodes - /// with the prefix or . - /// - /// Then, sorts the nodes from oldest to newest. In most, cases, this sort can be done purely using the sequence number. However, because sequence - /// numbers roll over at , more complex logic is needed to get a correct sort in certain scenarios. - /// - public static async ValueTask<(string Path, int SequenceNumber, string Prefix)[]> FilterAndSortAsync( - string parentNode, - IEnumerable childrenNames, - Func> getNodeCreationTimeAsync, - string prefix, - string? alternatePrefix = null) - { - var ephemeralChildrenWithPrefix = GetEphemeralChildrenWithPrefix(); + var ephemeralChildrenWithPrefix = GetEphemeralChildrenWithPrefix(); - if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } + if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } - // first, sort by the unsigned value - ephemeralChildrenWithPrefix.Sort((a, b) => a.UnsignedSequenceNumber.CompareTo(b.UnsignedSequenceNumber)); + // first, sort by the unsigned value + ephemeralChildrenWithPrefix.Sort((a, b) => a.UnsignedSequenceNumber.CompareTo(b.UnsignedSequenceNumber)); - // next, measure the gaps between each pair of sequential values to see if the break point is obvious + // next, measure the gaps between each pair of sequential values to see if the break point is obvious - // This is > 90% of the uint space; there can only be one gap of this size and if there is such a gap - // then we can safely assume that the gap identifies the end of the sequence - const uint LargeGapSize = 4_000_000_000u; + // This is > 90% of the uint space; there can only be one gap of this size and if there is such a gap + // then we can safely assume that the gap identifies the end of the sequence + const uint LargeGapSize = 4_000_000_000u; - var maxGap = 0u; - var maxGapEndIndex = -1; - for (var i = 0; i < ephemeralChildrenWithPrefix.Count; ++i) - { - var gapEndIndex = (i + 1) % ephemeralChildrenWithPrefix.Count; - var gap = unchecked(ephemeralChildrenWithPrefix[gapEndIndex].UnsignedSequenceNumber - ephemeralChildrenWithPrefix[i].UnsignedSequenceNumber); - if (gap > maxGap) - { - maxGap = gap; - maxGapEndIndex = gapEndIndex; - } - } - if (maxGap >= LargeGapSize) + var maxGap = 0u; + var maxGapEndIndex = -1; + for (var i = 0; i < ephemeralChildrenWithPrefix.Count; ++i) + { + var gapEndIndex = (i + 1) % ephemeralChildrenWithPrefix.Count; + var gap = unchecked(ephemeralChildrenWithPrefix[gapEndIndex].UnsignedSequenceNumber - ephemeralChildrenWithPrefix[i].UnsignedSequenceNumber); + if (gap > maxGap) { - return ReorderByLowestIndex(maxGapEndIndex); + maxGap = gap; + maxGapEndIndex = gapEndIndex; } + } + if (maxGap >= LargeGapSize) + { + return ReorderByLowestIndex(maxGapEndIndex); + } - // finally, fall back to determining the start point via creation time - var creationTimeTasksByChildPath = ephemeralChildrenWithPrefix.ToDictionary(t => t.Path, t => getNodeCreationTimeAsync(t.Path)); - await Task.WhenAll(creationTimeTasksByChildPath.Values).ConfigureAwait(false); - - ephemeralChildrenWithPrefix.RemoveAll(t => creationTimeTasksByChildPath[t.Path].Result == null); // remove all nodes with no creation time (they no longer exist) - if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } + // finally, fall back to determining the start point via creation time + var creationTimeTasksByChildPath = ephemeralChildrenWithPrefix.ToDictionary(t => t.Path, t => getNodeCreationTimeAsync(t.Path)); + await Task.WhenAll(creationTimeTasksByChildPath.Values).ConfigureAwait(false); + + ephemeralChildrenWithPrefix.RemoveAll(t => creationTimeTasksByChildPath[t.Path].Result == null); // remove all nodes with no creation time (they no longer exist) + if (ephemeralChildrenWithPrefix.Count == 0) { return Array.Empty<(string, int, string)>(); } - var oldestChild = ephemeralChildrenWithPrefix.Select((t, index) => (creationTime: creationTimeTasksByChildPath[t.Path].Result!.Value, index)) - .OrderBy(t => t.creationTime) - .ThenBy(t => t.index) - .First(); - return ReorderByLowestIndex(oldestChild.index); + var oldestChild = ephemeralChildrenWithPrefix.Select((t, index) => (creationTime: creationTimeTasksByChildPath[t.Path].Result!.Value, index)) + .OrderBy(t => t.creationTime) + .ThenBy(t => t.index) + .First(); + return ReorderByLowestIndex(oldestChild.index); - List<(string Path, uint UnsignedSequenceNumber, string Prefix)> GetEphemeralChildrenWithPrefix() + List<(string Path, uint UnsignedSequenceNumber, string Prefix)> GetEphemeralChildrenWithPrefix() + { + var result = new List<(string Path, uint UnsignedSequenceNumber, string Prefix)>(); + foreach (var childName in childrenNames) { - var result = new List<(string Path, uint UnsignedSequenceNumber, string Prefix)>(); - foreach (var childName in childrenNames) + int? childSequenceNumber; + string? childPrefix; + if (GetSequenceNumberOrDefault(childName, prefix) is { } prefixSequenceNumber) { - int? childSequenceNumber; - string? childPrefix; - if (GetSequenceNumberOrDefault(childName, prefix) is { } prefixSequenceNumber) - { - childSequenceNumber = prefixSequenceNumber; - childPrefix = prefix; - } - else if (alternatePrefix != null - && GetSequenceNumberOrDefault(childName, alternatePrefix) is { } alternatePrefixSequenceNumber) - { - childSequenceNumber = alternatePrefixSequenceNumber; - childPrefix = alternatePrefix; - } - else - { - childSequenceNumber = null; - childPrefix = null; - } - - if (childPrefix != null) - { - result.Add(($"{parentNode.TrimEnd(ZooKeeperPath.Separator)}/{childName}", unchecked((uint)childSequenceNumber!.Value), childPrefix)); - } + childSequenceNumber = prefixSequenceNumber; + childPrefix = prefix; + } + else if (alternatePrefix != null + && GetSequenceNumberOrDefault(childName, alternatePrefix) is { } alternatePrefixSequenceNumber) + { + childSequenceNumber = alternatePrefixSequenceNumber; + childPrefix = alternatePrefix; + } + else + { + childSequenceNumber = null; + childPrefix = null; } - return result; - } - - (string Path, int SequenceNumber, string Prefix)[] ReorderByLowestIndex(int lowestIndex) - { - var result = new (string Path, int SequenceNumber, string Prefix)[ephemeralChildrenWithPrefix.Count]; - for (var i = 0; i < result.Length; ++i) + if (childPrefix != null) { - var element = ephemeralChildrenWithPrefix[(i + lowestIndex) % result.Length]; - result[i] = (element.Path, unchecked((int)element.UnsignedSequenceNumber), element.Prefix); + result.Add(($"{parentNode.TrimEnd(ZooKeeperPath.Separator)}/{childName}", unchecked((uint)childSequenceNumber!.Value), childPrefix)); } - return result; } + + return result; } - /// - /// If is of the form [.../]prefix{sequence number}, returns the sequence - /// number. Otherwise, returns null. - /// - internal static int? GetSequenceNumberOrDefault(string pathOrName, string prefix) + (string Path, int SequenceNumber, string Prefix)[] ReorderByLowestIndex(int lowestIndex) { - Invariant.Require(prefix.Length > 0); - - // when processing child path names, this should be -1; that means we'll expect the prefix at the start - var prefixStartIndex = pathOrName.LastIndexOf(ZooKeeperPath.Separator) + 1; - if (pathOrName.IndexOf(prefix, startIndex: prefixStartIndex) != prefixStartIndex) + var result = new (string Path, int SequenceNumber, string Prefix)[ephemeralChildrenWithPrefix.Count]; + for (var i = 0; i < result.Length; ++i) { - return null; + var element = ephemeralChildrenWithPrefix[(i + lowestIndex) % result.Length]; + result[i] = (element.Path, unchecked((int)element.UnsignedSequenceNumber), element.Prefix); } + return result; + } + } + + /// + /// If is of the form [.../]prefix{sequence number}, returns the sequence + /// number. Otherwise, returns null. + /// + internal static int? GetSequenceNumberOrDefault(string pathOrName, string prefix) + { + Invariant.Require(prefix.Length > 0); - // FROM https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming - // "The counter has a format of %010d -- that is 10 digits with 0 (zero) padding (the counter is formatted in this way to simplify sorting), - // i.e. "0000000001". See Queue Recipe for an example use of this feature. Note: the counter used to store the next sequence number - // is a signed int (4bytes) maintained by the parent node, the counter will overflow when incremented beyond 2147483647 (resulting in a name "-2147483648")." - var counterSuffix = pathOrName.Substring(prefixStartIndex + prefix.Length); - return ( - (counterSuffix.Length == 10 && counterSuffix[0] != '+') // 10-char number; don't allow leading + - || (counterSuffix.Length == 11 && counterSuffix[0] == '-') // 11-char number MUST be - and then 10 digits - ) - && int.TryParse(counterSuffix, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var sequenceNumber) - ? sequenceNumber - : default(int?); + // when processing child path names, this should be -1; that means we'll expect the prefix at the start + var prefixStartIndex = pathOrName.LastIndexOf(ZooKeeperPath.Separator) + 1; + if (pathOrName.IndexOf(prefix, startIndex: prefixStartIndex) != prefixStartIndex) + { + return null; } - public static async Task GetNodeCreationTimeAsync(this ZooKeeperConnection connection, string path) => - (await connection.ZooKeeper.existsAsync(path).ConfigureAwait(false))?.getCtime(); + // FROM https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming + // "The counter has a format of %010d -- that is 10 digits with 0 (zero) padding (the counter is formatted in this way to simplify sorting), + // i.e. "0000000001". See Queue Recipe for an example use of this feature. Note: the counter used to store the next sequence number + // is a signed int (4bytes) maintained by the parent node, the counter will overflow when incremented beyond 2147483647 (resulting in a name "-2147483648")." + var counterSuffix = pathOrName.Substring(prefixStartIndex + prefix.Length); + return ( + (counterSuffix.Length == 10 && counterSuffix[0] != '+') // 10-char number; don't allow leading + + || (counterSuffix.Length == 11 && counterSuffix[0] == '-') // 11-char number MUST be - and then 10 digits + ) + && int.TryParse(counterSuffix, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var sequenceNumber) + ? sequenceNumber + : default(int?); } + + public static async Task GetNodeCreationTimeAsync(this ZooKeeperConnection connection, string path) => + (await connection.ZooKeeper.existsAsync(path).ConfigureAwait(false))?.getCtime(); } diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs index 7044bc18..8883417b 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs @@ -7,182 +7,181 @@ using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading.ZooKeeper +namespace Medallion.Threading.ZooKeeper; + +using org.apache.zookeeper; + +/// +/// Provides a common structure for ZooKeeper synchronization algorithms. The structure is: +/// * Create a sequential ephemeral node +/// * Loop +/// * Compare our node's sequence number to its siblings to see if we've acquired +/// * If we haven't acquired, wait for a watcher to tell us that something has changed +/// +internal class ZooKeeperSynchronizationHelper { - using org.apache.zookeeper; - - /// - /// Provides a common structure for ZooKeeper synchronization algorithms. The structure is: - /// * Create a sequential ephemeral node - /// * Loop - /// * Compare our node's sequence number to its siblings to see if we've acquired - /// * If we haven't acquired, wait for a watcher to tell us that something has changed - /// - internal class ZooKeeperSynchronizationHelper + public static readonly IReadOnlyList AcquiredMarker = Encoding.UTF8.GetBytes("ACQUIRED"); + + private readonly ZooKeeperConnectionInfo _connectionInfo; + private readonly IReadOnlyList _acl; + private readonly bool _assumePathExists, _setAcquiredMarker; + + public ZooKeeperSynchronizationHelper( + ZooKeeperPath path, + bool assumePathExists, + string connectionString, + Action? optionsBuilder, + bool setAcquiredMarker = false) { - public static readonly IReadOnlyList AcquiredMarker = Encoding.UTF8.GetBytes("ACQUIRED"); - - private readonly ZooKeeperConnectionInfo _connectionInfo; - private readonly IReadOnlyList _acl; - private readonly bool _assumePathExists, _setAcquiredMarker; - - public ZooKeeperSynchronizationHelper( - ZooKeeperPath path, - bool assumePathExists, - string connectionString, - Action? optionsBuilder, - bool setAcquiredMarker = false) - { - this.Path = path; - this._assumePathExists = assumePathExists; - var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); - this._connectionInfo = new ZooKeeperConnectionInfo( - connectionString ?? throw new ArgumentNullException(nameof(connectionString)), - ConnectTimeout: options.ConnectTimeout, - SessionTimeout: options.SessionTimeout, - AuthInfo: options.AuthInfo - ); - this._acl = options.Acl; - this._setAcquiredMarker = setAcquiredMarker; - } + this.Path = path; + this._assumePathExists = assumePathExists; + var options = ZooKeeperDistributedSynchronizationOptionsBuilder.GetOptions(optionsBuilder); + this._connectionInfo = new ZooKeeperConnectionInfo( + connectionString ?? throw new ArgumentNullException(nameof(connectionString)), + ConnectTimeout: options.ConnectTimeout, + SessionTimeout: options.SessionTimeout, + AuthInfo: options.AuthInfo + ); + this._acl = options.Acl; + this._setAcquiredMarker = setAcquiredMarker; + } - public ZooKeeperPath Path { get; } + public ZooKeeperPath Path { get; } - public async Task TryAcquireAsync( - Func hasAcquired, - Func> waitAsync, - TimeoutValue timeout, - CancellationToken cancellationToken, - string nodePrefix, - string? alternateNodePrefix = null) + public async Task TryAcquireAsync( + Func hasAcquired, + Func> waitAsync, + TimeoutValue timeout, + CancellationToken cancellationToken, + string nodePrefix, + string? alternateNodePrefix = null) + { + var acquired = false; + var ephemeralNodeLost = false; + ZooKeeperConnection? connection = null; + string? ephemeralNodePath = null; + var timeoutSource = new CancellationTokenSource(timeout.TimeSpan); + + try { - var acquired = false; - var ephemeralNodeLost = false; - ZooKeeperConnection? connection = null; - string? ephemeralNodePath = null; - var timeoutSource = new CancellationTokenSource(timeout.TimeSpan); + connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); - try - { - connection = await ZooKeeperConnection.DefaultPool.ConnectAsync(this._connectionInfo, cancellationToken).ConfigureAwait(false); - - // create a path that represents both our hold on the synch object and our place in line waiting for it - ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, nodePrefix, this._acl, ensureDirectoryExists: !this._assumePathExists).ConfigureAwait(false); + // create a path that represents both our hold on the synch object and our place in line waiting for it + ephemeralNodePath = await connection.CreateEphemeralSequentialNode(this.Path, nodePrefix, this._acl, ensureDirectoryExists: !this._assumePathExists).ConfigureAwait(false); - while (true) + while (true) + { + // get the children of the node, filter them by prefix, and sort them by age; we'll use this to determine our place in the list + var children = await connection.ZooKeeper.getChildrenAsync(this.Path.ToString()).ConfigureAwait(false); + var sortedChildren = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( + parentNode: this.Path.ToString(), + childrenNames: children.Children, + getNodeCreationTimeAsync: connection.GetNodeCreationTimeAsync, + prefix: nodePrefix, + alternatePrefix: alternateNodePrefix + ).ConfigureAwait(false); + + // Sanity check; this could happen if someone else deletes it out from under us. We must check + // this first because it covers the empty collection case + if (!sortedChildren.Any(t => t.Path == ephemeralNodePath)) { - // get the children of the node, filter them by prefix, and sort them by age; we'll use this to determine our place in the list - var children = await connection.ZooKeeper.getChildrenAsync(this.Path.ToString()).ConfigureAwait(false); - var sortedChildren = await ZooKeeperSequentialPathHelper.FilterAndSortAsync( - parentNode: this.Path.ToString(), - childrenNames: children.Children, - getNodeCreationTimeAsync: connection.GetNodeCreationTimeAsync, - prefix: nodePrefix, - alternatePrefix: alternateNodePrefix - ).ConfigureAwait(false); - - // Sanity check; this could happen if someone else deletes it out from under us. We must check - // this first because it covers the empty collection case - if (!sortedChildren.Any(t => t.Path == ephemeralNodePath)) - { - ephemeralNodeLost = true; - throw new InvalidOperationException($"Node '{ephemeralNodePath}' was created, but no longer exists"); - } - - // see if we've acquired - var state = new State(ephemeralNodePath, sortedChildren); - if (hasAcquired(state)) - { - if (this._setAcquiredMarker) - { - await connection.ZooKeeper.setDataAsync(ephemeralNodePath, AcquiredMarker.ToArray()).ConfigureAwait(false); - } - acquired = true; - return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumePathExists); - } + ephemeralNodeLost = true; + throw new InvalidOperationException($"Node '{ephemeralNodePath}' was created, but no longer exists"); + } - // wait for something to change - var waitCompletionSource = new TaskCompletionSource(); - using var timeoutRegistration = timeoutSource.Token.Register(state => ((TaskCompletionSource)state).TrySetResult(false), waitCompletionSource); - using var cancellationRegistration = cancellationToken.Register(state => ((TaskCompletionSource)state).TrySetCanceled(), waitCompletionSource); - // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification - using var connectionLostRegistration = connection.ConnectionLostToken.Register( - state => ((TaskCompletionSource)state).TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), - state: waitCompletionSource - ); - if (!waitCompletionSource.Task.IsCompleted - && await waitAsync(connection.ZooKeeper, state, new WaitCompletionSourceWatcher(waitCompletionSource)).ConfigureAwait(false)) + // see if we've acquired + var state = new State(ephemeralNodePath, sortedChildren); + if (hasAcquired(state)) + { + if (this._setAcquiredMarker) { - waitCompletionSource.TrySetResult(true); + await connection.ZooKeeper.setDataAsync(ephemeralNodePath, AcquiredMarker.ToArray()).ConfigureAwait(false); } + acquired = true; + return new ZooKeeperNodeHandle(connection, ephemeralNodePath, shouldDeleteParent: !this._assumePathExists); + } - if (!await waitCompletionSource.Task.ConfigureAwait(false)) - { - return null; // wait timed out - } + // wait for something to change + var waitCompletionSource = new TaskCompletionSource(); + using var timeoutRegistration = timeoutSource.Token.Register(state => ((TaskCompletionSource)state).TrySetResult(false), waitCompletionSource); + using var cancellationRegistration = cancellationToken.Register(state => ((TaskCompletionSource)state).TrySetCanceled(), waitCompletionSource); + // this is needed because if the connection goes down and never recovers, we'll never get the session expired notification + using var connectionLostRegistration = connection.ConnectionLostToken.Register( + state => ((TaskCompletionSource)state).TrySetException(new InvalidOperationException("Lost connection to ZooKeeper")), + state: waitCompletionSource + ); + if (!waitCompletionSource.Task.IsCompleted + && await waitAsync(connection.ZooKeeper, state, new WaitCompletionSourceWatcher(waitCompletionSource)).ConfigureAwait(false)) + { + waitCompletionSource.TrySetResult(true); } - } - finally - { - timeoutSource.Dispose(); - // if we failed to acquire, clean up the connection/node path - if (!acquired) + if (!await waitCompletionSource.Task.ConfigureAwait(false)) { - await this.CleanUpOnFailureAsync(connection, ephemeralNodePath, ephemeralNodeLost).ConfigureAwait(false); + return null; // wait timed out } } } - - private async Task CleanUpOnFailureAsync(ZooKeeperConnection? connection, string? ephemeralNodePath, bool ephemeralNodeLost) + finally { - if (connection == null) { return; } + timeoutSource.Dispose(); - try + // if we failed to acquire, clean up the connection/node path + if (!acquired) { - if (ephemeralNodePath != null) - { - if (!ephemeralNodeLost) - { - await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); - } - if (!this._assumePathExists) - { - // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because - // someone else is holding the lock. However, we could have encountered a race condition where the other holder - // released right after we failed to acquire and our ephemeral node prevented them from deleting. Therefore, we - // fire and forget this deletion to cover that case without slowing us down - _ = connection.ZooKeeper.deleteAsync(this.Path.ToString()); - } - } + await this.CleanUpOnFailureAsync(connection, ephemeralNodePath, ephemeralNodeLost).ConfigureAwait(false); } - finally + } + } + + private async Task CleanUpOnFailureAsync(ZooKeeperConnection? connection, string? ephemeralNodePath, bool ephemeralNodeLost) + { + if (connection == null) { return; } + + try + { + if (ephemeralNodePath != null) { - connection.Dispose(); + if (!ephemeralNodeLost) + { + await connection.ZooKeeper.deleteAsync(ephemeralNodePath).ConfigureAwait(false); + } + if (!this._assumePathExists) + { + // If the parent node should be cleaned up, try to do so. This attempt will almost certainly fail because + // someone else is holding the lock. However, we could have encountered a race condition where the other holder + // released right after we failed to acquire and our ephemeral node prevented them from deleting. Therefore, we + // fire and forget this deletion to cover that case without slowing us down + _ = connection.ZooKeeper.deleteAsync(this.Path.ToString()); + } } } + finally + { + connection.Dispose(); + } + } + + private sealed class WaitCompletionSourceWatcher : Watcher + { + private readonly TaskCompletionSource _waitCompletionSource; - private sealed class WaitCompletionSourceWatcher : Watcher + public WaitCompletionSourceWatcher(TaskCompletionSource waitCompletionSource) { - private readonly TaskCompletionSource _waitCompletionSource; + this._waitCompletionSource = waitCompletionSource; + } - public WaitCompletionSourceWatcher(TaskCompletionSource waitCompletionSource) + public override Task process(WatchedEvent @event) + { + // only care about connected state events; the ConnectionLostToken takes care of the other states for us + if (@event.getState() == Event.KeeperState.SyncConnected) { - this._waitCompletionSource = waitCompletionSource; + this._waitCompletionSource.TrySetResult(true); } - public override Task process(WatchedEvent @event) - { - // only care about connected state events; the ConnectionLostToken takes care of the other states for us - if (@event.getState() == Event.KeeperState.SyncConnected) - { - this._waitCompletionSource.TrySetResult(true); - } - - return Task.CompletedTask; - } + return Task.CompletedTask; } - - public record State(string EphemeralNodePath, (string Path, int SequenceNumber, string Prefix)[] SortedChildren); } + + public record State(string EphemeralNodePath, (string Path, int SequenceNumber, string Prefix)[] SortedChildren); } diff --git a/DistributedLockCodeGen/CodeGenHelpers.cs b/DistributedLockCodeGen/CodeGenHelpers.cs index 4176eb61..c73d419b 100644 --- a/DistributedLockCodeGen/CodeGenHelpers.cs +++ b/DistributedLockCodeGen/CodeGenHelpers.cs @@ -5,34 +5,33 @@ using System.Linq; using System.Text.RegularExpressions; -namespace DistributedLockCodeGen +namespace DistributedLockCodeGen; + +internal static class CodeGenHelpers { - internal static class CodeGenHelpers - { - public static string SolutionDirectory => Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..")); + public static string SolutionDirectory => Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..")); - public static IEnumerable EnumerateSolutionFiles() => Directory.EnumerateFiles(SolutionDirectory, "*.csproj", SearchOption.AllDirectories) - .Select(Path.GetDirectoryName) - .Where(d => !Regex.IsMatch(Path.GetFileName(d), "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) - .SelectMany(d => Directory.EnumerateFiles(d, "*.cs", SearchOption.AllDirectories)); + public static IEnumerable EnumerateSolutionFiles() => Directory.EnumerateFiles(SolutionDirectory, "*.csproj", SearchOption.AllDirectories) + .Select(Path.GetDirectoryName) + .Where(d => !Regex.IsMatch(Path.GetFileName(d), "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) + .SelectMany(d => Directory.EnumerateFiles(d, "*.cs", SearchOption.AllDirectories)); - public static string NormalizeCodeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); + public static string NormalizeCodeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); - public static bool HasPublicType(string code, out (string typeName, bool isInterface) info) + public static bool HasPublicType(string code, out (string typeName, bool isInterface) info) + { + var match = Regex.Match(code, @"\n( |\t)?public.*?(class|interface)\s+(?\w+)"); + if (match.Success) { - var match = Regex.Match(code, @"\n( |\t)public.*?(class|interface)\s+(?\w+)"); - if (match.Success) - { - info = (typeName: match.Groups["name"].Value, isInterface: match.Value.Contains("interface")); - return true; - } - - info = default; - return false; + info = (typeName: match.Groups["name"].Value, isInterface: match.Value.Contains("interface")); + return true; } - public static bool SupportsSyncApis(string path) => - // zookeeper is inherently asynchronous (watch-based), so any synchronous APIs it has are just sync-over-async - !path.Contains("ZooKeeper", StringComparison.OrdinalIgnoreCase); + info = default; + return false; } + + public static bool SupportsSyncApis(string path) => + // zookeeper is inherently asynchronous (watch-based), so any synchronous APIs it has are just sync-over-async + !path.Contains("ZooKeeper", StringComparison.OrdinalIgnoreCase); } diff --git a/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/DistributedLockCodeGen/DistributedLockCodeGen.csproj index ebf81e62..33d99fb6 100644 --- a/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false enable diff --git a/DistributedLockCodeGen/DocCommentGenerator.cs b/DistributedLockCodeGen/DocCommentGenerator.cs index 628b7fac..f2b53a7f 100644 --- a/DistributedLockCodeGen/DocCommentGenerator.cs +++ b/DistributedLockCodeGen/DocCommentGenerator.cs @@ -5,123 +5,122 @@ using System.Text; using System.Text.RegularExpressions; -namespace DistributedLockCodeGen +namespace DistributedLockCodeGen; + +[Category("CI")] +public class DocCommentGenerator { - [Category("CI")] - public class DocCommentGenerator + [Test] + public void GenerateDocComments() { - [Test] - public void GenerateDocComments() - { - var changes = CodeGenHelpers.EnumerateSolutionFiles() - .Select(f => (file: f, code: File.ReadAllText(f))) - .Select(t => (t.file, t.code, updatedCode: AddDocComments(t.code))) - .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.updatedCode) != CodeGenHelpers.NormalizeCodeWhitespace(t.code)) - .ToList(); - changes.ForEach(t => File.WriteAllText(t.file, t.updatedCode)); - Assert.IsEmpty(changes.Select(t => t.file)); - } + var changes = CodeGenHelpers.EnumerateSolutionFiles() + .Select(f => (file: f, code: File.ReadAllText(f))) + .Select(t => (t.file, t.code, updatedCode: AddDocComments(t.code))) + .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.updatedCode) != CodeGenHelpers.NormalizeCodeWhitespace(t.code)) + .ToList(); + changes.ForEach(t => File.WriteAllText(t.file, t.updatedCode)); + Assert.IsEmpty(changes.Select(t => t.file)); + } - internal static string AddDocComments(string code) + internal static string AddDocComments(string code) + { + if (!CodeGenHelpers.HasPublicType(code, out var typeInfo)) { return code; } + + var acquireMethods = Regex.Matches( + code, + $@"(?([ \t]+///.*?\n)*)(? ( )?|\t(\t)?){(typeInfo.isInterface ? "" : "public ")}(?\S+) (?([a-zA-Z])+)\(" + + @"((?\S+) (?([a-zA-Z])+)( = \S+)(, )?)+\)" + ); + + var updatedCode = code; + foreach (var acquireMethod in acquireMethods.Cast()) { - if (!CodeGenHelpers.HasPublicType(code, out var typeInfo)) { return code; } + var name = acquireMethod.Groups["name"].Value; + if (!name.Contains("Acquire")) { continue; } + + var isTry = name.StartsWith("Try"); + var isAsync = name.EndsWith("Async"); + var lockType = name.Contains("Upgradeable") ? LockType.Upgrade + : name.Contains("Write") ? LockType.Write + : name.Contains("Read") ? LockType.Read + : typeInfo.typeName.Contains("Semaphore") ? LockType.Semaphore + : LockType.Mutex; - var acquireMethods = Regex.Matches( - code, - $@"(?([ \t]+///.*?\n)*)(? |\t\t){(typeInfo.isInterface ? "" : "public ")}(?\S+) (?([a-zA-Z])+)\(" - + @"((?\S+) (?([a-zA-Z])+)( = \S+)(, )?)+\)" - ); + var @object = lockType == LockType.Semaphore ? "semaphore" : "lock"; + var handleObject = lockType == LockType.Semaphore ? "ticket" : "lock"; - var updatedCode = code; - foreach (var acquireMethod in acquireMethods.Cast()) + var lineStart = acquireMethod.Groups["indent"].Value + "/// "; + var docComment = new StringBuilder(); + + docComment.AppendLine(lineStart + ""); + + docComment.Append(lineStart); + if (isTry) { docComment.Append("Attempts to acquire "); } + else { docComment.Append("Acquires "); } + docComment.Append(lockType switch { - var name = acquireMethod.Groups["name"].Value; - if (!name.Contains("Acquire")) { continue; } - - var isTry = name.StartsWith("Try"); - var isAsync = name.EndsWith("Async"); - var lockType = name.Contains("Upgradeable") ? LockType.Upgrade - : name.Contains("Write") ? LockType.Write - : name.Contains("Read") ? LockType.Read - : typeInfo.typeName.Contains("Semaphore") ? LockType.Semaphore - : LockType.Mutex; - - var @object = lockType == LockType.Semaphore ? "semaphore" : "lock"; - var handleObject = lockType == LockType.Semaphore ? "ticket" : "lock"; - - var lineStart = acquireMethod.Groups["indent"].Value + "/// "; - var docComment = new StringBuilder(); - - docComment.AppendLine(lineStart + ""); - - docComment.Append(lineStart); - if (isTry) { docComment.Append("Attempts to acquire "); } - else { docComment.Append("Acquires "); } - docComment.Append(lockType switch - { - LockType.Read => "a READ lock ", - LockType.Upgrade => "an UPGRADE lock ", - LockType.Write => "a WRITE lock ", - LockType.Mutex => "the lock ", - LockType.Semaphore => "a semaphore ticket ", - _ => throw new NotSupportedException() - }); - docComment.Append(isAsync ? "asynchronously" : "synchronously"); - docComment.Append(isTry ? ". " : ", failing with if the attempt times out. "); - docComment.Append(lockType switch - { - LockType.Read => "Multiple readers are allowed. Not compatible with a WRITE lock. ", - LockType.Upgrade => "Not compatible with another UPGRADE lock or a WRITE lock. ", - LockType.Write => "Not compatible with another WRITE lock or an UPGRADE lock. ", - LockType.Mutex => "", - LockType.Semaphore => "", - _ => throw new NotSupportedException(), - }); - docComment.AppendLine("Usage: "); - - docComment.Append(lineStart).AppendLine(""); - docComment.Append(lineStart).Append($" {(isAsync ? "await " : "")}using (") - .Append(isTry ? "var handle = " : "") - .Append(isAsync ? "await " : "") - .Append($"my{char.ToUpper(@object[0])}{@object.Substring(1)}.") - .AppendLine($"{name}(...))"); - docComment.Append(lineStart).AppendLine(" {"); - docComment.Append(lineStart).Append(' ', 8) - .Append(isTry ? "if (handle != null) { " : "") - .Append($"/* we have the {handleObject}! */") - .AppendLine(isTry ? " }" : ""); - docComment.Append(lineStart).AppendLine(" }"); - docComment.Append(lineStart) - .Append($" // dispose releases the {handleObject}") - .AppendLine(isTry ? " if we took it" : ""); - docComment.Append(lineStart).AppendLine(""); - - docComment.Append(lineStart).AppendLine(""); - - docComment.Append(lineStart).Append("How long to wait before giving up on the acquisition attempt. ") - .AppendLine($"Defaults to {(isTry ? "0" : "")}"); - docComment.Append(lineStart).AppendLine("Specifies a token by which the wait can be canceled"); - - var returnType = acquireMethod.Groups["returnType"].Value; - if (returnType.StartsWith("ValueTask<")) { returnType = returnType.Replace("ValueTask<", "").TrimEnd('>'); } - var useAn = "aeiou".Contains(char.ToLower(returnType[0])); - docComment.Append(lineStart).Append($"A{(useAn ? "n" : "")} which can be used to release the {handleObject}") - .Append(isTry ? " or null on failure" : "") - .AppendLine(""); - - updatedCode = updatedCode.Replace(acquireMethod.Value, docComment + acquireMethod.Value.Substring(acquireMethod.Groups["docComment"].Length)); - } - - return updatedCode; + LockType.Read => "a READ lock ", + LockType.Upgrade => "an UPGRADE lock ", + LockType.Write => "a WRITE lock ", + LockType.Mutex => "the lock ", + LockType.Semaphore => "a semaphore ticket ", + _ => throw new NotSupportedException() + }); + docComment.Append(isAsync ? "asynchronously" : "synchronously"); + docComment.Append(isTry ? ". " : ", failing with if the attempt times out. "); + docComment.Append(lockType switch + { + LockType.Read => "Multiple readers are allowed. Not compatible with a WRITE lock. ", + LockType.Upgrade => "Not compatible with another UPGRADE lock or a WRITE lock. ", + LockType.Write => "Not compatible with another WRITE lock or an UPGRADE lock. ", + LockType.Mutex => "", + LockType.Semaphore => "", + _ => throw new NotSupportedException(), + }); + docComment.AppendLine("Usage: "); + + docComment.Append(lineStart).AppendLine(""); + docComment.Append(lineStart).Append($" {(isAsync ? "await " : "")}using (") + .Append(isTry ? "var handle = " : "") + .Append(isAsync ? "await " : "") + .Append($"my{char.ToUpper(@object[0])}{@object[1..]}.") + .AppendLine($"{name}(...))"); + docComment.Append(lineStart).AppendLine(" {"); + docComment.Append(lineStart).Append(' ', 8) + .Append(isTry ? "if (handle != null) { " : "") + .Append($"/* we have the {handleObject}! */") + .AppendLine(isTry ? " }" : ""); + docComment.Append(lineStart).AppendLine(" }"); + docComment.Append(lineStart) + .Append($" // dispose releases the {handleObject}") + .AppendLine(isTry ? " if we took it" : ""); + docComment.Append(lineStart).AppendLine(""); + + docComment.Append(lineStart).AppendLine(""); + + docComment.Append(lineStart).Append("How long to wait before giving up on the acquisition attempt. ") + .AppendLine($"Defaults to {(isTry ? "0" : "")}"); + docComment.Append(lineStart).AppendLine("Specifies a token by which the wait can be canceled"); + + var returnType = acquireMethod.Groups["returnType"].Value; + if (returnType.StartsWith("ValueTask<")) { returnType = returnType.Replace("ValueTask<", "").TrimEnd('>'); } + var useAn = "aeiou".Contains(char.ToLower(returnType[0])); + docComment.Append(lineStart).Append($"A{(useAn ? "n" : "")} which can be used to release the {handleObject}") + .Append(isTry ? " or null on failure" : "") + .AppendLine(""); + + updatedCode = updatedCode.Replace(acquireMethod.Value, docComment + acquireMethod.Value[acquireMethod.Groups["docComment"].Length..]); } - } - internal enum LockType - { - Mutex, - Read, - Write, - Upgrade, - Semaphore, + return updatedCode; } } + +internal enum LockType +{ + Mutex, + Read, + Write, + Upgrade, + Semaphore, +} diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 1b868375..13f50af0 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -6,209 +6,206 @@ using System.Text; using System.Text.RegularExpressions; -namespace DistributedLockCodeGen +namespace DistributedLockCodeGen; + +[Category("CI")] +public class GenerateIDistributedLockImplementations { - [Category("CI")] - public class GenerateIDistributedLockImplementations + [Test] + public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore")] string name) { - [Test] - public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore")] string name) + var files = CodeGenHelpers.EnumerateSolutionFiles() + .Where(f => !f.Contains($"Distributed{name}.Core", StringComparison.OrdinalIgnoreCase)) + .Where(f => f.EndsWith($"Distributed{name}.cs", StringComparison.OrdinalIgnoreCase) && Path.GetFileName(f)[0] != 'I'); + + var errors = new List(); + foreach (var file in files) { - var files = CodeGenHelpers.EnumerateSolutionFiles() - .Where(f => !f.Contains($"Distributed{name}.Core", StringComparison.OrdinalIgnoreCase)) - .Where(f => f.EndsWith($"Distributed{name}.cs", StringComparison.OrdinalIgnoreCase) && Path.GetFileName(f)[0] != 'I'); - - var errors = new List(); - foreach (var file in files) + var lockCode = File.ReadAllText(file); + if (lockCode.Contains("AUTO-GENERATED") + || !CodeGenHelpers.HasPublicType(lockCode, out _)) + { + continue; + } + + if (!lockCode.Contains($": IInternalDistributed{name}<")) { - var lockCode = File.ReadAllText(file); - if (lockCode.Contains("AUTO-GENERATED") - || !CodeGenHelpers.HasPublicType(lockCode, out _)) - { - continue; - } - - if (!lockCode.Contains($": IInternalDistributed{name}<")) - { - errors.Add($"{file} does not implement the expected interface"); - continue; - } - - var lockType = Path.GetFileNameWithoutExtension(file); - var handleType = lockType + "Handle"; - var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); - - var explicitImplementations = new StringBuilder(); - var @interface = $"IDistributed{name}"; - foreach (var method in new[] { "TryAcquire", "Acquire", "TryAcquireAsync", "AcquireAsync" }) - { - AppendExplicitInterfaceMethod( - explicitImplementations, - @interface, - method, - "IDistributedSynchronizationHandle", - @as: supportsSyncApis || method.EndsWith("Async") ? null : $"IInternalDistributed{name}<{handleType}>" - ); - } - - var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; - var code = + errors.Add($"{file} does not implement the expected interface"); + continue; + } + + var lockType = Path.GetFileNameWithoutExtension(file); + var handleType = lockType + "Handle"; + var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); + + var explicitImplementations = new StringBuilder(); + var @interface = $"IDistributed{name}"; + foreach (var method in new[] { "TryAcquire", "Acquire", "TryAcquireAsync", "AcquireAsync" }) + { + AppendExplicitInterfaceMethod( + explicitImplementations, + @interface, + method, + "IDistributedSynchronizationHandle", + @as: supportsSyncApis || method.EndsWith("Async") ? null : $"IInternalDistributed{name}<{handleType}>" + ); + } + + var @namespace = Regex.Match(lockCode, @"\nnamespace (?[^\s;]+)").Groups["namespace"].Value; + var code = $@"using System; using System.Threading; using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace {@namespace} +namespace {@namespace}; + +public partial class {lockType} {{ - public partial class {lockType} - {{ - // AUTO-GENERATED + // AUTO-GENERATED {explicitImplementations} - {IfSyncApis("public ")}{handleType}? {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}TryAcquire(TimeSpan timeout{IfSyncApis(" = default")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => - DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + {IfSyncApis("public ")}{handleType}? {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}TryAcquire(TimeSpan timeout{IfSyncApis(" = default")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - {IfSyncApis("public ")}{handleType} {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}Acquire(TimeSpan? timeout{IfSyncApis(" = null")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => - DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + {IfSyncApis("public ")}{handleType} {(supportsSyncApis ? "" : $"IInternalDistributed{name}<{handleType}>.")}Acquire(TimeSpan? timeout{IfSyncApis(" = null")}, CancellationToken cancellationToken{IfSyncApis(" = default")}) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - public ValueTask<{handleType}?> TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => - this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + public ValueTask<{handleType}?> TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - public ValueTask<{handleType}> AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - }} + public ValueTask<{handleType}> AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); }}"; - code = DocCommentGenerator.AddDocComments(code); - - var outputPath = Path.Combine(Path.GetDirectoryName(file)!, Path.GetFileNameWithoutExtension(file) + $".IDistributed{name}.cs"); - if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) - { - File.WriteAllText(outputPath, code); - errors.Add($"updated {file}"); - } + code = DocCommentGenerator.AddDocComments(code); - string IfSyncApis(string value) => supportsSyncApis ? value : string.Empty; + var outputPath = Path.Combine(Path.GetDirectoryName(file)!, Path.GetFileNameWithoutExtension(file) + $".IDistributed{name}.cs"); + if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) + { + File.WriteAllText(outputPath, code); + errors.Add($"updated {file}"); } - Assert.IsEmpty(errors); + string IfSyncApis(string value) => supportsSyncApis ? value : string.Empty; } - [Test] - public void GenerateForIDistributedReaderWriterLock() + Assert.IsEmpty(errors); + } + + [Test] + public void GenerateForIDistributedReaderWriterLock() + { + var files = CodeGenHelpers.EnumerateSolutionFiles() + .Where(f => f.IndexOf("DistributedLock.Core", StringComparison.OrdinalIgnoreCase) < 0) + .Where(f => Regex.IsMatch(Path.GetFileName(f), @"Distributed.*?ReaderWriterLock\.cs$", RegexOptions.IgnoreCase)); + + var errors = new List(); + foreach (var file in files) { - var files = CodeGenHelpers.EnumerateSolutionFiles() - .Where(f => f.IndexOf("DistributedLock.Core", StringComparison.OrdinalIgnoreCase) < 0) - .Where(f => Regex.IsMatch(Path.GetFileName(f), @"Distributed.*?ReaderWriterLock\.cs$", RegexOptions.IgnoreCase)); + var lockCode = File.ReadAllText(file); + if (lockCode.Contains("AUTO-GENERATED") + || !CodeGenHelpers.HasPublicType(lockCode, out _)) + { + continue; + } + + bool isUpgradeable; + if (lockCode.Contains(": IInternalDistributedUpgradeableReaderWriterLock<")) + { + isUpgradeable = true; + } + else if (lockCode.Contains(": IInternalDistributedReaderWriterLock<")) + { + isUpgradeable = false; + } + else + { + errors.Add($"{file} does not implement the expected interface"); + continue; + } + + var lockType = Path.GetFileNameWithoutExtension(file); + var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); - var errors = new List(); - foreach (var file in files) + var explicitImplementations = new StringBuilder(); + var publicMethods = new StringBuilder(); + foreach (var methodLockType in new[] { LockType.Read, LockType.Upgrade, LockType.Write }.Where(t => isUpgradeable || t != LockType.Upgrade)) + foreach (var isAsync in new[] { false, true }) + foreach (var isTry in new[] { true, false }) { - var lockCode = File.ReadAllText(file); - if (lockCode.Contains("AUTO-GENERATED") - || !CodeGenHelpers.HasPublicType(lockCode, out _)) - { - continue; - } - - bool isUpgradeable; - if (lockCode.Contains(": IInternalDistributedUpgradeableReaderWriterLock<")) - { - isUpgradeable = true; - } - else if (lockCode.Contains(": IInternalDistributedReaderWriterLock<")) - { - isUpgradeable = false; - } - else - { - errors.Add($"{file} does not implement the expected interface"); - continue; - } - - var lockType = Path.GetFileNameWithoutExtension(file); - var supportsSyncApis = CodeGenHelpers.SupportsSyncApis(file); - - var explicitImplementations = new StringBuilder(); - var publicMethods = new StringBuilder(); - foreach (var methodLockType in new[] { LockType.Read, LockType.Upgrade, LockType.Write }.Where(t => isUpgradeable || t != LockType.Upgrade)) - foreach (var isAsync in new[] { false, true }) - foreach (var isTry in new[] { true, false }) - { - var upgradeableText = methodLockType == LockType.Upgrade ? "Upgradeable" : ""; - var handleType = lockType + upgradeableText + "Handle"; - - var methodName = $"{(isTry ? "Try" : "")}Acquire{upgradeableText}{(methodLockType == LockType.Write ? "Write" : "Read")}Lock{(isAsync ? "Async" : "")}"; - AppendExplicitInterfaceMethod( - explicitImplementations, - $"IDistributed{upgradeableText}ReaderWriterLock", - methodName, - $"IDistributed{(methodLockType == LockType.Upgrade ? "LockUpgradeable" : "Synchronization")}Handle", - @as: supportsSyncApis || isAsync ? null : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>" - ); - - var simplifiedMethodName = methodLockType == LockType.Upgrade ? methodName : methodName.Replace("ReadLock", "").Replace("WriteLock", ""); - - publicMethods.AppendLine() - .Append(' ', 8).Append(IfPublic("public ")) - .Append(isAsync ? "ValueTask<" : "").Append(handleType).Append(isTry ? "?" : "").Append(isAsync ? ">" : "").Append(' ') - .Append(supportsSyncApis || isAsync ? "" : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>.") - .Append(methodName) - .Append("(").Append("TimeSpan").Append(isTry ? "" : "?").AppendLine($" timeout{IfPublic($" = {(isTry ? "default" : "null")}")}, CancellationToken cancellationToken{IfPublic(" = default")}) =>") - .Append(' ', 12) - .Append( - isTry && isAsync - ? $"this.As>()" - + $".Internal{simplifiedMethodName}(timeout, cancellationToken" - : $"DistributedLockHelpers.{simplifiedMethodName}(this, timeout, cancellationToken" - ) - .Append(methodLockType == LockType.Read ? ", isWrite: false" : methodLockType == LockType.Write ? ", isWrite: true" : "") - .AppendLine(");"); - - string? IfPublic(string content) => supportsSyncApis || isAsync ? content : null; - } - - var @namespace = Regex.Match(lockCode, @"\nnamespace (?\S+)").Groups["namespace"].Value; - var code = + var upgradeableText = methodLockType == LockType.Upgrade ? "Upgradeable" : ""; + var handleType = lockType + upgradeableText + "Handle"; + + var methodName = $"{(isTry ? "Try" : "")}Acquire{upgradeableText}{(methodLockType == LockType.Write ? "Write" : "Read")}Lock{(isAsync ? "Async" : "")}"; + AppendExplicitInterfaceMethod( + explicitImplementations, + $"IDistributed{upgradeableText}ReaderWriterLock", + methodName, + $"IDistributed{(methodLockType == LockType.Upgrade ? "LockUpgradeable" : "Synchronization")}Handle", + @as: supportsSyncApis || isAsync ? null : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>" + ); + + var simplifiedMethodName = methodLockType == LockType.Upgrade ? methodName : methodName.Replace("ReadLock", "").Replace("WriteLock", ""); + + publicMethods.AppendLine() + .Append(' ', 8).Append(IfPublic("public ")) + .Append(isAsync ? "ValueTask<" : "").Append(handleType).Append(isTry ? "?" : "").Append(isAsync ? ">" : "").Append(' ') + .Append(supportsSyncApis || isAsync ? "" : $"IInternalDistributed{upgradeableText}ReaderWriterLock<{handleType}>.") + .Append(methodName) + .Append("(").Append("TimeSpan").Append(isTry ? "" : "?").AppendLine($" timeout{IfPublic($" = {(isTry ? "default" : "null")}")}, CancellationToken cancellationToken{IfPublic(" = default")}) =>") + .Append(' ', 12) + .Append( + isTry && isAsync + ? $"this.As>()" + + $".Internal{simplifiedMethodName}(timeout, cancellationToken" + : $"DistributedLockHelpers.{simplifiedMethodName}(this, timeout, cancellationToken" + ) + .Append(methodLockType == LockType.Read ? ", isWrite: false" : methodLockType == LockType.Write ? ", isWrite: true" : "") + .AppendLine(");"); + + string? IfPublic(string content) => supportsSyncApis || isAsync ? content : null; + } + + var @namespace = Regex.Match(lockCode, @"\nnamespace (?[^\s;]+)").Groups["namespace"].Value; + var code = $@"using System; using System.Threading; using System.Threading.Tasks; using Medallion.Threading.Internal; -namespace {@namespace} +namespace {@namespace}; + +public partial class {lockType} {{ - public partial class {lockType} - {{ - // AUTO-GENERATED + // AUTO-GENERATED {explicitImplementations}{publicMethods} - }} }}"; - code = DocCommentGenerator.AddDocComments(code); - - var outputPath = Path.Combine(Path.GetDirectoryName(file)!, $"{Path.GetFileNameWithoutExtension(file)}.IDistributed{(isUpgradeable ? "Upgradeable" : "")}ReaderWriterLock.cs"); - if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) - { - File.WriteAllText(outputPath, code); - errors.Add($"updated {file}"); - } - } + code = DocCommentGenerator.AddDocComments(code); - Assert.IsEmpty(errors); + var outputPath = Path.Combine(Path.GetDirectoryName(file)!, $"{Path.GetFileNameWithoutExtension(file)}.IDistributed{(isUpgradeable ? "Upgradeable" : "")}ReaderWriterLock.cs"); + if (!File.Exists(outputPath) || CodeGenHelpers.NormalizeCodeWhitespace(File.ReadAllText(outputPath)) != CodeGenHelpers.NormalizeCodeWhitespace(code)) + { + File.WriteAllText(outputPath, code); + errors.Add($"updated {file}"); + } } - private static void AppendExplicitInterfaceMethod(StringBuilder code, string @interface, string method, string returnType, string? @as = null) - { - var isAsync = method.EndsWith("Async"); - var isTry = method.StartsWith("Try"); - var returnTypeToUse = isTry ? returnType + "?" : returnType; - - code.Append(' ', 8) - .Append(isAsync ? $"ValueTask<{returnTypeToUse}>" : returnTypeToUse) - .AppendLine($" {@interface}.{method}(TimeSpan{(isTry ? string.Empty : "?")} timeout, CancellationToken cancellationToken) =>") - .Append(' ', 12) - .Append($"this{(@as != null ? $".As<{@as}>()" : "")}.{method}(timeout, cancellationToken)") - .Append(isAsync ? $".Convert(To<{returnTypeToUse}>.ValueTask)" : string.Empty) - .AppendLine(";"); - } + Assert.IsEmpty(errors); + } + + private static void AppendExplicitInterfaceMethod(StringBuilder code, string @interface, string method, string returnType, string? @as = null) + { + var isAsync = method.EndsWith("Async"); + var isTry = method.StartsWith("Try"); + var returnTypeToUse = isTry ? returnType + "?" : returnType; + + code.Append(' ', 4) + .Append(isAsync ? $"ValueTask<{returnTypeToUse}>" : returnTypeToUse) + .AppendLine($" {@interface}.{method}(TimeSpan{(isTry ? string.Empty : "?")} timeout, CancellationToken cancellationToken) =>") + .Append(' ', 8) + .Append($"this{(@as != null ? $".As<{@as}>()" : "")}.{method}(timeout, cancellationToken)") + .Append(isAsync ? $".Convert(To<{returnTypeToUse}>.ValueTask)" : string.Empty) + .AppendLine(";"); } } diff --git a/DistributedLockCodeGen/GenerateProviders.cs b/DistributedLockCodeGen/GenerateProviders.cs index fa7cb8c9..a3e54006 100644 --- a/DistributedLockCodeGen/GenerateProviders.cs +++ b/DistributedLockCodeGen/GenerateProviders.cs @@ -6,94 +6,91 @@ using System.Text; using System.Text.RegularExpressions; -namespace DistributedLockCodeGen +namespace DistributedLockCodeGen; + +[Category("CI")] +public class GenerateProviders { - [Category("CI")] - public class GenerateProviders + public static readonly IReadOnlyList Interfaces = new[] + { + "IDistributedLock", + "IDistributedReaderWriterLock", + "IDistributedUpgradeableReaderWriterLock", + "IDistributedSemaphore" + }; + + [TestCaseSource(nameof(Interfaces))] + public void GenerateProviderInterfaceAndExtensions(string interfaceName) { - public static readonly IReadOnlyList Interfaces = new[] - { - "IDistributedLock", - "IDistributedReaderWriterLock", - "IDistributedUpgradeableReaderWriterLock", - "IDistributedSemaphore" - }; + var interfaceFile = Directory.GetFiles(CodeGenHelpers.SolutionDirectory, interfaceName + ".cs", SearchOption.AllDirectories) + .Single(); + var providerInterfaceName = interfaceName + "Provider"; - [TestCaseSource(nameof(Interfaces))] - public void GenerateProviderInterfaceAndExtensions(string interfaceName) - { - var interfaceFile = Directory.GetFiles(CodeGenHelpers.SolutionDirectory, interfaceName + ".cs", SearchOption.AllDirectories) - .Single(); - var providerInterfaceName = interfaceName + "Provider"; + var createMethodName = $"Create{interfaceName.Replace("IDistributed", string.Empty)}"; + var providerInterfaceCode = $@"// AUTO-GENERATED +namespace Medallion.Threading; - var createMethodName = $"Create{interfaceName.Replace("IDistributed", string.Empty)}"; - var providerInterfaceCode = $@"// AUTO-GENERATED -namespace Medallion.Threading +/// +/// Acts as a factory for instances of a certain type. This interface may be +/// easier to use than in dependency injection scenarios. +/// +public interface {providerInterfaceName}{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)} {{ /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. + /// Constructs an instance with the given . /// - public interface {providerInterfaceName}{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)} - {{ - /// - /// Constructs an instance with the given . - /// - {interfaceName} {createMethodName}(string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}); - }} + {interfaceName} {createMethodName}(string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}); }}"; - var interfaceMethods = Regex.Matches( - File.ReadAllText(interfaceFile), - @"(?\S+) (?\S+)\((?((?\S*) (?\w+)[^,)]*(\, )?)*)\);", - RegexOptions.ExplicitCapture + var interfaceMethods = Regex.Matches( + File.ReadAllText(interfaceFile), + @"(?\S+) (?\S+)\((?((?\S*) (?\w+)[^,)]*(\, )?)*)\);", + RegexOptions.ExplicitCapture + ); + var extensionMethodBodies = interfaceMethods.Cast() + .Select(m => +$@" /// + /// Equivalent to calling and then + /// ().Select(c => c.Value))})"" />. + /// + public static {m.Groups["returnType"].Value} {GetExtensionMethodName(m.Groups["name"].Value)}(this {providerInterfaceName} provider, string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => + (provider ?? throw new ArgumentNullException(nameof(provider))).{createMethodName}(name{(interfaceName.Contains("Semaphore") ? ", maxCount" : string.Empty)}).{m.Groups["name"].Value}({string.Join(", ", m.Groups["parameterName"].Captures.Cast().Select(c => c.Value))});" ); - var extensionMethodBodies = interfaceMethods.Cast() - .Select(m => -$@" /// - /// Equivalent to calling and then - /// ().Select(c => c.Value))})"" />. - /// - public static {m.Groups["returnType"].Value} {GetExtensionMethodName(m.Groups["name"].Value)}(this {providerInterfaceName} provider, string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => - (provider ?? throw new ArgumentNullException(nameof(provider))).{createMethodName}(name{(interfaceName.Contains("Semaphore") ? ", maxCount" : string.Empty)}).{m.Groups["name"].Value}({string.Join(", ", m.Groups["parameterName"].Captures.Cast().Select(c => c.Value))});" - ); - var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; - var providerExtensionsCode = $@"// AUTO-GENERATED + var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; + var providerExtensionsCode = $@"// AUTO-GENERATED using System; using System.Threading; using System.Threading.Tasks; -namespace Medallion.Threading +namespace Medallion.Threading; + +/// +/// Productivity helper methods for +/// +public static class {providerExtensionsName} {{ - /// - /// Productivity helper methods for - /// - public static class {providerExtensionsName} - {{ {string.Join(Environment.NewLine + Environment.NewLine, extensionMethodBodies)} - }} }}"; - var changes = new[] - { - (name: providerInterfaceName, code: providerInterfaceCode), - (name: providerExtensionsName, code: providerExtensionsCode) - } - .Select(t => (file: Path.Combine(Path.GetDirectoryName(interfaceFile)!, t.name + ".cs"), t.code)) - .Select(t => (t.file, t.code, originalCode: File.Exists(t.file) ? File.ReadAllText(t.file) : string.Empty)) - .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) - .ToList(); - changes.ForEach(t => File.WriteAllText(t.file, t.code)); - Assert.IsEmpty(changes.Select(t => t.file)); + var changes = new[] + { + (name: providerInterfaceName, code: providerInterfaceCode), + (name: providerExtensionsName, code: providerExtensionsCode) + } + .Select(t => (file: Path.Combine(Path.GetDirectoryName(interfaceFile)!, t.name + ".cs"), t.code)) + .Select(t => (t.file, t.code, originalCode: File.Exists(t.file) ? File.ReadAllText(t.file) : string.Empty)) + .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) + .ToList(); + changes.ForEach(t => File.WriteAllText(t.file, t.code)); + Assert.IsEmpty(changes.Select(t => t.file)); - string GetExtensionMethodName(string interfaceMethodName) => - Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$") - // make it more specific to differentiate when one concrete provider implements multiple provider interfaces - ? interfaceMethodName.Replace("Async", string.Empty) - + interfaceName.Replace("IDistributed", string.Empty) - + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) - : interfaceMethodName; - } + string GetExtensionMethodName(string interfaceMethodName) => + Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$") + // make it more specific to differentiate when one concrete provider implements multiple provider interfaces + ? interfaceMethodName.Replace("Async", string.Empty) + + interfaceName.Replace("IDistributed", string.Empty) + + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) + : interfaceMethodName; } } diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index f1d85871..a0feb542 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -22,155 +22,154 @@ using Microsoft.Data.SqlClient; #endif -namespace DistributedLockTaker +namespace DistributedLockTaker; + +internal static class Program { - internal static class Program + public static int Main(string[] args) { - public static int Main(string[] args) + var type = args[0]; + var name = args[1]; + IDisposable? handle; + switch (type) { - var type = args[0]; - var name = args[1]; - IDisposable? handle; - switch (type) - { - case nameof(SqlDistributedLock): - handle = new SqlDistributedLock(name, SqlServerCredentials.ConnectionString).Acquire(); - break; - case "Write" + nameof(SqlDistributedReaderWriterLock): - handle = new SqlDistributedReaderWriterLock(name, SqlServerCredentials.ConnectionString).AcquireWriteLock(); - break; - case nameof(SqlDistributedSemaphore) + "1AsMutex": - handle = new SqlDistributedSemaphore(name, maxCount: 1, connectionString: SqlServerCredentials.ConnectionString).Acquire(); - break; - case nameof(SqlDistributedSemaphore) + "5AsMutex": - handle = new SqlDistributedSemaphore(name, maxCount: 5, connectionString: SqlServerCredentials.ConnectionString).Acquire(); - break; - case nameof(PostgresDistributedLock): - handle = new PostgresDistributedLock(new PostgresAdvisoryLockKey(name), PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); - break; - case "Write" + nameof(PostgresDistributedReaderWriterLock): - handle = new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name), PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); - break; - case nameof(MySqlDistributedLock): - handle = new MySqlDistributedLock(name, MySqlCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); - break; - case "MariaDB" + nameof(MySqlDistributedLock): - handle = new MySqlDistributedLock(name, MariaDbCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); - break; - case nameof(OracleDistributedLock): - handle = new OracleDistributedLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); - break; - case "Write" + nameof(OracleDistributedReaderWriterLock): - handle = new OracleDistributedReaderWriterLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); - break; - case nameof(EventWaitHandleDistributedLock): - handle = new EventWaitHandleDistributedLock(name).Acquire(); - break; - case nameof(WaitHandleDistributedSemaphore) + "1AsMutex": - handle = new WaitHandleDistributedSemaphore(name, maxCount: 1).Acquire(); - break; - case nameof(WaitHandleDistributedSemaphore) + "5AsMutex": - handle = new WaitHandleDistributedSemaphore(name, maxCount: 5).Acquire(); - break; - case nameof(AzureBlobLeaseDistributedLock): - handle = new AzureBlobLeaseDistributedLock( - new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - o => o.Duration(TimeSpan.FromSeconds(15)) - ) - .Acquire(); - break; - case nameof(FileDistributedLock): - handle = new FileDistributedLock(new FileInfo(name)).Acquire(); - break; - case nameof(RedisDistributedLock) + "1": - handle = AcquireRedisLock(name, serverCount: 1); - break; - case nameof(RedisDistributedLock) + "3": - handle = AcquireRedisLock(name, serverCount: 3); - break; - case nameof(RedisDistributedLock) + "2x1": - handle = AcquireRedisLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) - break; - case nameof(RedisDistributedLock) + "1WithPrefix": - handle = AcquireRedisLock("distributed_locks:" + name, serverCount: 1); - break; - case "Write" + nameof(RedisDistributedReaderWriterLock) + "1": - handle = AcquireRedisWriteLock(name, serverCount: 1); - break; - case "Write" + nameof(RedisDistributedReaderWriterLock) + "3": - handle = AcquireRedisWriteLock(name, serverCount: 3); - break; - case "Write" + nameof(RedisDistributedReaderWriterLock) + "2x1": - handle = AcquireRedisWriteLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) - break; - case "Write" + nameof(RedisDistributedReaderWriterLock) + "1WithPrefix": - handle = AcquireRedisWriteLock("distributed_locks:" + name, serverCount: 1); - break; - case string _ when type.StartsWith(nameof(RedisDistributedSemaphore)): - { - var maxCount = type.EndsWith("1AsMutex") ? 1 - : type.EndsWith("5AsMutex") ? 5 - : throw new ArgumentException(type); - handle = new RedisDistributedSemaphore( - name, - maxCount, - GetRedisDatabases(serverCount: 1).Single(), - // in order to see abandonment work in a reasonable timeframe, use very short expiry - options => options.Expiry(TimeSpan.FromSeconds(1)) - .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)) - ).Acquire(); - break; - } - case nameof(ZooKeeperDistributedLock): - handle = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireAsync().Result; - break; - case "Write" + nameof(ZooKeeperDistributedReaderWriterLock): - handle = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireWriteLockAsync().Result; - break; - case string _ when type.StartsWith(nameof(ZooKeeperDistributedSemaphore)): - { - var maxCount = type.EndsWith("1AsMutex") ? 1 - : type.EndsWith("5AsMutex") ? 5 - : throw new ArgumentException(type); - handle = new ZooKeeperDistributedSemaphore( - new ZooKeeperPath(name), - maxCount, - ZooKeeperPorts.DefaultConnectionString, - options: ZooKeeperOptions - ).AcquireAsync().Result; - break; - } - default: - Console.Error.WriteLine($"type: {type}"); - return 123; - } - - Console.WriteLine("Acquired"); - Console.Out.Flush(); + case nameof(SqlDistributedLock): + handle = new SqlDistributedLock(name, SqlServerCredentials.ConnectionString).Acquire(); + break; + case "Write" + nameof(SqlDistributedReaderWriterLock): + handle = new SqlDistributedReaderWriterLock(name, SqlServerCredentials.ConnectionString).AcquireWriteLock(); + break; + case nameof(SqlDistributedSemaphore) + "1AsMutex": + handle = new SqlDistributedSemaphore(name, maxCount: 1, connectionString: SqlServerCredentials.ConnectionString).Acquire(); + break; + case nameof(SqlDistributedSemaphore) + "5AsMutex": + handle = new SqlDistributedSemaphore(name, maxCount: 5, connectionString: SqlServerCredentials.ConnectionString).Acquire(); + break; + case nameof(PostgresDistributedLock): + handle = new PostgresDistributedLock(new PostgresAdvisoryLockKey(name), PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; + case "Write" + nameof(PostgresDistributedReaderWriterLock): + handle = new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name), PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); + break; + case nameof(MySqlDistributedLock): + handle = new MySqlDistributedLock(name, MySqlCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; + case "MariaDB" + nameof(MySqlDistributedLock): + handle = new MySqlDistributedLock(name, MariaDbCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; + case nameof(OracleDistributedLock): + handle = new OracleDistributedLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).Acquire(); + break; + case "Write" + nameof(OracleDistributedReaderWriterLock): + handle = new OracleDistributedReaderWriterLock(name, OracleCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); + break; + case nameof(EventWaitHandleDistributedLock): + handle = new EventWaitHandleDistributedLock(name).Acquire(); + break; + case nameof(WaitHandleDistributedSemaphore) + "1AsMutex": + handle = new WaitHandleDistributedSemaphore(name, maxCount: 1).Acquire(); + break; + case nameof(WaitHandleDistributedSemaphore) + "5AsMutex": + handle = new WaitHandleDistributedSemaphore(name, maxCount: 5).Acquire(); + break; + case nameof(AzureBlobLeaseDistributedLock): + handle = new AzureBlobLeaseDistributedLock( + new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), + o => o.Duration(TimeSpan.FromSeconds(15)) + ) + .Acquire(); + break; + case nameof(FileDistributedLock): + handle = new FileDistributedLock(new FileInfo(name)).Acquire(); + break; + case nameof(RedisDistributedLock) + "1": + handle = AcquireRedisLock(name, serverCount: 1); + break; + case nameof(RedisDistributedLock) + "3": + handle = AcquireRedisLock(name, serverCount: 3); + break; + case nameof(RedisDistributedLock) + "2x1": + handle = AcquireRedisLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) + break; + case nameof(RedisDistributedLock) + "1WithPrefix": + handle = AcquireRedisLock("distributed_locks:" + name, serverCount: 1); + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "1": + handle = AcquireRedisWriteLock(name, serverCount: 1); + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "3": + handle = AcquireRedisWriteLock(name, serverCount: 3); + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "2x1": + handle = AcquireRedisWriteLock(name, serverCount: 2); // we know the last will fail; don't bother (we also don't know its port) + break; + case "Write" + nameof(RedisDistributedReaderWriterLock) + "1WithPrefix": + handle = AcquireRedisWriteLock("distributed_locks:" + name, serverCount: 1); + break; + case string _ when type.StartsWith(nameof(RedisDistributedSemaphore)): + { + var maxCount = type.EndsWith("1AsMutex") ? 1 + : type.EndsWith("5AsMutex") ? 5 + : throw new ArgumentException(type); + handle = new RedisDistributedSemaphore( + name, + maxCount, + GetRedisDatabases(serverCount: 1).Single(), + // in order to see abandonment work in a reasonable timeframe, use very short expiry + options => options.Expiry(TimeSpan.FromSeconds(1)) + .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)) + ).Acquire(); + break; + } + case nameof(ZooKeeperDistributedLock): + handle = new ZooKeeperDistributedLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireAsync().Result; + break; + case "Write" + nameof(ZooKeeperDistributedReaderWriterLock): + handle = new ZooKeeperDistributedReaderWriterLock(new ZooKeeperPath(name), ZooKeeperPorts.DefaultConnectionString, options: ZooKeeperOptions).AcquireWriteLockAsync().Result; + break; + case string _ when type.StartsWith(nameof(ZooKeeperDistributedSemaphore)): + { + var maxCount = type.EndsWith("1AsMutex") ? 1 + : type.EndsWith("5AsMutex") ? 5 + : throw new ArgumentException(type); + handle = new ZooKeeperDistributedSemaphore( + new ZooKeeperPath(name), + maxCount, + ZooKeeperPorts.DefaultConnectionString, + options: ZooKeeperOptions + ).AcquireAsync().Result; + break; + } + default: + Console.Error.WriteLine($"type: {type}"); + return 123; + } - if (Console.ReadLine() != "abandon") - { - handle.Dispose(); - } + Console.WriteLine("Acquired"); + Console.Out.Flush(); - return 0; + if (Console.ReadLine() != "abandon") + { + handle.Dispose(); } - private static IDistributedSynchronizationHandle AcquireRedisLock(string name, int serverCount) => - new RedisDistributedLock(name, GetRedisDatabases(serverCount), RedisOptions).Acquire(); + return 0; + } + + private static IDistributedSynchronizationHandle AcquireRedisLock(string name, int serverCount) => + new RedisDistributedLock(name, GetRedisDatabases(serverCount), RedisOptions).Acquire(); - private static IDistributedSynchronizationHandle AcquireRedisWriteLock(string name, int serverCount) => - new RedisDistributedReaderWriterLock(name, GetRedisDatabases(serverCount), RedisOptions).AcquireWriteLock(); + private static IDistributedSynchronizationHandle AcquireRedisWriteLock(string name, int serverCount) => + new RedisDistributedReaderWriterLock(name, GetRedisDatabases(serverCount), RedisOptions).AcquireWriteLock(); - private static IEnumerable GetRedisDatabases(int serverCount) => RedisPorts.DefaultPorts.Take(serverCount) - .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()); + private static IEnumerable GetRedisDatabases(int serverCount) => RedisPorts.DefaultPorts.Take(serverCount) + .Select(port => ConnectionMultiplexer.Connect($"localhost:{port}").GetDatabase()); - private static void RedisOptions(RedisDistributedSynchronizationOptionsBuilder options) => - options.Expiry(TimeSpan.FromSeconds(.5)) // short expiry for abandonment testing - .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); + private static void RedisOptions(RedisDistributedSynchronizationOptionsBuilder options) => + options.Expiry(TimeSpan.FromSeconds(.5)) // short expiry for abandonment testing + .BusyWaitSleepTime(TimeSpan.FromSeconds(.1), TimeSpan.FromSeconds(.3)); - private static void ZooKeeperOptions(ZooKeeperDistributedSynchronizationOptionsBuilder options) => - // use a very short session timeout to support abandonment - options.SessionTimeout(TimeSpan.FromSeconds(.1)); - } + private static void ZooKeeperOptions(ZooKeeperDistributedSynchronizationOptionsBuilder options) => + // use a very short session timeout to support abandonment + options.SessionTimeout(TimeSpan.FromSeconds(.1)); } From f363ab9eb2b16c449384f9d8c18b30809be1b6ab Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Nov 2022 19:42:18 -0500 Subject: [PATCH 202/399] Optimize combinatorial test creation: * Cache repeated calls to GetPossibleGenericInstantiations * Parallelize * Cache candidate assembly types * Skip on .NET Framework --- DistributedLock.Tests/Tests/TestSetupTest.cs | 26 ++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index b2a8696f..73c2fe78 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -1,5 +1,7 @@ -using NUnit.Framework; +#if NETCOREAPP // no need to run this on multiple frameworks +using NUnit.Framework; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; @@ -24,7 +26,8 @@ public void VerifyAllTestsAreCreated() ) .ToArray(); - var expectedTestTypes = testCaseClasses.SelectMany(this.GetPossibleGenericInstantiations) + var expectedTestTypes = testCaseClasses.AsParallel() + .SelectMany(this.GetPossibleGenericInstantiations) .ToArray(); var combinatorialTestsFile = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "Tests", "CombinatorialTests.cs")); @@ -117,11 +120,18 @@ static string GetCSharpName(Type type) private static string RemoveGenericMarkers(string name) => Regex.Replace(name, @"`\d+", string.Empty); + private static readonly ConcurrentDictionary PossibleGenericInstantiationsCache = new(); + private Type[] GetPossibleGenericInstantiations(Type genericTypeDefinition) { + if (PossibleGenericInstantiationsCache.TryGetValue(genericTypeDefinition, out var cached)) { return cached; } + var genericParameterTypes = genericTypeDefinition.GetGenericArguments() .Select(this.GetTypesForGenericParameter) .ToArray(); + // Re-check the cache since we may have computed the result in the call to GetTypesForGenericParameter + if (PossibleGenericInstantiationsCache.TryGetValue(genericTypeDefinition, out cached)) { return cached; } + var allCombinations = TraverseDepthFirst( root: (index: 0, value: Enumerable.Empty()), children: t => t.index == genericParameterTypes.Length @@ -132,19 +142,24 @@ private Type[] GetPossibleGenericInstantiations(Type genericTypeDefinition) .Select(t => MakeGenericTypeOrDefault(genericTypeDefinition, t.value.ToArray())) .Where(t => t != null).Select(t => t!) .ToArray(); + PossibleGenericInstantiationsCache.TryAdd(genericTypeDefinition, allCombinations); return allCombinations; } + private static readonly IReadOnlyList GenericParameterTypeCandidates = typeof(TestSetupTest).Assembly + .GetTypes() + .Where(t => !t.IsNestedPrivate && !t.IsAbstract) + .ToArray(); + private Type[] GetTypesForGenericParameter(Type genericParameter) { var constraints = genericParameter.GetGenericParameterConstraints(); - return this.GetType().Assembly - .GetTypes() + return GenericParameterTypeCandidates // This doesn't support all fancy constraints like class or new() // see https://stackoverflow.com/questions/4864496/checking-if-an-object-meets-a-generic-parameter-constraint. // It also does attempt to enforce cross-constraint rules (e. g. T : Foo[V]). The idea is to identify cases // that might match - .Where(t => !t.IsNestedPrivate && !t.IsAbstract && constraints.All(c => IsDerivedFromOrDerivedFromGenericOf(derived: t, @base: c))) + .Where(t => constraints.All(c => IsDerivedFromOrDerivedFromGenericOf(derived: t, @base: c))) .SelectMany(t => t.IsGenericTypeDefinition ? this.GetPossibleGenericInstantiations(t) : new[] { t }) .ToArray(); } @@ -212,3 +227,4 @@ private static IEnumerable TraverseAlong(T? root, Func next) } } } +#endif \ No newline at end of file From 23681dc05a1d1c02c03cf39e475fc51538892fd5 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Nov 2022 19:45:50 -0500 Subject: [PATCH 203/399] Revert back to netcoreapp3.1 to make appveyor happy --- DistributedLockCodeGen/DistributedLockCodeGen.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 33d99fb6..58fd4f9c 100644 --- a/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -1,8 +1,8 @@  - net6.0 - + netcoreapp3.1 + Latest false enable true From e544f62da99990f7c1b872cf912a94a0c347eb5f Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Tue, 15 Nov 2022 20:01:01 -0500 Subject: [PATCH 204/399] Switch to VS2022 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b3cbaac9..0886a4d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ version: 1.0.{build} image: - - Visual Studio 2019 + - Visual Studio 2022 - Ubuntu build_script: @@ -15,6 +15,6 @@ for: matrix: only: - - image: "Visual Studio 2019" + image: "Visual Studio 2022" test_script: - dotnet test DistributedLock.sln -c Release --no-build --filter "TestCategory=CI|TestCategory=CIWindows" \ No newline at end of file From 553255420eed4607f65f9b49ef6528b9461fb164 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 17 Nov 2022 07:22:04 -0500 Subject: [PATCH 205/399] Set up implicit usings --- DistributedLock.Azure/AssemblyAttributes.cs | 5 +---- .../AzureBlobLeaseDistributedLock.IDistributedLock.cs | 3 --- .../AzureBlobLeaseDistributedLock.cs | 5 ----- .../AzureBlobLeaseDistributedLockHandle.cs | 5 ----- ...zureBlobLeaseDistributedSynchronizationProvider.cs | 3 --- DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs | 4 ---- DistributedLock.Azure/AzureErrors.cs | 9 +-------- DistributedLock.Azure/BlobClientWrapper.cs | 6 ------ DistributedLock.Azure/BlobLeaseClientWrapper.cs | 5 ----- DistributedLock.Azure/DistributedLock.Azure.csproj | 1 + DistributedLock.Core/DeadlockException.cs | 4 +--- DistributedLock.Core/DistributedLock.Core.csproj | 5 +++++ .../DistributedLockProviderExtensions.cs | 3 --- .../DistributedReaderWriterLockProviderExtensions.cs | 3 --- .../DistributedSemaphoreProviderExtensions.cs | 3 --- ...edUpgradeableReaderWriterLockProviderExtensions.cs | 3 --- DistributedLock.Core/IDistributedLock.cs | 4 ---- DistributedLock.Core/IDistributedReaderWriterLock.cs | 4 ---- DistributedLock.Core/IDistributedSemaphore.cs | 6 ------ .../IDistributedSynchronizationHandle.cs | 5 +---- .../IDistributedUpgradeableReadLockHandle.cs | 6 +----- .../IDistributedUpgradeableReaderWriterLock.cs | 4 ---- DistributedLock.Core/Internal/AsyncLock.cs | 8 +------- DistributedLock.Core/Internal/BusyWaitHelper.cs | 9 +-------- .../Internal/Data/ConnectionMonitor.cs | 4 ---- DistributedLock.Core/Internal/Data/DatabaseCommand.cs | 8 +------- .../Internal/Data/DatabaseConnection.cs | 7 +------ ...dicatedConnectionOrTransactionDbDistributedLock.cs | 3 --- .../Data/IDatabaseConnectionMonitoringHandle.cs | 7 +------ .../Internal/Data/IDbDistributedLock.cs | 4 ---- .../Internal/Data/IDbSynchronizationStrategy.cs | 5 ----- .../Internal/Data/MultiplexedConnectionLock.cs | 5 ----- .../Internal/Data/MultiplexedConnectionLockPool.cs | 9 --------- ...timisticConnectionMultiplexingDbDistributedLock.cs | 3 --- .../Internal/DistributedLockHelpers.cs | 5 +---- DistributedLock.Core/Internal/Helpers.cs | 4 +--- .../Internal/IInternalDistributedLock.cs | 6 +----- .../IInternalDistributedLockUpgradeableHandle.cs | 5 +---- .../Internal/IInternalDistributedReaderWriterLock.cs | 6 +----- .../Internal/IInternalDistributedSemaphore.cs | 8 +------- ...IInternalDistributedUpgradeableReaderWriterLock.cs | 6 +----- DistributedLock.Core/Internal/Invariant.cs | 3 +-- DistributedLock.Core/Internal/LeaseMonitor.cs | 8 +------- .../Internal/ManagedFinalizerQueue.cs | 8 +------- DistributedLock.Core/Internal/RefBox.cs | 5 +---- DistributedLock.Core/Internal/SyncViaAsync.cs | 6 +----- DistributedLock.Core/Internal/TimeoutValue.cs | 5 +---- DistributedLock.FileSystem/AssemblyAttributes.cs | 5 +---- .../DistributedLock.FileSystem.csproj | 5 +++++ .../FileDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.FileSystem/FileDistributedLock.cs | 6 ------ .../FileDistributedLockHandle.cs | 6 ------ .../FileDistributedSynchronizationProvider.cs | 9 +-------- .../FileNameValidationHelper.cs | 4 +--- DistributedLock.MySql/DistributedLock.MySql.csproj | 5 +++++ .../MySqlConnectionOptionsBuilder.cs | 4 ---- DistributedLock.MySql/MySqlDatabaseConnection.cs | 5 ----- .../MySqlDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.MySql/MySqlDistributedLock.cs | 4 ---- DistributedLock.MySql/MySqlDistributedLockHandle.cs | 5 ----- .../MySqlDistributedSynchronizationProvider.cs | 5 +---- .../MySqlMultiplexedConnectionLockPool.cs | 3 --- DistributedLock.MySql/MySqlUserLock.cs | 6 ------ DistributedLock.Oracle/DistributedLock.Oracle.csproj | 5 +++++ .../OracleConnectionOptionsBuilder.cs | 4 ---- DistributedLock.Oracle/OracleDatabaseConnection.cs | 6 ------ DistributedLock.Oracle/OracleDbmsLock.cs | 5 ----- .../OracleDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.Oracle/OracleDistributedLock.cs | 6 ------ DistributedLock.Oracle/OracleDistributedLockHandle.cs | 5 ----- ...terLock.IDistributedUpgradeableReaderWriterLock.cs | 3 --- .../OracleDistributedReaderWriterLock.cs | 5 ----- .../OracleDistributedReaderWriterLockHandle.cs | 5 ----- .../OracleDistributedSynchronizationProvider.cs | 5 +---- .../OracleMultiplexedConnectionLockPool.cs | 3 --- .../DistributedLock.Postgres.csproj | 5 +++++ DistributedLock.Postgres/PostgresAdvisoryLock.cs | 4 ---- DistributedLock.Postgres/PostgresAdvisoryLockKey.cs | 1 - .../PostgresConnectionOptionsBuilder.cs | 4 ---- .../PostgresDatabaseConnection.cs | 5 ----- .../PostgresDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.Postgres/PostgresDistributedLock.cs | 5 ----- .../PostgresDistributedLockHandle.cs | 5 ----- ...edReaderWriterLock.IDistributedReaderWriterLock.cs | 3 --- .../PostgresDistributedReaderWriterLock.cs | 5 ----- .../PostgresDistributedReaderWriterLockHandle.cs | 5 ----- .../PostgresDistributedSynchronizationProvider.cs | 5 +---- .../PostgresMultiplexedConnectionLockPool.cs | 4 ---- DistributedLock.Redis/DistributedLock.Redis.csproj | 6 ++++++ .../Primitives/RedisMutexPrimitive.cs | 5 ----- .../Primitives/RedisReaderWriterLockPrimitives.cs | 5 ----- DistributedLock.Redis/Primitives/RedisScript.cs | 5 ----- .../Primitives/RedisSemaphorePrimitive.cs | 5 ----- DistributedLock.Redis/RedLock/RedLockAcquire.cs | 6 ------ DistributedLock.Redis/RedLock/RedLockExtend.cs | 6 ------ DistributedLock.Redis/RedLock/RedLockHandle.cs | 6 ------ DistributedLock.Redis/RedLock/RedLockHelper.cs | 5 ----- DistributedLock.Redis/RedLock/RedLockRelease.cs | 5 ----- DistributedLock.Redis/RedLock/RedLockTimeouts.cs | 5 ----- .../RedisDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.Redis/RedisDistributedLock.cs | 6 ------ DistributedLock.Redis/RedisDistributedLockHandle.cs | 6 ------ ...edReaderWriterLock.IDistributedReaderWriterLock.cs | 3 --- .../RedisDistributedReaderWriterLock.cs | 6 ------ .../RedisDistributedReaderWriterLockHandle.cs | 6 ------ ...RedisDistributedSemaphore.IDistributedSemaphore.cs | 3 --- DistributedLock.Redis/RedisDistributedSemaphore.cs | 6 ------ .../RedisDistributedSemaphoreHandle.cs | 6 ------ .../RedisDistributedSynchronizationOptionsBuilder.cs | 6 ------ .../RedisDistributedSynchronizationProvider.cs | 5 ----- DistributedLock.Redis/TimeoutTask.cs | 6 ------ .../DistributedLock.SqlServer.csproj | 5 +++++ DistributedLock.SqlServer/SqlApplicationLock.cs | 4 ---- .../SqlConnectionOptionsBuilder.cs | 4 ---- DistributedLock.SqlServer/SqlDatabaseConnection.cs | 5 ----- .../SqlDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.SqlServer/SqlDistributedLock.cs | 3 --- DistributedLock.SqlServer/SqlDistributedLockHandle.cs | 2 -- ...terLock.IDistributedUpgradeableReaderWriterLock.cs | 3 --- .../SqlDistributedReaderWriterLock.cs | 3 --- .../SqlDistributedReaderWriterLockHandle.cs | 3 --- .../SqlDistributedSemaphore.IDistributedSemaphore.cs | 3 --- DistributedLock.SqlServer/SqlDistributedSemaphore.cs | 3 --- .../SqlDistributedSemaphoreHandle.cs | 2 -- .../SqlDistributedSynchronizationProvider.cs | 7 +------ .../SqlMultiplexedConnectionLockPool.cs | 4 ---- DistributedLock.SqlServer/SqlSemaphore.cs | 3 --- .../Data/ConnectionStringStrategyTestCases.cs | 6 +----- .../AbstractTestCases/Data/DbSemaphoreTestCases.cs | 3 --- ...xternalConnectionOrTransactionStrategyTestCases.cs | 4 ---- .../Data/ExternalConnectionStrategyTestCases.cs | 1 - .../Data/ExternalTransactionStrategyTestCases.cs | 2 -- .../Data/MultiplexingConnectionStrategyTestCases.cs | 5 ----- .../Data/OwnedConnectionStrategyTestCases.cs | 7 +------ .../Data/OwnedTransactionStrategyTestCases.cs | 2 -- ...aderWriterLockConnectionStringStrategyTestCases.cs | 7 +------ .../AbstractTestCases/DistributedLockCoreTestCases.cs | 6 ------ .../DistributedReaderWriterLockCoreTestCases.cs | 2 -- .../DistributedSemaphoreCoreTestCases.cs | 5 ----- ...ributedUpgradeableReaderWriterLockCoreTestCases.cs | 5 ----- .../Redis/RedisExtensionTestCases.cs | 7 +------ .../Redis/RedisSynchronizationCoreTestCases.cs | 7 ------- .../ZooKeeperSynchronizationCoreTestCases.cs | 8 +------- DistributedLock.Tests/DistributedLock.Tests.csproj | 1 + .../Infrastructure/Azure/AzureSetUpFixture.cs | 5 ----- .../TestingAzureBlobLeaseDistributedLockProvider.cs | 4 ---- .../TestingAzureBlobLeaseSynchronizationStrategy.cs | 3 --- .../Infrastructure/Data/ConnectionOptions.cs | 6 +----- .../Infrastructure/Data/IdleSessionKiller.cs | 6 ------ .../Infrastructure/Data/TestingDb.cs | 4 ---- .../Data/TestingDbSynchronizationStrategy.cs | 8 +------- .../Infrastructure/DisposableCollection.cs | 8 +------- .../FileSystem/TestingFileSystemProviders.cs | 4 ---- .../TestingLockFileSynchronizationStrategy.cs | 6 +----- .../Infrastructure/ITestingNameProvider.cs | 7 +------ .../Infrastructure/MySql/TestingMySqlDb.cs | 5 ----- .../Infrastructure/MySql/TestingMySqlProviders.cs | 3 --- .../Infrastructure/Oracle/TestingOracleDb.cs | 4 ---- .../Infrastructure/Oracle/TestingOracleProviders.cs | 3 --- .../Infrastructure/Postgres/TestingPostgresDb.cs | 4 ---- .../Postgres/TestingPostgresProviders.cs | 3 --- .../Infrastructure/Redis/RedisServer.cs | 7 ------- .../Infrastructure/Redis/RedisSetUpFixture.cs | 3 --- .../Redis/TestingRedisDatabaseProvider.cs | 9 +-------- .../Infrastructure/Redis/TestingRedisProviders.cs | 5 ----- .../Redis/TestingRedisSynchronizationStrategy.cs | 5 ----- .../Infrastructure/Shared/AzureCredentials.cs | 7 +------ .../Infrastructure/Shared/MariaDbCredentials.cs | 2 -- .../Infrastructure/Shared/MySqlCredentials.cs | 4 ---- .../Infrastructure/Shared/OracleCredentials.cs | 3 --- .../Infrastructure/Shared/RedisPorts.cs | 4 +--- .../Infrastructure/Shared/SqlServerCredentials.cs | 6 +----- .../Infrastructure/Shared/TargetFramework.cs | 6 +----- .../Infrastructure/Shared/ZooKeeperPorts.cs | 6 +----- .../Infrastructure/SqlServer/TestingSqlServerDb.cs | 4 ---- .../SqlServer/TestingSqlServerProviders.cs | 5 +---- .../SupportsContinuousIntegrationAttribute.cs | 6 +----- DistributedLock.Tests/Infrastructure/TestHelper.cs | 3 --- .../Infrastructure/TestingLockProvider.cs | 6 +----- .../TestingReaderWriterLockAsMutexProvider.cs | 5 ----- .../Infrastructure/TestingReaderWriterLockProvider.cs | 6 +----- .../Infrastructure/TestingSemaphoreAsMutexProvider.cs | 8 +------- .../Infrastructure/TestingSemaphoreProvider.cs | 6 +----- .../Infrastructure/TestingSynchronizationStrategy.cs | 6 +----- .../WaitHandles/TestingWaitHandleProviders.cs | 3 --- .../TestingWaitHandleSynchronizationStrategy.cs | 6 +----- .../ZooKeeper/TestingZooKeeperProviders.cs | 3 --- .../TestingZooKeeperSynchronizationStrategy.cs | 5 ----- .../Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs | 3 --- DistributedLock.Tests/Tests/ApiTest.cs | 7 +------ .../Tests/Azure/AzureBehaviorTest.cs | 5 ----- .../Tests/Azure/AzureBlobLeaseDistributedLockTest.cs | 7 ------- ...BlobLeaseDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs | 5 ----- DistributedLock.Tests/Tests/CombinatorialTests.cs | 5 ----- .../Tests/Core/Data/DatabaseConnectionTest.cs | 10 +--------- .../Tests/Core/DeadlockExceptionTest.cs | 2 -- .../Core/DistributedLockProviderExtensionsTest.cs | 1 - DistributedLock.Tests/Tests/Core/HelpersTest.cs | 4 ---- .../Tests/Core/InternalVisibilityTest.cs | 1 - DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs | 2 -- DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs | 3 --- .../Tests/FileSystem/FileDistributedLockTest.cs | 6 ------ .../FileSystem/FileDistributedLockWindowsTest.cs | 4 ---- .../FileDistributedSynchronizationProviderTest.cs | 5 ----- .../Tests/MySql/MySqlConnectionOptionsBuilderTest.cs | 3 --- .../Tests/MySql/MySqlDistributedLockTest.cs | 4 ---- .../MySqlDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/Oracle/OracleBehaviorTest.cs | 4 ---- .../Oracle/OracleConnectionOptionsBuilderTest.cs | 4 ---- .../Tests/Oracle/OracleDistributedLockTest.cs | 3 --- .../Oracle/OracleDistributedReaderWriterLockTest.cs | 3 --- .../OracleDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/Postgres/PostgresAdvisoryLockKeyTest.cs | 3 --- .../Tests/Postgres/PostgresBehaviorTest.cs | 5 ----- .../Postgres/PostgresConnectionOptionsBuilderTest.cs | 3 --- .../Tests/Postgres/PostgresDistributedLockTest.cs | 7 ------- .../PostgresDistributedReaderWriterLockTest.cs | 5 ----- .../PostgresDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/Redis/RedisDistributedLockTest.cs | 9 +-------- .../Redis/RedisDistributedReaderWriterLockTest.cs | 5 ----- .../Tests/Redis/RedisDistributedSemaphoreTest.cs | 5 ----- ...disDistributedSynchronizationOptionsBuilderTest.cs | 4 ---- .../RedisDistributedSynchronizationProviderTest.cs | 4 ---- DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs | 4 ---- .../SqlServer/SqlConnectionOptionsBuilderTest.cs | 3 --- .../Tests/SqlServer/SqlDatabaseConnectionTest.cs | 4 ---- .../Tests/SqlServer/SqlDistributedLockTest.cs | 2 -- .../SqlServer/SqlDistributedReaderWriterLockTest.cs | 1 - .../Tests/SqlServer/SqlDistributedSemaphoreTest.cs | 2 -- .../SqlDistributedSynchronizationProviderTest.cs | 4 ---- DistributedLock.Tests/Tests/TestSetupTest.cs | 4 ---- .../WaitHandles/EventWaitHandleDistributedLockTest.cs | 1 - .../WaitHandles/WaitHandleDistributedSemaphoreTest.cs | 5 ----- ...aitHandleDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 4 ---- .../Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs | 3 --- .../Tests/ZooKeeper/ZooKeeperConnectionTest.cs | 6 ------ .../Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs | 11 +---------- .../ZooKeeperDistributedReaderWriterLockTest.cs | 3 --- .../ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs | 3 --- ...perDistributedSynchronizationOptionsBuilderTest.cs | 4 ---- ...ZooKeeperDistributedSynchronizationProviderTest.cs | 4 ---- .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 4 ---- .../ZooKeeper/ZooKeeperSequentialPathHelperTest.cs | 5 ----- .../DistributedLock.WaitHandles.csproj | 5 +++++ .../DistributedWaitHandleHelpers.cs | 5 ----- ...EventWaitHandleDistributedLock.IDistributedLock.cs | 3 --- .../EventWaitHandleDistributedLock.cs | 3 --- .../EventWaitHandleDistributedLockHandle.cs | 3 --- ...andleDistributedSemaphore.IDistributedSemaphore.cs | 3 --- .../WaitHandleDistributedSemaphore.cs | 5 ----- .../WaitHandleDistributedSemaphoreHandle.cs | 5 ----- .../WaitHandleDistributedSynchronizationProvider.cs | 6 +----- DistributedLock.WaitHandles/WaitHandleExtensions.cs | 3 --- DistributedLock.ZooKeeper/AssemblyAttributes.cs | 5 +---- .../DistributedLock.ZooKeeper.csproj | 5 +++++ DistributedLock.ZooKeeper/ZooKeeperConnection.cs | 10 ++-------- DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs | 4 ---- .../ZooKeeperDistributedLock.IDistributedLock.cs | 3 --- DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs | 6 ------ .../ZooKeeperDistributedLockHandle.cs | 5 ----- ...edReaderWriterLock.IDistributedReaderWriterLock.cs | 3 --- .../ZooKeeperDistributedReaderWriterLock.cs | 6 ------ .../ZooKeeperDistributedReaderWriterLockHandle.cs | 5 ----- ...eeperDistributedSemaphore.IDistributedSemaphore.cs | 3 --- .../ZooKeeperDistributedSemaphore.cs | 6 ------ .../ZooKeeperDistributedSemaphoreHandle.cs | 5 ----- ...oKeeperDistributedSynchronizationOptionsBuilder.cs | 3 --- .../ZooKeeperDistributedSynchronizationProvider.cs | 6 +----- DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs | 7 +------ DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs | 5 ----- DistributedLock.ZooKeeper/ZooKeeperPath.cs | 5 ----- .../ZooKeeperSequentialPathHelper.cs | 5 ----- .../ZooKeeperSynchronizationHelper.cs | 5 ----- DistributedLockCodeGen/DistributedLockCodeGen.csproj | 4 ++++ DistributedLockCodeGen/GenerateProviders.cs | 1 - DistributedLockTaker/DistributedLockTaker.csproj | 1 + DistributedLockTaker/Program.cs | 1 - 279 files changed, 117 insertions(+), 1179 deletions(-) diff --git a/DistributedLock.Azure/AssemblyAttributes.cs b/DistributedLock.Azure/AssemblyAttributes.cs index 398d8ac7..a9e3a34f 100644 --- a/DistributedLock.Azure/AssemblyAttributes.cs +++ b/DistributedLock.Azure/AssemblyAttributes.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Text; +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs index 59d44507..bef3fb80 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 82b6b435..32a67f8e 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -2,12 +2,7 @@ using Azure.Storage.Blobs; using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.IO; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs index 88d83aa7..e92a332e 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs index bdfebb38..9a405563 100644 --- a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs +++ b/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs @@ -1,7 +1,4 @@ using Azure.Storage.Blobs; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs index dbdff0c3..419fe0a4 100644 --- a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs +++ b/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/AzureErrors.cs b/DistributedLock.Azure/AzureErrors.cs index c3a1c8dd..01eef28b 100644 --- a/DistributedLock.Azure/AzureErrors.cs +++ b/DistributedLock.Azure/AzureErrors.cs @@ -1,11 +1,4 @@ -using Azure; -using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.Azure; +namespace Medallion.Threading.Azure; internal static class AzureErrors { diff --git a/DistributedLock.Azure/BlobClientWrapper.cs b/DistributedLock.Azure/BlobClientWrapper.cs index a246c75d..ffca59d1 100644 --- a/DistributedLock.Azure/BlobClientWrapper.cs +++ b/DistributedLock.Azure/BlobClientWrapper.cs @@ -2,12 +2,6 @@ using Azure.Storage.Blobs.Models; using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/DistributedLock.Azure/BlobLeaseClientWrapper.cs index 4a318ad4..11b13ec9 100644 --- a/DistributedLock.Azure/BlobLeaseClientWrapper.cs +++ b/DistributedLock.Azure/BlobLeaseClientWrapper.cs @@ -1,10 +1,5 @@ using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Azure; diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/DistributedLock.Azure/DistributedLock.Azure.csproj index f8977161..41401509 100644 --- a/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable diff --git a/DistributedLock.Core/DeadlockException.cs b/DistributedLock.Core/DeadlockException.cs index bfee2899..f9fb2336 100644 --- a/DistributedLock.Core/DeadlockException.cs +++ b/DistributedLock.Core/DeadlockException.cs @@ -1,6 +1,4 @@ -using System; - -namespace Medallion.Threading; +namespace Medallion.Threading; /// /// An exception that SOME distributed locks will throw under SOME deadlock conditions. Note that even locks diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/DistributedLock.Core/DistributedLock.Core.csproj index d75a4530..df5c7c0b 100644 --- a/DistributedLock.Core/DistributedLock.Core.csproj +++ b/DistributedLock.Core/DistributedLock.Core.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -56,5 +57,9 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.Core/DistributedLockProviderExtensions.cs b/DistributedLock.Core/DistributedLockProviderExtensions.cs index a6d60183..ea4ad6f5 100644 --- a/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -1,7 +1,4 @@ // AUTO-GENERATED -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading; diff --git a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index 45e926f4..5ac66fac 100644 --- a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -1,7 +1,4 @@ // AUTO-GENERATED -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading; diff --git a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index e5065e92..b808b004 100644 --- a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -1,7 +1,4 @@ // AUTO-GENERATED -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading; diff --git a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 57d46947..4b8c51f9 100644 --- a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -1,7 +1,4 @@ // AUTO-GENERATED -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading; diff --git a/DistributedLock.Core/IDistributedLock.cs b/DistributedLock.Core/IDistributedLock.cs index d503a9c5..2a8c7576 100644 --- a/DistributedLock.Core/IDistributedLock.cs +++ b/DistributedLock.Core/IDistributedLock.cs @@ -1,7 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading; /// diff --git a/DistributedLock.Core/IDistributedReaderWriterLock.cs b/DistributedLock.Core/IDistributedReaderWriterLock.cs index 365967f9..2579875a 100644 --- a/DistributedLock.Core/IDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedReaderWriterLock.cs @@ -1,7 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading; /// diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/DistributedLock.Core/IDistributedSemaphore.cs index f0618d1b..07ec6c91 100644 --- a/DistributedLock.Core/IDistributedSemaphore.cs +++ b/DistributedLock.Core/IDistributedSemaphore.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading; /// diff --git a/DistributedLock.Core/IDistributedSynchronizationHandle.cs b/DistributedLock.Core/IDistributedSynchronizationHandle.cs index 8fc00d19..c7c7512a 100644 --- a/DistributedLock.Core/IDistributedSynchronizationHandle.cs +++ b/DistributedLock.Core/IDistributedSynchronizationHandle.cs @@ -1,7 +1,4 @@ -using System; -using System.Threading; - -namespace Medallion.Threading; +namespace Medallion.Threading; /// /// A handle to a distributed lock or other synchronization primitive. To unlock/release, diff --git a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs index 5f8254d2..328db65c 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading; +namespace Medallion.Threading; /// /// A that can be upgraded to a write lock diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs index 5711dedb..f42f1637 100644 --- a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs @@ -1,7 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading; /// diff --git a/DistributedLock.Core/Internal/AsyncLock.cs b/DistributedLock.Core/Internal/AsyncLock.cs index 99b28169..78bcebe7 100644 --- a/DistributedLock.Core/Internal/AsyncLock.cs +++ b/DistributedLock.Core/Internal/AsyncLock.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; /// /// An async-based, -friendly mutex based on . We don't expose a diff --git a/DistributedLock.Core/Internal/BusyWaitHelper.cs b/DistributedLock.Core/Internal/BusyWaitHelper.cs index ef55560c..9dd7931c 100644 --- a/DistributedLock.Core/Internal/BusyWaitHelper.cs +++ b/DistributedLock.Core/Internal/BusyWaitHelper.cs @@ -1,11 +1,4 @@ -using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 627b0cca..9615c503 100644 --- a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Internal.Data; diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 5b2accd4..624ffb07 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Data; +using System.Data; using System.Data.Common; using System.Runtime.CompilerServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Internal.Data; diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index abcd0db6..a52d7806 100644 --- a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Data; +using System.Data; using System.Data.Common; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Internal.Data; diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index 00a29ac5..ee0c51c0 100644 --- a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -1,7 +1,4 @@ -using System; using System.Data; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Internal.Data; diff --git a/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs b/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs index 44da93ca..a4000c5c 100644 --- a/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs +++ b/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; - -namespace Medallion.Threading.Internal.Data; +namespace Medallion.Threading.Internal.Data; internal interface IDatabaseConnectionMonitoringHandle : IDisposable { diff --git a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs index 4fe15346..775abce3 100644 --- a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs @@ -1,7 +1,3 @@ -using Medallion.Threading.Internal; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Internal.Data; /// diff --git a/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs b/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs index f24fb219..bc1249cb 100644 --- a/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs +++ b/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs @@ -1,8 +1,3 @@ -using Medallion.Threading.Internal; -using Medallion.Threading.Internal.Data; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Internal.Data; /// diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 7fbe6a20..d25db848 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Internal.Data; /// diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index 99a7220b..e4b94f83 100644 --- a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -1,12 +1,3 @@ -using Medallion.Threading.Internal; -using System; -using System.Collections; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Internal.Data; /// diff --git a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs index 4dc35a3e..deb72111 100644 --- a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs +++ b/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs @@ -1,6 +1,3 @@ -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Internal.Data; /// diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 7e02d501..7427b731 100644 --- a/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -1,8 +1,5 @@ -using System; -using System.Security.Cryptography; +using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Internal; diff --git a/DistributedLock.Core/Internal/Helpers.cs b/DistributedLock.Core/Internal/Helpers.cs index b2c19d2c..67d6a724 100644 --- a/DistributedLock.Core/Internal/Helpers.cs +++ b/DistributedLock.Core/Internal/Helpers.cs @@ -1,6 +1,4 @@ -using System; -using System.Runtime.CompilerServices; -using System.Threading.Tasks; +using System.Runtime.CompilerServices; namespace Medallion.Threading.Internal; diff --git a/DistributedLock.Core/Internal/IInternalDistributedLock.cs b/DistributedLock.Core/Internal/IInternalDistributedLock.cs index 0e823933..0b866b6e 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLock.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs b/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs index 603f51c4..5aff0949 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs @@ -1,7 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs index d13e3c69..6ffc15be 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs index 52cae3da..dad79851 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs index f03c6feb..24dbf56b 100644 --- a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; #if DEBUG public diff --git a/DistributedLock.Core/Internal/Invariant.cs b/DistributedLock.Core/Internal/Invariant.cs index 457aaec3..f48e4a6f 100644 --- a/DistributedLock.Core/Internal/Invariant.cs +++ b/DistributedLock.Core/Internal/Invariant.cs @@ -1,5 +1,4 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; namespace Medallion.Threading.Internal; diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/DistributedLock.Core/Internal/LeaseMonitor.cs index bf01683a..f81ea8c1 100644 --- a/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using System.Diagnostics; namespace Medallion.Threading.Internal; diff --git a/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs index 7d34bff1..4247a12d 100644 --- a/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs +++ b/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using System.Collections.Concurrent; namespace Medallion.Threading.Internal; diff --git a/DistributedLock.Core/Internal/RefBox.cs b/DistributedLock.Core/Internal/RefBox.cs index 106eeab9..4fcb63dc 100644 --- a/DistributedLock.Core/Internal/RefBox.cs +++ b/DistributedLock.Core/Internal/RefBox.cs @@ -1,7 +1,4 @@ -using System; -using System.Threading; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; /// /// Wraps a value tuple to be a read/write reference diff --git a/DistributedLock.Core/Internal/SyncViaAsync.cs b/DistributedLock.Core/Internal/SyncViaAsync.cs index 672c973f..82869991 100644 --- a/DistributedLock.Core/Internal/SyncViaAsync.cs +++ b/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; /// /// Helps re-use code across sync and async pathways, leveraging the fact that async code will run synchronously diff --git a/DistributedLock.Core/Internal/TimeoutValue.cs b/DistributedLock.Core/Internal/TimeoutValue.cs index b7b23f4a..671e6705 100644 --- a/DistributedLock.Core/Internal/TimeoutValue.cs +++ b/DistributedLock.Core/Internal/TimeoutValue.cs @@ -1,7 +1,4 @@ -using System; -using System.Threading; - -namespace Medallion.Threading.Internal; +namespace Medallion.Threading.Internal; /// /// A type which can only store a valid timeout value diff --git a/DistributedLock.FileSystem/AssemblyAttributes.cs b/DistributedLock.FileSystem/AssemblyAttributes.cs index 398d8ac7..a9e3a34f 100644 --- a/DistributedLock.FileSystem/AssemblyAttributes.cs +++ b/DistributedLock.FileSystem/AssemblyAttributes.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Text; +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index c901bd0c..079cda1d 100644 --- a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -55,6 +56,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs index 9f0deea6..b236d6b1 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.FileSystem; diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/DistributedLock.FileSystem/FileDistributedLock.cs index 7a136dcf..0cd633af 100644 --- a/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/DistributedLock.FileSystem/FileDistributedLock.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.FileSystem; diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/DistributedLock.FileSystem/FileDistributedLockHandle.cs index 44996b77..a54ca733 100644 --- a/DistributedLock.FileSystem/FileDistributedLockHandle.cs +++ b/DistributedLock.FileSystem/FileDistributedLockHandle.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.FileSystem; diff --git a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs index 4f215039..0d3ef27e 100644 --- a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs +++ b/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.FileSystem; +namespace Medallion.Threading.FileSystem; /// /// Implements for diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/DistributedLock.FileSystem/FileNameValidationHelper.cs index e978e61a..2a79938d 100644 --- a/DistributedLock.FileSystem/FileNameValidationHelper.cs +++ b/DistributedLock.FileSystem/FileNameValidationHelper.cs @@ -1,6 +1,4 @@ -using System; -using System.IO; -using System.Security.Cryptography; +using System.Security.Cryptography; using System.Text; namespace Medallion.Threading.FileSystem; diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/DistributedLock.MySql/DistributedLock.MySql.csproj index ebb7ae04..95c44362 100644 --- a/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -50,6 +51,10 @@ + + + + diff --git a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs index 7dd2ab87..54cf5100 100644 --- a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs +++ b/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlDatabaseConnection.cs b/DistributedLock.MySql/MySqlDatabaseConnection.cs index 66554c00..f9f6271c 100644 --- a/DistributedLock.MySql/MySqlDatabaseConnection.cs +++ b/DistributedLock.MySql/MySqlDatabaseConnection.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal.Data; using MySqlConnector; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs index 327fb695..f9c1e374 100644 --- a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs +++ b/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlDistributedLock.cs b/DistributedLock.MySql/MySqlDistributedLock.cs index e5ab9025..f57c0e7e 100644 --- a/DistributedLock.MySql/MySqlDistributedLock.cs +++ b/DistributedLock.MySql/MySqlDistributedLock.cs @@ -1,12 +1,8 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlDistributedLockHandle.cs b/DistributedLock.MySql/MySqlDistributedLockHandle.cs index 34710fba..1fee6c5e 100644 --- a/DistributedLock.MySql/MySqlDistributedLockHandle.cs +++ b/DistributedLock.MySql/MySqlDistributedLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs index 98c89947..34b078e5 100644 --- a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs +++ b/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; +using System.Data; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs index 6c66a846..6c32adbc 100644 --- a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs +++ b/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs @@ -1,7 +1,4 @@ using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.MySql/MySqlUserLock.cs b/DistributedLock.MySql/MySqlUserLock.cs index 7e5274d9..693da295 100644 --- a/DistributedLock.MySql/MySqlUserLock.cs +++ b/DistributedLock.MySql/MySqlUserLock.cs @@ -1,12 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using MySqlConnector; -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.MySql; diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 3b55c852..ddd84379 100644 --- a/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -54,6 +55,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs index 4b12495b..d5e3282d 100644 --- a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs +++ b/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/DistributedLock.Oracle/OracleDatabaseConnection.cs index cd5b3a64..bf2a26d9 100644 --- a/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -1,12 +1,6 @@ using Medallion.Threading.Internal.Data; using Oracle.ManagedDataAccess.Client; -using System; -using System.Collections.Generic; using System.Data; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/DistributedLock.Oracle/OracleDbmsLock.cs index f6d44726..fd81d4dc 100644 --- a/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/DistributedLock.Oracle/OracleDbmsLock.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs index 4e557461..f616371b 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/DistributedLock.Oracle/OracleDistributedLock.cs index 22c694c3..c93231f3 100644 --- a/DistributedLock.Oracle/OracleDistributedLock.cs +++ b/DistributedLock.Oracle/OracleDistributedLock.cs @@ -1,12 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; -using System.Diagnostics.CodeAnalysis; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/DistributedLock.Oracle/OracleDistributedLockHandle.cs index 78d59ea4..29d6ae4f 100644 --- a/DistributedLock.Oracle/OracleDistributedLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs index a561de64..ae396666 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs index f49d077d..614ea424 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs index 1444fabf..e7ca0e44 100644 --- a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs index 4fdf98ff..a59d3066 100644 --- a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs +++ b/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; +using System.Data; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs index 2b73590f..31435863 100644 --- a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs +++ b/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs @@ -1,7 +1,4 @@ using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Oracle; diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 509c8cf7..cb6e2675 100644 --- a/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -53,6 +54,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/DistributedLock.Postgres/PostgresAdvisoryLock.cs index d8ec45fe..3f6ad6e2 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -1,12 +1,8 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using Npgsql; -using System; -using System.Collections.Generic; using System.Data; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs index 0311174c..c8b5647b 100644 --- a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs +++ b/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs @@ -1,5 +1,4 @@ using Medallion.Threading.Internal; -using System; using System.Globalization; using System.Security.Cryptography; using System.Text; diff --git a/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs index 4005cc0f..8ea25514 100644 --- a/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs +++ b/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDatabaseConnection.cs b/DistributedLock.Postgres/PostgresDatabaseConnection.cs index 9136f069..474e6e2d 100644 --- a/DistributedLock.Postgres/PostgresDatabaseConnection.cs +++ b/DistributedLock.Postgres/PostgresDatabaseConnection.cs @@ -1,12 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using Npgsql; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs index de050f21..d0051d42 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/DistributedLock.Postgres/PostgresDistributedLock.cs index 86a58f30..4bef94c6 100644 --- a/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs index b9a2c7b7..4c0cfcea 100644 --- a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index 8e89209a..abd694a5 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 73bad696..88329223 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs index 17455899..eb8bcf24 100644 --- a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index b134c13f..de2b710b 100644 --- a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; +using System.Data; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs index 494aede0..7f576747 100644 --- a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs +++ b/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Postgres; diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/DistributedLock.Redis/DistributedLock.Redis.csproj index 334b6734..7553a206 100644 --- a/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -54,6 +55,11 @@ + + + + + diff --git a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs index 37df5541..51b3c2d6 100644 --- a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs +++ b/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.Primitives; diff --git a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs index 4685fd60..06d4025f 100644 --- a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs +++ b/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.Primitives; diff --git a/DistributedLock.Redis/Primitives/RedisScript.cs b/DistributedLock.Redis/Primitives/RedisScript.cs index 632da485..00442819 100644 --- a/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/DistributedLock.Redis/Primitives/RedisScript.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.Primitives; diff --git a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 49eb396b..39297e49 100644 --- a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.Primitives; diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/DistributedLock.Redis/RedLock/RedLockAcquire.cs index fdcd6388..a103285f 100644 --- a/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -1,12 +1,6 @@ using Medallion.Threading.Internal; using StackExchange.Redis; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/DistributedLock.Redis/RedLock/RedLockExtend.cs index 323569f2..f159dc47 100644 --- a/DistributedLock.Redis/RedLock/RedLockExtend.cs +++ b/DistributedLock.Redis/RedLock/RedLockExtend.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/DistributedLock.Redis/RedLock/RedLockHandle.cs index 73e58e21..43a99422 100644 --- a/DistributedLock.Redis/RedLock/RedLockHandle.cs +++ b/DistributedLock.Redis/RedLock/RedLockHandle.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedLock/RedLockHelper.cs b/DistributedLock.Redis/RedLock/RedLockHelper.cs index 0cbbf3ff..88836629 100644 --- a/DistributedLock.Redis/RedLock/RedLockHelper.cs +++ b/DistributedLock.Redis/RedLock/RedLockHelper.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using StackExchange.Redis; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/DistributedLock.Redis/RedLock/RedLockRelease.cs index 8ba29c80..414b2a16 100644 --- a/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Internal; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs index 247d59db..fa33f75f 100644 --- a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs +++ b/DistributedLock.Redis/RedLock/RedLockTimeouts.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis.RedLock; diff --git a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs index dc5760db..e0e1465f 100644 --- a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/DistributedLock.Redis/RedisDistributedLock.cs index 6c590b14..5a9cea84 100644 --- a/DistributedLock.Redis/RedisDistributedLock.cs +++ b/DistributedLock.Redis/RedisDistributedLock.cs @@ -2,12 +2,6 @@ using Medallion.Threading.Redis.Primitives; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/DistributedLock.Redis/RedisDistributedLockHandle.cs index 15bb6182..e299e66a 100644 --- a/DistributedLock.Redis/RedisDistributedLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedLockHandle.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index b0f6fa3a..82699e5e 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index 6e14c644..72b93c07 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -2,12 +2,6 @@ using Medallion.Threading.Redis.Primitives; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs index b4261a57..3ac6effb 100644 --- a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs index 0f62ff86..533d7769 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/DistributedLock.Redis/RedisDistributedSemaphore.cs index e49a51a3..44bee55a 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -2,12 +2,6 @@ using Medallion.Threading.Redis.Primitives; using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs index 5f7528d4..727cfcf0 100644 --- a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs +++ b/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs index 76dafcfe..77e4be22 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs @@ -1,11 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis.RedLock; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs index 791464e5..8089313d 100644 --- a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs +++ b/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs @@ -1,9 +1,4 @@ using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.Redis/TimeoutTask.cs b/DistributedLock.Redis/TimeoutTask.cs index 077bae50..7ebd27fa 100644 --- a/DistributedLock.Redis/TimeoutTask.cs +++ b/DistributedLock.Redis/TimeoutTask.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Redis; diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 0c14646e..4b5ba58f 100644 --- a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -53,6 +54,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.SqlServer/SqlApplicationLock.cs b/DistributedLock.SqlServer/SqlApplicationLock.cs index 1357ba32..ac7b5689 100644 --- a/DistributedLock.SqlServer/SqlApplicationLock.cs +++ b/DistributedLock.SqlServer/SqlApplicationLock.cs @@ -1,10 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs index 20acc839..9184d39a 100644 --- a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs +++ b/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs @@ -1,9 +1,5 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDatabaseConnection.cs b/DistributedLock.SqlServer/SqlDatabaseConnection.cs index 55218f42..03a5b18e 100644 --- a/DistributedLock.SqlServer/SqlDatabaseConnection.cs +++ b/DistributedLock.SqlServer/SqlDatabaseConnection.cs @@ -1,13 +1,8 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using Microsoft.Data.SqlClient; -using System; -using System.Collections.Generic; using System.Data; using System.Reflection; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs index 64ea0bb7..9d73b848 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/DistributedLock.SqlServer/SqlDistributedLock.cs index a5343a40..e66fbc36 100644 --- a/DistributedLock.SqlServer/SqlDistributedLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedLock.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; using System.Data; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs index 82735fcf..0b47c16d 100644 --- a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedLockHandle.cs @@ -1,6 +1,4 @@ using Medallion.Threading.Internal; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs index 900f0c4e..3026efa1 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs index 08fccbba..c71f0ed4 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; using System.Data; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs index d8bd19cb..50627703 100644 --- a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs index ca33c619..59e0ac75 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs index e9771bce..5f03e635 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphore.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; using System.Data; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs index 9666d8f0..03d54b04 100644 --- a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs +++ b/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs @@ -1,6 +1,4 @@ using Medallion.Threading.Internal; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs index 3b2f208e..b952d9c4 100644 --- a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs +++ b/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using System.Data; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs index 56ff8020..b280c793 100644 --- a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs +++ b/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs @@ -1,8 +1,4 @@ using Medallion.Threading.Internal.Data; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/DistributedLock.SqlServer/SqlSemaphore.cs index 1e2c7085..6b12ee3e 100644 --- a/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/DistributedLock.SqlServer/SqlSemaphore.cs @@ -1,11 +1,8 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; -using System; using System.Data; using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.SqlServer; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index a9e8e628..e9bbf377 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -1,9 +1,5 @@ -using Medallion.Threading.Internal; -using NUnit.Framework; -using System; +using NUnit.Framework; using System.Diagnostics; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs index e451869f..17456fcd 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs @@ -1,7 +1,4 @@ using NUnit.Framework; -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index e8792b1f..636d8f86 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -1,11 +1,7 @@ using NUnit.Framework; -using System; using System.Data; using System.Data.Common; -using System.Linq; using System.Reflection; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs index e3652c5d..cd42e918 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using System; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index 643e5661..c5137c59 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -1,7 +1,5 @@ using NUnit.Framework; -using System; using System.Data.Common; -using System.Linq; using System.Runtime.CompilerServices; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index f8b40b13..00a99344 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -1,12 +1,7 @@ using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Data.Common; using System.Diagnostics; using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs index 8cf69da7..67db6cbc 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs @@ -1,11 +1,6 @@ -using Medallion.Threading.Internal; -using NUnit.Framework; -using System; -using System.Collections.Generic; +using NUnit.Framework; using System.Data.Common; using System.Diagnostics; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs index 7a8793c8..31fc9126 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs @@ -1,6 +1,4 @@ -using Medallion.Threading.Internal; using NUnit.Framework; -using System; using System.Data; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs index 191ccb89..c66540e3 100644 --- a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs @@ -1,9 +1,4 @@ -using Medallion.Threading.Internal; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; +using NUnit.Framework; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index bead266e..04170742 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -1,15 +1,9 @@ using Medallion.Shell; using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index cf0fc50c..08f795d1 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using System; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index cec2afff..798d2bf6 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -1,9 +1,4 @@ using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index 7b6d3282..ae207b6d 100644 --- a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -1,9 +1,4 @@ using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index e9b95a5b..8d0f216a 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -1,9 +1,4 @@ -using Medallion.Threading.Tests.Redis; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; +using NUnit.Framework; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index ad9b02e9..ae67a209 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -4,13 +4,6 @@ using StackExchange.Redis; using StackExchange.Redis.KeyspaceIsolation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Tests.Redis; public abstract class RedisSynchronizationCoreTestCases diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 05d4ecd8..16bbde6f 100644 --- a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -1,15 +1,9 @@ -using Medallion.Threading.Tests.ZooKeeper; -using Medallion.Threading.ZooKeeper; +using Medallion.Threading.ZooKeeper; using NUnit.Framework; using org.apache.zookeeper; using org.apache.zookeeper.data; -using System; -using System.Collections.Generic; -using System.Linq; using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/DistributedLock.Tests/DistributedLock.Tests.csproj index aaef38e6..b4683fd2 100644 --- a/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -6,6 +6,7 @@ net471;netcoreapp3.1 Latest enable + enable Medallion.Threading.Tests true ..\DistributedLock.snk diff --git a/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs index 8571988f..91760ff6 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs @@ -1,12 +1,7 @@ using Azure.Storage.Blobs; using Medallion.Shell; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Text; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs index ef304621..8f926647 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs @@ -1,9 +1,5 @@ using Azure.Storage.Blobs; using Medallion.Threading.Azure; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs index 1689784c..dd9d8e5a 100644 --- a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs @@ -2,12 +2,9 @@ using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Azure; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Numerics; using System.Security.Cryptography; using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs index 0d49212b..b85fc4e3 100644 --- a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs +++ b/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Text; -using System.Threading; +using System.Data.Common; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs index a122d706..268f2689 100644 --- a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs +++ b/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Threading; -using System.Threading.Tasks; - namespace Medallion.Threading.Tests.Data; internal class IdleSessionKiller : IDisposable diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs index 72d2f317..2cbe9e64 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs @@ -1,12 +1,8 @@ using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 2dd71923..3ad98196 100644 --- a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -1,10 +1,4 @@ -using Medallion.Threading.Internal; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Data.Common; -using System.Text; -using System.Threading; +using System.Data.Common; namespace Medallion.Threading.Tests.Data; diff --git a/DistributedLock.Tests/Infrastructure/DisposableCollection.cs b/DistributedLock.Tests/Infrastructure/DisposableCollection.cs index 30fa93fc..f670d32c 100644 --- a/DistributedLock.Tests/Infrastructure/DisposableCollection.cs +++ b/DistributedLock.Tests/Infrastructure/DisposableCollection.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; internal sealed class DisposableCollection : IDisposable { diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs index 17d80b62..9d12d806 100644 --- a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs @@ -1,8 +1,4 @@ using Medallion.Threading.FileSystem; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; namespace Medallion.Threading.Tests.FileSystem; diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs index ec4e71d5..5df35d13 100644 --- a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests.FileSystem; +namespace Medallion.Threading.Tests.FileSystem; [SupportsContinuousIntegration] public sealed class TestingLockFileSynchronizationStrategy : TestingSynchronizationStrategy diff --git a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs index 8279943a..5702b4de 100644 --- a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs +++ b/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs @@ -1,9 +1,4 @@ -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public interface ITestingNameProvider { diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index 0f77abae..be7f0946 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -1,13 +1,8 @@ using Medallion.Threading.Tests.Data; using MySqlConnector; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.MySql; diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs index d870a64e..a8c91c86 100644 --- a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs +++ b/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs @@ -1,8 +1,5 @@ using Medallion.Threading.MySql; using Medallion.Threading.Tests.Data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.MySql; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index afc11dc1..2d390bad 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -3,12 +3,8 @@ using Medallion.Threading.Tests.Data; using NUnit.Framework; using Oracle.ManagedDataAccess.Client; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index de18c2ae..16a990a9 100644 --- a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Oracle; using Medallion.Threading.Tests.Data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 0d185430..280db911 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -3,12 +3,8 @@ using Npgsql; using NpgsqlTypes; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index 65b62271..b7e6c57b 100644 --- a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Postgres; using Medallion.Threading.Tests.Data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 674414e0..078d9bac 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -1,12 +1,5 @@ using Medallion.Shell; using StackExchange.Redis; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs index 69c6d347..0226708a 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs @@ -1,7 +1,4 @@ using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 7d0e9b67..83e0f0d1 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -1,14 +1,7 @@ -using Medallion.Threading.Tests.Redis; -using NUnit.Framework; +using NUnit.Framework; using StackExchange.Redis; using StackExchange.Redis.KeyspaceIsolation; - -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs index cc41b77c..10b5f144 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Redis; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index d3c152a0..e3067da4 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs index 1a7f1cee..b8847cd3 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs @@ -1,9 +1,4 @@ -using Azure.Storage.Blobs; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public static class AzureCredentials { diff --git a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs index 2b320f23..c9747ca1 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs @@ -1,8 +1,6 @@ using MySqlConnector; using System; -using System.Collections.Generic; using System.IO; -using System.Text; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs index 85923710..2740b0eb 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs @@ -1,10 +1,6 @@ using MySqlConnector; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs index ecbee8cb..15ff975e 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -1,10 +1,7 @@ using Oracle.ManagedDataAccess.Client; using System; -using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs index 3ef4137f..e970f9d8 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs index 89c6508f..ec75f53f 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; internal static class SqlServerCredentials { diff --git a/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs b/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs index 26e13265..ed609213 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; internal static class TargetFramework { diff --git a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs index 942f4c3a..c8df041d 100644 --- a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs +++ b/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public static class ZooKeeperPorts { diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index 1c2c493c..51205304 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -1,11 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.Tests.Data; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs index 29c042b5..ddb4e411 100644 --- a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs +++ b/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Medallion.Threading.SqlServer; +using Medallion.Threading.SqlServer; using Medallion.Threading.Tests.Data; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs index 675b5a11..609826e5 100644 --- a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs +++ b/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; /// /// Indicates that a test infrastructure component supports being run in a remote continuous integration environment diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/DistributedLock.Tests/Infrastructure/TestHelper.cs index 32d94380..16fc8559 100644 --- a/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.Redis; using NUnit.Framework; -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index c83e2f47..0ceed0c8 100644 --- a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public abstract class TestingLockProvider : ITestingNameProvider, IDisposable where TStrategy : TestingSynchronizationStrategy, new() diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs index 0bf6f421..9d4cb834 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs index 6d427e64..8e137c74 100644 --- a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public abstract class TestingReaderWriterLockProvider : ITestingNameProvider, IDisposable where TStrategy : TestingSynchronizationStrategy, new() diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index 2fc749db..a2e7c022 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Medallion.Threading.Internal; +using Medallion.Threading.Internal; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs index 4e58bcd8..febd92e1 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; public abstract class TestingSemaphoreProvider : ITestingNameProvider, IDisposable where TStrategy : TestingSynchronizationStrategy, new() diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs index 76dc05d3..8a58ea08 100644 --- a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests; +namespace Medallion.Threading.Tests; /// /// Manages the underlying approach to synchronization. Having this class allows us to parameterize tests by diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs index 6596072e..6f511114 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs @@ -1,7 +1,4 @@ using Medallion.Threading.WaitHandles; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.WaitHandles; diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs index 494ee725..17e6687a 100644 --- a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.Tests.WaitHandles; +namespace Medallion.Threading.Tests.WaitHandles; [SupportsContinuousIntegration] public sealed class TestingWaitHandleSynchronizationStrategy : TestingSynchronizationStrategy diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs index b715ea12..c1470a2c 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs @@ -1,7 +1,4 @@ using Medallion.Threading.ZooKeeper; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs index 58f7a135..db4572bb 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs @@ -1,9 +1,4 @@ using Medallion.Threading.ZooKeeper; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs index f101eba9..6dc62d7e 100644 --- a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs +++ b/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -1,8 +1,5 @@ using Medallion.Shell; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; using System.Net.Sockets; using System.Text; diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/DistributedLock.Tests/Tests/ApiTest.cs index 68986451..d0db0be7 100644 --- a/DistributedLock.Tests/Tests/ApiTest.cs +++ b/DistributedLock.Tests/Tests/ApiTest.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Linq; -using System.Reflection; +using System.Reflection; using NUnit.Framework; using System.Runtime.CompilerServices; -using System.IO; using System.Text.RegularExpressions; namespace Medallion.Threading.Tests; diff --git a/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs index 4add37ae..933ba52b 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs @@ -3,11 +3,6 @@ using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Azure; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 597eaaa6..473c7304 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -5,13 +5,6 @@ using Medallion.Threading.Azure; using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs index 7010aa18..e8205b84 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Azure.Storage.Blobs; using Medallion.Threading.Azure; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs index 95cd2bdc..fa55f33d 100644 --- a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Azure; -using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Azure; diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/DistributedLock.Tests/Tests/CombinatorialTests.cs index 5db0de62..cfa4c9ab 100644 --- a/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Tests.Data; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Azure { diff --git a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs index 24db466b..0122d1ea 100644 --- a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs @@ -1,14 +1,6 @@ -using Medallion.Threading.Internal.Data; -using Medallion.Threading.SqlServer; +using Medallion.Threading.SqlServer; using Medallion.Threading.Tests.SqlServer; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Core.Data; diff --git a/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs b/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs index 7e771f1f..cb71a6d9 100644 --- a/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs +++ b/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using System; -using System.IO; using System.Runtime.Serialization.Formatters.Binary; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index dfa05fd0..074e82d5 100644 --- a/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs +++ b/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -1,6 +1,5 @@ using Moq; using NUnit.Framework; -using System; using System.Linq.Expressions; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/DistributedLock.Tests/Tests/Core/HelpersTest.cs index c9687305..8cf74807 100644 --- a/DistributedLock.Tests/Tests/Core/HelpersTest.cs +++ b/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs b/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs index f6bc5459..0f9c4907 100644 --- a/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs +++ b/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using System.Linq; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs index 5d3b7040..baa7c8f1 100644 --- a/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs +++ b/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs @@ -1,7 +1,5 @@ using Medallion.Threading.Internal; using NUnit.Framework; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs b/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs index feddcb8f..58f58a5d 100644 --- a/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs +++ b/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Internal; using NUnit.Framework; -using System; -using System.Linq; -using System.Threading; namespace Medallion.Threading.Tests.Core; diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 769172ad..868873a1 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -1,14 +1,8 @@ using Medallion.Threading.FileSystem; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.FileSystem; diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs index 923be383..2ca51744 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.FileSystem; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; namespace Medallion.Threading.Tests.FileSystem; diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs index a78e618a..1ab631d8 100644 --- a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs @@ -1,10 +1,5 @@ using Medallion.Threading.FileSystem; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.FileSystem; diff --git a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs index 957f0c11..9d03c7c2 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.MySql; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.MySql; diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs index 263b7689..47d98ae1 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -2,11 +2,7 @@ using Medallion.Threading.Tests.Data; using MySqlConnector; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.MySql; diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs index f099b878..1d185d33 100644 --- a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.MySql; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.MySql; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs index 46a2b0cf..f56cc2d3 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs @@ -1,9 +1,5 @@ using NUnit.Framework; using Oracle.ManagedDataAccess.Client; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs index a13ebc38..e678bdba 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.Oracle; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs index 6d488352..ce8eb5e0 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Oracle; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs index dc9fb0b0..3f036db3 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Oracle; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs index 6aa5b59a..bede063a 100644 --- a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.Oracle; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Oracle; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs index 8c9470ac..5a3585d4 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Postgres; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index afba2917..5c7cdebb 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -1,11 +1,6 @@ using Npgsql; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs index decee184..902d5e07 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Postgres; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index cd49a091..e31eea5d 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -1,14 +1,7 @@ using Medallion.Threading.Postgres; using Npgsql; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Data.Common; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs index 5ed1be2b..de544b94 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Postgres; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index ce2fe4b2..30fae2fe 100644 --- a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.Postgres; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Postgres; diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index b0cd929b..e56754fe 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -1,14 +1,7 @@ -using Medallion.Threading.Internal; -using Medallion.Threading.Redis; +using Medallion.Threading.Redis; using Moq; using NUnit.Framework; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index cebbd943..bac045bf 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -2,11 +2,6 @@ using Moq; using NUnit.Framework; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index 101b8d8c..d6154385 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -2,11 +2,6 @@ using Moq; using NUnit.Framework; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs index b462ce84..63f1f5ba 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.Redis; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs index d64f90a0..c0893a27 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.Redis; using NUnit.Framework; using StackExchange.Redis; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs index ee3e3ab2..0569cdb8 100644 --- a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs +++ b/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs @@ -1,11 +1,7 @@ using Medallion.Threading.Redis.Primitives; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using System.Text; namespace Medallion.Threading.Tests.Redis; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs index 6e77d77d..12709c1f 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.SqlServer; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 215c79e4..25d28970 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -1,11 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.SqlServer; -using Medallion.Threading.Tests.SqlServer; using NUnit.Framework; -using System; using System.Data.Common; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs index e9b63bf9..bea7104d 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs @@ -1,9 +1,7 @@ using Medallion.Threading.SqlServer; using Microsoft.Data.SqlClient; using NUnit.Framework; -using System; using System.Data; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs index 51c388f0..461b4352 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using System; using System.Data.Common; using Medallion.Threading.SqlServer; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs index 74449635..8c675f61 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs @@ -1,9 +1,7 @@ using Medallion.Threading.SqlServer; using Microsoft.Data.SqlClient; using NUnit.Framework; -using System; using System.Data; -using System.Linq; using System.Text; using System.Text.RegularExpressions; diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs index fa55da5b..63c6d2ab 100644 --- a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.SqlServer; using NUnit.Framework; -using System; -using System.Collections.Generic; using System.Data; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.SqlServer; diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 73c2fe78..9bc5bcd6 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -1,10 +1,6 @@ #if NETCOREAPP // no need to run this on multiple frameworks using NUnit.Framework; -using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Reflection; using System.Text.RegularExpressions; diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index c9d37967..0dcae3e9 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -1,6 +1,5 @@ using Medallion.Threading.WaitHandles; using NUnit.Framework; -using System; namespace Medallion.Threading.Tests.WaitHandles; diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 6bd9b7ab..4dc082f6 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.WaitHandles; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.WaitHandles; diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs index 9b5a152e..af1412cd 100644 --- a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.WaitHandles; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.WaitHandles; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs index c977dcd2..929c07f0 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -1,10 +1,6 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs index d4c0b815..4db568dd 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs @@ -1,8 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs index 458b51b0..1069b2c8 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -1,11 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Linq; using Medallion.Threading.Internal; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs index 77d31ba7..599087e7 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs @@ -1,15 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Medallion.Threading.Internal; +using Medallion.Threading.Internal; using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using org.apache.zookeeper; -using org.apache.zookeeper.data; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs index 2ccad2e3..63516758 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs index d35476c5..2f2d545c 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs index 11090c46..a3b2ad85 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs index 4e79457e..e225b9f1 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index d7349f24..9d999b93 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -1,9 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs index e79e290c..c9ed849e 100644 --- a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs +++ b/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs @@ -1,10 +1,5 @@ using Medallion.Threading.ZooKeeper; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.Tests.ZooKeeper; diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index bdd7091d..526406b2 100644 --- a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -53,6 +54,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs index ee74e447..5b8feb74 100644 --- a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs +++ b/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs index af25c114..c8214e6d 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs index e1c8fd18..a885aa4d 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs @@ -1,9 +1,6 @@ using Medallion.Threading.Internal; -using System; using System.Security.AccessControl; using System.Security.Principal; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs index 6e2e03e7..72a44922 100644 --- a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs +++ b/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs @@ -1,7 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs index 9fb1b6bd..5ec9994c 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs index f45437c9..1d805ecc 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; using System.Security.AccessControl; using System.Security.Principal; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs index e8b630d2..e16e5a7d 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs index 3324076d..28808674 100644 --- a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs +++ b/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.WaitHandles; +namespace Medallion.Threading.WaitHandles; /// /// Implements for diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/DistributedLock.WaitHandles/WaitHandleExtensions.cs index 98493dcf..e274ca34 100644 --- a/DistributedLock.WaitHandles/WaitHandleExtensions.cs +++ b/DistributedLock.WaitHandles/WaitHandleExtensions.cs @@ -1,7 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.WaitHandles; diff --git a/DistributedLock.ZooKeeper/AssemblyAttributes.cs b/DistributedLock.ZooKeeper/AssemblyAttributes.cs index 398d8ac7..a9e3a34f 100644 --- a/DistributedLock.ZooKeeper/AssemblyAttributes.cs +++ b/DistributedLock.ZooKeeper/AssemblyAttributes.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; -using System.Text; +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index 88da52c2..a29a8143 100644 --- a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -7,6 +7,7 @@ 4 Latest enable + enable @@ -59,6 +60,10 @@ + + + + \ No newline at end of file diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs index bc3952ee..817114da 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; +using Medallion.Threading.Internal; +using System.Collections; namespace Medallion.Threading.ZooKeeper; -using Medallion.Threading.Internal; using org.apache.zookeeper; -using System.Collections; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; /// /// We don't want to use one session () per lock because "The creation and closing of sessions are diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs index a6cc961b..b680eaad 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs @@ -1,9 +1,5 @@ using Medallion.Threading.Internal; -using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs index 8a8794e3..257fd336 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs index 85bf88da..60b1a643 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs index 5a365e3b..8b87ff45 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs index 026c84c8..1e20b351 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs index 92c73628..3c4cf113 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs index 5829541f..705ad69a 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs index 4fce986a..c2ac2afc 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using Medallion.Threading.Internal; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs index 98d11547..9e4c9804 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs @@ -1,10 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs index da16c121..d209092d 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs index 53ae0e11..4e085043 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs @@ -1,8 +1,5 @@ using Medallion.Threading.Internal; using org.apache.zookeeper.data; -using System; -using System.Collections.Generic; -using System.Text; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs index c29b5682..7f390d33 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Medallion.Threading.ZooKeeper; +namespace Medallion.Threading.ZooKeeper; /// /// Implements for , diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs index d9698edb..2a55ce46 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Medallion.Threading.ZooKeeper; +namespace Medallion.Threading.ZooKeeper; using org.apache.zookeeper; using org.apache.zookeeper.data; diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs index 877cc591..be32aacc 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Internal; using org.apache.zookeeper; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperPath.cs b/DistributedLock.ZooKeeper/ZooKeeperPath.cs index b1bdbd99..01ec85f0 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperPath.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperPath.cs @@ -1,9 +1,4 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Security.Cryptography; -using System.Text; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs index ede843de..d618f45c 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs @@ -1,10 +1,5 @@ using Medallion.Threading.Internal; -using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs index 8883417b..ed8fe596 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs @@ -1,11 +1,6 @@ using Medallion.Threading.Internal; using org.apache.zookeeper.data; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading.ZooKeeper; diff --git a/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 58fd4f9c..9a1d4552 100644 --- a/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -14,5 +14,9 @@ + + + + diff --git a/DistributedLockCodeGen/GenerateProviders.cs b/DistributedLockCodeGen/GenerateProviders.cs index a3e54006..94b33f66 100644 --- a/DistributedLockCodeGen/GenerateProviders.cs +++ b/DistributedLockCodeGen/GenerateProviders.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; namespace DistributedLockCodeGen; diff --git a/DistributedLockTaker/DistributedLockTaker.csproj b/DistributedLockTaker/DistributedLockTaker.csproj index c3a8be47..37cf8330 100644 --- a/DistributedLockTaker/DistributedLockTaker.csproj +++ b/DistributedLockTaker/DistributedLockTaker.csproj @@ -30,4 +30,5 @@ + \ No newline at end of file diff --git a/DistributedLockTaker/Program.cs b/DistributedLockTaker/Program.cs index a0feb542..e42414db 100644 --- a/DistributedLockTaker/Program.cs +++ b/DistributedLockTaker/Program.cs @@ -11,7 +11,6 @@ using StackExchange.Redis; using System.Linq; using Medallion.Threading; -using System.Drawing.Text; using System.Collections.Generic; using Medallion.Threading.ZooKeeper; using Medallion.Threading.MySql; From 72e6d26828fbdd7f279aec5b44cf702e4eba938d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 17 Nov 2022 07:25:59 -0500 Subject: [PATCH 206/399] Update IsExternalInit compat package --- DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index a29a8143..be9498bf 100644 --- a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -50,7 +50,7 @@ all - + all From fb2ab401aeffa836a3205b312490d9916f00d93b Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 17 Nov 2022 19:01:40 -0500 Subject: [PATCH 207/399] Fix codegen to not generate implicit usings --- DistributedLock.Tests/Tests/TestSetupTest.cs | 2 +- .../GenerateIDistributedLockImplementations.cs | 10 ++-------- DistributedLockCodeGen/GenerateProviders.cs | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index 9bc5bcd6..a74669a1 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -217,7 +217,7 @@ private static IEnumerable TraverseDepthFirst(T root, Func TraverseAlong(T? root, Func next) where T : class { - for (T? node = root; node != null; node = next(node)) + for (var node = root; node != null; node = next(node)) { yield return node; } diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 13f50af0..4d4dbfd1 100644 --- a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -53,10 +53,7 @@ public void GenerateForIDistributedLockAndSemaphore([Values("Lock", "Semaphore") var @namespace = Regex.Match(lockCode, @"\nnamespace (?[^\s;]+)").Groups["namespace"].Value; var code = -$@"using System; -using System.Threading; -using System.Threading.Tasks; -using Medallion.Threading.Internal; +$@"using Medallion.Threading.Internal; namespace {@namespace}; @@ -168,10 +165,7 @@ public void GenerateForIDistributedReaderWriterLock() var @namespace = Regex.Match(lockCode, @"\nnamespace (?[^\s;]+)").Groups["namespace"].Value; var code = -$@"using System; -using System.Threading; -using System.Threading.Tasks; -using Medallion.Threading.Internal; +$@"using Medallion.Threading.Internal; namespace {@namespace}; diff --git a/DistributedLockCodeGen/GenerateProviders.cs b/DistributedLockCodeGen/GenerateProviders.cs index 94b33f66..f9d09116 100644 --- a/DistributedLockCodeGen/GenerateProviders.cs +++ b/DistributedLockCodeGen/GenerateProviders.cs @@ -58,9 +58,6 @@ public interface {providerInterfaceName}{(interfaceName == "IDistributedUpgradea var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; var providerExtensionsCode = $@"// AUTO-GENERATED -using System; -using System.Threading; -using System.Threading.Tasks; namespace Medallion.Threading; From 563130c71f30d495495c761970bf0eb3b1314266 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Thu, 17 Nov 2022 21:17:21 -0500 Subject: [PATCH 208/399] More implicit namespace cleanup --- DistributedLock.Tests/Tests/TestSetupTest.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/DistributedLock.Tests/Tests/TestSetupTest.cs index a74669a1..96b32667 100644 --- a/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -31,11 +31,6 @@ public void VerifyAllTestsAreCreated() var expectedTestContents = $@"using Medallion.Threading.Tests.Data; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; {string.Join( Environment.NewLine + Environment.NewLine, From 196c90c365a86f06ce39993756408ac411b9e815 Mon Sep 17 00:00:00 2001 From: askazakov Date: Thu, 1 Dec 2022 10:07:00 +0500 Subject: [PATCH 209/399] kick away extra ')' --- docs/DistributedLock.MySql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.MySql.md b/docs/DistributedLock.MySql.md index 6a5ac53b..e6cd264d 100644 --- a/docs/DistributedLock.MySql.md +++ b/docs/DistributedLock.MySql.md @@ -5,7 +5,7 @@ The DistributedLock.MySql package offers distributed synchronization primitives based on [MySQL/MariaDB user locks](https://dev.mysql.com/doc/refman/5.7/en/locking-functions.html). For example: ```C# -var @lock = new MySqlDistributedLock("mylockname"), connectionString); +var @lock = new MySqlDistributedLock("mylockname", connectionString); await using (await @lock.AcquireAsync()) { // I have the lock From acd4b83a2a73cc64f409d0a66ebe280bfaba1a33 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 3 Dec 2022 12:52:19 -0500 Subject: [PATCH 210/399] Minor code cleanup --- DistributedLock.ZooKeeper/ZooKeeperConnection.cs | 6 +++--- DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs index 817114da..1c4cbabc 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperConnection.cs @@ -20,7 +20,7 @@ internal class ZooKeeperConnection : IDisposable /// Hopefully, 10m prevents leaks from ever getting too bad while granting efficiencies by allowing us to re-use /// sessions under load. /// - public static readonly Pool DefaultPool = new Pool(maxAge: TimeSpan.FromMinutes(10)); + public static readonly Pool DefaultPool = new(maxAge: TimeSpan.FromMinutes(10)); private readonly InternalConnection _internalConnection; private Action? _releaseToPool; @@ -39,7 +39,7 @@ private ZooKeeperConnection(InternalConnection internalConnection, Action releas public sealed class Pool { - private readonly Dictionary Connections = new Dictionary(); + private readonly Dictionary Connections = new(); private readonly TimeoutValue _maxAge; public Pool(TimeoutValue maxAge) @@ -207,7 +207,7 @@ public async ValueTask DisposeAsync() private class ConnectionWatcher : Watcher, IDisposable { - private readonly CancellationTokenSource _connectionLostSource = new CancellationTokenSource(); + private readonly CancellationTokenSource _connectionLostSource = new(); private readonly TimeoutValue _sessionTimeout; private int _isWaitingForReconnect; diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs index 2a55ce46..00eaf506 100644 --- a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs +++ b/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs @@ -9,7 +9,7 @@ internal static class ZooKeeperNodeCreator /// /// See https://zookeeper.apache.org/doc/r3.5.4-beta/zookeeperProgrammers.html under "Builtin ACL Schemes" /// - public static readonly ACL PublicAcl = new ACL(0x1f, new Id("world", "anyone")); + public static readonly ACL PublicAcl = new(0x1f, new Id("world", "anyone")); public static async Task CreateEphemeralSequentialNode( this ZooKeeperConnection connection, From 3757293067ac4ca30a029c95830c021723af5299 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 3 Dec 2022 13:13:51 -0500 Subject: [PATCH 211/399] move solution to src directory --- appveyor.yml | 6 +- .../CopyPackageToPublishDirectory.targets | 2 +- .../AssemblyAttributes.cs | 0 ...obLeaseDistributedLock.IDistributedLock.cs | 0 .../AzureBlobLeaseDistributedLock.cs | 0 .../AzureBlobLeaseDistributedLockHandle.cs | 0 ...LeaseDistributedSynchronizationProvider.cs | 0 .../AzureBlobLeaseOptionsBuilder.cs | 0 .../DistributedLock.Azure}/AzureErrors.cs | 0 .../BlobClientWrapper.cs | 0 .../BlobLeaseClientWrapper.cs | 0 .../DistributedLock.Azure.csproj | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DeadlockException.cs | 0 .../DistributedLock.Core.csproj | 0 .../DistributedLockProviderExtensions.cs | 0 ...butedReaderWriterLockProviderExtensions.cs | 0 .../DistributedSemaphoreProviderExtensions.cs | 0 ...eableReaderWriterLockProviderExtensions.cs | 0 .../DistributedLock.Core}/IDistributedLock.cs | 0 .../IDistributedLockProvider.cs | 0 .../IDistributedReaderWriterLock.cs | 0 .../IDistributedReaderWriterLockProvider.cs | 0 .../IDistributedSemaphore.cs | 0 .../IDistributedSemaphoreProvider.cs | 0 .../IDistributedSynchronizationHandle.cs | 0 .../IDistributedUpgradeableReadLockHandle.cs | 0 ...IDistributedUpgradeableReaderWriterLock.cs | 0 ...utedUpgradeableReaderWriterLockProvider.cs | 0 .../Internal/AsyncLock.cs | 0 .../Internal/BusyWaitHelper.cs | 0 .../Internal/Data/ConnectionMonitor.cs | 0 .../Internal/Data/DatabaseCommand.cs | 0 .../Internal/Data/DatabaseConnection.cs | 0 ...onnectionOrTransactionDbDistributedLock.cs | 0 .../IDatabaseConnectionMonitoringHandle.cs | 0 .../Internal/Data/IDbDistributedLock.cs | 0 .../Data/IDbSynchronizationStrategy.cs | 0 .../Data/MultiplexedConnectionLock.cs | 0 .../Data/MultiplexedConnectionLockPool.cs | 0 ...ConnectionMultiplexingDbDistributedLock.cs | 0 .../Internal/DistributedLockHelpers.cs | 0 .../DistributedLock.Core}/Internal/Helpers.cs | 0 .../Internal/IInternalDistributedLock.cs | 0 ...nternalDistributedLockUpgradeableHandle.cs | 0 .../IInternalDistributedReaderWriterLock.cs | 0 .../Internal/IInternalDistributedSemaphore.cs | 0 ...lDistributedUpgradeableReaderWriterLock.cs | 0 .../Internal/Invariant.cs | 0 .../Internal/LeaseMonitor.cs | 0 .../Internal/ManagedFinalizerQueue.cs | 0 .../DistributedLock.Core}/Internal/RefBox.cs | 0 .../Internal/SyncViaAsync.cs | 0 .../Internal/TimeoutValue.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.FileSystem.csproj | 0 .../FileDistributedLock.IDistributedLock.cs | 0 .../FileDistributedLock.cs | 0 .../FileDistributedLockHandle.cs | 0 .../FileDistributedSynchronizationProvider.cs | 0 .../FileNameValidationHelper.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.MySql.csproj | 0 .../MySqlConnectionOptionsBuilder.cs | 0 .../MySqlDatabaseConnection.cs | 0 .../MySqlDistributedLock.IDistributedLock.cs | 0 .../MySqlDistributedLock.cs | 0 .../MySqlDistributedLockHandle.cs | 0 ...MySqlDistributedSynchronizationProvider.cs | 0 .../MySqlMultiplexedConnectionLockPool.cs | 0 .../DistributedLock.MySql}/MySqlUserLock.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.Oracle.csproj | 0 .../OracleConnectionOptionsBuilder.cs | 0 .../OracleDatabaseConnection.cs | 0 .../DistributedLock.Oracle}/OracleDbmsLock.cs | 0 .../OracleDistributedLock.IDistributedLock.cs | 0 .../OracleDistributedLock.cs | 0 .../OracleDistributedLockHandle.cs | 0 ...IDistributedUpgradeableReaderWriterLock.cs | 0 .../OracleDistributedReaderWriterLock.cs | 0 ...OracleDistributedReaderWriterLockHandle.cs | 0 ...racleDistributedSynchronizationProvider.cs | 0 .../OracleMultiplexedConnectionLockPool.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.Postgres.csproj | 0 .../PostgresAdvisoryLock.cs | 0 .../PostgresAdvisoryLockKey.cs | 0 .../PostgresConnectionOptionsBuilder.cs | 0 .../PostgresDatabaseConnection.cs | 0 ...ostgresDistributedLock.IDistributedLock.cs | 0 .../PostgresDistributedLock.cs | 0 .../PostgresDistributedLockHandle.cs | 0 ...WriterLock.IDistributedReaderWriterLock.cs | 0 .../PostgresDistributedReaderWriterLock.cs | 0 ...stgresDistributedReaderWriterLockHandle.cs | 0 ...tgresDistributedSynchronizationProvider.cs | 0 .../PostgresMultiplexedConnectionLockPool.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.Redis.csproj | 0 .../Primitives/RedisMutexPrimitive.cs | 0 .../RedisReaderWriterLockPrimitives.cs | 0 .../Primitives/RedisScript.cs | 8 +- .../Primitives/RedisSemaphorePrimitive.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../RedLock/RedLockAcquire.cs | 0 .../RedLock/RedLockExtend.cs | 0 .../RedLock/RedLockHandle.cs | 0 .../RedLock/RedLockHelper.cs | 0 .../RedLock/RedLockRelease.cs | 0 .../RedLock/RedLockTimeouts.cs | 0 .../RedisDistributedLock.IDistributedLock.cs | 0 .../RedisDistributedLock.cs | 0 .../RedisDistributedLockHandle.cs | 0 ...WriterLock.IDistributedReaderWriterLock.cs | 0 .../RedisDistributedReaderWriterLock.cs | 0 .../RedisDistributedReaderWriterLockHandle.cs | 0 ...tributedSemaphore.IDistributedSemaphore.cs | 0 .../RedisDistributedSemaphore.cs | 0 .../RedisDistributedSemaphoreHandle.cs | 0 ...istributedSynchronizationOptionsBuilder.cs | 0 ...RedisDistributedSynchronizationProvider.cs | 0 .../DistributedLock.Redis}/TimeoutTask.cs | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.SqlServer.csproj | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../SqlApplicationLock.cs | 0 .../SqlConnectionOptionsBuilder.cs | 0 .../SqlDatabaseConnection.cs | 0 .../SqlDistributedLock.IDistributedLock.cs | 0 .../SqlDistributedLock.cs | 0 .../SqlDistributedLockHandle.cs | 0 ...IDistributedUpgradeableReaderWriterLock.cs | 0 .../SqlDistributedReaderWriterLock.cs | 0 .../SqlDistributedReaderWriterLockHandle.cs | 0 ...tributedSemaphore.IDistributedSemaphore.cs | 0 .../SqlDistributedSemaphore.cs | 0 .../SqlDistributedSemaphoreHandle.cs | 0 .../SqlDistributedSynchronizationProvider.cs | 0 .../SqlMultiplexedConnectionLockPool.cs | 0 .../SqlSemaphore.cs | 0 .../Data/ConnectionStringStrategyTestCases.cs | 0 .../Data/DbSemaphoreTestCases.cs | 0 ...onnectionOrTransactionStrategyTestCases.cs | 0 .../ExternalConnectionStrategyTestCases.cs | 0 .../ExternalTransactionStrategyTestCases.cs | 0 ...MultiplexingConnectionStrategyTestCases.cs | 0 .../Data/OwnedConnectionStrategyTestCases.cs | 0 .../Data/OwnedTransactionStrategyTestCases.cs | 0 ...erLockConnectionStringStrategyTestCases.cs | 0 .../DistributedLockCoreTestCases.cs | 0 ...istributedReaderWriterLockCoreTestCases.cs | 0 .../DistributedSemaphoreCoreTestCases.cs | 0 ...pgradeableReaderWriterLockCoreTestCases.cs | 0 .../Redis/RedisExtensionTestCases.cs | 0 .../RedisSynchronizationCoreTestCases.cs | 342 +++++++++--------- .../ZooKeeperSynchronizationCoreTestCases.cs | 0 .../DistributedLock.Tests.csproj | 0 .../Infrastructure/Azure/AzureSetUpFixture.cs | 0 ...ngAzureBlobLeaseDistributedLockProvider.cs | 0 ...ngAzureBlobLeaseSynchronizationStrategy.cs | 0 .../Infrastructure/Data/ConnectionOptions.cs | 0 .../Infrastructure/Data/IdleSessionKiller.cs | 0 .../Infrastructure/Data/TestingDb.cs | 0 .../Data/TestingDbSynchronizationStrategy.cs | 0 .../Infrastructure/DisposableCollection.cs | 0 .../FileSystem/TestingFileSystemProviders.cs | 0 .../TestingLockFileSynchronizationStrategy.cs | 0 .../Infrastructure/ITestingNameProvider.cs | 0 .../Infrastructure/MySql/TestingMySqlDb.cs | 0 .../MySql/TestingMySqlProviders.cs | 0 .../Infrastructure/Oracle/TestingOracleDb.cs | 0 .../Oracle/TestingOracleProviders.cs | 0 .../Postgres/TestingPostgresDb.cs | 0 .../Postgres/TestingPostgresProviders.cs | 0 .../Infrastructure/Redis/RedisServer.cs | 0 .../Infrastructure/Redis/RedisSetUpFixture.cs | 0 .../Redis/TestingRedisDatabaseProvider.cs | 126 +++---- .../Redis/TestingRedisProviders.cs | 0 .../TestingRedisSynchronizationStrategy.cs | 168 ++++----- .../Infrastructure/Shared/AzureCredentials.cs | 0 .../Shared/MariaDbCredentials.cs | 0 .../Infrastructure/Shared/MySqlCredentials.cs | 0 .../Shared/OracleCredentials.cs | 0 .../Shared/PostgresCredentials.cs | 0 .../Infrastructure/Shared/RedisPorts.cs | 0 .../Shared/SqlServerCredentials.cs | 0 .../Infrastructure/Shared/TargetFramework.cs | 0 .../Infrastructure/Shared/ZooKeeperPorts.cs | 0 .../SqlServer/TestingSqlServerDb.cs | 0 .../SqlServer/TestingSqlServerProviders.cs | 0 .../SupportsContinuousIntegrationAttribute.cs | 0 .../Infrastructure/TestHelper.cs | 0 .../Infrastructure/TestingLockProvider.cs | 0 .../TestingReaderWriterLockAsMutexProvider.cs | 0 .../TestingReaderWriterLockProvider.cs | 0 .../TestingSemaphoreAsMutexProvider.cs | 0 .../TestingSemaphoreProvider.cs | 0 .../TestingSynchronizationStrategy.cs | 0 .../WaitHandles/TestingWaitHandleProviders.cs | 0 ...estingWaitHandleSynchronizationStrategy.cs | 0 .../ZooKeeper/TestingZooKeeperProviders.cs | 0 ...TestingZooKeeperSynchronizationStrategy.cs | 0 .../ZooKeeper/ZooKeeperSetUpFixture.cs | 0 .../DistributedLock.Tests}/Tests/ApiTest.cs | 0 .../Tests/Azure/AzureBehaviorTest.cs | 0 .../AzureBlobLeaseDistributedLockTest.cs | 0 ...eDistributedSynchronizationProviderTest.cs | 0 .../Azure/AzureBlobLeaseOptionsBuilderTest.cs | 0 .../Tests/CombinatorialTests.cs | 0 .../Tests/Core/Data/DatabaseConnectionTest.cs | 0 .../Tests/Core/DeadlockExceptionTest.cs | 0 .../DistributedLockProviderExtensionsTest.cs | 0 .../Tests/Core/HelpersTest.cs | 0 .../Tests/Core/InternalVisibilityTest.cs | 0 .../Tests/Core/SyncViaAsyncTest.cs | 0 .../Tests/Core/TimeoutValueTest.cs | 0 .../FileSystem/FileDistributedLockTest.cs | 0 .../FileDistributedLockWindowsTest.cs | 0 ...eDistributedSynchronizationProviderTest.cs | 0 .../MySqlConnectionOptionsBuilderTest.cs | 0 .../Tests/MySql/MySqlDistributedLockTest.cs | 0 ...lDistributedSynchronizationProviderTest.cs | 0 .../Tests/Oracle/OracleBehaviorTest.cs | 0 .../OracleConnectionOptionsBuilderTest.cs | 0 .../Tests/Oracle/OracleDistributedLockTest.cs | 0 .../OracleDistributedReaderWriterLockTest.cs | 0 ...eDistributedSynchronizationProviderTest.cs | 0 .../Postgres/PostgresAdvisoryLockKeyTest.cs | 0 .../Tests/Postgres/PostgresBehaviorTest.cs | 0 .../PostgresConnectionOptionsBuilderTest.cs | 0 .../Postgres/PostgresDistributedLockTest.cs | 0 ...PostgresDistributedReaderWriterLockTest.cs | 0 ...sDistributedSynchronizationProviderTest.cs | 0 .../Tests/Redis/RedisDistributedLockTest.cs | 0 .../RedisDistributedReaderWriterLockTest.cs | 0 .../Redis/RedisDistributedSemaphoreTest.cs | 0 ...ibutedSynchronizationOptionsBuilderTest.cs | 0 ...sDistributedSynchronizationProviderTest.cs | 0 .../Tests/Redis/RedisLibraryTest.cs | 0 .../SqlConnectionOptionsBuilderTest.cs | 0 .../SqlServer/SqlDatabaseConnectionTest.cs | 0 .../Tests/SqlServer/SqlDistributedLockTest.cs | 0 .../SqlDistributedReaderWriterLockTest.cs | 0 .../SqlServer/SqlDistributedSemaphoreTest.cs | 0 ...lDistributedSynchronizationProviderTest.cs | 0 .../Tests/TestSetupTest.cs | 0 .../EventWaitHandleDistributedLockTest.cs | 0 .../WaitHandleDistributedSemaphoreTest.cs | 0 ...eDistributedSynchronizationProviderTest.cs | 0 .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 0 .../ZooKeeper/ZooKeeperConnectionInfoTest.cs | 0 .../ZooKeeper/ZooKeeperConnectionTest.cs | 0 .../ZooKeeper/ZooKeeperDistributedLockTest.cs | 0 ...ooKeeperDistributedReaderWriterLockTest.cs | 0 .../ZooKeeperDistributedSemaphoreTest.cs | 0 ...ibutedSynchronizationOptionsBuilderTest.cs | 0 ...rDistributedSynchronizationProviderTest.cs | 0 .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 0 .../ZooKeeperSequentialPathHelperTest.cs | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.WaitHandles.csproj | 0 .../DistributedWaitHandleHelpers.cs | 0 ...tHandleDistributedLock.IDistributedLock.cs | 0 .../EventWaitHandleDistributedLock.cs | 0 .../EventWaitHandleDistributedLockHandle.cs | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 ...tributedSemaphore.IDistributedSemaphore.cs | 0 .../WaitHandleDistributedSemaphore.cs | 0 .../WaitHandleDistributedSemaphoreHandle.cs | 0 ...andleDistributedSynchronizationProvider.cs | 0 .../WaitHandleExtensions.cs | 0 .../AssemblyAttributes.cs | 0 .../DistributedLock.ZooKeeper.csproj | 0 .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../ZooKeeperConnection.cs | 0 .../ZooKeeperConnectionInfo.cs | 0 ...oKeeperDistributedLock.IDistributedLock.cs | 0 .../ZooKeeperDistributedLock.cs | 0 .../ZooKeeperDistributedLockHandle.cs | 0 ...WriterLock.IDistributedReaderWriterLock.cs | 0 .../ZooKeeperDistributedReaderWriterLock.cs | 0 ...KeeperDistributedReaderWriterLockHandle.cs | 0 ...tributedSemaphore.IDistributedSemaphore.cs | 0 .../ZooKeeperDistributedSemaphore.cs | 0 .../ZooKeeperDistributedSemaphoreHandle.cs | 0 ...istributedSynchronizationOptionsBuilder.cs | 0 ...eeperDistributedSynchronizationProvider.cs | 0 .../ZooKeeperNodeCreator.cs | 0 .../ZooKeeperNodeHandle.cs | 0 .../ZooKeeperPath.cs | 0 .../ZooKeeperSequentialPathHelper.cs | 0 .../ZooKeeperSynchronizationHelper.cs | 0 .../DistributedLock.sln | 0 .../DistributedLock.snk | Bin .../DistributedLock}/DistributedLock.csproj | 0 .../DistributedLockCodeGen}/CodeGenHelpers.cs | 0 .../DistributedLockCodeGen.csproj | 0 .../DocCommentGenerator.cs | 0 ...GenerateIDistributedLockImplementations.cs | 0 .../GenerateProviders.cs | 0 .../DistributedLockTaker}/App.config | 0 .../DistributedLockTaker.csproj | 0 .../DistributedLockTaker}/Program.cs | 0 ...stributedLockCoreDependencyVersion.targets | 0 321 files changed, 326 insertions(+), 326 deletions(-) rename CopyPackageToPublishDirectory.targets => src/CopyPackageToPublishDirectory.targets (76%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AssemblyAttributes.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureBlobLeaseDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureBlobLeaseDistributedLock.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureBlobLeaseDistributedLockHandle.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureBlobLeaseDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureBlobLeaseOptionsBuilder.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/AzureErrors.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/BlobClientWrapper.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/BlobLeaseClientWrapper.cs (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/DistributedLock.Azure.csproj (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.Azure => src/DistributedLock.Azure}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/AssemblyAttributes.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DeadlockException.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DistributedLock.Core.csproj (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DistributedLockProviderExtensions.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DistributedReaderWriterLockProviderExtensions.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DistributedSemaphoreProviderExtensions.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/DistributedUpgradeableReaderWriterLockProviderExtensions.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedLockProvider.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedReaderWriterLockProvider.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedSemaphore.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedSemaphoreProvider.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedSynchronizationHandle.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedUpgradeableReadLockHandle.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedUpgradeableReaderWriterLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/IDistributedUpgradeableReaderWriterLockProvider.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/AsyncLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/BusyWaitHelper.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/ConnectionMonitor.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/DatabaseCommand.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/DatabaseConnection.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/IDatabaseConnectionMonitoringHandle.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/IDbDistributedLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/IDbSynchronizationStrategy.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/MultiplexedConnectionLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/MultiplexedConnectionLockPool.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/DistributedLockHelpers.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Helpers.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/IInternalDistributedLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/IInternalDistributedLockUpgradeableHandle.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/IInternalDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/IInternalDistributedSemaphore.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/Invariant.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/LeaseMonitor.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/ManagedFinalizerQueue.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/RefBox.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/SyncViaAsync.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/Internal/TimeoutValue.cs (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.Core => src/DistributedLock.Core}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/AssemblyAttributes.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/DistributedLock.FileSystem.csproj (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/FileDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/FileDistributedLock.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/FileDistributedLockHandle.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/FileDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/FileNameValidationHelper.cs (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.FileSystem => src/DistributedLock.FileSystem}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/AssemblyAttributes.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/DistributedLock.MySql.csproj (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlConnectionOptionsBuilder.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlDatabaseConnection.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlDistributedLock.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlDistributedLockHandle.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlMultiplexedConnectionLockPool.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/MySqlUserLock.cs (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.MySql => src/DistributedLock.MySql}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/AssemblyAttributes.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/DistributedLock.Oracle.csproj (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleConnectionOptionsBuilder.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDatabaseConnection.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDbmsLock.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedLock.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedLockHandle.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedReaderWriterLockHandle.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/OracleMultiplexedConnectionLockPool.cs (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.Oracle => src/DistributedLock.Oracle}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/AssemblyAttributes.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/DistributedLock.Postgres.csproj (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresAdvisoryLock.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresAdvisoryLockKey.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresConnectionOptionsBuilder.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDatabaseConnection.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedLock.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedLockHandle.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedReaderWriterLockHandle.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PostgresMultiplexedConnectionLockPool.cs (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.Postgres => src/DistributedLock.Postgres}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/AssemblyAttributes.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/DistributedLock.Redis.csproj (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/Primitives/RedisMutexPrimitive.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/Primitives/RedisReaderWriterLockPrimitives.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/Primitives/RedisScript.cs (99%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/Primitives/RedisSemaphorePrimitive.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockAcquire.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockExtend.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockHandle.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockHelper.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockRelease.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedLock/RedLockTimeouts.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedLock.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedLockHandle.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedReaderWriterLock.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedReaderWriterLockHandle.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedSemaphore.IDistributedSemaphore.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedSemaphore.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedSemaphoreHandle.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedSynchronizationOptionsBuilder.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/RedisDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.Redis => src/DistributedLock.Redis}/TimeoutTask.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/AssemblyAttributes.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/DistributedLock.SqlServer.csproj (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlApplicationLock.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlConnectionOptionsBuilder.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDatabaseConnection.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedLock.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedLockHandle.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedReaderWriterLock.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedReaderWriterLockHandle.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedSemaphore.IDistributedSemaphore.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedSemaphore.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedSemaphoreHandle.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlMultiplexedConnectionLockPool.cs (100%) rename {DistributedLock.SqlServer => src/DistributedLock.SqlServer}/SqlSemaphore.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/DbSemaphoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/DistributedLockCoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Redis/RedisExtensionTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs (98%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/DistributedLock.Tests.csproj (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Azure/AzureSetUpFixture.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Data/ConnectionOptions.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Data/IdleSessionKiller.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Data/TestingDb.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Data/TestingDbSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/DisposableCollection.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/FileSystem/TestingFileSystemProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/ITestingNameProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/MySql/TestingMySqlDb.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/MySql/TestingMySqlProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Oracle/TestingOracleDb.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Oracle/TestingOracleProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Postgres/TestingPostgresDb.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Postgres/TestingPostgresProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Redis/RedisServer.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Redis/RedisSetUpFixture.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Redis/TestingRedisDatabaseProvider.cs (97%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Redis/TestingRedisProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs (97%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/AzureCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/MariaDbCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/MySqlCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/OracleCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/PostgresCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/RedisPorts.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/SqlServerCredentials.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/TargetFramework.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/Shared/ZooKeeperPorts.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/SqlServer/TestingSqlServerDb.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/SqlServer/TestingSqlServerProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/SupportsContinuousIntegrationAttribute.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestHelper.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingLockProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingReaderWriterLockProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingSemaphoreAsMutexProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingSemaphoreProvider.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/TestingSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ApiTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Azure/AzureBehaviorTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/CombinatorialTests.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/Data/DatabaseConnectionTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/DeadlockExceptionTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/DistributedLockProviderExtensionsTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/HelpersTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/InternalVisibilityTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/SyncViaAsyncTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Core/TimeoutValueTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/FileSystem/FileDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/FileSystem/FileDistributedLockWindowsTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/MySql/MySqlDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Oracle/OracleBehaviorTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Oracle/OracleDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresBehaviorTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisDistributedReaderWriterLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisDistributedSemaphoreTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/Redis/RedisLibraryTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlDatabaseConnectionTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlDistributedSemaphoreTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/TestSetupTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperApiTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperConnectionTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperPathTest.cs (100%) rename {DistributedLock.Tests => src/DistributedLock.Tests}/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/AssemblyAttributes.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/DistributedLock.WaitHandles.csproj (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/DistributedWaitHandleHelpers.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/EventWaitHandleDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/EventWaitHandleDistributedLock.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/EventWaitHandleDistributedLockHandle.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/WaitHandleDistributedSemaphore.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/WaitHandleDistributedSemaphoreHandle.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/WaitHandleDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.WaitHandles => src/DistributedLock.WaitHandles}/WaitHandleExtensions.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/AssemblyAttributes.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/DistributedLock.ZooKeeper.csproj (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/PublicAPI.Shipped.txt (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/PublicAPI.Unshipped.txt (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperConnection.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperConnectionInfo.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedLock.IDistributedLock.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedLock.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedLockHandle.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedReaderWriterLock.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedReaderWriterLockHandle.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedSemaphore.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedSemaphoreHandle.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedSynchronizationOptionsBuilder.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperDistributedSynchronizationProvider.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperNodeCreator.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperNodeHandle.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperPath.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperSequentialPathHelper.cs (100%) rename {DistributedLock.ZooKeeper => src/DistributedLock.ZooKeeper}/ZooKeeperSynchronizationHelper.cs (100%) rename DistributedLock.sln => src/DistributedLock.sln (100%) rename DistributedLock.snk => src/DistributedLock.snk (100%) rename {DistributedLock => src/DistributedLock}/DistributedLock.csproj (100%) rename {DistributedLockCodeGen => src/DistributedLockCodeGen}/CodeGenHelpers.cs (100%) rename {DistributedLockCodeGen => src/DistributedLockCodeGen}/DistributedLockCodeGen.csproj (100%) rename {DistributedLockCodeGen => src/DistributedLockCodeGen}/DocCommentGenerator.cs (100%) rename {DistributedLockCodeGen => src/DistributedLockCodeGen}/GenerateIDistributedLockImplementations.cs (100%) rename {DistributedLockCodeGen => src/DistributedLockCodeGen}/GenerateProviders.cs (100%) rename {DistributedLockTaker => src/DistributedLockTaker}/App.config (100%) rename {DistributedLockTaker => src/DistributedLockTaker}/DistributedLockTaker.csproj (100%) rename {DistributedLockTaker => src/DistributedLockTaker}/Program.cs (100%) rename FixDistributedLockCoreDependencyVersion.targets => src/FixDistributedLockCoreDependencyVersion.targets (100%) diff --git a/appveyor.yml b/appveyor.yml index 0886a4d3..29408d72 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,10 +5,10 @@ image: - Ubuntu build_script: - - dotnet build DistributedLock.sln -c Release + - dotnet build src/DistributedLock.sln -c Release test_script: - - dotnet test DistributedLock.sln -c Release -f netcoreapp3.1 --no-build --filter TestCategory=CI + - dotnet test src/DistributedLock.sln -c Release -f netcoreapp3.1 --no-build --filter TestCategory=CI for: - @@ -17,4 +17,4 @@ for: - image: "Visual Studio 2022" test_script: - - dotnet test DistributedLock.sln -c Release --no-build --filter "TestCategory=CI|TestCategory=CIWindows" \ No newline at end of file + - dotnet test src/DistributedLock.sln -c Release --no-build --filter "TestCategory=CI|TestCategory=CIWindows" \ No newline at end of file diff --git a/CopyPackageToPublishDirectory.targets b/src/CopyPackageToPublishDirectory.targets similarity index 76% rename from CopyPackageToPublishDirectory.targets rename to src/CopyPackageToPublishDirectory.targets index 619b08c6..1972bbab 100644 --- a/CopyPackageToPublishDirectory.targets +++ b/src/CopyPackageToPublishDirectory.targets @@ -2,6 +2,6 @@ + DestinationFiles="..\..\publish\$(PackageId).$(PackageVersion).nupkg" /> \ No newline at end of file diff --git a/DistributedLock.Azure/AssemblyAttributes.cs b/src/DistributedLock.Azure/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.Azure/AssemblyAttributes.cs rename to src/DistributedLock.Azure/AssemblyAttributes.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs rename to src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs similarity index 100% rename from DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs rename to src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs similarity index 100% rename from DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs rename to src/DistributedLock.Azure/AzureBlobLeaseDistributedLockHandle.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs rename to src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs diff --git a/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs b/src/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs similarity index 100% rename from DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs rename to src/DistributedLock.Azure/AzureBlobLeaseOptionsBuilder.cs diff --git a/DistributedLock.Azure/AzureErrors.cs b/src/DistributedLock.Azure/AzureErrors.cs similarity index 100% rename from DistributedLock.Azure/AzureErrors.cs rename to src/DistributedLock.Azure/AzureErrors.cs diff --git a/DistributedLock.Azure/BlobClientWrapper.cs b/src/DistributedLock.Azure/BlobClientWrapper.cs similarity index 100% rename from DistributedLock.Azure/BlobClientWrapper.cs rename to src/DistributedLock.Azure/BlobClientWrapper.cs diff --git a/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs similarity index 100% rename from DistributedLock.Azure/BlobLeaseClientWrapper.cs rename to src/DistributedLock.Azure/BlobLeaseClientWrapper.cs diff --git a/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj similarity index 100% rename from DistributedLock.Azure/DistributedLock.Azure.csproj rename to src/DistributedLock.Azure/DistributedLock.Azure.csproj diff --git a/DistributedLock.Azure/PublicAPI.Shipped.txt b/src/DistributedLock.Azure/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.Azure/PublicAPI.Shipped.txt rename to src/DistributedLock.Azure/PublicAPI.Shipped.txt diff --git a/DistributedLock.Azure/PublicAPI.Unshipped.txt b/src/DistributedLock.Azure/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.Azure/PublicAPI.Unshipped.txt rename to src/DistributedLock.Azure/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Core/AssemblyAttributes.cs b/src/DistributedLock.Core/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.Core/AssemblyAttributes.cs rename to src/DistributedLock.Core/AssemblyAttributes.cs diff --git a/DistributedLock.Core/DeadlockException.cs b/src/DistributedLock.Core/DeadlockException.cs similarity index 100% rename from DistributedLock.Core/DeadlockException.cs rename to src/DistributedLock.Core/DeadlockException.cs diff --git a/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj similarity index 100% rename from DistributedLock.Core/DistributedLock.Core.csproj rename to src/DistributedLock.Core/DistributedLock.Core.csproj diff --git a/DistributedLock.Core/DistributedLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs similarity index 100% rename from DistributedLock.Core/DistributedLockProviderExtensions.cs rename to src/DistributedLock.Core/DistributedLockProviderExtensions.cs diff --git a/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs similarity index 100% rename from DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs rename to src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs diff --git a/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs similarity index 100% rename from DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs rename to src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs diff --git a/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs similarity index 100% rename from DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs rename to src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs diff --git a/DistributedLock.Core/IDistributedLock.cs b/src/DistributedLock.Core/IDistributedLock.cs similarity index 100% rename from DistributedLock.Core/IDistributedLock.cs rename to src/DistributedLock.Core/IDistributedLock.cs diff --git a/DistributedLock.Core/IDistributedLockProvider.cs b/src/DistributedLock.Core/IDistributedLockProvider.cs similarity index 100% rename from DistributedLock.Core/IDistributedLockProvider.cs rename to src/DistributedLock.Core/IDistributedLockProvider.cs diff --git a/DistributedLock.Core/IDistributedReaderWriterLock.cs b/src/DistributedLock.Core/IDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Core/IDistributedReaderWriterLock.cs rename to src/DistributedLock.Core/IDistributedReaderWriterLock.cs diff --git a/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs b/src/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs similarity index 100% rename from DistributedLock.Core/IDistributedReaderWriterLockProvider.cs rename to src/DistributedLock.Core/IDistributedReaderWriterLockProvider.cs diff --git a/DistributedLock.Core/IDistributedSemaphore.cs b/src/DistributedLock.Core/IDistributedSemaphore.cs similarity index 100% rename from DistributedLock.Core/IDistributedSemaphore.cs rename to src/DistributedLock.Core/IDistributedSemaphore.cs diff --git a/DistributedLock.Core/IDistributedSemaphoreProvider.cs b/src/DistributedLock.Core/IDistributedSemaphoreProvider.cs similarity index 100% rename from DistributedLock.Core/IDistributedSemaphoreProvider.cs rename to src/DistributedLock.Core/IDistributedSemaphoreProvider.cs diff --git a/DistributedLock.Core/IDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/IDistributedSynchronizationHandle.cs similarity index 100% rename from DistributedLock.Core/IDistributedSynchronizationHandle.cs rename to src/DistributedLock.Core/IDistributedSynchronizationHandle.cs diff --git a/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs b/src/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs similarity index 100% rename from DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs rename to src/DistributedLock.Core/IDistributedUpgradeableReadLockHandle.cs diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs b/src/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs similarity index 100% rename from DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs rename to src/DistributedLock.Core/IDistributedUpgradeableReaderWriterLock.cs diff --git a/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs b/src/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs similarity index 100% rename from DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs rename to src/DistributedLock.Core/IDistributedUpgradeableReaderWriterLockProvider.cs diff --git a/DistributedLock.Core/Internal/AsyncLock.cs b/src/DistributedLock.Core/Internal/AsyncLock.cs similarity index 100% rename from DistributedLock.Core/Internal/AsyncLock.cs rename to src/DistributedLock.Core/Internal/AsyncLock.cs diff --git a/DistributedLock.Core/Internal/BusyWaitHelper.cs b/src/DistributedLock.Core/Internal/BusyWaitHelper.cs similarity index 100% rename from DistributedLock.Core/Internal/BusyWaitHelper.cs rename to src/DistributedLock.Core/Internal/BusyWaitHelper.cs diff --git a/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/ConnectionMonitor.cs rename to src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs diff --git a/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/DatabaseCommand.cs rename to src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs diff --git a/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/DatabaseConnection.cs rename to src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs diff --git a/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs rename to src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs diff --git a/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs b/src/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs rename to src/DistributedLock.Core/Internal/Data/IDatabaseConnectionMonitoringHandle.cs diff --git a/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs b/src/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/IDbDistributedLock.cs rename to src/DistributedLock.Core/Internal/Data/IDbDistributedLock.cs diff --git a/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs b/src/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs rename to src/DistributedLock.Core/Internal/Data/IDbSynchronizationStrategy.cs diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs rename to src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs diff --git a/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs rename to src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs diff --git a/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs b/src/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs similarity index 100% rename from DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs rename to src/DistributedLock.Core/Internal/Data/OptimisticConnectionMultiplexingDbDistributedLock.cs diff --git a/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs similarity index 100% rename from DistributedLock.Core/Internal/DistributedLockHelpers.cs rename to src/DistributedLock.Core/Internal/DistributedLockHelpers.cs diff --git a/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs similarity index 100% rename from DistributedLock.Core/Internal/Helpers.cs rename to src/DistributedLock.Core/Internal/Helpers.cs diff --git a/DistributedLock.Core/Internal/IInternalDistributedLock.cs b/src/DistributedLock.Core/Internal/IInternalDistributedLock.cs similarity index 100% rename from DistributedLock.Core/Internal/IInternalDistributedLock.cs rename to src/DistributedLock.Core/Internal/IInternalDistributedLock.cs diff --git a/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs b/src/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs similarity index 100% rename from DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs rename to src/DistributedLock.Core/Internal/IInternalDistributedLockUpgradeableHandle.cs diff --git a/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs b/src/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs rename to src/DistributedLock.Core/Internal/IInternalDistributedReaderWriterLock.cs diff --git a/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs b/src/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs similarity index 100% rename from DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs rename to src/DistributedLock.Core/Internal/IInternalDistributedSemaphore.cs diff --git a/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs b/src/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs similarity index 100% rename from DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs rename to src/DistributedLock.Core/Internal/IInternalDistributedUpgradeableReaderWriterLock.cs diff --git a/DistributedLock.Core/Internal/Invariant.cs b/src/DistributedLock.Core/Internal/Invariant.cs similarity index 100% rename from DistributedLock.Core/Internal/Invariant.cs rename to src/DistributedLock.Core/Internal/Invariant.cs diff --git a/DistributedLock.Core/Internal/LeaseMonitor.cs b/src/DistributedLock.Core/Internal/LeaseMonitor.cs similarity index 100% rename from DistributedLock.Core/Internal/LeaseMonitor.cs rename to src/DistributedLock.Core/Internal/LeaseMonitor.cs diff --git a/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs similarity index 100% rename from DistributedLock.Core/Internal/ManagedFinalizerQueue.cs rename to src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs diff --git a/DistributedLock.Core/Internal/RefBox.cs b/src/DistributedLock.Core/Internal/RefBox.cs similarity index 100% rename from DistributedLock.Core/Internal/RefBox.cs rename to src/DistributedLock.Core/Internal/RefBox.cs diff --git a/DistributedLock.Core/Internal/SyncViaAsync.cs b/src/DistributedLock.Core/Internal/SyncViaAsync.cs similarity index 100% rename from DistributedLock.Core/Internal/SyncViaAsync.cs rename to src/DistributedLock.Core/Internal/SyncViaAsync.cs diff --git a/DistributedLock.Core/Internal/TimeoutValue.cs b/src/DistributedLock.Core/Internal/TimeoutValue.cs similarity index 100% rename from DistributedLock.Core/Internal/TimeoutValue.cs rename to src/DistributedLock.Core/Internal/TimeoutValue.cs diff --git a/DistributedLock.Core/PublicAPI.Shipped.txt b/src/DistributedLock.Core/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.Core/PublicAPI.Shipped.txt rename to src/DistributedLock.Core/PublicAPI.Shipped.txt diff --git a/DistributedLock.Core/PublicAPI.Unshipped.txt b/src/DistributedLock.Core/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.Core/PublicAPI.Unshipped.txt rename to src/DistributedLock.Core/PublicAPI.Unshipped.txt diff --git a/DistributedLock.FileSystem/AssemblyAttributes.cs b/src/DistributedLock.FileSystem/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.FileSystem/AssemblyAttributes.cs rename to src/DistributedLock.FileSystem/AssemblyAttributes.cs diff --git a/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj similarity index 100% rename from DistributedLock.FileSystem/DistributedLock.FileSystem.csproj rename to src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj diff --git a/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs rename to src/DistributedLock.FileSystem/FileDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs similarity index 100% rename from DistributedLock.FileSystem/FileDistributedLock.cs rename to src/DistributedLock.FileSystem/FileDistributedLock.cs diff --git a/DistributedLock.FileSystem/FileDistributedLockHandle.cs b/src/DistributedLock.FileSystem/FileDistributedLockHandle.cs similarity index 100% rename from DistributedLock.FileSystem/FileDistributedLockHandle.cs rename to src/DistributedLock.FileSystem/FileDistributedLockHandle.cs diff --git a/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs b/src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs rename to src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs diff --git a/DistributedLock.FileSystem/FileNameValidationHelper.cs b/src/DistributedLock.FileSystem/FileNameValidationHelper.cs similarity index 100% rename from DistributedLock.FileSystem/FileNameValidationHelper.cs rename to src/DistributedLock.FileSystem/FileNameValidationHelper.cs diff --git a/DistributedLock.FileSystem/PublicAPI.Shipped.txt b/src/DistributedLock.FileSystem/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.FileSystem/PublicAPI.Shipped.txt rename to src/DistributedLock.FileSystem/PublicAPI.Shipped.txt diff --git a/DistributedLock.FileSystem/PublicAPI.Unshipped.txt b/src/DistributedLock.FileSystem/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.FileSystem/PublicAPI.Unshipped.txt rename to src/DistributedLock.FileSystem/PublicAPI.Unshipped.txt diff --git a/DistributedLock.MySql/AssemblyAttributes.cs b/src/DistributedLock.MySql/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.MySql/AssemblyAttributes.cs rename to src/DistributedLock.MySql/AssemblyAttributes.cs diff --git a/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj similarity index 100% rename from DistributedLock.MySql/DistributedLock.MySql.csproj rename to src/DistributedLock.MySql/DistributedLock.MySql.csproj diff --git a/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs b/src/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs similarity index 100% rename from DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs rename to src/DistributedLock.MySql/MySqlConnectionOptionsBuilder.cs diff --git a/DistributedLock.MySql/MySqlDatabaseConnection.cs b/src/DistributedLock.MySql/MySqlDatabaseConnection.cs similarity index 100% rename from DistributedLock.MySql/MySqlDatabaseConnection.cs rename to src/DistributedLock.MySql/MySqlDatabaseConnection.cs diff --git a/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs b/src/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs rename to src/DistributedLock.MySql/MySqlDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.MySql/MySqlDistributedLock.cs b/src/DistributedLock.MySql/MySqlDistributedLock.cs similarity index 100% rename from DistributedLock.MySql/MySqlDistributedLock.cs rename to src/DistributedLock.MySql/MySqlDistributedLock.cs diff --git a/DistributedLock.MySql/MySqlDistributedLockHandle.cs b/src/DistributedLock.MySql/MySqlDistributedLockHandle.cs similarity index 100% rename from DistributedLock.MySql/MySqlDistributedLockHandle.cs rename to src/DistributedLock.MySql/MySqlDistributedLockHandle.cs diff --git a/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs b/src/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs rename to src/DistributedLock.MySql/MySqlDistributedSynchronizationProvider.cs diff --git a/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs b/src/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs similarity index 100% rename from DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs rename to src/DistributedLock.MySql/MySqlMultiplexedConnectionLockPool.cs diff --git a/DistributedLock.MySql/MySqlUserLock.cs b/src/DistributedLock.MySql/MySqlUserLock.cs similarity index 100% rename from DistributedLock.MySql/MySqlUserLock.cs rename to src/DistributedLock.MySql/MySqlUserLock.cs diff --git a/DistributedLock.MySql/PublicAPI.Shipped.txt b/src/DistributedLock.MySql/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.MySql/PublicAPI.Shipped.txt rename to src/DistributedLock.MySql/PublicAPI.Shipped.txt diff --git a/DistributedLock.MySql/PublicAPI.Unshipped.txt b/src/DistributedLock.MySql/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.MySql/PublicAPI.Unshipped.txt rename to src/DistributedLock.MySql/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Oracle/AssemblyAttributes.cs b/src/DistributedLock.Oracle/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.Oracle/AssemblyAttributes.cs rename to src/DistributedLock.Oracle/AssemblyAttributes.cs diff --git a/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj similarity index 100% rename from DistributedLock.Oracle/DistributedLock.Oracle.csproj rename to src/DistributedLock.Oracle/DistributedLock.Oracle.csproj diff --git a/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs b/src/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs similarity index 100% rename from DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs rename to src/DistributedLock.Oracle/OracleConnectionOptionsBuilder.cs diff --git a/DistributedLock.Oracle/OracleDatabaseConnection.cs b/src/DistributedLock.Oracle/OracleDatabaseConnection.cs similarity index 100% rename from DistributedLock.Oracle/OracleDatabaseConnection.cs rename to src/DistributedLock.Oracle/OracleDatabaseConnection.cs diff --git a/DistributedLock.Oracle/OracleDbmsLock.cs b/src/DistributedLock.Oracle/OracleDbmsLock.cs similarity index 100% rename from DistributedLock.Oracle/OracleDbmsLock.cs rename to src/DistributedLock.Oracle/OracleDbmsLock.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs b/src/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs rename to src/DistributedLock.Oracle/OracleDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.Oracle/OracleDistributedLock.cs b/src/DistributedLock.Oracle/OracleDistributedLock.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedLock.cs rename to src/DistributedLock.Oracle/OracleDistributedLock.cs diff --git a/DistributedLock.Oracle/OracleDistributedLockHandle.cs b/src/DistributedLock.Oracle/OracleDistributedLockHandle.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedLockHandle.cs rename to src/DistributedLock.Oracle/OracleDistributedLockHandle.cs diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/src/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs rename to src/DistributedLock.Oracle/OracleDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs b/src/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs rename to src/DistributedLock.Oracle/OracleDistributedReaderWriterLock.cs diff --git a/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs b/src/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs rename to src/DistributedLock.Oracle/OracleDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs b/src/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs rename to src/DistributedLock.Oracle/OracleDistributedSynchronizationProvider.cs diff --git a/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs b/src/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs similarity index 100% rename from DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs rename to src/DistributedLock.Oracle/OracleMultiplexedConnectionLockPool.cs diff --git a/DistributedLock.Oracle/PublicAPI.Shipped.txt b/src/DistributedLock.Oracle/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.Oracle/PublicAPI.Shipped.txt rename to src/DistributedLock.Oracle/PublicAPI.Shipped.txt diff --git a/DistributedLock.Oracle/PublicAPI.Unshipped.txt b/src/DistributedLock.Oracle/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.Oracle/PublicAPI.Unshipped.txt rename to src/DistributedLock.Oracle/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Postgres/AssemblyAttributes.cs b/src/DistributedLock.Postgres/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.Postgres/AssemblyAttributes.cs rename to src/DistributedLock.Postgres/AssemblyAttributes.cs diff --git a/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj similarity index 100% rename from DistributedLock.Postgres/DistributedLock.Postgres.csproj rename to src/DistributedLock.Postgres/DistributedLock.Postgres.csproj diff --git a/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs similarity index 100% rename from DistributedLock.Postgres/PostgresAdvisoryLock.cs rename to src/DistributedLock.Postgres/PostgresAdvisoryLock.cs diff --git a/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs similarity index 100% rename from DistributedLock.Postgres/PostgresAdvisoryLockKey.cs rename to src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs diff --git a/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs similarity index 100% rename from DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs rename to src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs diff --git a/DistributedLock.Postgres/PostgresDatabaseConnection.cs b/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDatabaseConnection.cs rename to src/DistributedLock.Postgres/PostgresDatabaseConnection.cs diff --git a/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs rename to src/DistributedLock.Postgres/PostgresDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedLock.cs rename to src/DistributedLock.Postgres/PostgresDistributedLock.cs diff --git a/DistributedLock.Postgres/PostgresDistributedLockHandle.cs b/src/DistributedLock.Postgres/PostgresDistributedLockHandle.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedLockHandle.cs rename to src/DistributedLock.Postgres/PostgresDistributedLockHandle.cs diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs rename to src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.IDistributedReaderWriterLock.cs diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs rename to src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs diff --git a/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs rename to src/DistributedLock.Postgres/PostgresDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs rename to src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs diff --git a/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs b/src/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs similarity index 100% rename from DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs rename to src/DistributedLock.Postgres/PostgresMultiplexedConnectionLockPool.cs diff --git a/DistributedLock.Postgres/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.Postgres/PublicAPI.Shipped.txt rename to src/DistributedLock.Postgres/PublicAPI.Shipped.txt diff --git a/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.Postgres/PublicAPI.Unshipped.txt rename to src/DistributedLock.Postgres/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Redis/AssemblyAttributes.cs b/src/DistributedLock.Redis/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.Redis/AssemblyAttributes.cs rename to src/DistributedLock.Redis/AssemblyAttributes.cs diff --git a/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj similarity index 100% rename from DistributedLock.Redis/DistributedLock.Redis.csproj rename to src/DistributedLock.Redis/DistributedLock.Redis.csproj diff --git a/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs similarity index 100% rename from DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs rename to src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs diff --git a/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs similarity index 100% rename from DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs rename to src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs diff --git a/DistributedLock.Redis/Primitives/RedisScript.cs b/src/DistributedLock.Redis/Primitives/RedisScript.cs similarity index 99% rename from DistributedLock.Redis/Primitives/RedisScript.cs rename to src/DistributedLock.Redis/Primitives/RedisScript.cs index 00442819..569264ad 100644 --- a/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/src/DistributedLock.Redis/Primitives/RedisScript.cs @@ -15,12 +15,12 @@ public RedisScript(string script, Func parameters) this._parameters = parameters; } - public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix database.ScriptEvaluate(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); - public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix + public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => + // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix database.ScriptEvaluateAsync(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); // send the smallest possible script to the server diff --git a/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs similarity index 100% rename from DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs rename to src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs diff --git a/DistributedLock.Redis/PublicAPI.Shipped.txt b/src/DistributedLock.Redis/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.Redis/PublicAPI.Shipped.txt rename to src/DistributedLock.Redis/PublicAPI.Shipped.txt diff --git a/DistributedLock.Redis/PublicAPI.Unshipped.txt b/src/DistributedLock.Redis/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.Redis/PublicAPI.Unshipped.txt rename to src/DistributedLock.Redis/PublicAPI.Unshipped.txt diff --git a/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/src/DistributedLock.Redis/RedLock/RedLockAcquire.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockAcquire.cs rename to src/DistributedLock.Redis/RedLock/RedLockAcquire.cs diff --git a/DistributedLock.Redis/RedLock/RedLockExtend.cs b/src/DistributedLock.Redis/RedLock/RedLockExtend.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockExtend.cs rename to src/DistributedLock.Redis/RedLock/RedLockExtend.cs diff --git a/DistributedLock.Redis/RedLock/RedLockHandle.cs b/src/DistributedLock.Redis/RedLock/RedLockHandle.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockHandle.cs rename to src/DistributedLock.Redis/RedLock/RedLockHandle.cs diff --git a/DistributedLock.Redis/RedLock/RedLockHelper.cs b/src/DistributedLock.Redis/RedLock/RedLockHelper.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockHelper.cs rename to src/DistributedLock.Redis/RedLock/RedLockHelper.cs diff --git a/DistributedLock.Redis/RedLock/RedLockRelease.cs b/src/DistributedLock.Redis/RedLock/RedLockRelease.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockRelease.cs rename to src/DistributedLock.Redis/RedLock/RedLockRelease.cs diff --git a/DistributedLock.Redis/RedLock/RedLockTimeouts.cs b/src/DistributedLock.Redis/RedLock/RedLockTimeouts.cs similarity index 100% rename from DistributedLock.Redis/RedLock/RedLockTimeouts.cs rename to src/DistributedLock.Redis/RedLock/RedLockTimeouts.cs diff --git a/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs b/src/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs rename to src/DistributedLock.Redis/RedisDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.Redis/RedisDistributedLock.cs b/src/DistributedLock.Redis/RedisDistributedLock.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedLock.cs rename to src/DistributedLock.Redis/RedisDistributedLock.cs diff --git a/DistributedLock.Redis/RedisDistributedLockHandle.cs b/src/DistributedLock.Redis/RedisDistributedLockHandle.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedLockHandle.cs rename to src/DistributedLock.Redis/RedisDistributedLockHandle.cs diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs rename to src/DistributedLock.Redis/RedisDistributedReaderWriterLock.IDistributedReaderWriterLock.cs diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedReaderWriterLock.cs rename to src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs diff --git a/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs b/src/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs rename to src/DistributedLock.Redis/RedisDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs rename to src/DistributedLock.Redis/RedisDistributedSemaphore.IDistributedSemaphore.cs diff --git a/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedSemaphore.cs rename to src/DistributedLock.Redis/RedisDistributedSemaphore.cs diff --git a/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs b/src/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs rename to src/DistributedLock.Redis/RedisDistributedSemaphoreHandle.cs diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs rename to src/DistributedLock.Redis/RedisDistributedSynchronizationOptionsBuilder.cs diff --git a/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs rename to src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs diff --git a/DistributedLock.Redis/TimeoutTask.cs b/src/DistributedLock.Redis/TimeoutTask.cs similarity index 100% rename from DistributedLock.Redis/TimeoutTask.cs rename to src/DistributedLock.Redis/TimeoutTask.cs diff --git a/DistributedLock.SqlServer/AssemblyAttributes.cs b/src/DistributedLock.SqlServer/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.SqlServer/AssemblyAttributes.cs rename to src/DistributedLock.SqlServer/AssemblyAttributes.cs diff --git a/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj similarity index 100% rename from DistributedLock.SqlServer/DistributedLock.SqlServer.csproj rename to src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj diff --git a/DistributedLock.SqlServer/PublicAPI.Shipped.txt b/src/DistributedLock.SqlServer/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.SqlServer/PublicAPI.Shipped.txt rename to src/DistributedLock.SqlServer/PublicAPI.Shipped.txt diff --git a/DistributedLock.SqlServer/PublicAPI.Unshipped.txt b/src/DistributedLock.SqlServer/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.SqlServer/PublicAPI.Unshipped.txt rename to src/DistributedLock.SqlServer/PublicAPI.Unshipped.txt diff --git a/DistributedLock.SqlServer/SqlApplicationLock.cs b/src/DistributedLock.SqlServer/SqlApplicationLock.cs similarity index 100% rename from DistributedLock.SqlServer/SqlApplicationLock.cs rename to src/DistributedLock.SqlServer/SqlApplicationLock.cs diff --git a/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs similarity index 100% rename from DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs rename to src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs diff --git a/DistributedLock.SqlServer/SqlDatabaseConnection.cs b/src/DistributedLock.SqlServer/SqlDatabaseConnection.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDatabaseConnection.cs rename to src/DistributedLock.SqlServer/SqlDatabaseConnection.cs diff --git a/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs b/src/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs rename to src/DistributedLock.SqlServer/SqlDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.SqlServer/SqlDistributedLock.cs b/src/DistributedLock.SqlServer/SqlDistributedLock.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedLock.cs rename to src/DistributedLock.SqlServer/SqlDistributedLock.cs diff --git a/DistributedLock.SqlServer/SqlDistributedLockHandle.cs b/src/DistributedLock.SqlServer/SqlDistributedLockHandle.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedLockHandle.cs rename to src/DistributedLock.SqlServer/SqlDistributedLockHandle.cs diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs b/src/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs rename to src/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.IDistributedUpgradeableReaderWriterLock.cs diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs b/src/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs rename to src/DistributedLock.SqlServer/SqlDistributedReaderWriterLock.cs diff --git a/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs b/src/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs rename to src/DistributedLock.SqlServer/SqlDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs b/src/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs rename to src/DistributedLock.SqlServer/SqlDistributedSemaphore.IDistributedSemaphore.cs diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphore.cs b/src/DistributedLock.SqlServer/SqlDistributedSemaphore.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedSemaphore.cs rename to src/DistributedLock.SqlServer/SqlDistributedSemaphore.cs diff --git a/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs b/src/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs rename to src/DistributedLock.SqlServer/SqlDistributedSemaphoreHandle.cs diff --git a/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs b/src/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs rename to src/DistributedLock.SqlServer/SqlDistributedSynchronizationProvider.cs diff --git a/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs b/src/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs similarity index 100% rename from DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs rename to src/DistributedLock.SqlServer/SqlMultiplexedConnectionLockPool.cs diff --git a/DistributedLock.SqlServer/SqlSemaphore.cs b/src/DistributedLock.SqlServer/SqlSemaphore.cs similarity index 100% rename from DistributedLock.SqlServer/SqlSemaphore.cs rename to src/DistributedLock.SqlServer/SqlSemaphore.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/OwnedTransactionStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Data/UpgradeableReaderWriterLockConnectionStringStrategyTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs diff --git a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs similarity index 98% rename from DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index ae67a209..966ce4de 100644 --- a/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -1,171 +1,171 @@ -using Medallion.Threading.Redis; -using Moq; -using NUnit.Framework; -using StackExchange.Redis; -using StackExchange.Redis.KeyspaceIsolation; - -namespace Medallion.Threading.Tests.Redis; - -public abstract class RedisSynchronizationCoreTestCases - // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't - // want to see cases for each possible db provider type - where TLockProvider : TestingLockProvider>, new() -{ - private TLockProvider _provider = default!; - - [SetUp] - public void SetUp() => this._provider = new TLockProvider(); - - [TearDown] - public void TearDown() => this._provider.Dispose(); - - [Test] - public void TestMajorityFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); - - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("multi"); - - // we only get the one exception - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); - - // single sync acquire flow is different - this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; - var singleDatabaseLock = this._provider.CreateLock("single"); - Assert.Throws(() => singleDatabaseLock.Acquire()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestMajorityHangingDatabasesCauseAcquireToFail() - { - using var @event = new ManualResetEventSlim(initialState: false); - var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[1], () => { @event.Wait(); return true; }); - MockDatabase(databases[2], () => { @event.Wait(); return false; }); - - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); - var @lock = this._provider.CreateLock("lock"); - - Assert.IsNull(await @lock.TryAcquireAsync()); - - @event.Set(); // just to free the waiting threads - } - - [Test] - public void TestMajorityFaultingDatabasesCauseReleaseToThrow() - { - var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - var @lock = this._provider.CreateLock("lock"); - using var handle = @lock.Acquire(); - - new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); - var aggregateException = Assert.Throws(() => handle.Dispose()); - Assert.IsInstanceOf(aggregateException.InnerException); - } - - [Test] - public void TestHalfFaultingDatabasesCauseAcquireToThrow() - { - var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); - MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); - this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); - - var @lock = this._provider.CreateLock("lock"); - Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); - } - - [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) - { - var database = CreateDatabaseMock(); - MockDatabase(database, () => { Thread.Sleep(50); return true; }); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; - this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); - var @lock = this._provider.CreateLock("lock"); - - // single sync acquire has different timeout logic, so we test it separately - Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); - } - - [Test] - [NonParallelizable] // timing-sensitive - public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() - { - using var @event = new ManualResetEventSlim(); - var failDatabase = CreateDatabaseMock(); - MockDatabase(failDatabase, () => { @event.Wait(); return false; }); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; - var @lock = this._provider.CreateLock("lock"); - - var acquireTask = @lock.TryAcquireAsync().AsTask(); - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); - @event.Set(); - Assert.IsNull(await acquireTask); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; - var singleDatabaseLock = this._provider.CreateLock("lock"); - using var handle = await singleDatabaseLock.TryAcquireAsync(); - Assert.IsNotNull(handle); - } - - [Test] - public void TestAcquireWithLockPrefix() - { - this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; - var implicitPrefixLock = this._provider.CreateLock("N"); - - this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; - var noPrefixLock = this._provider.CreateLock("N"); - var explicitPrefixLock = this._provider.CreateLock("PN"); - - using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); - Assert.IsNotNull(implicitPrefixHandle); - using var noPrefixHandle = noPrefixLock.TryAcquire(); - Assert.IsNotNull(noPrefixHandle); - using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); - Assert.IsNull(explicitPrefixHandle); - - static IDatabase CreateDatabase(string? keyPrefix = null) - { - var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); - return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); - } - } - - private static Mock CreateDatabaseMock() - { - var mock = new Mock(MockBehavior.Strict); - MockDatabase(mock, () => true); - return mock; - } - - private static void MockDatabase(Mock mockDatabase, Func returns) - { - mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(returns); - mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(returns)); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => RedisResult.Create(returns())); - mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => RedisResult.Create(returns()))); - mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => (bool)RedisResult.Create(returns())); - mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); - } -} +using Medallion.Threading.Redis; +using Moq; +using NUnit.Framework; +using StackExchange.Redis; +using StackExchange.Redis.KeyspaceIsolation; + +namespace Medallion.Threading.Tests.Redis; + +public abstract class RedisSynchronizationCoreTestCases + // note: we arbitrarily use the single db provider because we will be overriding the set of dbs and so we don't + // want to see cases for each possible db provider type + where TLockProvider : TestingLockProvider>, new() +{ + private TLockProvider _provider = default!; + + [SetUp] + public void SetUp() => this._provider = new TLockProvider(); + + [TearDown] + public void TearDown() => this._provider.Dispose(); + + [Test] + public void TestMajorityFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + MockDatabase(databases[2], () => throw new ArrayTypeMismatchException()); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("multi"); + + // we only get the one exception + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + + // single sync acquire flow is different + this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; + var singleDatabaseLock = this._provider.CreateLock("single"); + Assert.Throws(() => singleDatabaseLock.Acquire()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestMajorityHangingDatabasesCauseAcquireToFail() + { + using var @event = new ManualResetEventSlim(initialState: false); + var databases = Enumerable.Range(0, 3).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[1], () => { @event.Wait(); return true; }); + MockDatabase(databases[2], () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + // use a high min validity time so that TryAcquireAsync() can return very quickly despite the hang + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); + var @lock = this._provider.CreateLock("lock"); + + Assert.IsNull(await @lock.TryAcquireAsync()); + + @event.Set(); // just to free the waiting threads + } + + [Test] + public void TestMajorityFaultingDatabasesCauseReleaseToThrow() + { + var databases = Enumerable.Range(0, 5).Select(_ => CreateDatabaseMock()).ToArray(); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + var @lock = this._provider.CreateLock("lock"); + using var handle = @lock.Acquire(); + + new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); + var aggregateException = Assert.Throws(() => handle.Dispose()); + Assert.IsInstanceOf(aggregateException.InnerException); + } + + [Test] + public void TestHalfFaultingDatabasesCauseAcquireToThrow() + { + var databases = Enumerable.Range(0, 2).Select(_ => CreateDatabaseMock()).ToArray(); + MockDatabase(databases[0], () => throw new TimeZoneNotFoundException()); + this._provider.Strategy.DatabaseProvider.Databases = databases.Select(d => d.Object).ToArray(); + + var @lock = this._provider.CreateLock("lock"); + Assert.Throws(() => @lock.Acquire(TimeSpan.FromSeconds(10))); + } + + [Test] + [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive + public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) + { + var database = CreateDatabaseMock(); + MockDatabase(database, () => { Thread.Sleep(50); return true; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { database.Object }; + this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromMilliseconds(10))); + var @lock = this._provider.CreateLock("lock"); + + // single sync acquire has different timeout logic, so we test it separately + Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + } + + [Test] + [NonParallelizable] // timing-sensitive + public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() + { + using var @event = new ManualResetEventSlim(); + var failDatabase = CreateDatabaseMock(); + MockDatabase(failDatabase, () => { @event.Wait(); return false; }); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(), failDatabase.Object }; + var @lock = this._provider.CreateLock("lock"); + + var acquireTask = @lock.TryAcquireAsync().AsTask(); + Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + @event.Set(); + Assert.IsNull(await acquireTask); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; + var singleDatabaseLock = this._provider.CreateLock("lock"); + using var handle = await singleDatabaseLock.TryAcquireAsync(); + Assert.IsNotNull(handle); + } + + [Test] + public void TestAcquireWithLockPrefix() + { + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase(keyPrefix: "P") }; + var implicitPrefixLock = this._provider.CreateLock("N"); + + this._provider.Strategy.DatabaseProvider.Databases = new[] { CreateDatabase() }; + var noPrefixLock = this._provider.CreateLock("N"); + var explicitPrefixLock = this._provider.CreateLock("PN"); + + using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); + Assert.IsNotNull(implicitPrefixHandle); + using var noPrefixHandle = noPrefixLock.TryAcquire(); + Assert.IsNotNull(noPrefixHandle); + using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); + Assert.IsNull(explicitPrefixHandle); + + static IDatabase CreateDatabase(string? keyPrefix = null) + { + var database = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + return keyPrefix is null ? database : database.WithKeyPrefix(keyPrefix); + } + } + + private static Mock CreateDatabaseMock() + { + var mock = new Mock(MockBehavior.Strict); + MockDatabase(mock, () => true); + return mock; + } + + private static void MockDatabase(Mock mockDatabase, Func returns) + { + mockDatabase.Setup(d => d.StringSet(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(returns); + mockDatabase.Setup(d => d.StringSetAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(returns)); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.ScriptEvaluate(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => RedisResult.Create(returns())); + mockDatabase.Setup(d => d.ScriptEvaluateAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.SortedSetRemove(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => (bool)RedisResult.Create(returns())); + mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); + } +} diff --git a/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs similarity index 100% rename from DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs rename to src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs diff --git a/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj similarity index 100% rename from DistributedLock.Tests/DistributedLock.Tests.csproj rename to src/DistributedLock.Tests/DistributedLock.Tests.csproj diff --git a/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs rename to src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs rename to src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs b/src/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs rename to src/DistributedLock.Tests/Infrastructure/Data/ConnectionOptions.cs diff --git a/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs b/src/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs rename to src/DistributedLock.Tests/Infrastructure/Data/IdleSessionKiller.cs diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs b/src/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Data/TestingDb.cs rename to src/DistributedLock.Tests/Infrastructure/Data/TestingDb.cs diff --git a/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/DisposableCollection.cs b/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/DisposableCollection.cs rename to src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs b/src/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs rename to src/DistributedLock.Tests/Infrastructure/FileSystem/TestingFileSystemProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/FileSystem/TestingLockFileSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs b/src/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs rename to src/DistributedLock.Tests/Infrastructure/ITestingNameProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs rename to src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs diff --git a/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs b/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs rename to src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs rename to src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs diff --git a/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs rename to src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs rename to src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs diff --git a/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs rename to src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs rename to src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs diff --git a/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs rename to src/DistributedLock.Tests/Infrastructure/Redis/RedisSetUpFixture.cs diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs similarity index 97% rename from DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs rename to src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 83e0f0d1..92a00ff3 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -1,63 +1,63 @@ -using NUnit.Framework; -using StackExchange.Redis; -using StackExchange.Redis.KeyspaceIsolation; -using System.Diagnostics; - -namespace Medallion.Threading.Tests.Redis; - -public abstract class TestingRedisDatabaseProvider -{ - protected TestingRedisDatabaseProvider(IEnumerable databases) - { - this.Databases = databases.ToArray(); - } - - protected TestingRedisDatabaseProvider(int count) - : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) - { - } - - // publicly settable so that callers can alter the dbs in use - public IReadOnlyList Databases { get; set; } - - public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); -} - -public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider -{ - public TestingRedisSingleDatabaseProvider() : base(count: 1) { } -} - -public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider -{ - public TestingRedisWithKeyPrefixSingleDatabaseProvider() - : base(new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase().WithKeyPrefix("distributed_locks:") }) { } - - public override string CrossProcessLockTypeSuffix => "1WithPrefix"; -} - -public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider -{ - public TestingRedis3DatabaseProvider() : base(count: 3) { } -} - -public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider -{ - private static readonly IDatabase DeadDatabase; - - static TestingRedis2x1DatabaseProvider() - { - var server = new RedisServer(allowAdmin: true); - DeadDatabase = server.Multiplexer.GetDatabase(); - using var process = Process.GetProcessById(server.ProcessId); - server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); - Assert.IsTrue(process.WaitForExit(5000)); - } - - public TestingRedis2x1DatabaseProvider() - : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) - { - } - - public override string CrossProcessLockTypeSuffix => "2x1"; -} +using NUnit.Framework; +using StackExchange.Redis; +using StackExchange.Redis.KeyspaceIsolation; +using System.Diagnostics; + +namespace Medallion.Threading.Tests.Redis; + +public abstract class TestingRedisDatabaseProvider +{ + protected TestingRedisDatabaseProvider(IEnumerable databases) + { + this.Databases = databases.ToArray(); + } + + protected TestingRedisDatabaseProvider(int count) + : this(Enumerable.Range(0, count).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase())) + { + } + + // publicly settable so that callers can alter the dbs in use + public IReadOnlyList Databases { get; set; } + + public virtual string CrossProcessLockTypeSuffix => this.Databases.Count.ToString(); +} + +public sealed class TestingRedisSingleDatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedisSingleDatabaseProvider() : base(count: 1) { } +} + +public sealed class TestingRedisWithKeyPrefixSingleDatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedisWithKeyPrefixSingleDatabaseProvider() + : base(new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase().WithKeyPrefix("distributed_locks:") }) { } + + public override string CrossProcessLockTypeSuffix => "1WithPrefix"; +} + +public sealed class TestingRedis3DatabaseProvider : TestingRedisDatabaseProvider +{ + public TestingRedis3DatabaseProvider() : base(count: 3) { } +} + +public sealed class TestingRedis2x1DatabaseProvider : TestingRedisDatabaseProvider +{ + private static readonly IDatabase DeadDatabase; + + static TestingRedis2x1DatabaseProvider() + { + var server = new RedisServer(allowAdmin: true); + DeadDatabase = server.Multiplexer.GetDatabase(); + using var process = Process.GetProcessById(server.ProcessId); + server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); + Assert.IsTrue(process.WaitForExit(5000)); + } + + public TestingRedis2x1DatabaseProvider() + : base(Enumerable.Range(0, 2).Select(i => RedisServer.GetDefaultServer(i).Multiplexer.GetDatabase()).Append(DeadDatabase)) + { + } + + public override string CrossProcessLockTypeSuffix => "2x1"; +} diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs rename to src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs similarity index 97% rename from DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index e3067da4..041ac2d8 100644 --- a/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -1,84 +1,84 @@ -using Medallion.Threading.Internal; -using Medallion.Threading.Redis; - -namespace Medallion.Threading.Tests.Redis; - -public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy - where TDatabaseProvider : TestingRedisDatabaseProvider, new() -{ - private bool _preparedForHandleLost, _preparedForHandleAbandonment; - private Action? _killHandleAction; - private Action? _options; - - public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); - - public void SetOptions(Action? options) - { - this._options = options; - } - - public void Options(RedisDistributedSynchronizationOptionsBuilder options) - { - if (this._preparedForHandleLost) - { - options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); - } - if (this._preparedForHandleAbandonment) - { - options.Expiry(TimeSpan.FromSeconds(.2)) - // the reader writer lock requires that the busy wait sleep time is shorter - // than the expiry, so adjust for that - .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); - } - - this._options?.Invoke(options); - } - - public override IDisposable? PrepareForHandleLost() - { - Invariant.Require(!this._preparedForHandleLost); - this._preparedForHandleLost = true; - return new HandleLostScope(this); - } - - public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; - - public override void PerformAdditionalCleanupForHandleAbandonment() - { - Invariant.Require(this._preparedForHandleAbandonment); - Thread.Sleep(TimeSpan.FromSeconds(.5)); - } - - public void RegisterKillHandleAction(Action action) - { - if (this._preparedForHandleLost) - { - this._killHandleAction += action; - } - } - - private class HandleLostScope : IDisposable - { - private TestingRedisSynchronizationStrategy? _strategy; - - public HandleLostScope(TestingRedisSynchronizationStrategy strategy) - { - this._strategy = strategy; - } - - public void Dispose() - { - var strategy = Interlocked.Exchange(ref this._strategy, null); - if (strategy != null) - { - Invariant.Require(strategy._preparedForHandleLost); - try { strategy._killHandleAction?.Invoke(); } - finally - { - strategy._killHandleAction = null; - strategy._preparedForHandleLost = false; - } - } - } - } -} +using Medallion.Threading.Internal; +using Medallion.Threading.Redis; + +namespace Medallion.Threading.Tests.Redis; + +public sealed class TestingRedisSynchronizationStrategy : TestingSynchronizationStrategy + where TDatabaseProvider : TestingRedisDatabaseProvider, new() +{ + private bool _preparedForHandleLost, _preparedForHandleAbandonment; + private Action? _killHandleAction; + private Action? _options; + + public TDatabaseProvider DatabaseProvider { get; } = new TDatabaseProvider(); + + public void SetOptions(Action? options) + { + this._options = options; + } + + public void Options(RedisDistributedSynchronizationOptionsBuilder options) + { + if (this._preparedForHandleLost) + { + options.ExtensionCadence(TimeSpan.FromMilliseconds(30)); + } + if (this._preparedForHandleAbandonment) + { + options.Expiry(TimeSpan.FromSeconds(.2)) + // the reader writer lock requires that the busy wait sleep time is shorter + // than the expiry, so adjust for that + .BusyWaitSleepTime(TimeSpan.FromSeconds(.01), TimeSpan.FromSeconds(.1)); + } + + this._options?.Invoke(options); + } + + public override IDisposable? PrepareForHandleLost() + { + Invariant.Require(!this._preparedForHandleLost); + this._preparedForHandleLost = true; + return new HandleLostScope(this); + } + + public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; + + public override void PerformAdditionalCleanupForHandleAbandonment() + { + Invariant.Require(this._preparedForHandleAbandonment); + Thread.Sleep(TimeSpan.FromSeconds(.5)); + } + + public void RegisterKillHandleAction(Action action) + { + if (this._preparedForHandleLost) + { + this._killHandleAction += action; + } + } + + private class HandleLostScope : IDisposable + { + private TestingRedisSynchronizationStrategy? _strategy; + + public HandleLostScope(TestingRedisSynchronizationStrategy strategy) + { + this._strategy = strategy; + } + + public void Dispose() + { + var strategy = Interlocked.Exchange(ref this._strategy, null); + if (strategy != null) + { + Invariant.Require(strategy._preparedForHandleLost); + try { strategy._killHandleAction?.Invoke(); } + finally + { + strategy._killHandleAction = null; + strategy._preparedForHandleLost = false; + } + } + } + } +} diff --git a/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/AzureCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs b/src/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/RedisPorts.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs b/src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs diff --git a/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs b/src/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs rename to src/DistributedLock.Tests/Infrastructure/Shared/ZooKeeperPorts.cs diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs rename to src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs diff --git a/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs rename to src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs b/src/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs rename to src/DistributedLock.Tests/Infrastructure/SupportsContinuousIntegrationAttribute.cs diff --git a/DistributedLock.Tests/Infrastructure/TestHelper.cs b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestHelper.cs rename to src/DistributedLock.Tests/Infrastructure/TestHelper.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingLockProvider.cs rename to src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs rename to src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs rename to src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs rename to src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs rename to src/DistributedLock.Tests/Infrastructure/TestingSemaphoreProvider.cs diff --git a/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/TestingSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs b/src/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs rename to src/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/WaitHandles/TestingWaitHandleSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs rename to src/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperProviders.cs diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs rename to src/DistributedLock.Tests/Infrastructure/ZooKeeper/TestingZooKeeperSynchronizationStrategy.cs diff --git a/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs similarity index 100% rename from DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs rename to src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs diff --git a/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ApiTest.cs rename to src/DistributedLock.Tests/Tests/ApiTest.cs diff --git a/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs rename to src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/CombinatorialTests.cs b/src/DistributedLock.Tests/Tests/CombinatorialTests.cs similarity index 100% rename from DistributedLock.Tests/Tests/CombinatorialTests.cs rename to src/DistributedLock.Tests/Tests/CombinatorialTests.cs diff --git a/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs rename to src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs diff --git a/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs b/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs rename to src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs diff --git a/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs rename to src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs diff --git a/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/HelpersTest.cs rename to src/DistributedLock.Tests/Tests/Core/HelpersTest.cs diff --git a/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs b/src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs rename to src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs diff --git a/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs b/src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs rename to src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs diff --git a/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs b/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs rename to src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs rename to src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs diff --git a/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs rename to src/DistributedLock.Tests/Tests/Oracle/OracleBehaviorTest.cs diff --git a/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/Oracle/OracleDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs rename to src/DistributedLock.Tests/Tests/Oracle/OracleDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs rename to src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs diff --git a/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/TestSetupTest.cs b/src/DistributedLock.Tests/Tests/TestSetupTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/TestSetupTest.cs rename to src/DistributedLock.Tests/Tests/TestSetupTest.cs diff --git a/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs rename to src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs diff --git a/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedLockTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedReaderWriterLockTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSemaphoreTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilderTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs diff --git a/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs similarity index 100% rename from DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs rename to src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs diff --git a/DistributedLock.WaitHandles/AssemblyAttributes.cs b/src/DistributedLock.WaitHandles/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.WaitHandles/AssemblyAttributes.cs rename to src/DistributedLock.WaitHandles/AssemblyAttributes.cs diff --git a/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj similarity index 100% rename from DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj rename to src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj diff --git a/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs b/src/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs similarity index 100% rename from DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs rename to src/DistributedLock.WaitHandles/DistributedWaitHandleHelpers.cs diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs b/src/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs rename to src/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs b/src/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs similarity index 100% rename from DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs rename to src/DistributedLock.WaitHandles/EventWaitHandleDistributedLock.cs diff --git a/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs b/src/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs similarity index 100% rename from DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs rename to src/DistributedLock.WaitHandles/EventWaitHandleDistributedLockHandle.cs diff --git a/DistributedLock.WaitHandles/PublicAPI.Shipped.txt b/src/DistributedLock.WaitHandles/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.WaitHandles/PublicAPI.Shipped.txt rename to src/DistributedLock.WaitHandles/PublicAPI.Shipped.txt diff --git a/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt b/src/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.WaitHandles/PublicAPI.Unshipped.txt rename to src/DistributedLock.WaitHandles/PublicAPI.Unshipped.txt diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs b/src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs similarity index 100% rename from DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs rename to src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.IDistributedSemaphore.cs diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs b/src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs similarity index 100% rename from DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs rename to src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphore.cs diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs b/src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs similarity index 100% rename from DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs rename to src/DistributedLock.WaitHandles/WaitHandleDistributedSemaphoreHandle.cs diff --git a/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs b/src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs rename to src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs diff --git a/DistributedLock.WaitHandles/WaitHandleExtensions.cs b/src/DistributedLock.WaitHandles/WaitHandleExtensions.cs similarity index 100% rename from DistributedLock.WaitHandles/WaitHandleExtensions.cs rename to src/DistributedLock.WaitHandles/WaitHandleExtensions.cs diff --git a/DistributedLock.ZooKeeper/AssemblyAttributes.cs b/src/DistributedLock.ZooKeeper/AssemblyAttributes.cs similarity index 100% rename from DistributedLock.ZooKeeper/AssemblyAttributes.cs rename to src/DistributedLock.ZooKeeper/AssemblyAttributes.cs diff --git a/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj similarity index 100% rename from DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj rename to src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj diff --git a/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt b/src/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt similarity index 100% rename from DistributedLock.ZooKeeper/PublicAPI.Shipped.txt rename to src/DistributedLock.ZooKeeper/PublicAPI.Shipped.txt diff --git a/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt b/src/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt similarity index 100% rename from DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt rename to src/DistributedLock.ZooKeeper/PublicAPI.Unshipped.txt diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnection.cs b/src/DistributedLock.ZooKeeper/ZooKeeperConnection.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperConnection.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperConnection.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs b/src/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperConnectionInfo.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.IDistributedLock.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedLock.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedLockHandle.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.IDistributedReaderWriterLock.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLockHandle.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.IDistributedSemaphore.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphore.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedSemaphoreHandle.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationOptionsBuilder.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs b/src/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperNodeCreator.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs b/src/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperNodeHandle.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperPath.cs b/src/DistributedLock.ZooKeeper/ZooKeeperPath.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperPath.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperPath.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs b/src/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperSequentialPathHelper.cs diff --git a/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs b/src/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs similarity index 100% rename from DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs rename to src/DistributedLock.ZooKeeper/ZooKeeperSynchronizationHelper.cs diff --git a/DistributedLock.sln b/src/DistributedLock.sln similarity index 100% rename from DistributedLock.sln rename to src/DistributedLock.sln diff --git a/DistributedLock.snk b/src/DistributedLock.snk similarity index 100% rename from DistributedLock.snk rename to src/DistributedLock.snk diff --git a/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj similarity index 100% rename from DistributedLock/DistributedLock.csproj rename to src/DistributedLock/DistributedLock.csproj diff --git a/DistributedLockCodeGen/CodeGenHelpers.cs b/src/DistributedLockCodeGen/CodeGenHelpers.cs similarity index 100% rename from DistributedLockCodeGen/CodeGenHelpers.cs rename to src/DistributedLockCodeGen/CodeGenHelpers.cs diff --git a/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj similarity index 100% rename from DistributedLockCodeGen/DistributedLockCodeGen.csproj rename to src/DistributedLockCodeGen/DistributedLockCodeGen.csproj diff --git a/DistributedLockCodeGen/DocCommentGenerator.cs b/src/DistributedLockCodeGen/DocCommentGenerator.cs similarity index 100% rename from DistributedLockCodeGen/DocCommentGenerator.cs rename to src/DistributedLockCodeGen/DocCommentGenerator.cs diff --git a/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs similarity index 100% rename from DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs rename to src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs diff --git a/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs similarity index 100% rename from DistributedLockCodeGen/GenerateProviders.cs rename to src/DistributedLockCodeGen/GenerateProviders.cs diff --git a/DistributedLockTaker/App.config b/src/DistributedLockTaker/App.config similarity index 100% rename from DistributedLockTaker/App.config rename to src/DistributedLockTaker/App.config diff --git a/DistributedLockTaker/DistributedLockTaker.csproj b/src/DistributedLockTaker/DistributedLockTaker.csproj similarity index 100% rename from DistributedLockTaker/DistributedLockTaker.csproj rename to src/DistributedLockTaker/DistributedLockTaker.csproj diff --git a/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs similarity index 100% rename from DistributedLockTaker/Program.cs rename to src/DistributedLockTaker/Program.cs diff --git a/FixDistributedLockCoreDependencyVersion.targets b/src/FixDistributedLockCoreDependencyVersion.targets similarity index 100% rename from FixDistributedLockCoreDependencyVersion.targets rename to src/FixDistributedLockCoreDependencyVersion.targets From e5c838b9f6b25a76210bca00e57efa320c7c6f3d Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sat, 3 Dec 2022 13:15:42 -0500 Subject: [PATCH 212/399] relocate .editorconfig --- .editorconfig => src/.editorconfig | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .editorconfig => src/.editorconfig (100%) diff --git a/.editorconfig b/src/.editorconfig similarity index 100% rename from .editorconfig rename to src/.editorconfig From c2034b2b0f7b16aa535ea88f893c8d135d306042 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 4 Dec 2022 08:45:27 -0500 Subject: [PATCH 213/399] Fix AzureSetUpFixture cleanup logic --- .../Infrastructure/Azure/AzureSetUpFixture.cs | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs index 91760ff6..11228b1d 100644 --- a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs @@ -8,12 +8,14 @@ namespace Medallion.Threading.Tests.Azure; [SetUpFixture] public class AzureSetUpFixture { - private Command? _azureStorageEmulatorCommand; + private const string EmulatorProcessName = "AzureStorageEmulator"; + + private bool _startedEmulator; [OneTimeSetUp] public void OneTimeSetUp() { - var existingProcesses = Process.GetProcessesByName("AzureStorageEmulator"); + var existingProcesses = Process.GetProcessesByName(EmulatorProcessName); if (existingProcesses.Any()) { Console.WriteLine($"Emulator already running (PID={existingProcesses[0].Id})"); @@ -21,17 +23,19 @@ public void OneTimeSetUp() } else { - var emulatorExePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft SDKs", "Azure", "Storage Emulator", "AzureStorageEmulator.exe"); + var emulatorExePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft SDKs", "Azure", "Storage Emulator", $"{EmulatorProcessName}.exe"); if (!File.Exists(emulatorExePath)) { - throw new FileNotFoundException($"Could not locate the AzureStorageEmulator at {emulatorExePath}. This is required to run Azure tests. See https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator"); + throw new FileNotFoundException($"Could not locate the {EmulatorProcessName} at {emulatorExePath}. This is required to run Azure tests. See https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator"); } + // Note: we used to hang on to this command to kill it later; we no longer do that because this process seems to naturally exit + // by the end of the test and instead the emulator is running in another process. Therefore, we do a name-based lookup in teardown instead. var command = Command.Run(emulatorExePath, new[] { "start" }, o => o.StartInfo(i => i.RedirectStandardInput = false)) .RedirectTo(Console.Out) .RedirectStandardErrorTo(Console.Error); - Console.WriteLine($"Launched AzureStorageEmulator (PID={command.ProcessId})"); - this._azureStorageEmulatorCommand = command; + Console.WriteLine($"Launched {EmulatorProcessName}"); + this._startedEmulator = true; } new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).CreateIfNotExists(); @@ -42,15 +46,13 @@ public void OneTimeTearDown() { new BlobContainerClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName).DeleteIfExists(); - if (this._azureStorageEmulatorCommand != null) + if (this._startedEmulator) { - if (this._azureStorageEmulatorCommand.Task.IsCompleted) + foreach (var process in Process.GetProcessesByName(EmulatorProcessName)) { - throw new InvalidOperationException($"AzureStorageEmulator exited unexpectedly with error code {this._azureStorageEmulatorCommand.Result.ExitCode}"); + process.Kill(); + process.WaitForExit(); } - - this._azureStorageEmulatorCommand.Kill(); - this._azureStorageEmulatorCommand.Wait(); } } } From abb62f91024623b9975f04b6ac1eebef894364bf Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 4 Dec 2022 08:46:09 -0500 Subject: [PATCH 214/399] Leverage modern C# in DisposableCollection --- .../Infrastructure/DisposableCollection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs b/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs index f670d32c..43f33169 100644 --- a/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs +++ b/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs @@ -2,8 +2,8 @@ internal sealed class DisposableCollection : IDisposable { - private readonly object _lock = new object(); - private Stack? _resources = new Stack(); + private readonly object _lock = new(); + private Stack? _resources = new(); public void Add(IDisposable resource) { From 1447bb2130ba3c98310e51df7a7f99ca0a048775 Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Sun, 16 Jul 2023 21:20:06 -0400 Subject: [PATCH 215/399] Update packages to fix #49 --- README.md | 3 +++ src/DistributedLock.Oracle/DistributedLock.Oracle.csproj | 6 +++--- .../DistributedLock.SqlServer.csproj | 4 ++-- src/DistributedLock/DistributedLock.csproj | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 377ccbdc..0cd1e9bd 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,9 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.3.3 + - Update Microsoft.Data.SqlClient due to vulnerabilities ([#49](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) + - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) - 2.3.2 - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! - 2.3.1 diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index ddd84379..24a56f42 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -11,7 +11,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Oracle Database @@ -45,8 +45,8 @@ - - + + diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 4b5ba58f..e8f1bb14 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -11,7 +11,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server @@ -45,7 +45,7 @@ - + diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 01cd4994..028834e7 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.3.2 + 2.3.3 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 00c0f4e926c586f5a1fabf869b79817a1cefbe46 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 16 Jul 2023 21:20:59 -0400 Subject: [PATCH 216/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0cd1e9bd..2a900651 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ Contributions are welcome! If you are interested in contributing towards a new o ## Release notes - 2.3.3 - - Update Microsoft.Data.SqlClient due to vulnerabilities ([#49](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) + - Update Microsoft.Data.SqlClient due to vulnerabilities ([#149](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) - 2.3.2 - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! From 3c0b6dc881b4a212eebcedca78aecb808282dcfe Mon Sep 17 00:00:00 2001 From: Robin <7276999+Kaffeetasse@users.noreply.github.com> Date: Wed, 22 Nov 2023 01:31:34 +0100 Subject: [PATCH 217/399] Handle npgsql 8 command null value to fix #174 --- src/DistributedLock.Postgres/PostgresAdvisoryLock.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 3f6ad6e2..9b6d1053 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -103,6 +103,7 @@ private PostgresAdvisoryLock(bool isShared) return acquireCommandResult switch { DBNull _ => Cookie, // indicates we called pg_advisory_lock and not pg_try_advisory_lock + null => Cookie, // Npgsql 8 returns null instead of DBNull false => null, true => Cookie, _ => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") From 8f892e5e834147d1b55f776849d0cacaa3f50fdd Mon Sep 17 00:00:00 2001 From: Michael Adelson Date: Mon, 27 Nov 2023 19:38:49 -0500 Subject: [PATCH 218/399] 2.3.4 release --- README.md | 2 ++ src/DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- src/DistributedLock/DistributedLock.csproj | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a900651..ddaca1e9 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. ## Release notes +- 2.3.4 + - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! - 2.3.3 - Update Microsoft.Data.SqlClient due to vulnerabilities ([#149](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index cb6e2675..97544eed 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.0.4 + 1.0.5 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 028834e7..20b3b73e 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.3.3 + 2.3.4 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From c074cd56dc928e7682e98b7a1e50c7e769a3e858 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 19:46:20 +0000 Subject: [PATCH 219/399] Bump Microsoft.Data.SqlClient in /src/DistributedLock.SqlServer Bumps [Microsoft.Data.SqlClient](https://github.com/dotnet/sqlclient) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/dotnet/sqlclient/releases) - [Changelog](https://github.com/dotnet/SqlClient/blob/main/CHANGELOG.md) - [Commits](https://github.com/dotnet/sqlclient/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: Microsoft.Data.SqlClient dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index e8f1bb14..2b3e20a4 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -45,7 +45,7 @@ - + From e401f845051790e8936fbe6503891e56461b1018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 20:18:47 +0000 Subject: [PATCH 220/399] Bump System.Data.SqlClient in /src/DistributedLock.Tests Bumps [System.Data.SqlClient](https://github.com/dotnet/corefx) from 4.8.5 to 4.8.6. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) --- updated-dependencies: - dependency-name: System.Data.SqlClient dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src/DistributedLock.Tests/DistributedLock.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index e16c9094..1f8dd8e8 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -19,7 +19,7 @@ - + From 158b71c7d3a11ac1cca25247d451930d10f6a542 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 10 Feb 2024 21:50:59 -0500 Subject: [PATCH 221/399] Document and revamp local dev setup, some package updates --- README.md | 2 + docs/Developing DistributedLock.md | 76 +++++++++++++++++++ .../BlobClientWrapper.cs | 2 +- .../DistributedLock.Azure.csproj | 2 +- .../DistributedLock.Core.csproj | 2 +- .../DistributedLock.FileSystem.csproj | 4 +- .../DistributedLock.MySql.csproj | 6 +- .../DistributedLock.Oracle.csproj | 2 +- .../DistributedLock.Postgres.csproj | 2 +- .../DistributedLock.Redis.csproj | 4 +- .../DistributedLock.SqlServer.csproj | 4 +- .../Data/ConnectionStringStrategyTestCases.cs | 2 +- ...onnectionOrTransactionStrategyTestCases.cs | 2 +- .../ExternalTransactionStrategyTestCases.cs | 2 +- .../Data/OwnedConnectionStrategyTestCases.cs | 2 +- .../DistributedLockCoreTestCases.cs | 6 +- ...istributedReaderWriterLockCoreTestCases.cs | 4 +- .../Redis/RedisExtensionTestCases.cs | 4 +- .../DistributedLock.Tests.csproj | 6 +- .../Infrastructure/Azure/AzureSetUpFixture.cs | 17 +++-- ...ngAzureBlobLeaseDistributedLockProvider.cs | 5 +- .../Infrastructure/Oracle/TestingOracleDb.cs | 6 +- .../Oracle/TestingOracleProviders.cs | 4 +- .../Postgres/TestingPostgresDb.cs | 2 +- .../Postgres/TestingPostgresProviders.cs | 4 +- .../Infrastructure/Redis/RedisServer.cs | 8 +- .../Shared/MariaDbCredentials.cs | 2 +- .../Infrastructure/Shared/MySqlCredentials.cs | 4 +- .../Shared/OracleCredentials.cs | 29 ++----- .../Shared/PostgresCredentials.cs | 2 +- .../Shared/SqlServerCredentials.cs | 2 +- .../Infrastructure/Shared/TargetFramework.cs | 8 +- .../SqlServer/TestingSqlServerDb.cs | 2 +- .../Infrastructure/TestHelper.cs | 4 +- .../ZooKeeper/ZooKeeperSetUpFixture.cs | 8 +- src/DistributedLock.Tests/Tests/ApiTest.cs | 2 +- .../Tests/Azure/AzureBehaviorTest.cs | 44 ----------- .../AzureBlobLeaseDistributedLockTest.cs | 23 +----- .../Tests/Core/DeadlockExceptionTest.cs | 2 + .../FileSystem/FileDistributedLockTest.cs | 5 +- .../Tests/MySql/MySqlDistributedLockTest.cs | 8 +- ...lDistributedSynchronizationProviderTest.cs | 19 +++-- .../Tests/Postgres/PostgresBehaviorTest.cs | 8 +- .../Postgres/PostgresDistributedLockTest.cs | 2 +- .../RedisDistributedReaderWriterLockTest.cs | 4 +- .../DistributedLock.WaitHandles.csproj | 2 +- .../DistributedLock.ZooKeeper.csproj | 4 +- src/DistributedLock/DistributedLock.csproj | 4 +- .../DistributedLockTaker.csproj | 2 +- 49 files changed, 190 insertions(+), 180 deletions(-) create mode 100644 docs/Developing DistributedLock.md diff --git a/README.md b/README.md index ddaca1e9..7cefcc11 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,8 @@ public class SomeService Contributions are welcome! If you are interested in contributing towards a new or existing issue, please let me know via comments on the issue so that I can help you get started and avoid wasted effort on your part. +Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). + ## Release notes - 2.3.4 - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md new file mode 100644 index 00000000..c013b24b --- /dev/null +++ b/docs/Developing DistributedLock.md @@ -0,0 +1,76 @@ +# Developing DistributedLock + +## Installing back-ends for testing + +DistributedLock has a variety of back-ends; to be able to develop and run tests against all of them you'll need to install a good amount of software. + +### Azure + +For the Azure back-end, [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite) is used for local development. See [here](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage#install-azurite) for how to install. + +### MySQL + +The MySQL driver covers both MySQL and MariaDB; so we'll need to install both. + +#### MariaDB + +The MariaDB installer can be downloaded [here](https://mariadb.org/download/?t=mariadb&p=mariadb&os=windows&cpu=x86_64&pkg=msi&m=acorn). + +After downloading, you'll need to enable the performance_schema which is used by DistributedLock's tests. You can do this by adding the following to your my.ini/my.cnf file (C:\Program Files\MariaDB {version}\data\my.ini on windows): + +```ini +# activates the performance_schema tables which are needed by DistributedLock tests +performance_schema=ON +``` + +After doing this, restart MariaDB (on Windows, do this in the Services app). + +Next, create the `distributed_lock` database and a user for the tests to run as: +```sql +CREATE DATABASE distributed_lock; +CREATE USER 'DistributedLock'@'localhost' IDENTIFIED BY ''; +GRANT ALL PRIVILEGES ON distributed_lock.* TO 'DistributedLock'@'localhost'; +GRANT SELECT ON performance_schema.* TO 'DistributedLock'@'localhost'; +``` + +Finally, add your username (DistributedLock) and password to `DistributedLock.Tests/credentials/mariadb.txt`, with the username on line 1 and the password on line 2. + +#### MySQL + +You can install MySQL from [here](https://dev.mysql.com/downloads/mysql/). Run on port 3307 to avoid conflicting with MariaDB. + +Add your username and password to `DistributedLock.Tests/credentials/mysql.txt`, with the username on line 1 and the password on line 2. + +### Oracle + +You can install Oracle from [here](https://www.oracle.com/database/technologies/oracle-database-software-downloads.html#db_free). It claims not to support Windows 11 Home, but it seems to install and work fine. + +Add your username (e.g. SYSTEM) and password to `DistributedLock.Tests/credentials/oracle.txt`, with the username on line 1 and the password on line 2. + +### Postgres + +You can install Postgres from [here](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). + +In `C:\Program Files\PostgreSQL\\data\postgresql.conf`, update `max_connections` to 200. + +Add your username (e.g. postgres) and password to `DistributedLock.Tests/credentials/postgres.txt`, with the username on line 1 and the password on line 2. + +### SQL Server + +Download SQL developer edition from [here](https://www.microsoft.com/en-us/sql-server/sql-server-downloads). + +The tests connect via integrated security. + +### Redis + +Install Redis locally. On Windows, install it via WSL as described [here](https://developer.redis.com/create/windows/). + +You do not need it running as a service: the tests will start and stop instances automatically. + +### ZooKeeper + +Download a ZooKeeper installation by going to [https://zookeeper.apache.org/](https://zookeeper.apache.org/)->Documentation->Release ...->Getting Started->Download->stable. + +Extract the zip archive, and within it copy `zoo_sample.cfg` to `zoo.cfg`. + +Add the full path of the extracted directory (the one containing README.md, bin, conf, etc) to `DistributedLock.Tests/credentials/zookeeper.txt` as a single line. diff --git a/src/DistributedLock.Azure/BlobClientWrapper.cs b/src/DistributedLock.Azure/BlobClientWrapper.cs index ffca59d1..6d9839a2 100644 --- a/src/DistributedLock.Azure/BlobClientWrapper.cs +++ b/src/DistributedLock.Azure/BlobClientWrapper.cs @@ -19,7 +19,7 @@ public BlobClientWrapper(BlobBaseClient blobClient) public string Name => this._blobClient.Name; - public BlobLeaseClientWrapper GetBlobLeaseClient() => new BlobLeaseClientWrapper(this._blobClient.GetBlobLeaseClient()); + public BlobLeaseClientWrapper GetBlobLeaseClient() => new(this._blobClient.GetBlobLeaseClient()); public async ValueTask> GetMetadataAsync(string leaseId, CancellationToken cancellationToken) { diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 41401509..9e1cac09 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index df5c7c0b..1c358e9e 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 079cda1d..e107f59e 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -49,11 +49,11 @@ - + all - + diff --git a/src/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj index 95c44362..e5907413 100644 --- a/src/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/src/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.MySql True 4 @@ -46,9 +46,9 @@ - + - + diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 24a56f42..dc2bdf95 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 97544eed..0c9fd861 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 7553a206..1459377c 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -50,11 +50,11 @@ - + all - + diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index e8f1bb14..86a770e1 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -45,9 +45,9 @@ - + - + diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index e9bbf377..7984771b 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -110,7 +110,7 @@ public async Task TestAccessingHandleLostTokenWhileKeepaliveActiveDoesNotBlock() handle.HandleLostToken.Register(() => { }); } }); - Assert.IsTrue(await accessHandleLostTokenTask.WaitAsync(TimeSpan.FromSeconds(5))); + Assert.IsTrue(await accessHandleLostTokenTask.TryWaitAsync(TimeSpan.FromSeconds(5))); // do this only on success; on failure we're likely deadlocked and dispose will hang await handle.DisposeAsync(); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index 636d8f86..ad6c4fef 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -95,7 +95,7 @@ public void TestStateChangeHandlerIsNotLeaked() .Where(f => f.FieldType == typeof(StateChangeEventHandler)) .SingleOrDefault() ) - .First(f => f != null) + .First(f => f != null)! .GetValue(connection); } } diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index c5137c59..21fe3ccc 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -74,7 +74,7 @@ public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] boo if (closeConnection) { - this._lockProvider.Strategy.AmbientTransaction!.Connection.Dispose(); + this._lockProvider.Strategy.AmbientTransaction!.Connection!.Dispose(); } else { diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs index 67db6cbc..1e25fb3c 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/OwnedConnectionStrategyTestCases.cs @@ -53,6 +53,6 @@ public void TestIdleSessionKiller() } } - Assert.Catch(() => handle.Dispose()); + Assert.Catch(handle.Dispose); } } diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 04170742..ba0d6d75 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -12,7 +12,7 @@ public abstract class DistributedLockCoreTestCases where TStrategy : TestingSynchronizationStrategy, new() { private TLockProvider _lockProvider = default!; - private readonly List _cleanupActions = new List(); + private readonly List _cleanupActions = []; [SetUp] public void SetUp() => this._lockProvider = new TLockProvider(); @@ -99,8 +99,8 @@ public void TestDisposeHandleIsIdempotent() Assert.IsNotNull(handle); handle.Dispose(); var handle2 = @lock.Acquire(TimeSpan.FromSeconds(30)); - Assert.DoesNotThrow(() => handle.Dispose()); - Assert.DoesNotThrow(() => handle2.Dispose()); + Assert.DoesNotThrow(handle.Dispose); + Assert.DoesNotThrow(handle2.Dispose); } [Test] diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index 08f795d1..22e3b862 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -53,7 +53,7 @@ IDistributedReaderWriterLock Lock() => await using var readerHandle = await Lock().AcquireReadLockAsync(); var writerHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); - Assert.IsFalse(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(0.2))); + Assert.IsFalse(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(0.2))); // trying to take a read lock here fails because there is a writer waiting await using var readerHandle2 = await Lock().TryAcquireReadLockAsync(); @@ -61,7 +61,7 @@ IDistributedReaderWriterLock Lock() => await readerHandle.DisposeAsync(); - Assert.IsTrue(await writerHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + Assert.IsTrue(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); await writerHandleTask.Result.DisposeAsync(); } diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index 8d0f216a..eae06598 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -25,10 +25,10 @@ public async Task TestCanExtendLock() var secondHandleTask = @lock.AcquireAsync().AsTask(); _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(2))); + Assert.IsFalse(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(2))); await handle.DisposeAsync(); - Assert.IsTrue(await secondHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + Assert.IsTrue(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); } } diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index e16c9094..7af1c040 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -2,8 +2,8 @@ - netcoreapp3.1 - net471;netcoreapp3.1 + net8.0 + net472;net8.0 Latest enable enable @@ -19,7 +19,7 @@ - + diff --git a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs index 11228b1d..cfb627ed 100644 --- a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs @@ -8,7 +8,8 @@ namespace Medallion.Threading.Tests.Azure; [SetUpFixture] public class AzureSetUpFixture { - private const string EmulatorProcessName = "AzureStorageEmulator"; + // https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage + private const string EmulatorProcessName = "azurite"; private bool _startedEmulator; @@ -23,15 +24,21 @@ public void OneTimeSetUp() } else { - var emulatorExePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft SDKs", "Azure", "Storage Emulator", $"{EmulatorProcessName}.exe"); - if (!File.Exists(emulatorExePath)) + var emulatorExePaths = Directory.GetFiles(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Microsoft Visual Studio"), $"{EmulatorProcessName}.exe", SearchOption.AllDirectories) + .OrderByDescending(File.GetLastWriteTimeUtc) + .ToArray(); + if (!emulatorExePaths.Any()) { - throw new FileNotFoundException($"Could not locate the {EmulatorProcessName} at {emulatorExePath}. This is required to run Azure tests. See https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator"); + throw new FileNotFoundException($"Could not locate {EmulatorProcessName}. This is required to run Azure tests. See https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite"); } // Note: we used to hang on to this command to kill it later; we no longer do that because this process seems to naturally exit // by the end of the test and instead the emulator is running in another process. Therefore, we do a name-based lookup in teardown instead. - var command = Command.Run(emulatorExePath, new[] { "start" }, o => o.StartInfo(i => i.RedirectStandardInput = false)) + var command = Command.Run( + emulatorExePaths[0], + ["start"], + o => o.StartInfo(i => i.RedirectStandardInput = false) + .WorkingDirectory(Path.GetDirectoryName(this.GetType().Assembly.Location)!)) .RedirectTo(Console.Out) .RedirectStandardErrorTo(Console.Error); Console.WriteLine($"Launched {EmulatorProcessName}"); diff --git a/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs index 8f926647..6dfc26f2 100644 --- a/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseDistributedLockProvider.cs @@ -5,7 +5,7 @@ namespace Medallion.Threading.Tests.Azure; public sealed class TestingAzureBlobLeaseDistributedLockProvider : TestingLockProvider { - private readonly HashSet _createdBlobs = new HashSet(); + private readonly HashSet _createdBlobs = []; public override IDistributedLock CreateLockWithExactName(string name) { @@ -16,7 +16,8 @@ public override IDistributedLock CreateLockWithExactName(string name) { if (this._createdBlobs.Add(client.Uri)) { - client.Upload(Stream.Null); + // Azurite blobs persist across runs, so we need overwrite: true + client.Upload(Stream.Null, overwrite: true); } } } diff --git a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index 2d390bad..0b5c7735 100644 --- a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -12,7 +12,7 @@ public sealed class TestingOracleDb : TestingPrimaryClientDb { internal static readonly string DefaultConnectionString = OracleCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly OracleConnectionStringBuilder _connectionStringBuilder = new OracleConnectionStringBuilder(DefaultConnectionString); + private readonly OracleConnectionStringBuilder _connectionStringBuilder = new(DefaultConnectionString); public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; @@ -51,10 +51,10 @@ public override IsolationLevel GetIsolationLevel(DbConnection connection) public override void PrepareForHighContention(ref int maxConcurrentAcquires) { - // The free Oracle Autonomous database has a fixed max session limit of 20. When concurrency approaches that, parellel + // Oracle XE has a default max session limit of 20. When concurrency approaches that, parellel // execution slows down greatly because often releases become queued behind competing aquires. When concurrency surpasses // that level we risk total deadlock where all active sessions are in use by acquires and as such no release can ever get - // through. + // through. It's possible that we could configure a higher limit but I'm not sure that's necessary. maxConcurrentAcquires = Math.Min(maxConcurrentAcquires, 15); } diff --git a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs index 16a990a9..90729c4e 100644 --- a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleProviders.cs @@ -11,7 +11,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => .Create( (connectionString, options) => new OracleDistributedLock(name, connectionString, options: ToOracleOptions(options)), connection => new OracleDistributedLock(name, connection), - transaction => new OracleDistributedLock(name, transaction.Connection) + transaction => new OracleDistributedLock(name, transaction.Connection!) ); public override string GetSafeName(string name) => new OracleDistributedLock(name, TestingOracleDb.DefaultConnectionString).Name; @@ -32,7 +32,7 @@ public override IDistributedUpgradeableReaderWriterLock CreateUpgradeableReaderW (connectionString, options) => new OracleDistributedReaderWriterLock(name, connectionString, TestingOracleDistributedLockProvider.ToOracleOptions(options), exactName: true), connection => new OracleDistributedReaderWriterLock(name, connection, exactName: true), - transaction => new OracleDistributedReaderWriterLock(name, transaction.Connection, exactName: true)); + transaction => new OracleDistributedReaderWriterLock(name, transaction.Connection!, exactName: true)); public override string GetSafeName(string name) => new OracleDistributedReaderWriterLock(name, TestingOracleDb.DefaultConnectionString).Name; } diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 280db911..4ad9c4f7 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -43,7 +43,7 @@ public override IsolationLevel GetIsolationLevel(DbConnection connection) using var command = connection.CreateCommand(); // values based on https://www.postgresql.org/docs/12/transaction-iso.html command.CommandText = "SELECT REPLACE(current_setting('transaction_isolation'), ' ', '')"; - return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar(), ignoreCase: true); + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()!, ignoreCase: true); } public override DbConnection CreateConnection() => new NpgsqlConnection(this.ConnectionStringBuilder.ConnectionString); diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index b7e6c57b..bedff140 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -15,7 +15,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => ToPostgresOptions(options) ), connection => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), - transaction => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) + transaction => new PostgresDistributedLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection!) ); public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); @@ -40,7 +40,7 @@ public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName TestingPostgresDistributedLockProvider.ToPostgresOptions(options) ), connection => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), connection), - transaction => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection) + transaction => new PostgresDistributedReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: false), transaction.Connection!) ); public override string GetSafeName(string name) => new PostgresAdvisoryLockKey(name, allowHashing: true).ToString(); diff --git a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 078d9bac..bb73c733 100644 --- a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -9,7 +9,7 @@ internal class RedisServer private static readonly int MinDynamicPort = RedisPorts.DefaultPorts.Max() + 1, MaxDynamicPort = MinDynamicPort + 100; // it's important for this to be lazy because it doesn't work when running on Linux - private static readonly Lazy WslPath = new Lazy( + private static readonly Lazy WslPath = new( () => Directory.GetDirectories(@"C:\Windows\WinSxS") .Select(d => Path.Combine(d, "wsl.exe")) .Where(File.Exists) @@ -17,7 +17,7 @@ internal class RedisServer .First() ); - private static readonly Dictionary ActiveServersByPort = new Dictionary(); + private static readonly Dictionary ActiveServersByPort = []; private static readonly RedisServer[] DefaultServers = new RedisServer[RedisPorts.DefaultPorts.Count]; private readonly Command _command; @@ -30,7 +30,7 @@ private RedisServer(int? port, bool allowAdmin) { this.Port = port ?? Enumerable.Range(MinDynamicPort, count: MaxDynamicPort - MinDynamicPort + 1) .First(p => !ActiveServersByPort.ContainsKey(p)); - this._command = Command.Run(WslPath.Value, new object[] { "redis-server", "--port", this.Port }, options: o => o.StartInfo(si => si.RedirectStandardInput = false)) + this._command = Command.Run(WslPath.Value, ["redis-server", "--port", this.Port], options: o => o.StartInfo(si => si.RedirectStandardInput = false)) .RedirectTo(Console.Out) .RedirectStandardErrorTo(Console.Error); ActiveServersByPort.Add(this.Port, this); @@ -70,7 +70,7 @@ public static void DisposeAll() } finally { - if (!await server._command.Task.WaitAsync(TimeSpan.FromSeconds(5))) + if (!await server._command.Task.TryWaitAsync(TimeSpan.FromSeconds(5))) { server._command.Kill(); throw new InvalidOperationException("Forced to kill Redis server"); diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs index c9747ca1..045d1fc5 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MariaDbCredentials.cs @@ -29,7 +29,7 @@ public static string GetConnectionString(string baseDirectory) return new MySqlConnectionStringBuilder { - Port = 3307, + Port = 3306, Server = "localhost", Database = "mysql", UserID = username, diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs index 2740b0eb..d2b9aa0d 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MySqlCredentials.cs @@ -21,7 +21,7 @@ public static string GetConnectionString(string baseDirectory) return new MySqlConnectionStringBuilder { - Port = 3306, + Port = 3307, Server = "localhost", Database = "mysql", UserID = username, @@ -29,6 +29,8 @@ public static string GetConnectionString(string baseDirectory) PersistSecurityInfo = true, // set a high pool size so that we don't empty the pool through things like lock abandonment tests MaximumPoolSize = 500, + // workaround for https://github.com/mysql-net/MySqlConnector/issues/1448 + TlsVersion = "Tls12" }.ConnectionString; } } diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs index 15ff975e..517f078e 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/OracleCredentials.cs @@ -19,42 +19,23 @@ internal static class OracleCredentials public static string GetConnectionString(string baseDirectory) { var credentialDirectory = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials")); - ConfigureWallet(credentialDirectory); - var (datasource, username, password) = GetCredentials(credentialDirectory); + var (username, password) = GetCredentials(credentialDirectory); return new OracleConnectionStringBuilder { - DataSource = datasource, + DataSource = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=XE)))", UserID = username, Password = password, PersistSecurityInfo = true, - // The free-tier autonomous database only allows 20 connections maximum (presumably across all clients) so this limit - // should help keep us below this limit. Running up against the limit throws errors on Connection.Open() - MaxPoolSize = 15, }.ConnectionString; } - private static void ConfigureWallet(string credentialDirectory) - { - var walletDirectory = Directory.GetDirectories(credentialDirectory, "Wallet_*").Single(); - if (OracleConfiguration.TnsAdmin != walletDirectory) - { - // directory containing tnsnames.ora and sqlnet.ora - OracleConfiguration.TnsAdmin = walletDirectory; - } - if (OracleConfiguration.WalletLocation != walletDirectory) - { - // directory containing cwallet.sso - OracleConfiguration.WalletLocation = walletDirectory; - } - } - - private static (string DataSource, string Username, string Password) GetCredentials(string credentialDirectory) + private static (string Username, string Password) GetCredentials(string credentialDirectory) { var file = Path.Combine(credentialDirectory, "oracle.txt"); if (!File.Exists(file)) { throw new InvalidOperationException($"Unable to find Oracle credentials file {file}"); } var lines = File.ReadAllLines(file); - if (lines.Length != 3) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } - return (lines[0], lines[1], lines[2]); + if (lines.Length != 2) { throw new FormatException($"{file} must contain exactly 2 lines of text"); } + return (lines[0], lines[1]); } } diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs index 06b742b3..3222829a 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/PostgresCredentials.cs @@ -21,7 +21,7 @@ public static string GetConnectionString(string baseDirectory) return new NpgsqlConnectionStringBuilder { - Port = 5433, + Port = 5432, Host = "localhost", Database = "postgres", Username = username, diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs index ec75f53f..0929c5a0 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs @@ -6,7 +6,7 @@ internal static class SqlServerCredentials public static readonly string ConnectionString = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder { - DataSource = @".\SQLEXPRESS", + DataSource = @"localhost", // localhost for SQL Developer, .\SQLEXPRESS for express InitialCatalog = "master", IntegratedSecurity = true, ApplicationName = ApplicationName, diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs b/src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs index ed609213..a4044956 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/TargetFramework.cs @@ -3,9 +3,9 @@ internal static class TargetFramework { public const string Current = -#if NET471 - "net471"; -#elif NETCOREAPP3_1 - "netcoreapp3.1"; +#if NET472 + "net472"; +#elif NET8_0 + "net8.0"; #endif } diff --git a/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index 51205304..2b258178 100644 --- a/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -47,7 +47,7 @@ WHEN 5 THEN 'Snapshot' ELSE 'Unknown' END AS isolationLevel FROM sys.dm_exec_sessions WHERE session_id = @@SPID"; - return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()); + return (IsolationLevel)Enum.Parse(typeof(IsolationLevel), (string)command.ExecuteScalar()!); } public override DbConnection CreateConnection() => new Microsoft.Data.SqlClient.SqlConnection(this.ConnectionStringBuilder.ConnectionString); diff --git a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs index 16fc8559..43174adc 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -23,7 +23,7 @@ public static bool IsHeld(this IDistributedLock @lock) return handle == null; } - public static async Task WaitAsync(this Task task, TimeoutValue timeout) + public static async Task TryWaitAsync(this Task task, TimeoutValue timeout) { if (!task.IsCompleted) { @@ -47,7 +47,7 @@ public static async Task WaitForAsync(Func> predicate, Tim using var cancellationSource = new CancellationTokenSource(); var waitForPredicateTask = WaitForPredicateAsync(); - if (!await waitForPredicateTask.WaitAsync(timeout)) + if (!await waitForPredicateTask.TryWaitAsync(timeout)) { cancellationSource.Cancel(); await waitForPredicateTask; diff --git a/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs index 6dc62d7e..b3c79d1a 100644 --- a/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -23,12 +23,8 @@ public void OneTimeSetUp() } else { - // based on Windows install as per https://medium.com/@shaaslam/installing-apache-zookeeper-on-windows-45eda303e835 - - const string ZooKeeperHomeEnvironmentVariable = "ZOOKEEPER_HOME"; - var zooKeeperHome = Environment.GetEnvironmentVariable(ZooKeeperHomeEnvironmentVariable); - if (zooKeeperHome == null) { throw new InvalidOperationException($"Environment variable '{ZooKeeperHomeEnvironmentVariable}' is not set"); } - + var zooKeeperHome = File.ReadAllText(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "credentials", "zookeeper.txt")).Trim(); + if (!Directory.Exists(zooKeeperHome)) { throw new DirectoryNotFoundException(zooKeeperHome); } var zooKeeperPath = Path.Combine(zooKeeperHome, "bin", "zkServer.cmd"); var command = Command.Run(zooKeeperPath, options: o => o.StartInfo(i => i.RedirectStandardInput = false)) diff --git a/src/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs index d0db0be7..1e188bae 100644 --- a/src/DistributedLock.Tests/Tests/ApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ApiTest.cs @@ -108,7 +108,7 @@ public void TestLibraryFilesDoNotWriteToConsole() { var projectDirectory = Path.GetDirectoryName(Path.GetDirectoryName(CurrentFilePath())); var solutionDirectory = Path.GetDirectoryName(projectDirectory!); - var libraryCsFiles = Directory.GetFiles(solutionDirectory, "*.cs", SearchOption.AllDirectories) + var libraryCsFiles = Directory.GetFiles(solutionDirectory!, "*.cs", SearchOption.AllDirectories) .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); Assert.IsEmpty( libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs index 933ba52b..9dc7956d 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs @@ -24,50 +24,6 @@ public void TestAttemptToLeaseBlobIfDoesNotExist() .ErrorCode.ShouldEqual("ContainerNotFound"); } - [Test] - public void TestUploadToWrongBlobType([Values("block", "page", "append")] string actualType) - { - var blobName = Guid.NewGuid().ToString(); - - var createFunctions = new Dictionary - { - ["block"] = () => new BlockBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).Upload(Stream.Null), - ["page"] = () => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists(size: 0), - ["append"] = () => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName).CreateIfNotExists() - }; - - // right now append blobs aren't fully supported, so we can't fully test this - if (actualType == "append") - { - Assert.Throws(() => createFunctions[actualType]()) - .ErrorCode.ShouldEqual("FeatureNotSupportedByEmulator"); - return; - } - else - { - createFunctions.Remove("append"); // to prevent it from failing below - } - - var baseClient = new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, blobName); - - Assert.IsFalse(baseClient.Exists()); - createFunctions[actualType](); - Assert.IsTrue(baseClient.Exists()); - - foreach (var kvp in createFunctions) - { - if (kvp.Key == actualType) - { - Assert.DoesNotThrow(() => kvp.Value()); - } - else - { - Assert.Throws(() => kvp.Value()) - .ErrorCode.ShouldEqual("InvalidBlobType"); - } - } - } - [Test] public void TestSlashEquivalence() { diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 473c7304..7d07e4e9 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -53,18 +53,11 @@ async ValueTask TestAsync() var name = provider.GetUniqueSafeName(); var client = CreateClient(type, name); - if (client is AppendBlobClient appendClient) - { - Assert.That( - Assert.Throws(() => appendClient.CreateIfNotExists()).ToString(), - Does.Contain("This feature is not currently supported by the Storage Emulator") - ); - return; - } if (client.GetType() == typeof(BlobBaseClient)) { // work around inability to do CreateIfNotExists for the base client - new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name).Upload(Stream.Null); + await new BlobClientWrapper(new BlobClient(AzureCredentials.ConnectionString, client.BlobContainerName, client.Name)) + .CreateIfNotExistsAsync(new Dictionary(), CancellationToken.None); } var @lock = new AzureBlobLeaseDistributedLock(client); @@ -85,14 +78,6 @@ public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) var metadata = new Dictionary { ["abc"] = "123" }; - if (client is AppendBlobClient) - { - Assert.That( - Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), - Does.Contain("This feature is not currently supported by the Storage Emulator") - ); - return; - } if (client.GetType() == typeof(BlobBaseClient)) { Assert.That( @@ -196,7 +181,7 @@ public void TestTriggersHandleLostIfLeaseExpiresNaturally() Assert.IsTrue(@event.Wait(TimeSpan.FromSeconds(15.1))); Assert.Throws(handle.Dispose) - .ErrorCode.ShouldEqual("LeaseLost"); + .ErrorCode.ShouldEqual("LeaseNotPresentWithBlobOperation"); } [Test] @@ -222,7 +207,7 @@ public void TestExitsDespiteLongSleepTime() BlobClientType.Page => new PageBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), BlobClientType.Append => new AppendBlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), BlobClientType.Base => new BlobBaseClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name), - _ => throw new ArgumentException(nameof(type)), + _ => throw new ArgumentException("Bad type", nameof(type)), }; public enum BlobClientType diff --git a/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs b/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs index cb71a6d9..4f6cc540 100644 --- a/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs @@ -6,6 +6,7 @@ namespace Medallion.Threading.Tests.Core; [Category("CI")] public class DeadlockExceptionTest { +#if NETFRAMEWORK // binary serialization has been removed from newer versions of .NET [Test] public void TestDeadlockExceptionSerialization() { @@ -22,4 +23,5 @@ public void TestDeadlockExceptionSerialization() deserialized.StackTrace.ShouldEqual(deadlockException.StackTrace); (deserialized.InnerException?.Message).ShouldEqual(deadlockException.InnerException?.Message); } +#endif } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 868873a1..a3245630 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -238,7 +238,10 @@ public void TestReservedWindowsNamesAreAllowed(string name) { AssertCanUseName(variant); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) + // Restrictions were alleviated in Win11: https://superuser.com/a/1742520/281669 + // Win <= 10 detection: see https://stackoverflow.com/a/69038652/1142970 + && Environment.OSVersion.Version.Build < 22000) { Assert.IsFalse(CanCreateFileWithName(variant), variant); Assert.AreNotEqual(name, Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), variant); diff --git a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs index 47d98ae1..bbe4e53f 100644 --- a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -51,22 +51,22 @@ public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type te await connection.OpenAsync(); using var createTableCommand = connection.CreateCommand(); - createTableCommand.CommandText = "CREATE TEMPORARY TABLE world.temp (id INT)"; + createTableCommand.CommandText = "CREATE TEMPORARY TABLE distributed_lock.temp (id INT)"; await createTableCommand.ExecuteNonQueryAsync(); using var transaction = connection.BeginTransaction(); using var commandInTransaction = connection.CreateCommand(); commandInTransaction.Transaction = transaction; - commandInTransaction.CommandText = @"INSERT INTO world.temp (id) VALUES (1), (2)"; + commandInTransaction.CommandText = @"INSERT INTO distributed_lock.temp (id) VALUES (1), (2)"; await commandInTransaction.ExecuteNonQueryAsync(); using var commandOutsideTransaction = connection.CreateCommand(); - commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM distributed_lock.temp"; var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); Assert.That(exception.Message, Does.Contain("The transaction associated with this command is not the connection's active transaction")); - commandInTransaction.CommandText = "SELECT COUNT(*) FROM world.temp"; + commandInTransaction.CommandText = "SELECT COUNT(*) FROM distributed_lock.temp"; (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual(2); } } diff --git a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs index 1d185d33..a7a64059 100644 --- a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs @@ -1,4 +1,5 @@ using Medallion.Threading.MySql; +using Medallion.Threading.Tests.Data; using NUnit.Framework; using System.Data; @@ -15,18 +16,16 @@ public void TestArgumentValidation() } [Test] - public async Task BasicTest() + public async Task BasicTest([Values(typeof(TestingMySqlDb), typeof(TestingMariaDbDb))] Type dbType) { - foreach (var db in new[] { new TestingMySqlDb(), new TestingMariaDbDb() }) - { - var provider = new MySqlDistributedSynchronizationProvider(db.ConnectionString); + var db = (TestingDb)Activator.CreateInstance(dbType)!; + var provider = new MySqlDistributedSynchronizationProvider(db.ConnectionString); - const string LockName = TargetFramework.Current + "ProviderBasicTest"; - await using (await provider.AcquireLockAsync(LockName)) - { - await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle, db.GetType().Name); - } + const string LockName = TargetFramework.Current + "ProviderBasicTest"; + await using (await provider.AcquireLockAsync(LockName)) + { + await using var handle = await provider.TryAcquireLockAsync(LockName); + Assert.IsNull(handle, db.GetType().Name); } } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index 5c7cdebb..44d4d804 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -22,9 +22,9 @@ public async Task TestPostgresCommandAutomaticallyParticipatesInTransaction() await connection.OpenAsync(); using var transaction = -#if NETCOREAPP3_1 +#if NETCOREAPP await connection.BeginTransactionAsync(); -#elif NET471 +#elif NETFRAMEWORK connection.BeginTransaction(); #endif @@ -121,7 +121,7 @@ public async Task TestDoesNotDetectConnectionBreakViaState() using var getPidCommand = connection.CreateCommand(); getPidCommand.CommandText = "SELECT pg_backend_pid()"; - var pid = (int)(await getPidCommand.ExecuteScalarAsync()); + var pid = (int)(await getPidCommand.ExecuteScalarAsync())!; var stateChangedEvent = new ManualResetEventSlim(initialState: false); connection.StateChange += (_, _2) => stateChangedEvent.Set(); @@ -151,7 +151,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() using var getPidCommand = connection.CreateCommand(); getPidCommand.CommandText = "SELECT pg_backend_pid()"; - var pid = (int)(await getPidCommand.ExecuteScalarAsync()); + var pid = (int)(await getPidCommand.ExecuteScalarAsync())!; Assert.AreEqual(ConnectionState.Open, connection.State); diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index e31eea5d..4a823f05 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -69,7 +69,7 @@ public async Task TestWorksWithAmbientTransaction() static Task GetTimeoutAsync(NpgsqlCommand command) { command.CommandText = "SHOW statement_timeout"; - return command.ExecuteScalarAsync(); + return command.ExecuteScalarAsync()!; } } } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index bac045bf..cc5189b1 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -44,11 +44,11 @@ public async Task TestCanExtendReadLock() var writeHandleTask = @lock.AcquireWriteLockAsync().AsTask(); _ = writeHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(.5))); + Assert.IsFalse(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(.5))); await readHandle.DisposeAsync(); - Assert.IsTrue(await writeHandleTask.WaitAsync(TimeSpan.FromSeconds(5))); + Assert.IsTrue(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); } [Test] diff --git a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 526406b2..2f9bfd54 100644 --- a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index be9498bf..356dd4a4 100644 --- a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -47,7 +47,7 @@ - + all @@ -57,7 +57,7 @@ - + diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 20b3b73e..f038c795 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net461;net462 + netstandard2.0;netstandard2.1;net462 Medallion.Threading True 4 @@ -58,7 +58,7 @@ - + diff --git a/src/DistributedLockTaker/DistributedLockTaker.csproj b/src/DistributedLockTaker/DistributedLockTaker.csproj index 37cf8330..d7197b25 100644 --- a/src/DistributedLockTaker/DistributedLockTaker.csproj +++ b/src/DistributedLockTaker/DistributedLockTaker.csproj @@ -1,7 +1,7 @@  - net471;netcoreapp3.1 + net472;net8.0 Exe false Latest From fb8397a43a09b2f9b4c2a1e50e046a644730cbfe Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 10 Feb 2024 21:56:05 -0500 Subject: [PATCH 222/399] Leverage latest Azure package For #177 --- src/DistributedLock.Azure/DistributedLock.Azure.csproj | 2 +- .../Data/ConnectionStringStrategyTestCases.cs | 2 +- .../Infrastructure/MySql/TestingMySqlDb.cs | 4 ++-- .../Infrastructure/Postgres/TestingPostgresDb.cs | 2 +- .../Tests/FileSystem/FileDistributedLockTest.cs | 2 +- .../Tests/Postgres/PostgresBehaviorTest.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 9e1cac09..479550ae 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 7984771b..9807af48 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -69,7 +69,7 @@ public void TestKeepaliveProtectsFromIdleSessionKiller() var handle = @lock.Acquire(); using var idleSessionKiller = new IdleSessionKiller(this._lockProvider.Strategy.Db, applicationName, idleTimeout: TimeSpan.FromSeconds(.5)); Thread.Sleep(TimeSpan.FromSeconds(2)); - Assert.DoesNotThrow(() => handle.Dispose()); + Assert.DoesNotThrow(handle.Dispose); } /// diff --git a/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs b/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs index be7f0946..827e2937 100644 --- a/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/MySql/TestingMySqlDb.cs @@ -11,8 +11,8 @@ public class TestingMySqlDb : TestingPrimaryClientDb private readonly string _defaultConnectionString; private readonly MySqlConnectionStringBuilder _connectionStringBuilder; - public TestingMySqlDb() : - this(MySqlCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) + public TestingMySqlDb() + : this(MySqlCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory)) { } diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 4ad9c4f7..4e898168 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -12,7 +12,7 @@ public sealed class TestingPostgresDb : TestingPrimaryClientDb { internal static readonly string DefaultConnectionString = PostgresCredentials.GetConnectionString(TestContext.CurrentContext.TestDirectory); - private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new NpgsqlConnectionStringBuilder(DefaultConnectionString); + private readonly NpgsqlConnectionStringBuilder _connectionStringBuilder = new(DefaultConnectionString); public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index a3245630..4e67d4c9 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Tests.FileSystem; public class FileDistributedLockTest { private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedLockTest), TargetFramework.Current); - private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); + private static DirectoryInfo LockFileDirectoryInfo => new(LockFileDirectory); [OneTimeSetUp] public void OneTimeSetUp() diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index 44d4d804..64468616 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -162,7 +162,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; await killCommand.ExecuteNonQueryAsync(); - Assert.ThrowsAsync(() => getPidCommand.ExecuteScalarAsync()); + Assert.ThrowsAsync(getPidCommand.ExecuteScalarAsync); Assert.AreNotEqual(ConnectionState.Open, connection.State); Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); From 55f8517e4f88024de7a4d37b56424337857e775c Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 24 Feb 2024 14:45:16 -0500 Subject: [PATCH 223/399] Update StackExchange.Redis and handle new backlog behavior For #162 --- ...LeaseDistributedSynchronizationProvider.cs | 2 +- .../DistributedLock.Azure.csproj | 2 +- .../Internal/AsyncLock.cs | 2 +- .../Data/MultiplexedConnectionLock.cs | 4 +- .../Data/MultiplexedConnectionLockPool.cs | 4 +- src/DistributedLock.Core/Internal/Helpers.cs | 8 +-- .../Internal/LeaseMonitor.cs | 4 +- .../Internal/ManagedFinalizerQueue.cs | 4 +- src/DistributedLock.Core/Internal/RefBox.cs | 2 +- .../Internal/TimeoutValue.cs | 2 +- .../FileDistributedSynchronizationProvider.cs | 2 +- src/DistributedLock.Oracle/OracleDbmsLock.cs | 8 +-- .../DistributedLock.Redis.csproj | 2 +- .../Primitives/RedisMutexPrimitive.cs | 22 +++--- .../RedisReaderWriterLockPrimitives.cs | 12 ++-- .../Primitives/RedisScript.cs | 19 ++---- .../Primitives/RedisSemaphorePrimitive.cs | 6 +- .../RedLock/RedLockAcquire.cs | 68 ++++++++++++++++++- .../RedLock/RedLockHelper.cs | 7 +- .../RedLock/RedLockRelease.cs | 35 ++++------ ...RedisDistributedSynchronizationProvider.cs | 6 +- .../SqlApplicationLock.cs | 10 +-- src/DistributedLock.SqlServer/SqlSemaphore.cs | 10 +-- .../ExternalTransactionStrategyTestCases.cs | 2 +- .../RedisSynchronizationCoreTestCases.cs | 2 + ...ngAzureBlobLeaseSynchronizationStrategy.cs | 2 +- .../Data/TestingDbSynchronizationStrategy.cs | 6 +- .../Infrastructure/Redis/RedisServer.cs | 10 ++- .../SqlServer/TestingSqlServerDb.cs | 4 +- .../Infrastructure/TestingLockProvider.cs | 2 +- .../TestingReaderWriterLockAsMutexProvider.cs | 2 +- .../TestingSemaphoreAsMutexProvider.cs | 6 +- ...eDistributedSynchronizationProviderTest.cs | 2 +- .../Tests/Redis/RedisDistributedLockTest.cs | 34 +++++++++- .../SqlServer/SqlDatabaseConnectionTest.cs | 2 +- .../EventWaitHandleDistributedLockTest.cs | 4 +- .../ZooKeeper/ZooKeeperConnectionTest.cs | 2 +- ...andleDistributedSynchronizationProvider.cs | 4 +- ...eeperDistributedSynchronizationProvider.cs | 6 +- 39 files changed, 213 insertions(+), 118 deletions(-) diff --git a/src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs index 9a405563..417dba39 100644 --- a/src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Azure/AzureBlobLeaseDistributedSynchronizationProvider.cs @@ -22,7 +22,7 @@ public AzureBlobLeaseDistributedSynchronizationProvider(BlobContainerClient blob /// /// Constructs an with the given . /// - public AzureBlobLeaseDistributedLock CreateLock(string name) => new AzureBlobLeaseDistributedLock(this._blobContainerClient, name, this._options); + public AzureBlobLeaseDistributedLock CreateLock(string name) => new(this._blobContainerClient, name, this._options); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 479550ae..c196eba3 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/DistributedLock.Core/Internal/AsyncLock.cs b/src/DistributedLock.Core/Internal/AsyncLock.cs index 78bcebe7..8fceef0b 100644 --- a/src/DistributedLock.Core/Internal/AsyncLock.cs +++ b/src/DistributedLock.Core/Internal/AsyncLock.cs @@ -14,7 +14,7 @@ private AsyncLock(SemaphoreSlim semaphore) this._semaphore = semaphore; } - public static AsyncLock Create() => new AsyncLock(new SemaphoreSlim(initialCount: 1, maxCount: 1)); + public static AsyncLock Create() => new(new SemaphoreSlim(initialCount: 1, maxCount: 1)); public async ValueTask AcquireAsync(CancellationToken cancellationToken) { diff --git a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index d25db848..ac960ae5 100644 --- a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -11,7 +11,7 @@ internal sealed class MultiplexedConnectionLock : IAsyncDisposable /// Protects access to and /// private readonly AsyncLock _mutex = AsyncLock.Create(); - private readonly Dictionary _heldLocksToKeepaliveCadences = new Dictionary(); + private readonly Dictionary _heldLocksToKeepaliveCadences = new(); private readonly DatabaseConnection _connection; /// /// Tracks whether we've successfully opened the connection. We track this explicity instead of just looking at @@ -106,7 +106,7 @@ public async ValueTask GetIsInUseAsync() private Result GetAlreadyBrokenResultNoLock() => // Retry on any already-broken connection to avoid "leaking" the killing or death of connections. We want there to be no observable // results (other than perf) of multiplexing vs. not. - new Result(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); + new(MultiplexedConnectionLockRetry.Retry, canSafelyDispose: this._heldLocksToKeepaliveCadences.Count == 0); private Result GetFailureResultNoLock(bool isAlreadyHeld, bool opportunistic, TimeoutValue timeout) { diff --git a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs index e4b94f83..fc968650 100644 --- a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs +++ b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLockPool.cs @@ -12,8 +12,8 @@ sealed class MultiplexedConnectionLockPool { private readonly AsyncLock _lock = AsyncLock.Create(); - private readonly Dictionary> _poolsByConnectionString = - new Dictionary>(); + private readonly Dictionary> _poolsByConnectionString = []; + /// /// The number of times we've called /// since we last called diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index 67d6a724..c3ce854a 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -30,9 +30,9 @@ public readonly struct TaskConversion { } internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); - public static ValueTask AsValueTask(this Task task) => new ValueTask(task); - public static ValueTask AsValueTask(this Task task) => new ValueTask(task); - public static ValueTask AsValueTask(this T value) => new ValueTask(value); + public static ValueTask AsValueTask(this Task task) => new(task); + public static ValueTask AsValueTask(this Task task) => new(task); + public static ValueTask AsValueTask(this T value) => new(value); public static Task SafeCreateTask(Func> taskFactory, TState state) => InternalSafeCreateTask, TResult>(taskFactory, state); @@ -59,7 +59,7 @@ public static ObjectDisposedException ObjectDisposed(this T _) where T : IAsy throw new ObjectDisposedException(typeof(T).ToString()); public static NonThrowingAwaitable TryAwait(this TTask task) where TTask : Task => - new NonThrowingAwaitable(task); + new(task); /// /// Throwing exceptions is slow and our workflow has us canceling tasks in the common case. Using this special awaitable diff --git a/src/DistributedLock.Core/Internal/LeaseMonitor.cs b/src/DistributedLock.Core/Internal/LeaseMonitor.cs index f81ea8c1..dc33b459 100644 --- a/src/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/src/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -12,8 +12,8 @@ namespace Medallion.Threading.Internal; #endif sealed class LeaseMonitor : IDisposable, IAsyncDisposable { - private readonly CancellationTokenSource _disposalSource = new CancellationTokenSource(), - _handleLostSource = new CancellationTokenSource(); + private readonly CancellationTokenSource _disposalSource = new(), + _handleLostSource = new(); private readonly ILeaseHandle _leaseHandle; private readonly Task _monitoringTask; diff --git a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs index 4247a12d..89676fdd 100644 --- a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs +++ b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs @@ -24,9 +24,9 @@ sealed class ManagedFinalizerQueue #endif ); - public static readonly ManagedFinalizerQueue Instance = new ManagedFinalizerQueue(); + public static readonly ManagedFinalizerQueue Instance = new(); - private readonly ConcurrentDictionary _items = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _items = new(); // The state of this class can be described by 3 bits: // _count: >0 or ==0 diff --git a/src/DistributedLock.Core/Internal/RefBox.cs b/src/DistributedLock.Core/Internal/RefBox.cs index 4fcb63dc..718cee47 100644 --- a/src/DistributedLock.Core/Internal/RefBox.cs +++ b/src/DistributedLock.Core/Internal/RefBox.cs @@ -30,7 +30,7 @@ internal RefBox(T value) #endif sealed class RefBox { - public static RefBox Create(T value) where T : struct => new RefBox(value); + public static RefBox Create(T value) where T : struct => new(value); /// /// Thread-safely checks if is non-null and if so sets it to null and outputs diff --git a/src/DistributedLock.Core/Internal/TimeoutValue.cs b/src/DistributedLock.Core/Internal/TimeoutValue.cs index 671e6705..ff5997cf 100644 --- a/src/DistributedLock.Core/Internal/TimeoutValue.cs +++ b/src/DistributedLock.Core/Internal/TimeoutValue.cs @@ -53,7 +53,7 @@ public int CompareTo(TimeoutValue that) => public static bool operator ==(TimeoutValue a, TimeoutValue b) => a.Equals(b); public static bool operator !=(TimeoutValue a, TimeoutValue b) => !(a == b); - public static implicit operator TimeoutValue(TimeSpan? timeout) => new TimeoutValue(timeout); + public static implicit operator TimeoutValue(TimeSpan? timeout) => new(timeout); public override string ToString() => this.IsInfinite ? "∞" diff --git a/src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs b/src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs index 0d3ef27e..6d722a7b 100644 --- a/src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.FileSystem/FileDistributedSynchronizationProvider.cs @@ -18,7 +18,7 @@ public FileDistributedSynchronizationProvider(DirectoryInfo lockFileDirectory) /// /// Constructs a with the given . /// - public FileDistributedLock CreateLock(string name) => new FileDistributedLock(this._lockFileDirectory, name); + public FileDistributedLock CreateLock(string name) => new(this._lockFileDirectory, name); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } diff --git a/src/DistributedLock.Oracle/OracleDbmsLock.cs b/src/DistributedLock.Oracle/OracleDbmsLock.cs index fd81d4dc..d536bf34 100644 --- a/src/DistributedLock.Oracle/OracleDbmsLock.cs +++ b/src/DistributedLock.Oracle/OracleDbmsLock.cs @@ -13,10 +13,10 @@ internal class OracleDbmsLock : IDbSynchronizationStrategy private const int MaxWaitSeconds = 32767; private const int MaxTimeoutSeconds = MaxWaitSeconds - 1; - public static readonly OracleDbmsLock SharedLock = new OracleDbmsLock(Mode.Shared), - UpdateLock = new OracleDbmsLock(Mode.Update), - ExclusiveLock = new OracleDbmsLock(Mode.Exclusive), - UpgradeLock = new OracleDbmsLock(Mode.Exclusive, isUpgrade: true); + public static readonly OracleDbmsLock SharedLock = new(Mode.Shared), + UpdateLock = new(Mode.Update), + ExclusiveLock = new(Mode.Exclusive), + UpgradeLock = new(Mode.Exclusive, isUpgrade: true); private static readonly object Cookie = new(); diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 1459377c..cd0ddd96 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -49,7 +49,7 @@ - + all diff --git a/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs index 51b3c2d6..b65d1b77 100644 --- a/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs @@ -19,11 +19,11 @@ public RedisMutexPrimitive(RedisKey key, RedisValue lockId, RedLockTimeouts time public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - private static readonly RedisScript ReleaseScript = new RedisScript(@" - if redis.call('get', @key) == @lockId then - return redis.call('del', @key) - end - return 0", + private static readonly RedisScript ReleaseScript = new(@" + if redis.call('get', @key) == @lockId then + return redis.call('del', @key) + end + return 0", p => new { key = p._key, lockId = p._lockId } ); @@ -35,13 +35,15 @@ public bool TryAcquire(IDatabase database) => public Task TryAcquireAsync(IDatabaseAsync database) => database.StringSetAsync(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - private static readonly RedisScript ExtendScript = new RedisScript(@" - if redis.call('get', @key) == @lockId then - return redis.call('pexpire', @key, @expiryMillis) - end - return 0", + private static readonly RedisScript ExtendScript = new(@" + if redis.call('get', @key) == @lockId then + return redis.call('pexpire', @key, @expiryMillis) + end + return 0", p => new { key = p._key, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } ); public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); + + public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); } diff --git a/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs index 06d4025f..d2398767 100644 --- a/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs +++ b/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -24,7 +24,7 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim /// /// Just remove our ID from the reader set (noop if it wasn't there or the set DNE) /// - private static readonly RedisScript ReleaseReadScript = new RedisScript( + private static readonly RedisScript ReleaseReadScript = new( @"redis.call('srem', @readerKey, @lockId)", p => new { readerKey = p._readerKey, lockId = p._lockId } ); @@ -39,7 +39,7 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim /// /// Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) /// - private static readonly RedisScript TryExtendReadScript = new RedisScript(@" + private static readonly RedisScript TryExtendReadScript = new(@" if redis.call('sismember', @readerKey, @lockId) == 0 then return 0 end @@ -60,7 +60,7 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim /// Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL /// of the reader set to be at least our expiry. Return success. /// - private static readonly RedisScript TryAcquireReadScript = new RedisScript($@" + private static readonly RedisScript TryAcquireReadScript = new($@" if redis.call('exists', @writerKey) == 1 then return 0 end @@ -75,6 +75,8 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireReadScript.ExecuteAsync(database, this).AsBooleanTask(); public bool TryAcquire(IDatabase database) => (bool)TryAcquireReadScript.Execute(database, this); + + public bool IsConnected(IDatabase database) => database.IsConnected(this._readerKey, CommandFlags.DemandMaster); } internal class RedisWriterWaitingPrimitive : RedisMutexPrimitive @@ -122,7 +124,7 @@ public RedisWriteLockPrimitive( /// /// Finally, return failure. /// - private static readonly RedisScript TryAcquireWriteScript = new RedisScript($@" + private static readonly RedisScript TryAcquireWriteScript = new($@" local writerValue = redis.call('get', @writerKey) if writerValue == false or writerValue == @lockId .. '{RedisWriterWaitingPrimitive.LockIdSuffix}' then if redis.call('scard', @readerKey) == 0 then @@ -141,4 +143,6 @@ public RedisWriteLockPrimitive( public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireWriteScript.ExecuteAsync(database, this).AsBooleanTask(); public Task TryExtendAsync(IDatabaseAsync database) => this._mutexPrimitive.TryExtendAsync(database); + + public bool IsConnected(IDatabase database) => database.IsConnected(this._writerKey, CommandFlags.DemandMaster); } diff --git a/src/DistributedLock.Redis/Primitives/RedisScript.cs b/src/DistributedLock.Redis/Primitives/RedisScript.cs index 569264ad..efbcfbb9 100644 --- a/src/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/src/DistributedLock.Redis/Primitives/RedisScript.cs @@ -4,24 +4,17 @@ namespace Medallion.Threading.Redis.Primitives; -internal class RedisScript +internal class RedisScript(string script, Func parameters) { - private readonly LuaScript _script; - private readonly Func _parameters; - - public RedisScript(string script, Func parameters) - { - this._script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); - this._parameters = parameters; - } + private readonly LuaScript _script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluate(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + // database.ScriptEvaluate must be called instead of script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluate(this._script, parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of _script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluateAsync(this._script, this._parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + // database.ScriptEvaluate must be called instead of script.Evaluate in order to respect the database's key prefix + database.ScriptEvaluateAsync(this._script, parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); // send the smallest possible script to the server private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); diff --git a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 39297e49..bae81947 100644 --- a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -51,7 +51,7 @@ public void Release(IDatabase database, bool fireAndForget) => public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => database.SortedSetRemoveAsync(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); - private static readonly RedisScript AcquireScript = new RedisScript($@" + private static readonly RedisScript AcquireScript = new($@" {GetNowMillisScriptFragment} redis.call('zremrangebyscore', @key, '-inf', nowMillis) if redis.call('zcard', @key) < tonumber(@maxCount) then @@ -67,7 +67,7 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => public Task TryAcquireAsync(IDatabaseAsync database) => AcquireScript.ExecuteAsync(database, this).AsBooleanTask(); - private static readonly RedisScript ExtendScript = new RedisScript($@" + private static readonly RedisScript ExtendScript = new($@" {GetNowMillisScriptFragment} local result = redis.call('zadd', @key, 'XX', 'CH', nowMillis + tonumber(@expiryMillis), @lockId) {RenewSetScriptFragment} @@ -76,4 +76,6 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ); public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); + + public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); } diff --git a/src/DistributedLock.Redis/RedLock/RedLockAcquire.cs b/src/DistributedLock.Redis/RedLock/RedLockAcquire.cs index a103285f..9357570a 100644 --- a/src/DistributedLock.Redis/RedLock/RedLockAcquire.cs +++ b/src/DistributedLock.Redis/RedLock/RedLockAcquire.cs @@ -9,6 +9,7 @@ internal interface IRedLockAcquirableSynchronizationPrimitive : IRedLockReleasab TimeoutValue AcquireTimeout { get; } Task TryAcquireAsync(IDatabaseAsync database); bool TryAcquire(IDatabase database); + bool IsConnected(IDatabase database); } /// @@ -77,7 +78,7 @@ public RedLockAcquire( } else { - (releaseTasks ??= new List()) + (releaseTasks ??= []) .Add(Helpers.SafeCreateTask(state => state.primitive.ReleaseAsync(state.Key, fireAndForget: true), (primitive, kvp.Key))); } } @@ -103,7 +104,8 @@ private async Task WaitForAcquireAsync(IReadOnlyDictionary WaitForAcquireAsync(IReadOnlyDictionary 1, "should be more than just timeout left"); } + + // MA: this behavior is non-trivial and worth a detailed explanation. Basically, StackExchange.Redis 2.5.27 switched + // the behavior when firing commands against a disconnected database so that those commands would backlog for a period waiting for + // a reconnect rather than failing fast (fail fast is still a non-default option on ConnectionMultiplexer, but we don't want to + // require that). + // + // While this behavior generally makes sense, it creates long delays for the RedLock algorithm. For example, imagine + // a case where processes 1 and 2 are locking against servers A, B, and C when C is down. If process 1 acquires on A and process 2 acquires + // on B, then C is left casting the winning vote and for that to happen both threads must wait for the full connection timeout to observe + // the issue and declare a failed acquire. + // + // The delays caused by this are quite evident in our TestParallelism() case in the 2x1 scenario emulating a downed server: they are significant + // enough to fail the test! + // + // The fix I've implemented is to bypass the backlog via a connectivity check when it comes to the server casting the "deciding vote" in a multi-server + // scenario. That way, the case above is resolved quickly because both proceses will see that C is disconnected and fail the current acquire without + // waiting. Note that this is always a no-op in the single-server scenario. + // + // The current approach DOES NOT handle the case where the deciding vote is down to multiple servers all of which are down. We could implement this + // at the cost of additional complexity, but currently I don't see that as worthwhile since the scenario should be much less common and more problematic + // anyway. + // + // Finally, note that while this behavior could be extended to all RedLock operations (extend, release), I don't see that as valuable since only acquire is + // subject to contention in normal scenarios, so the optimization isn't worth anything elsewhere. + // + // RELEVANT LINKS: + // https://github.com/madelson/DistributedLock/pull/173#discussion_r1342236087 + // https://github.com/StackExchange/StackExchange.Redis/issues/2645 + Task? TryResolveDisconnectedDatabaseAsFaulted(RedLockAcquire @this) + { + // First, check to see if (a) we have at least 1 success/failure and (b) one more would be decisive. If not, bail. + if (!((successCount > 0 && RedLockHelper.HasSufficientSuccesses(successCount + 1, @this._databases.Count)) + || (failCount > 0 && RedLockHelper.HasTooManyFailuresOrFaults(failCount + 1, @this._databases.Count)))) + { + return null; + } + + // Iterate over the tasks to see if all outstanding tasks are disconnected. If so, pick one to resolve + Task? toResolve = null; + foreach (var kvp in tryAcquireTasks) + { + if (incompleteTasks.Contains(kvp.Value)) + { + if (kvp.Value.IsCompleted) + { + return null; + } + if (toResolve is null && !@this._primitive.IsConnected(kvp.Key)) + { + toResolve = kvp.Value; + // don't return here because if another task is completed we want that to take precedence + } + } + } + + if (toResolve is null) { return null; } + + // Remove this here because we'll be replacing it with a resolved task so the later call to + // incompleteTasks.Remove() will noop + incompleteTasks.Remove(toResolve); + return Task.FromException(new RedisException("Database is disconnected")); + } } /// diff --git a/src/DistributedLock.Redis/RedLock/RedLockHelper.cs b/src/DistributedLock.Redis/RedLock/RedLockHelper.cs index 88836629..5b819e58 100644 --- a/src/DistributedLock.Redis/RedLock/RedLockHelper.cs +++ b/src/DistributedLock.Redis/RedLock/RedLockHelper.cs @@ -44,15 +44,16 @@ public static void FireAndForgetReleaseUponCompletion(IRedLockReleasableSynchron { if (ReturnedFalse(acquireOrRenewTask)) { return; } - acquireOrRenewTask.ContinueWith(async (t, state) => + acquireOrRenewTask.ContinueWith(static async (t, state) => { // don't clean up if we know we failed if (!ReturnedFalse(t)) { - await primitive.ReleaseAsync((IDatabase) state, fireAndForget: true).ConfigureAwait(false); + var (primitive, database) = (Tuple)state; + await primitive.ReleaseAsync(database, fireAndForget: true).ConfigureAwait(false); } }, - state: database + state: Tuple.Create(primitive, database) ); } diff --git a/src/DistributedLock.Redis/RedLock/RedLockRelease.cs b/src/DistributedLock.Redis/RedLock/RedLockRelease.cs index 414b2a16..3604851c 100644 --- a/src/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/src/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -12,23 +12,14 @@ internal interface IRedLockReleasableSynchronizationPrimitive /// /// Implements the release operation in the RedLock algorithm. See https://redis.io/topics/distlock /// -internal readonly struct RedLockRelease +internal readonly struct RedLockRelease( + IRedLockReleasableSynchronizationPrimitive primitive, + IReadOnlyDictionary> tryAcquireOrRenewTasks) { - private readonly IRedLockReleasableSynchronizationPrimitive _primitive; - private readonly IReadOnlyDictionary> _tryAcquireOrRenewTasks; - - public RedLockRelease( - IRedLockReleasableSynchronizationPrimitive primitive, - IReadOnlyDictionary> tryAcquireOrRenewTasks) - { - this._primitive = primitive; - this._tryAcquireOrRenewTasks = tryAcquireOrRenewTasks; - } - public async ValueTask ReleaseAsync() { var isSynchronous = SyncViaAsync.IsSynchronous; - var unreleasedTryAcquireOrRenewTasks = this._tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + var unreleasedTryAcquireOrRenewTasks = tryAcquireOrRenewTasks.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); List? releaseExceptions = null; var successCount = 0; @@ -40,10 +31,12 @@ public async ValueTask ReleaseAsync() while (true) { var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) - // work through non-faulted tasks first - .OrderByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) - // then start with failed since no action is required to release those - .ThenBy(kvp => kvp.Value.Status == TaskStatus.RanToCompletion && kvp.Value.Result) + // work through completed tasks first TODO necessary? + .OrderByDescending(kvp => kvp.Value.IsCompleted) + // among those prioritize successful completions since faults are likely to be slow to process + .ThenByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) + // among those prioritize failed (not faulted) acquisitions since those require no work to release + .ThenByDescending(kvp => RedLockHelper.ReturnedFalse(kvp.Value)) .Select(kvp => kvp.Key) .ToArray(); foreach (var db in releaseableDatabases) @@ -60,13 +53,13 @@ public async ValueTask ReleaseAsync() { try { - if (isSynchronous) { this._primitive.Release(db, fireAndForget: false); } - else { await this._primitive.ReleaseAsync(db, fireAndForget: false).ConfigureAwait(false); } + if (isSynchronous) { primitive.Release(db, fireAndForget: false); } + else { await primitive.ReleaseAsync(db, fireAndForget: false).ConfigureAwait(false); } ++successCount; } catch (Exception ex) { - (releaseExceptions ??= new List()).Add(ex); + (releaseExceptions ??= []).Add(ex); ++faultCount; if (RedLockHelper.HasTooManyFailuresOrFaults(faultCount, databaseCount)) { @@ -90,7 +83,7 @@ public async ValueTask ReleaseAsync() { foreach (var kvp in unreleasedTryAcquireOrRenewTasks) { - RedLockHelper.FireAndForgetReleaseUponCompletion(this._primitive, kvp.Key, kvp.Value); + RedLockHelper.FireAndForgetReleaseUponCompletion(primitive, kvp.Key, kvp.Value); } } } diff --git a/src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs b/src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs index 8089313d..af740768 100644 --- a/src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Redis/RedisDistributedSynchronizationProvider.cs @@ -37,7 +37,7 @@ public RedisDistributedSynchronizationProvider(IEnumerable databases, /// /// Creates a using the given . /// - public RedisDistributedLock CreateLock(RedisKey key) => new RedisDistributedLock(key, this._databases, this._options); + public RedisDistributedLock CreateLock(RedisKey key) => new(key, this._databases, this._options); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); @@ -45,7 +45,7 @@ public RedisDistributedSynchronizationProvider(IEnumerable databases, /// Creates a using the given . /// public RedisDistributedReaderWriterLock CreateReaderWriterLock(string name) => - new RedisDistributedReaderWriterLock(name, this._databases, this._options); + new(name, this._databases, this._options); IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(name); @@ -53,7 +53,7 @@ IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWr /// /// Creates a using the provided and . /// - public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new RedisDistributedSemaphore(key, maxCount, this._databases[0], this._options); + public RedisDistributedSemaphore CreateSemaphore(RedisKey key, int maxCount) => new(key, maxCount, this._databases[0], this._options); IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); diff --git a/src/DistributedLock.SqlServer/SqlApplicationLock.cs b/src/DistributedLock.SqlServer/SqlApplicationLock.cs index ac7b5689..d9037d88 100644 --- a/src/DistributedLock.SqlServer/SqlApplicationLock.cs +++ b/src/DistributedLock.SqlServer/SqlApplicationLock.cs @@ -13,12 +13,12 @@ internal sealed class SqlApplicationLock : IDbSynchronizationStrategy AlreadyHeldExitCode = 103, InvalidUpgradeExitCode = 104; - public static readonly SqlApplicationLock SharedLock = new SqlApplicationLock(Mode.Shared), - UpdateLock = new SqlApplicationLock(Mode.Update), - ExclusiveLock = new SqlApplicationLock(Mode.Exclusive), - UpgradeLock = new SqlApplicationLock(Mode.Exclusive, isUpgrade: true); + public static readonly SqlApplicationLock SharedLock = new(Mode.Shared), + UpdateLock = new(Mode.Update), + ExclusiveLock = new(Mode.Exclusive), + UpgradeLock = new(Mode.Exclusive, isUpgrade: true); - private static readonly object Cookie = new object(); + private static readonly object Cookie = new(); private readonly Mode _mode; private readonly bool _isUpgrade; diff --git a/src/DistributedLock.SqlServer/SqlSemaphore.cs b/src/DistributedLock.SqlServer/SqlSemaphore.cs index 6b12ee3e..14f8d089 100644 --- a/src/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/src/DistributedLock.SqlServer/SqlSemaphore.cs @@ -278,7 +278,7 @@ private static string HashName(string name) AllTicketsHeldByCurrentSessionCode = SqlApplicationLock.AlreadyHeldExitCode; // when we don't have to deal with cancellation, we can put everything in one big query to save on round trips - private static readonly Lazy AcquireNonCancelableQuery = new Lazy(() => Merge( + private static readonly Lazy AcquireNonCancelableQuery = new(() => Merge( CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: null), CreateAcquireSql(cancelable: false), @@ -286,22 +286,22 @@ private static string HashName(string name) )), // for cancellation, we run the preamble first as non-cancellable followed by a cancelable busy wait. This // ensures that we avoid the case where we create a marker table in the preamble and then cancel before returning it - AcquireCancelablePreambleQuery = new Lazy(() => Merge( + AcquireCancelablePreambleQuery = new(() => Merge( CreateCommonVariableDeclarationsSql(includePreambleLock: true, includeBusyWaitLock: false, includeTryAcquireOnceVariables: true), CreateAcquirePreambleSql(willRetryInSeparateQueryAfterPreamble: true), CreateCodaSql(includePreambleLockRelease: true, includeBusyWaitLockRelease: false) )), - AcquireCancelableQuery = new Lazy(() => Merge( + AcquireCancelableQuery = new(() => Merge( CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: true), CreateAcquireSql(cancelable: true), CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) )), - CancellationCleanupQuery = new Lazy(() => Merge( + CancellationCleanupQuery = new(() => Merge( CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: true, includeTryAcquireOnceVariables: false), CreateCancellationCleanupSql(), CreateCodaSql(includePreambleLockRelease: false, includeBusyWaitLockRelease: true) )), - ReleaseQuery = new Lazy(() => Merge( + ReleaseQuery = new(() => Merge( CreateCommonVariableDeclarationsSql(includePreambleLock: false, includeBusyWaitLock: false, includeTryAcquireOnceVariables: false), CreateReleaseSql() )); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index 21fe3ccc..b596f1ef 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -53,7 +53,7 @@ private class SpecificConnectionStrategy : TestingDbSynchronizationStrategy public ExternalTransactionStrategyTestCases? Test { get; set; } public override TestingDbConnectionOptions GetConnectionOptions() => - new TestingDbConnectionOptions { Connection = this.Test!._lockProvider.Strategy.AmbientTransaction!.Connection }; + new() { Connection = this.Test!._lockProvider.Strategy.AmbientTransaction!.Connection }; } public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] bool closeConnection) diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 966ce4de..10748eea 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -167,5 +167,7 @@ private static void MockDatabase(Mock mockDatabase, Func return .Returns(() => (bool)RedisResult.Create(returns())); mockDatabase.Setup(d => d.SortedSetRemoveAsync(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(() => Task.Run(() => (bool)RedisResult.Create(returns()))); + mockDatabase.Setup(d => d.IsConnected(It.IsAny(), It.IsAny())) + .Returns(true); } } diff --git a/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs index dd9d8e5a..eaedd1a6 100644 --- a/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/Azure/TestingAzureBlobLeaseSynchronizationStrategy.cs @@ -10,7 +10,7 @@ namespace Medallion.Threading.Tests.Azure; public sealed class TestingAzureBlobLeaseSynchronizationStrategy : TestingSynchronizationStrategy { - private readonly DisposableCollection _disposables = new DisposableCollection(); + private readonly DisposableCollection _disposables = new(); private static readonly Action DefaultTestingOptions = o => // for test speed diff --git a/src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs index 3ad98196..91e8bc0e 100644 --- a/src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/Data/TestingDbSynchronizationStrategy.cs @@ -50,7 +50,7 @@ public abstract class TestingConnectionStringSynchronizationStrategy : Test public TimeSpan? KeepaliveCadence { get; set; } public sealed override TestingDbConnectionOptions GetConnectionOptions() => - new TestingDbConnectionOptions + new() { ConnectionString = this.Db.ConnectionString, ConnectionStringUseMultiplexing = this.UseMultiplexingNotTransaction == true, @@ -136,7 +136,7 @@ public sealed override void PerformAdditionalCleanupForHandleAbandonment() public sealed class TestingExternalConnectionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy where TDb : TestingDb, new() { - private readonly DisposableCollection _disposables = new DisposableCollection(); + private readonly DisposableCollection _disposables = new(); private DbConnection? _ambientConnection; public override DbConnection? AmbientConnection => this._ambientConnection; @@ -177,7 +177,7 @@ public override void Dispose() public sealed class TestingExternalTransactionSynchronizationStrategy : TestingExternalConnectionOrTransactionSynchronizationStrategy where TDb : TestingDb, new() { - private readonly DisposableCollection _disposables = new DisposableCollection(); + private readonly DisposableCollection _disposables = new(); public DbTransaction? AmbientTransaction { get; private set; } public override DbConnection? AmbientConnection => this.AmbientTransaction?.Connection; diff --git a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index bb73c733..18e2e6c4 100644 --- a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -62,11 +62,17 @@ public static void DisposeAll() var shutdownTasks = ActiveServersByPort.Values .Select(async server => { + // When testing the case of a server outage, we'll have manually shut down some servers. + // In that case, we shouldn't attempt to connect to them since that will fail. + var isConnected = server.Multiplexer.GetServers().Any(s => s.IsConnected); server.Multiplexer.Dispose(); try { - using var adminMultiplexer = await ConnectionMultiplexer.ConnectAsync($"localhost:{server.Port},allowAdmin=true"); - adminMultiplexer.GetServer("localhost", server.Port).Shutdown(ShutdownMode.Never); + if (isConnected) + { + using var adminMultiplexer = await ConnectionMultiplexer.ConnectAsync($"localhost:{server.Port},allowAdmin=true"); + adminMultiplexer.GetServer("localhost", server.Port).Shutdown(ShutdownMode.Never); + } } finally { diff --git a/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs index 2b258178..a7f8327a 100644 --- a/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/SqlServer/TestingSqlServerDb.cs @@ -12,7 +12,7 @@ public sealed class TestingSqlServerDb : TestingPrimaryClientDb, ITestingSqlServ internal static readonly string DefaultConnectionString = SqlServerCredentials.ConnectionString; private readonly Microsoft.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(DefaultConnectionString); + new(DefaultConnectionString); public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; @@ -94,7 +94,7 @@ @idleSince IS NULL public sealed class TestingSystemDataSqlServerDb : TestingDb, ITestingSqlServerDb { private readonly System.Data.SqlClient.SqlConnectionStringBuilder _connectionStringBuilder = - new System.Data.SqlClient.SqlConnectionStringBuilder(TestingSqlServerDb.DefaultConnectionString); + new(TestingSqlServerDb.DefaultConnectionString); public override DbConnectionStringBuilder ConnectionStringBuilder => this._connectionStringBuilder; diff --git a/src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs index 0ceed0c8..407e04c2 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestingLockProvider.cs @@ -3,7 +3,7 @@ public abstract class TestingLockProvider : ITestingNameProvider, IDisposable where TStrategy : TestingSynchronizationStrategy, new() { - private readonly Lazy _lazyStrategy = new Lazy(() => new TStrategy()); + private readonly Lazy _lazyStrategy = new(() => new TStrategy()); public virtual TStrategy Strategy => this._lazyStrategy.Value; diff --git a/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs index 9d4cb834..87a542b0 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestingReaderWriterLockAsMutexProvider.cs @@ -11,7 +11,7 @@ public sealed class TestingReaderWriterLockAsMutexProvider, new() where TStrategy : TestingSynchronizationStrategy, new() { - private readonly TReaderWriterLockProvider _readerWriterLockProvider = new TReaderWriterLockProvider(); + private readonly TReaderWriterLockProvider _readerWriterLockProvider = new(); public override TStrategy Strategy => this._readerWriterLockProvider.Strategy; diff --git a/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs b/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs index a2e7c022..0bb03996 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestingSemaphoreAsMutexProvider.cs @@ -6,9 +6,9 @@ public abstract class TestingSemaphoreAsMutexProvider, new() where TStrategy : TestingSynchronizationStrategy, new() { - private readonly TSemaphoreProvider _semaphoreProvider = new TSemaphoreProvider(); - private readonly DisposableCollection _disposables = new DisposableCollection(); - private readonly HashSet _mostlyDrainedSemaphoreNames = new HashSet(); + private readonly TSemaphoreProvider _semaphoreProvider = new(); + private readonly DisposableCollection _disposables = new(); + private readonly HashSet _mostlyDrainedSemaphoreNames = new(); private readonly int _maxCount; protected TestingSemaphoreAsMutexProvider(int maxCount) diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs index 1ab631d8..d74b9f78 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs @@ -6,7 +6,7 @@ namespace Medallion.Threading.Tests.FileSystem; public class FileDistributedSynchronizationProviderTest { private static readonly string LockFileDirectory = Path.Combine(Path.GetTempPath(), nameof(FileDistributedSynchronizationProviderTest), TargetFramework.Current); - private static DirectoryInfo LockFileDirectoryInfo => new DirectoryInfo(LockFileDirectory); + private static DirectoryInfo LockFileDirectoryInfo => new(LockFileDirectory); [OneTimeSetUp] public void OneTimeSetUp() diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index e56754fe..6ea2d757 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -2,13 +2,13 @@ using Moq; using NUnit.Framework; using StackExchange.Redis; +using System.Globalization; namespace Medallion.Threading.Tests.Redis; -[Category("CI")] public class RedisDistributedLockTest { - [Test] + [Test, Category("CI")] public void TestName() { const string Name = "\0🐉汉字\b\r\n\\"; @@ -17,7 +17,7 @@ public void TestName() @lock.Key.ShouldEqual(new RedisKey(Name)); } - [Test] + [Test, Category("CI")] public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; @@ -28,4 +28,32 @@ public void TestValidatesConstructorParameters() Assert.Throws(() => new RedisDistributedLock("key", new[] { database, null! })); Assert.Throws(() => new RedisDistributedLock("key", Enumerable.Empty())); } + + /// + /// Reproduces the bug in https://github.com/madelson/DistributedLock/issues/162 + /// where a Redis lock couldn't be acquired if the current CultureInfo was tr-TR, + /// due to a bug in the underlying StackExchange.Redis package. + /// + /// This is because there are both "dotted i" and "dotless i" in some Turkic languages: + /// https://en.wikipedia.org/wiki/Dotted_and_dotless_I_in_computing + /// + [Test] + public async Task TestCanAcquireLockWhenCurrentCultureIsTurkishTurkey() + { + var originalCultureInfo = CultureInfo.CurrentCulture; + + try + { + CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("tr-TR"); + var @lock = new RedisDistributedLock( + TestHelper.UniqueName, + RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() + ); + await (await @lock.AcquireAsync()).DisposeAsync(); + } + finally + { + CultureInfo.CurrentCulture = originalCultureInfo; + } + } } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 25d28970..3e8b2dc8 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -66,7 +66,7 @@ public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] b } private static SqlDatabaseConnection CreateConnection(bool isSystemDataSqlClient) => - new SqlDatabaseConnection( + new( isSystemDataSqlClient ? new System.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString).As() : new Microsoft.Data.SqlClient.SqlConnection(TestingSqlServerDb.DefaultConnectionString), diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index 0dcae3e9..adf605d6 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -42,7 +42,7 @@ public void TestMaxLengthNames() public void TestGarbageCollection() { var @lock = CreateLock("gc_test", NameStyle.AddPrefix); - WeakReference AbandonLock() => new WeakReference(@lock.Acquire()); + WeakReference AbandonLock() => new(@lock.Acquire()); var weakHandle = AbandonLock(); GC.Collect(); @@ -73,7 +73,7 @@ public void TestGetSafeLockNameCompat() } private static EventWaitHandleDistributedLock CreateLock(string name, NameStyle nameStyle) => - new EventWaitHandleDistributedLock( + new( (nameStyle == NameStyle.AddPrefix ? DistributedWaitHandleHelpers.GlobalPrefix + name : name), abandonmentCheckCadence: TimeSpan.FromSeconds(.3), exactName: nameStyle != NameStyle.Safe diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs index 1069b2c8..bf0158e2 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -98,7 +98,7 @@ public void TestThreadSafety() } private static ZooKeeperConnectionInfo GetConnectionInfo(TimeoutValue? connectTimeout = null) => - new ZooKeeperConnectionInfo( + new( ZooKeeperPorts.DefaultConnectionString, ConnectTimeout: connectTimeout ?? TimeSpan.FromSeconds(30), SessionTimeout: TimeSpan.FromSeconds(30), diff --git a/src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs b/src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs index 28808674..709cd9b4 100644 --- a/src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.WaitHandles/WaitHandleDistributedSynchronizationProvider.cs @@ -21,7 +21,7 @@ public WaitHandleDistributedSynchronizationProvider(TimeSpan? abandonmentCheckCa /// is specified, invalid wait handle names will be escaped/hashed. /// public EventWaitHandleDistributedLock CreateLock(string name, bool exactName = false) => - new EventWaitHandleDistributedLock(name, this._abandonmentCheckCadence, exactName); + new(name, this._abandonmentCheckCadence, exactName); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); @@ -31,7 +31,7 @@ public EventWaitHandleDistributedLock CreateLock(string name, bool exactName = f /// handle names will be escaped/hashed. /// public WaitHandleDistributedSemaphore CreateSemaphore(string name, int maxCount, bool exactName = false) => - new WaitHandleDistributedSemaphore(name, maxCount, this._abandonmentCheckCadence, exactName); + new(name, maxCount, this._abandonmentCheckCadence, exactName); IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); diff --git a/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs index 7f390d33..f72eff90 100644 --- a/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedSynchronizationProvider.cs @@ -33,7 +33,7 @@ public ZooKeeperDistributedSynchronizationProvider(ZooKeeperPath directoryPath, /// Creates a using the given . /// public ZooKeeperDistributedLock CreateLock(string name) => - new ZooKeeperDistributedLock(this._directoryPath, name, this._connectionString, this._options); + new(this._directoryPath, name, this._connectionString, this._options); IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); @@ -41,7 +41,7 @@ public ZooKeeperDistributedLock CreateLock(string name) => /// Creates a using the given . /// public ZooKeeperDistributedReaderWriterLock CreateReaderWriterLock(string name) => - new ZooKeeperDistributedReaderWriterLock(this._directoryPath, name, this._connectionString, this._options); + new(this._directoryPath, name, this._connectionString, this._options); IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(name); @@ -49,7 +49,7 @@ public ZooKeeperDistributedReaderWriterLock CreateReaderWriterLock(string name) /// Creates a using the given and . /// public ZooKeeperDistributedSemaphore CreateSemaphore(string name, int maxCount) => - new ZooKeeperDistributedSemaphore(this._directoryPath, name, maxCount, this._connectionString, this._options); + new(this._directoryPath, name, maxCount, this._connectionString, this._options); IDistributedSemaphore IDistributedSemaphoreProvider.CreateSemaphore(string name, int maxCount) => this.CreateSemaphore(name, maxCount); } From e7bf9ab50c6fbbe4b4d0b856931e5cd6d82a9782 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 11 Feb 2024 11:24:51 -0500 Subject: [PATCH 224/399] Add RestorePackagesWithLockFile true for better diffs --- src/Directory.Build.props | 6 + src/DistributedLock.Azure/packages.lock.json | 514 +++ src/DistributedLock.Core/packages.lock.json | 135 + .../packages.lock.json | 160 + src/DistributedLock.MySql/packages.lock.json | 313 ++ src/DistributedLock.Oracle/packages.lock.json | 283 ++ .../packages.lock.json | 366 ++ src/DistributedLock.Redis/packages.lock.json | 388 ++ .../packages.lock.json | 2641 +++++++++++++ src/DistributedLock.Tests/packages.lock.json | 1230 ++++++ .../packages.lock.json | 241 ++ .../packages.lock.json | 202 + src/DistributedLock/packages.lock.json | 3435 +++++++++++++++++ src/DistributedLockCodeGen/packages.lock.json | 955 +++++ src/DistributedLockTaker/packages.lock.json | 1031 +++++ 15 files changed, 11900 insertions(+) create mode 100644 src/Directory.Build.props create mode 100644 src/DistributedLock.Azure/packages.lock.json create mode 100644 src/DistributedLock.Core/packages.lock.json create mode 100644 src/DistributedLock.FileSystem/packages.lock.json create mode 100644 src/DistributedLock.MySql/packages.lock.json create mode 100644 src/DistributedLock.Oracle/packages.lock.json create mode 100644 src/DistributedLock.Postgres/packages.lock.json create mode 100644 src/DistributedLock.Redis/packages.lock.json create mode 100644 src/DistributedLock.SqlServer/packages.lock.json create mode 100644 src/DistributedLock.Tests/packages.lock.json create mode 100644 src/DistributedLock.WaitHandles/packages.lock.json create mode 100644 src/DistributedLock.ZooKeeper/packages.lock.json create mode 100644 src/DistributedLock/packages.lock.json create mode 100644 src/DistributedLockCodeGen/packages.lock.json create mode 100644 src/DistributedLockTaker/packages.lock.json diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..4bea5e10 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,6 @@ + + + true + true + + \ No newline at end of file diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json new file mode 100644 index 00000000..5d0c3575 --- /dev/null +++ b/src/DistributedLock.Azure/packages.lock.json @@ -0,0 +1,514 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Azure.Storage.Blobs": { + "type": "Direct", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Net.Http": "4.3.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Azure.Storage.Blobs": { + "type": "Direct", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Azure.Storage.Blobs": { + "type": "Direct", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.7.1", + "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json new file mode 100644 index 00000000..0523803f --- /dev/null +++ b/src/DistributedLock.Core/packages.lock.json @@ -0,0 +1,135 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "System.ValueTuple": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json new file mode 100644 index 00000000..4a034fa1 --- /dev/null +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -0,0 +1,160 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json new file mode 100644 index 00000000..0a881d0a --- /dev/null +++ b/src/DistributedLock.MySql/packages.lock.json @@ -0,0 +1,313 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "MySqlConnector": { + "type": "Direct", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "MySqlConnector": { + "type": "Direct", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "MySqlConnector": { + "type": "Direct", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json new file mode 100644 index 00000000..9490b6ee --- /dev/null +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -0,0 +1,283 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Direct", + "requested": "[21.10.0, )", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Oracle.ManagedDataAccess.Core": { + "type": "Direct", + "requested": "[3.21.100, )", + "resolved": "3.21.100", + "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "dependencies": { + "System.Diagnostics.PerformanceCounter": "6.0.1", + "System.DirectoryServices": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.1", + "System.Text.Json": "6.0.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json new file mode 100644 index 00000000..46b4680c --- /dev/null +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -0,0 +1,366 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Npgsql": { + "type": "Direct", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "BXgFO8Yi7ao7hVA/nklD0Hre1Bbce048ZqryGZVFifGNPuh+2jqF1i/jLJLMfFGZIzUOw+nCIeH24SQhghDSPw==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "4F8Xe+JIkVoDJ8hDAZ7HqLkjctN/6WItJIzQaifBwClC7wmoLSda/Sv2i6i1kycqDb3hWF4JCVbpAweyOKHEUA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.0.0", + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Encodings.Web": "4.6.0", + "System.Threading.Tasks.Extensions": "4.5.2", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "gdOOXBhtt2UpTxYJm1DRmoqNfYg5ypvhzhVt0vxKhzxXFjS81r8yIOSFsJYLRa1Jc14GBAqCnjxJstO3zBN7gg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Npgsql": { + "type": "Direct", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "BXgFO8Yi7ao7hVA/nklD0Hre1Bbce048ZqryGZVFifGNPuh+2jqF1i/jLJLMfFGZIzUOw+nCIeH24SQhghDSPw==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "4F8Xe+JIkVoDJ8hDAZ7HqLkjctN/6WItJIzQaifBwClC7wmoLSda/Sv2i6i1kycqDb3hWF4JCVbpAweyOKHEUA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.0.0", + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Encodings.Web": "4.6.0", + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "gdOOXBhtt2UpTxYJm1DRmoqNfYg5ypvhzhVt0vxKhzxXFjS81r8yIOSFsJYLRa1Jc14GBAqCnjxJstO3zBN7gg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Npgsql": { + "type": "Direct", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "K63Y4hORbBcKLWH5wnKgzyn7TOfYzevIEwIedQHBIkmkEBA9SCqgvom+XTuE+fAFGvINGkhFItaZ2dvMGdT5iw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "BXgFO8Yi7ao7hVA/nklD0Hre1Bbce048ZqryGZVFifGNPuh+2jqF1i/jLJLMfFGZIzUOw+nCIeH24SQhghDSPw==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "4F8Xe+JIkVoDJ8hDAZ7HqLkjctN/6WItJIzQaifBwClC7wmoLSda/Sv2i6i1kycqDb3hWF4JCVbpAweyOKHEUA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.0.0", + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Encodings.Web": "4.6.0", + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "gdOOXBhtt2UpTxYJm1DRmoqNfYg5ypvhzhVt0vxKhzxXFjS81r8yIOSFsJYLRa1Jc14GBAqCnjxJstO3zBN7gg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.2" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.2", + "contentHash": "BG/TNxDFv0svAzx8OiMXDlsHfGw623BZ8tCXw4YLhDFDvDhNUEV58jKYMGRnkbJNm7c3JNNJDiN7JBMzxRBR2w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json new file mode 100644 index 00000000..a98e738f --- /dev/null +++ b/src/DistributedLock.Redis/packages.lock.json @@ -0,0 +1,388 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "StackExchange.Redis": { + "type": "Direct", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "StackExchange.Redis": { + "type": "Direct", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "StackExchange.Redis": { + "type": "Direct", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json new file mode 100644 index 00000000..643edb2a --- /dev/null +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -0,0 +1,2641 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.Data.SqlClient": { + "type": "Direct", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.Data.SqlClient": { + "type": "Direct", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "NETStandard.Library": "1.6.1", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Private.Uri": "4.3.2", + "System.Runtime.Serialization.Formatters": "4.3.0", + "System.Runtime.Serialization.Json": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Security.SecureString": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Private.DataContractSerialization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "IpU1lcHz8/09yDr9N+Juc7SCgNUz+RohkCQI+KsWKR67XxpFr8Z6c8t1iENCXZuRuNCc4HBwme/MDHNVCwyAKg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Runtime.Serialization.Formatters": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0" + } + }, + "System.Runtime.Serialization.Json": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "dependencies": { + "System.IO": "4.3.0", + "System.Private.DataContractSerialization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", + "dependencies": { + "System.Security.Principal.Windows": "4.7.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", + "dependencies": { + "System.Security.AccessControl": "4.7.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + }, + "System.Security.SecureString": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlSerializer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.Data.SqlClient": { + "type": "Direct", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "NETStandard.Library": "1.6.1", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Private.Uri": "4.3.2", + "System.Runtime.Serialization.Formatters": "4.3.0", + "System.Runtime.Serialization.Json": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Security.SecureString": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "System.AppContext": "4.3.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Console": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.Compression.ZipFile": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.Net.Http": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Net.Sockets": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Timer": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + }, + "System.AppContext": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" + } + }, + "System.Console": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Buffers": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.IO.Compression": "4.3.0" + } + }, + "System.IO.Compression.ZipFile": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", + "dependencies": { + "System.Buffers": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Net.Sockets": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Private.DataContractSerialization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "IpU1lcHz8/09yDr9N+Juc7SCgNUz+RohkCQI+KsWKR67XxpFr8Z6c8t1iENCXZuRuNCc4HBwme/MDHNVCwyAKg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Runtime.Serialization.Formatters": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0" + } + }, + "System.Runtime.Serialization.Json": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "dependencies": { + "System.IO": "4.3.0", + "System.Private.DataContractSerialization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", + "dependencies": { + "System.Security.Principal.Windows": "4.7.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", + "dependencies": { + "System.Security.AccessControl": "4.7.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + }, + "System.Security.SecureString": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Threading.Timer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlSerializer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json new file mode 100644 index 00000000..886d495c --- /dev/null +++ b/src/DistributedLock.Tests/packages.lock.json @@ -0,0 +1,1230 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.1, )", + "resolved": "1.6.1", + "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[16.4.0, )", + "resolved": "16.4.0", + "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", + "dependencies": { + "Microsoft.CodeCoverage": "16.4.0", + "Microsoft.TestPlatform.TestHost": "16.4.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.13.1, )", + "resolved": "4.13.1", + "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", + "dependencies": { + "Castle.Core": "4.4.0", + "System.Threading.Tasks.Extensions": "4.5.1" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.12.0, )", + "resolved": "3.12.0", + "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==", + "dependencies": { + "NETStandard.Library": "2.0.0" + } + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[3.15.1, )", + "resolved": "3.15.1", + "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==", + "dependencies": { + "Microsoft.DotNet.InternalAbstractions": "1.0.0", + "System.ComponentModel.EventBasedAsync": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Xml.XPath.XmlDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==", + "dependencies": { + "Microsoft.Win32.Registry": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "runtime.native.System.Data.SqlClient.sni": "4.7.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==", + "dependencies": { + "NETStandard.Library": "1.6.1", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.TraceSource": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "16.4.0", + "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.DotNet.InternalAbstractions": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", + "dependencies": { + "System.AppContext": "4.1.0", + "System.Collections": "4.0.11", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "16.4.0", + "contentHash": "4geKywSUJHHrfBTr1wJXUVWP0Vx1X03oFQAdZdGa8jK8p5MSwsJ4Vd0/mqN0dB2YXaIXIhDT94ti5WQ1KZ4jdw==", + "dependencies": { + "NuGet.Frameworks": "5.0.0" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "16.4.0", + "contentHash": "tMlz3uc7VUZSYYslyVOVXH40KexTptZMAi8gIE+5w+SIt8I0qLPObpqX6QVLWszPr7sxX4WAKTiFgqgBB1MxjA==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "16.4.0", + "Newtonsoft.Json": "9.0.1" + } + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1" + } + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "9.0.1", + "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", + "dependencies": { + "Microsoft.CSharp": "4.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Extensions": "4.0.1", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Text.Encoding": "4.0.11", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Text.RegularExpressions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11", + "System.Xml.XDocument": "4.0.11" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0" + } + }, + "NuGet.Frameworks": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + }, + "Oracle.ManagedDataAccess.Core": { + "type": "Transitive", + "resolved": "3.21.100", + "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "dependencies": { + "System.Diagnostics.PerformanceCounter": "6.0.1", + "System.DirectoryServices": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Data.SqlClient.sni": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "9kyFSIdN3T0qjDQ2R0HRXYIhS3l5psBzQi6qqhdLz+SzFyEy4sVxNOke+yyYv8Cu8rPER12c3RDjLT8wF3WBYQ==", + "dependencies": { + "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni": "4.4.0", + "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": "4.4.0", + "runtime.win-x86.runtime.native.System.Data.SqlClient.sni": "4.4.0" + } + }, + "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "LbrynESTp3bm5O/+jGL8v0Qg5SJlTV08lpIpFesXjF6uGNMWqFnUQbYBJwZTeua6E/Y7FIM1C54Ey1btLWupdg==" + }, + "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "38ugOfkYJqJoX9g6EYRlZB5U2ZJH51UP8ptxZgdpS07FgOEToV+lS11ouNK2PM12Pr6X/PpT5jK82G3DwH/SxQ==" + }, + "runtime.win-x86.runtime.native.System.Data.SqlClient.sni": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8" + } + }, + "System.AppContext": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", + "dependencies": { + "System.Runtime": "4.1.0" + } + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.EventBasedAsync": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fCFl8f0XdwA/BuoNrVBB5D0Y48/hv2J+w4xSDdXQitXZsR6UCSOrDVE7TCUraY802ENwcHUnUCv4En8CupDU1g==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "oJjw3uFuVDJiJNbCD8HB4a2p3NYLdt1fiT5OGsPLw+WTOuG0KpP4OXelMmmVKpClueMsit6xOlzy4wNKQFiBLg==" + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + } + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "xBfJ8pnd4C17dWaC9FM6aShzbJcRNMChUMD42I6772KGGrqaFdumwhn9OdM68erj1ueNo3xdQ1EwiFjK5k8p0g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Diagnostics.TraceSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VnYp1NxGx8Ww731y2LJ1vpfb/DKVNKEZ8Jsh5SgQTZREL/YpWRArgh9pI8CDLmgHspZmLL697CaLvH85qQpRiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", + "dependencies": { + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Windows.Extensions": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Windows.Extensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "Mk2mKmPi0nWaoiYeotq1dgeNK1fqWh61+EK+w4Wu8SWuTYLzpUnschb59bJtGywaPq7SmTuPf44wrXRwbIrukg==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tools": "4.0.1", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Text.Encoding": "4.0.11", + "System.Threading": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XPath": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XPath.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "A/uxsWi/Ifzkmd4ArTLISMbfFs6XpRPsXZonrIqyTY70xi8t+mDtvSM5Os0RqyRDobjMBwIDHDL4NOIbkDwf7A==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XPath": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.0, )", + "DistributedLock.FileSystem": "[1.0.1, )", + "DistributedLock.MySql": "[1.0.1, )", + "DistributedLock.Oracle": "[1.0.2, )", + "DistributedLock.Postgres": "[1.0.5, )", + "DistributedLock.Redis": "[1.0.2, )", + "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project" + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "System.Threading.AccessControl": "[5.0.0, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json new file mode 100644 index 00000000..32a47f61 --- /dev/null +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -0,0 +1,241 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "System.Threading.AccessControl": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "System.Threading.AccessControl": { + "type": "Direct", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json new file mode 100644 index 00000000..f2930780 --- /dev/null +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -0,0 +1,202 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.1": { + "IsExternalInit": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "ZooKeeperNetEx": { + "type": "Direct", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "IsExternalInit": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "ZooKeeperNetEx": { + "type": "Direct", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "IsExternalInit": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Nullable": { + "type": "Direct", + "requested": "[1.3.1, )", + "resolved": "1.3.1", + "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" + }, + "ZooKeeperNetEx": { + "type": "Direct", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json new file mode 100644 index 00000000..23277ef9 --- /dev/null +++ b/src/DistributedLock/packages.lock.json @@ -0,0 +1,3435 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Net.Http": "4.3.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess": "[21.10.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + }, + ".NETStandard,Version=v2.0": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "NETStandard.Library": "1.6.1", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Private.Uri": "4.3.2", + "System.Runtime.Serialization.Formatters": "4.3.0", + "System.Runtime.Serialization.Json": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Security.SecureString": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Private.DataContractSerialization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Runtime.Serialization.Formatters": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0" + } + }, + "System.Runtime.Serialization.Json": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "dependencies": { + "System.IO": "4.3.0", + "System.Private.DataContractSerialization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", + "dependencies": { + "System.Security.AccessControl": "4.7.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Security.SecureString": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlSerializer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "System.Threading.AccessControl": "[5.0.0, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "NETStandard.Library": "1.6.1", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.Private.Uri": "4.3.2", + "System.Runtime.Serialization.Formatters": "4.3.0", + "System.Runtime.Serialization.Json": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Security.SecureString": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Buffers": "4.5.0", + "System.Memory": "4.5.3", + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2" + } + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "System.AppContext": "4.3.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Console": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.Compression.ZipFile": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.Net.Http": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Net.Sockets": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Timer": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0" + } + }, + "Oracle.ManagedDataAccess.Core": { + "type": "Transitive", + "resolved": "3.21.100", + "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "dependencies": { + "System.Diagnostics.PerformanceCounter": "6.0.1", + "System.DirectoryServices": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.1", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "System.AppContext": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" + } + }, + "System.Console": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Buffers": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.IO.Compression": "4.3.0" + } + }, + "System.IO.Compression.ZipFile": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", + "dependencies": { + "System.Buffers": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Net.Sockets": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Private.DataContractSerialization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Runtime.Serialization.Formatters": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Serialization.Primitives": "4.3.0" + } + }, + "System.Runtime.Serialization.Json": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "dependencies": { + "System.IO": "4.3.0", + "System.Private.DataContractSerialization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Security.SecureString": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==" + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Threading.Timer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlSerializer": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project" + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "System.Threading.AccessControl": "[5.0.0, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json new file mode 100644 index 00000000..18d7202e --- /dev/null +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -0,0 +1,955 @@ +{ + "version": 1, + "dependencies": { + ".NETCoreApp,Version=v3.1": { + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[16.2.0, )", + "resolved": "16.2.0", + "contentHash": "56w1drIQqpMgg3IxHcfra/jXOngiD4pbl0j6TNeJMlOQGlZ8wCMlyRTvn6Crd/FgGjwKbWLurdOHNGrfzLtl6A==", + "dependencies": { + "Microsoft.CodeCoverage": "16.2.0", + "Microsoft.TestPlatform.TestHost": "16.2.0" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.12.0, )", + "resolved": "3.12.0", + "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==", + "dependencies": { + "NETStandard.Library": "2.0.0" + } + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[3.15.1, )", + "resolved": "3.15.1", + "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==", + "dependencies": { + "Microsoft.DotNet.InternalAbstractions": "1.0.0", + "System.ComponentModel.EventBasedAsync": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Xml.XPath.XmlDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "16.2.0", + "contentHash": "fKiUOhhMP3IN1qM2tDHPWzW4JRbriFkIPiIzKUwMWT+Q+80bycxkLLCvxmVFoeA7gvWegNbTUjaX7mL3MM9XKg==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Globalization": "4.0.11", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "Microsoft.DotNet.InternalAbstractions": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", + "dependencies": { + "System.AppContext": "4.1.0", + "System.Collections": "4.0.11", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "16.2.0", + "contentHash": "RAyBf87uZ5XjRE953LlxqILpD1SqwQM6bXwxPUCAPPEy0uv12R+eKnFL7yaeLVHInMKkNNh1iD/cDOVDfSgllA==", + "dependencies": { + "NETStandard.Library": "1.6.0", + "System.ComponentModel.EventBasedAsync": "4.0.11", + "System.ComponentModel.TypeConverter": "4.1.0", + "System.Diagnostics.Process": "4.1.0", + "System.Diagnostics.TextWriterTraceListener": "4.0.0", + "System.Diagnostics.TraceSource": "4.0.0", + "System.Reflection.Metadata": "1.3.0", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", + "System.Runtime.Loader": "4.0.0", + "System.Runtime.Serialization.Json": "4.0.2", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Threading.Thread": "4.0.0", + "System.Xml.XPath.XmlDocument": "4.0.1" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "16.2.0", + "contentHash": "PogSQ40KgkZjEBdC6KBGpMtuvFFCIdoJAMmK7CAHWyTXCfN1cPN8j0TFJKh+LneSg+y0QQDP23STMF609KhHQw==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "16.2.0", + "Newtonsoft.Json": "9.0.1" + } + }, + "Microsoft.Win32.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "9.0.1", + "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", + "dependencies": { + "Microsoft.CSharp": "4.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Extensions": "4.0.1", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Text.Encoding": "4.0.11", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Text.RegularExpressions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11", + "System.Xml.XDocument": "4.0.11" + } + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.AppContext": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", + "dependencies": { + "System.Runtime": "4.1.0" + } + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.0.12", + "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tracing": "4.1.0", + "System.Globalization": "4.0.11", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "1.2.0", + "contentHash": "Cma8cBW6di16ZLibL8LYQ+cLjGzoKxpOTu/faZfDcx94ZjAGq6Nv5RO7+T1YZXqEXTZP9rt1wLVEONVpURtUqw==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Linq": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.EventBasedAsync": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fCFl8f0XdwA/BuoNrVBB5D0Y48/hv2J+w4xSDdXQitXZsR6UCSOrDVE7TCUraY802ENwcHUnUCv4En8CupDU1g==", + "dependencies": { + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.Process": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Diagnostics.TextWriterTraceListener": { + "type": "Transitive", + "resolved": "4.0.0", + "contentHash": "w36Dr8yKy8xP150qPANe7Td+/zOI3G62ImRcHDIEW+oUXUuTKZHd4DHmqRx5+x8RXd85v3tXd1uhNTfsr+yxjA==", + "dependencies": { + "System.Diagnostics.TraceSource": "4.0.0", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "System.Diagnostics.Tools": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "xBfJ8pnd4C17dWaC9FM6aShzbJcRNMChUMD42I6772KGGrqaFdumwhn9OdM68erj1ueNo3xdQ1EwiFjK5k8p0g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Diagnostics.TraceSource": { + "type": "Transitive", + "resolved": "4.0.0", + "contentHash": "6WVCczFZKXwpWpzd/iJkYnsmWTSFFiU24Xx/YdHXBcu+nFI/ehTgeqdJQFbtRPzbrO3KtRNjvkhtj4t5/WwWsA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11", + "runtime.native.System": "4.0.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Dynamic.Runtime": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.Linq": "4.1.0", + "System.Linq.Expressions": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Linq.Expressions": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.ObjectModel": "4.0.12", + "System.Reflection": "4.1.0", + "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Emit.Lightweight": "4.0.1", + "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "System.ObjectModel": { + "type": "Transitive", + "resolved": "4.0.12", + "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Threading": "4.0.11" + } + }, + "System.Private.DataContractSerialization": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "lcqFBUaCZxPiUkA4dlSOoPZGtZsAuuElH2XHgLwGLxd7ZozWetV5yiz0qGAV2AUYOqw97MtZBjbLMN16Xz4vXA==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Collections.Concurrent": "4.0.12", + "System.Diagnostics.Debug": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Reflection": "4.1.0", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Emit.Lightweight": "4.0.1", + "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Text.Encoding": "4.0.11", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Text.RegularExpressions": "4.1.0", + "System.Threading": "4.0.11", + "System.Threading.Tasks": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11", + "System.Xml.XmlDocument": "4.0.1", + "System.Xml.XmlSerializer": "4.0.11" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", + "dependencies": { + "System.IO": "4.1.0", + "System.Reflection": "4.1.0", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", + "dependencies": { + "System.Reflection": "4.1.0", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", + "dependencies": { + "System.Reflection": "4.1.0", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "jMSCxA4LSyKBGRDm/WtfkO03FkcgRzHxwvQRib1bm2GZ8ifKM1MX1al6breGCEQK280mdl9uQS7JNPXRYk90jw==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Collections.Immutable": "1.2.0", + "System.Diagnostics.Debug": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Reflection": "4.1.0", + "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Text.Encoding": "4.0.11", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Threading": "4.0.11" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + } + }, + "System.Runtime.Loader": { + "type": "Transitive", + "resolved": "4.0.0", + "contentHash": "4UN78GOVU/mbDFcXkEWtetJT/sJ0yic2gGk1HSlSpWI0TDf421xnrZTDZnwNBapk1GQeYN7U1lTj/aQB1by6ow==", + "dependencies": { + "System.IO": "4.1.0", + "System.Reflection": "4.1.0", + "System.Runtime": "4.1.0" + } + }, + "System.Runtime.Serialization.Json": { + "type": "Transitive", + "resolved": "4.0.2", + "contentHash": "+7DIJhnKYgCzUgcLbVTtRQb2l1M0FP549XFlFkQM5lmNiUBl44AfNbx4bz61xA8PzLtlYwfmif4JJJW7MPPnjg==", + "dependencies": { + "System.IO": "4.1.0", + "System.Private.DataContractSerialization": "4.1.1", + "System.Runtime": "4.1.0" + } + }, + "System.Runtime.Serialization.Primitives": { + "type": "Transitive", + "resolved": "4.1.1", + "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", + "dependencies": { + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Text.Encoding.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Thread": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Threading.ThreadPool": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Xml.ReaderWriter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.3.0" + } + }, + "System.Xml.XDocument": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "Mk2mKmPi0nWaoiYeotq1dgeNK1fqWh61+EK+w4Wu8SWuTYLzpUnschb59bJtGywaPq7SmTuPf44wrXRwbIrukg==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tools": "4.0.1", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Reflection": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Text.Encoding": "4.0.11", + "System.Threading": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11" + } + }, + "System.Xml.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XmlSerializer": { + "type": "Transitive", + "resolved": "4.0.11", + "contentHash": "FrazwwqfIXTfq23mfv4zH+BjqkSFNaNFBtjzu3I9NRmG8EELYyrv/fJnttCIwRMFRR/YKXF1hmsMmMEnl55HGw==", + "dependencies": { + "System.Collections": "4.0.11", + "System.Globalization": "4.0.11", + "System.IO": "4.1.0", + "System.Linq": "4.1.0", + "System.Reflection": "4.1.0", + "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit.ILGeneration": "4.0.1", + "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Primitives": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Resources.ResourceManager": "4.0.1", + "System.Runtime": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Text.RegularExpressions": "4.1.0", + "System.Threading": "4.0.11", + "System.Xml.ReaderWriter": "4.0.11", + "System.Xml.XmlDocument": "4.0.1" + } + }, + "System.Xml.XPath": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + } + }, + "System.Xml.XPath.XmlDocument": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "A/uxsWi/Ifzkmd4ArTLISMbfFs6XpRPsXZonrIqyTY70xi8t+mDtvSM5Os0RqyRDobjMBwIDHDL4NOIbkDwf7A==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XPath": "4.3.0", + "System.Xml.XmlDocument": "4.3.0" + } + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json new file mode 100644 index 00000000..dcec1078 --- /dev/null +++ b/src/DistributedLockTaker/packages.lock.json @@ -0,0 +1,1031 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.7.2": { + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Net.Http": "4.3.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0" + } + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.0, )", + "DistributedLock.FileSystem": "[1.0.1, )", + "DistributedLock.MySql": "[1.0.1, )", + "DistributedLock.Oracle": "[1.0.2, )", + "DistributedLock.Postgres": "[1.0.5, )", + "DistributedLock.Redis": "[1.0.2, )", + "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess": "[21.10.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + }, + ".NETFramework,Version=v4.7.2/win7-x86": { + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + } + }, + "net8.0": { + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Blobs": { + "type": "Transitive", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.8.0", + "System.Security.Cryptography.Cng": "4.5.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "MySqlConnector": { + "type": "Transitive", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1" + } + }, + "Npgsql": { + "type": "Transitive", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0" + } + }, + "Oracle.ManagedDataAccess.Core": { + "type": "Transitive", + "resolved": "3.21.100", + "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "dependencies": { + "System.Diagnostics.PerformanceCounter": "6.0.1", + "System.DirectoryServices": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "StackExchange.Redis": { + "type": "Transitive", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "oJjw3uFuVDJiJNbCD8HB4a2p3NYLdt1fiT5OGsPLw+WTOuG0KpP4OXelMmmVKpClueMsit6xOlzy4wNKQFiBLg==" + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + } + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Windows.Extensions": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" + }, + "System.Threading.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + }, + "System.Windows.Extensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "Transitive", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.0, )", + "DistributedLock.FileSystem": "[1.0.1, )", + "DistributedLock.MySql": "[1.0.1, )", + "DistributedLock.Oracle": "[1.0.2, )", + "DistributedLock.Postgres": "[1.0.5, )", + "DistributedLock.Redis": "[1.0.2, )", + "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project" + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "System.Threading.AccessControl": "[5.0.0, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + } + }, + "net8.0/win7-x86": { + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + } + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.7.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0" + } + }, + "System.Threading.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Windows.Extensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } + } + } + } +} \ No newline at end of file From 784eabd48533642c8dceb662e4ea506969e5e7f8 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 11 Feb 2024 11:51:04 -0500 Subject: [PATCH 225/399] Close #179 adopt central package management --- src/Directory.Packages.props | 29 + .../DistributedLock.Azure.csproj | 6 +- src/DistributedLock.Azure/packages.lock.json | 47 +- .../DistributedLock.Core.csproj | 8 +- src/DistributedLock.Core/packages.lock.json | 2 +- .../DistributedLock.FileSystem.csproj | 6 +- .../packages.lock.json | 47 +- .../DistributedLock.MySql.csproj | 6 +- src/DistributedLock.MySql/packages.lock.json | 19 +- .../DistributedLock.Oracle.csproj | 8 +- src/DistributedLock.Oracle/packages.lock.json | 2 +- .../DistributedLock.Postgres.csproj | 6 +- .../packages.lock.json | 47 +- .../DistributedLock.Redis.csproj | 9 +- src/DistributedLock.Redis/packages.lock.json | 47 +- .../DistributedLock.SqlServer.csproj | 6 +- .../packages.lock.json | 47 +- .../DistributedLock.Tests.csproj | 12 +- src/DistributedLock.Tests/packages.lock.json | 139 ++--- .../DistributedLock.WaitHandles.csproj | 6 +- .../packages.lock.json | 47 +- .../DistributedLock.ZooKeeper.csproj | 10 +- .../packages.lock.json | 53 +- src/DistributedLock/DistributedLock.csproj | 4 +- src/DistributedLock/packages.lock.json | 497 +++++++++--------- .../DistributedLockCodeGen.csproj | 6 +- src/DistributedLockCodeGen/packages.lock.json | 2 +- src/DistributedLockTaker/packages.lock.json | 304 ++++++----- 28 files changed, 756 insertions(+), 666 deletions(-) create mode 100644 src/Directory.Packages.props diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 00000000..9937cc18 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,29 @@ + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index c196eba3..27e62f18 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -42,9 +42,9 @@ - - - + + + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index 5d0c3575..7b54ac2e 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Azure.Storage.Blobs": { @@ -47,14 +47,6 @@ "System.IO.Hashing": "6.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -188,17 +180,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -254,14 +256,6 @@ "System.IO.Hashing": "6.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -364,6 +358,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index 1c358e9e..e6fb0864 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -45,16 +45,16 @@ - + - + - - + + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 0523803f..424c5cd7 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.Bcl.AsyncInterfaces": { diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index e107f59e..2e482fdd 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -49,11 +49,11 @@ - + all - - + + diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index 4a034fa1..3b040d12 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.SourceLink.GitHub": { @@ -18,14 +18,6 @@ "resolved": "1.3.1", "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -49,17 +41,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -88,14 +90,6 @@ "resolved": "1.3.1", "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -129,6 +123,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj index e5907413..e70ca4f9 100644 --- a/src/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/src/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -46,9 +46,9 @@ - - - + + + diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 0a881d0a..95bd82c4 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { "Microsoft.NETFramework.ReferenceAssemblies": { @@ -150,14 +150,6 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -229,6 +221,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index dc2bdf95..ab5cdcb2 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -45,10 +45,10 @@ - - - - + + + + diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index 9490b6ee..fe89e481 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { "Microsoft.NETFramework.ReferenceAssemblies": { diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 0c9fd861..974fdfa8 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -45,9 +45,9 @@ - - - + + + diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 46b4680c..55369b70 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.SourceLink.GitHub": { @@ -27,14 +27,6 @@ "System.ValueTuple": "4.5.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -109,17 +101,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -157,14 +159,6 @@ "System.ValueTuple": "4.5.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -253,6 +247,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index cd0ddd96..6912cc65 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -49,13 +49,12 @@ - - + + all - - - + + diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index a98e738f..20bd0f33 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.SourceLink.GitHub": { @@ -32,14 +32,6 @@ "System.Threading.Channels": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -128,17 +120,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -179,14 +181,6 @@ "System.Threading.Channels": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -275,6 +269,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 86a770e1..1526ec0a 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -45,9 +45,9 @@ - - - + + + diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 643edb2a..e150fd9d 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.Data.SqlClient": { @@ -24,14 +24,6 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -113,17 +105,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -164,14 +166,6 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -1283,6 +1277,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index 7af1c040..bf465c79 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 886d495c..8330c20c 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { "net8.0": { "MedallionShell.StrongName": { @@ -79,15 +79,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -129,23 +120,6 @@ "resolved": "4.5.0", "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "2.1.1", @@ -268,14 +242,6 @@ "resolved": "6.0.0", "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1" - } - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.0", @@ -313,14 +279,6 @@ "System.Xml.XDocument": "4.0.11" } }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.6.0" - } - }, "NuGet.Frameworks": { "type": "Transitive", "resolved": "5.0.0", @@ -378,15 +336,6 @@ "resolved": "4.4.0", "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8" - } - }, "System.AppContext": { "type": "Transitive", "resolved": "4.1.0", @@ -1001,15 +950,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Threading.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Threading.Tasks": { "type": "Transitive", "resolved": "4.3.0", @@ -1141,11 +1081,6 @@ "System.Xml.XmlDocument": "4.3.0" } }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock": { "type": "Project", "dependencies": { @@ -1224,6 +1159,78 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } } } diff --git a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 2f9bfd54..688c35db 100644 --- a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -45,9 +45,9 @@ - - - + + + diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index 32a47f61..64aa8b81 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "Microsoft.SourceLink.GitHub": { @@ -12,14 +12,6 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -43,17 +35,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -87,14 +89,6 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -161,6 +155,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index 356dd4a4..5c1b7af8 100644 --- a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -45,19 +45,19 @@ - - - + + + all - + all - + diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index f2930780..60374ce8 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { "IsExternalInit": { @@ -30,14 +30,6 @@ "resolved": "3.4.12.4", "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -61,17 +53,27 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { @@ -112,14 +114,6 @@ "resolved": "3.4.12.4", "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -153,6 +147,15 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } } }, ".NETStandard,Version=v2.1": { @@ -172,12 +175,6 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, - "Nullable": { - "type": "Direct", - "requested": "[1.3.1, )", - "resolved": "1.3.1", - "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" - }, "ZooKeeperNetEx": { "type": "Direct", "requested": "[3.4.12.4, )", diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index f038c795..ebb13155 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -57,8 +57,8 @@ - - + + diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 23277ef9..c2e5c5d3 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { "Microsoft.NETFramework.ReferenceAssemblies": { @@ -37,15 +37,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -68,17 +59,6 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" - } - }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", "resolved": "2.1.1", @@ -147,38 +127,6 @@ "resolved": "1.0.0", "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.6.0", - "System.Text.Json": "4.6.0", - "System.Threading.Channels": "4.7.0", - "System.Threading.Tasks.Extensions": "4.5.3", - "System.ValueTuple": "4.5.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", - "dependencies": { - "System.Text.Json": "6.0.1" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -187,19 +135,6 @@ "System.IO.Pipelines": "5.0.1" } }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -362,11 +297,6 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -434,6 +364,83 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[21.10.0, )", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, ".NETStandard,Version=v2.0": { @@ -470,15 +477,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -488,14 +486,6 @@ "System.IO.Hashing": "6.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -506,23 +496,6 @@ "resolved": "4.5.0", "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "2.1.1", @@ -634,30 +607,6 @@ "System.Security.Principal.Windows": "4.7.0" } }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.6.0", - "System.Text.Json": "4.6.0", - "System.Threading.Channels": "4.7.0", - "System.Threading.Tasks.Extensions": "4.5.3", - "System.ValueTuple": "4.5.0" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -764,17 +713,6 @@ "resolved": "4.3.0", "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.Threading.Channels": "5.0.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1614,16 +1552,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Threading.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Threading.Channels": { "type": "Transitive", "resolved": "5.0.0", @@ -1754,11 +1682,6 @@ "System.Xml.XmlDocument": "4.3.0" } }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -1819,6 +1742,98 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, ".NETStandard,Version=v2.1": { @@ -1846,15 +1861,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -1879,23 +1885,6 @@ "resolved": "4.5.0", "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "2.1.1", @@ -2007,15 +1996,6 @@ "System.Security.Principal.Windows": "4.7.0" } }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2" - } - }, "NETStandard.Library": { "type": "Transitive", "resolved": "1.6.1", @@ -2067,27 +2047,6 @@ "System.Xml.XDocument": "4.3.0" } }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.6.0", - "System.Text.Json": "4.6.0", - "System.Threading.Channels": "4.7.0" - } - }, - "Oracle.ManagedDataAccess.Core": { - "type": "Transitive", - "resolved": "3.21.100", - "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", - "dependencies": { - "System.Diagnostics.PerformanceCounter": "6.0.1", - "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.1", - "System.Text.Json": "6.0.1" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -2203,17 +2162,6 @@ "resolved": "4.3.0", "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.Threading.Channels": "5.0.0" - } - }, "System.AppContext": { "type": "Transitive", "resolved": "4.3.0", @@ -3218,16 +3166,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Threading.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Threading.Channels": { "type": "Transitive", "resolved": "5.0.0", @@ -3360,11 +3298,6 @@ "System.Xml.XmlDocument": "4.3.0" } }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -3429,6 +3362,96 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0" + } + }, + "Oracle.ManagedDataAccess.Core": { + "type": "CentralTransitive", + "requested": "[3.21.100, )", + "resolved": "3.21.100", + "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "dependencies": { + "System.Diagnostics.PerformanceCounter": "6.0.1", + "System.DirectoryServices": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.1", + "System.Text.Json": "6.0.1" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } } } diff --git a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 9a1d4552..226058ca 100644 --- a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json index 18d7202e..0acabd67 100644 --- a/src/DistributedLockCodeGen/packages.lock.json +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETCoreApp,Version=v3.1": { "Microsoft.NET.Test.Sdk": { diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index dcec1078..147495a2 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "dependencies": { ".NETFramework,Version=v4.7.2": { "Azure.Core": { @@ -18,15 +18,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -44,17 +35,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" - } - }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", "resolved": "2.1.1", @@ -113,30 +93,6 @@ "Microsoft.IdentityModel.Logging": "6.8.0" } }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.6.0", - "System.Text.Json": "4.6.0", - "System.Threading.Channels": "4.7.0", - "System.Threading.Tasks.Extensions": "4.5.3", - "System.ValueTuple": "4.5.0" - } - }, "Oracle.ManagedDataAccess": { "type": "Transitive", "resolved": "21.10.0", @@ -153,18 +109,6 @@ "System.IO.Pipelines": "5.0.1" } }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -340,11 +284,6 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock": { "type": "Project", "dependencies": { @@ -426,11 +365,20 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } - } - }, - ".NETFramework,Version=v4.7.2/win7-x86": { + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Microsoft.Data.SqlClient": { - "type": "Transitive", + "type": "CentralTransitive", + "requested": "[2.1.7, )", "resolved": "2.1.7", "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", "dependencies": { @@ -440,6 +388,53 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" } }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, + ".NETFramework,Version=v4.7.2/win7-x86": { "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", @@ -482,6 +477,18 @@ "System.Security.Cryptography.Algorithms": "4.3.0", "System.Security.Cryptography.Encoding": "4.3.0" } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } } }, "net8.0": { @@ -499,15 +506,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Azure.Storage.Blobs": { - "type": "Transitive", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.12.0", @@ -527,23 +525,6 @@ "resolved": "4.5.0", "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "Microsoft.Data.SqlClient": { - "type": "Transitive", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "2.1.1", @@ -619,22 +600,6 @@ "resolved": "6.0.0", "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" }, - "MySqlConnector": { - "type": "Transitive", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1" - } - }, - "Npgsql": { - "type": "Transitive", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.6.0" - } - }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", "resolved": "3.21.100", @@ -653,15 +618,6 @@ "System.IO.Pipelines": "5.0.1" } }, - "StackExchange.Redis": { - "type": "Transitive", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8" - } - }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.0", @@ -799,15 +755,6 @@ "resolved": "4.7.2", "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" }, - "System.Threading.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -821,11 +768,6 @@ "System.Drawing.Common": "6.0.0" } }, - "ZooKeeperNetEx": { - "type": "Transitive", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - }, "distributedlock": { "type": "Project", "dependencies": { @@ -904,11 +846,20 @@ "DistributedLock.Core": "[1.0.5, )", "ZooKeeperNetEx": "[3.4.12.4, )" } - } - }, - "net8.0/win7-x86": { + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, "Microsoft.Data.SqlClient": { - "type": "Transitive", + "type": "CentralTransitive", + "requested": "[2.1.7, )", "resolved": "2.1.7", "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", "dependencies": { @@ -924,6 +875,52 @@ "System.Text.Encoding.CodePages": "4.7.0" } }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.6.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, + "net8.0/win7-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "2.1.1", @@ -1009,15 +1006,6 @@ "Microsoft.NETCore.Platforms": "3.1.0" } }, - "System.Threading.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Windows.Extensions": { "type": "Transitive", "resolved": "6.0.0", @@ -1025,6 +1013,34 @@ "dependencies": { "System.Drawing.Common": "6.0.0" } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Runtime.Caching": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "System.Text.Encoding.CodePages": "4.7.0" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } } } } From 521f290e94b826470db42b60d6a86e942cc2a799 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:03:47 -0500 Subject: [PATCH 226/399] Fix #189 --- docs/DistributedLock.SqlServer.md | 2 +- src/DistributedLock.Postgres/PostgresDistributedLock.cs | 2 +- .../SqlConnectionOptionsBuilder.cs | 5 +++-- .../Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/DistributedLock.SqlServer.md b/docs/DistributedLock.SqlServer.md index adeb2c97..6a7d7449 100644 --- a/docs/DistributedLock.SqlServer.md +++ b/docs/DistributedLock.SqlServer.md @@ -29,4 +29,4 @@ When connecting using a `connectionString`, several other tuning options can als - `KeepaliveCadence` configures the frequency at which an innocuous query will be issued on the connection while the lock is being held. The purpose of automatic keepalive is to prevent SQL Azure's aggressive connection governor from killing "idle" lock-holding connections. Defaults to 10 minutes. - `UseTransaction` scopes the lock to an internally-managed transaction under the hood (otherwise it is connection-scoped). Defaults to FALSE because this mode can lead to long-running transactions which can be disruptive on databases using the full recovery model. -- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). +- `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON except in the case where `UseTransaction` is set to TRUE since the two are not compatible. You should only manually disable `UseMultiplexing` for troubleshooting purposes if you suspect it is causing issues. diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index 4bef94c6..350101ad 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -49,7 +49,7 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke { if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - var (keepaliveCadence, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options); + var (keepaliveCadence, useMultiplexing, useTransaction) = PostgresConnectionOptionsBuilder.GetOptions(options); if (useMultiplexing) { diff --git a/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs index 9184d39a..625f4069 100644 --- a/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs +++ b/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs @@ -51,7 +51,8 @@ public SqlConnectionOptionsBuilder UseTransaction(bool useTransaction = true) /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. /// - /// Multiplexing is on by default. + /// Multiplexing is on by default, unless is set to TRUE in which case multiplexing is disabled + /// because it is not compatible with . /// /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing @@ -83,7 +84,7 @@ internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMul var keepaliveCadence = options?._keepaliveCadence ?? TimeSpan.FromMinutes(10); var useTransaction = options?._useTransaction ?? false; - var useMultiplexing = options?._useMultiplexing ?? true; + var useMultiplexing = options?._useMultiplexing ?? !options?._useTransaction ?? true; if (useMultiplexing && useTransaction) { diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs index 12709c1f..cb167f6c 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs @@ -25,4 +25,12 @@ public void TestDefaults() Assert.IsFalse(options.useTransaction); options.ShouldEqual(SqlConnectionOptionsBuilder.GetOptions(o => { })); } + + [Test] + public void TestUseTransactionDoesNotRequireDisablingMultiplexing() + { + var options = SqlConnectionOptionsBuilder.GetOptions(o => o.UseTransaction()); + Assert.IsTrue(options.useTransaction); + Assert.IsFalse(options.useMultiplexing); + } } From a7d8a9a696643651a07289655ccbb23758e72bab Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sat, 24 Feb 2024 17:05:19 -0500 Subject: [PATCH 227/399] Remove VersionOverride for DistributedLockCodeGen.csproj --- .../DistributedLockCodeGen.csproj | 2 +- src/DistributedLockCodeGen/packages.lock.json | 212 ++---------------- 2 files changed, 19 insertions(+), 195 deletions(-) diff --git a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 226058ca..4b1e1f03 100644 --- a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json index 0acabd67..7f700325 100644 --- a/src/DistributedLockCodeGen/packages.lock.json +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -4,12 +4,12 @@ ".NETCoreApp,Version=v3.1": { "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[16.2.0, )", - "resolved": "16.2.0", - "contentHash": "56w1drIQqpMgg3IxHcfra/jXOngiD4pbl0j6TNeJMlOQGlZ8wCMlyRTvn6Crd/FgGjwKbWLurdOHNGrfzLtl6A==", + "requested": "[16.4.0, )", + "resolved": "16.4.0", + "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", "dependencies": { - "Microsoft.CodeCoverage": "16.2.0", - "Microsoft.TestPlatform.TestHost": "16.2.0" + "Microsoft.CodeCoverage": "16.4.0", + "Microsoft.TestPlatform.TestHost": "16.4.0" } }, "NUnit": { @@ -40,8 +40,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.2.0", - "contentHash": "fKiUOhhMP3IN1qM2tDHPWzW4JRbriFkIPiIzKUwMWT+Q+80bycxkLLCvxmVFoeA7gvWegNbTUjaX7mL3MM9XKg==" + "resolved": "16.4.0", + "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -93,31 +93,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.2.0", - "contentHash": "RAyBf87uZ5XjRE953LlxqILpD1SqwQM6bXwxPUCAPPEy0uv12R+eKnFL7yaeLVHInMKkNNh1iD/cDOVDfSgllA==", + "resolved": "16.4.0", + "contentHash": "4geKywSUJHHrfBTr1wJXUVWP0Vx1X03oFQAdZdGa8jK8p5MSwsJ4Vd0/mqN0dB2YXaIXIhDT94ti5WQ1KZ4jdw==", "dependencies": { - "NETStandard.Library": "1.6.0", - "System.ComponentModel.EventBasedAsync": "4.0.11", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Diagnostics.Process": "4.1.0", - "System.Diagnostics.TextWriterTraceListener": "4.0.0", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Reflection.Metadata": "1.3.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", - "System.Runtime.Loader": "4.0.0", - "System.Runtime.Serialization.Json": "4.0.2", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Threading.Thread": "4.0.0", - "System.Xml.XPath.XmlDocument": "4.0.1" + "NuGet.Frameworks": "5.0.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.2.0", - "contentHash": "PogSQ40KgkZjEBdC6KBGpMtuvFFCIdoJAMmK7CAHWyTXCfN1cPN8j0TFJKh+LneSg+y0QQDP23STMF609KhHQw==", + "resolved": "16.4.0", + "contentHash": "tMlz3uc7VUZSYYslyVOVXH40KexTptZMAi8gIE+5w+SIt8I0qLPObpqX6QVLWszPr7sxX4WAKTiFgqgBB1MxjA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.2.0", + "Microsoft.TestPlatform.ObjectModel": "16.4.0", "Newtonsoft.Json": "9.0.1" } }, @@ -183,6 +170,11 @@ "System.Xml.XDocument": "4.0.11" } }, + "NuGet.Frameworks": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + }, "runtime.native.System": { "type": "Transitive", "resolved": "4.3.0", @@ -210,38 +202,6 @@ "System.Runtime": "4.3.0" } }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.2.0", - "contentHash": "Cma8cBW6di16ZLibL8LYQ+cLjGzoKxpOTu/faZfDcx94ZjAGq6Nv5RO7+T1YZXqEXTZP9rt1wLVEONVpURtUqw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -358,19 +318,6 @@ "runtime.native.System": "4.3.0" } }, - "System.Diagnostics.TextWriterTraceListener": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "w36Dr8yKy8xP150qPANe7Td+/zOI3G62ImRcHDIEW+oUXUuTKZHd4DHmqRx5+x8RXd85v3tXd1uhNTfsr+yxjA==", - "dependencies": { - "System.Diagnostics.TraceSource": "4.0.0", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Diagnostics.Tools": { "type": "Transitive", "resolved": "4.0.1", @@ -381,32 +328,6 @@ "System.Runtime": "4.1.0" } }, - "System.Diagnostics.TraceSource": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "6WVCczFZKXwpWpzd/iJkYnsmWTSFFiU24Xx/YdHXBcu+nFI/ehTgeqdJQFbtRPzbrO3KtRNjvkhtj4t5/WwWsA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, "System.Dynamic.Runtime": { "type": "Transitive", "resolved": "4.0.11", @@ -535,37 +456,6 @@ "System.Threading": "4.0.11" } }, - "System.Private.DataContractSerialization": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "lcqFBUaCZxPiUkA4dlSOoPZGtZsAuuElH2XHgLwGLxd7ZozWetV5yiz0qGAV2AUYOqw97MtZBjbLMN16Xz4vXA==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Collections.Concurrent": "4.0.12", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XmlDocument": "4.0.1", - "System.Xml.XmlSerializer": "4.0.11" - } - }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -622,28 +512,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "jMSCxA4LSyKBGRDm/WtfkO03FkcgRzHxwvQRib1bm2GZ8ifKM1MX1al6breGCEQK280mdl9uQS7JNPXRYk90jw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Collections.Immutable": "1.2.0", - "System.Diagnostics.Debug": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.0.11" - } - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -731,26 +599,6 @@ "runtime.native.System": "4.3.0" } }, - "System.Runtime.Loader": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "4UN78GOVU/mbDFcXkEWtetJT/sJ0yic2gGk1HSlSpWI0TDf421xnrZTDZnwNBapk1GQeYN7U1lTj/aQB1by6ow==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, - "System.Runtime.Serialization.Json": { - "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "+7DIJhnKYgCzUgcLbVTtRQb2l1M0FP549XFlFkQM5lmNiUBl44AfNbx4bz61xA8PzLtlYwfmif4JJJW7MPPnjg==", - "dependencies": { - "System.IO": "4.1.0", - "System.Private.DataContractSerialization": "4.1.1", - "System.Runtime": "4.1.0" - } - }, "System.Runtime.Serialization.Primitives": { "type": "Transitive", "resolved": "4.1.1", @@ -893,30 +741,6 @@ "System.Xml.ReaderWriter": "4.3.0" } }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "FrazwwqfIXTfq23mfv4zH+BjqkSFNaNFBtjzu3I9NRmG8EELYyrv/fJnttCIwRMFRR/YKXF1hmsMmMEnl55HGw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XmlDocument": "4.0.1" - } - }, "System.Xml.XPath": { "type": "Transitive", "resolved": "4.3.0", From ffdee1e136b418222ee470d4422ffa369cbbeb22 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 11 Feb 2024 13:38:32 -0500 Subject: [PATCH 228/399] Rename CopyPackageToPublishDirectory.targets to Directory.Build.targets for cleaner project files --- ...ackageToPublishDirectory.targets => Directory.Build.targets} | 0 src/DistributedLock.Azure/DistributedLock.Azure.csproj | 1 - src/DistributedLock.Core/DistributedLock.Core.csproj | 2 -- .../DistributedLock.FileSystem.csproj | 1 - src/DistributedLock.MySql/DistributedLock.MySql.csproj | 1 - src/DistributedLock.Oracle/DistributedLock.Oracle.csproj | 1 - src/DistributedLock.Postgres/DistributedLock.Postgres.csproj | 1 - src/DistributedLock.Redis/DistributedLock.Redis.csproj | 1 - src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj | 1 - .../DistributedLock.WaitHandles.csproj | 1 - src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj | 1 - src/DistributedLock/DistributedLock.csproj | 2 -- 12 files changed, 13 deletions(-) rename src/{CopyPackageToPublishDirectory.targets => Directory.Build.targets} (100%) diff --git a/src/CopyPackageToPublishDirectory.targets b/src/Directory.Build.targets similarity index 100% rename from src/CopyPackageToPublishDirectory.targets rename to src/Directory.Build.targets diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 27e62f18..f411ce1f 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -51,6 +51,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index e6fb0864..07602e8c 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -60,6 +60,4 @@ - - \ No newline at end of file diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 2e482fdd..bdfb24a0 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -60,6 +60,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj index e70ca4f9..dd7b3b9b 100644 --- a/src/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/src/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -59,6 +59,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index ab5cdcb2..200f17e9 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -59,6 +59,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 974fdfa8..12e4cd11 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -58,6 +58,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 6912cc65..949088cb 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -61,6 +61,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 1526ec0a..4fce4f15 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -58,6 +58,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index 688c35db..f078b27a 100644 --- a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -58,6 +58,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index 5c1b7af8..a3ae4bee 100644 --- a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -64,6 +64,5 @@ - \ No newline at end of file diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index ebb13155..553dfb4c 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -60,6 +60,4 @@ - - \ No newline at end of file From 8df027afd061ba5ae56ec1b3d91001cd755201ff Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sat, 24 Feb 2024 17:45:11 -0500 Subject: [PATCH 229/399] Remove RestoreLockedMode because some packages have a condition on Configuration --- src/Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4bea5e10..dd22cefd 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,5 @@ true - true \ No newline at end of file From ad1a70a5b614472d0b561a3c0aa1d5cadd50fac4 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:18:46 -0400 Subject: [PATCH 230/399] Implement transaction-scoped locks for postgres Fix #168 --- docs/DistributedLock.Postgres.md | 1 + docs/DistributedLock.SqlServer.md | 2 +- ...onnectionOrTransactionDbDistributedLock.cs | 4 +- .../PostgresAdvisoryLock.cs | 66 +++++++++++++------ .../PostgresConnectionOptionsBuilder.cs | 32 +++++++-- .../PostgresDistributedLock.cs | 11 ++-- .../SqlConnectionOptionsBuilder.cs | 4 +- .../Postgres/TestingPostgresProviders.cs | 4 +- .../PostgresConnectionOptionsBuilderTest.cs | 11 ++++ 9 files changed, 100 insertions(+), 35 deletions(-) diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md index fc433ab1..da92deaa 100644 --- a/docs/DistributedLock.Postgres.md +++ b/docs/DistributedLock.Postgres.md @@ -35,6 +35,7 @@ In addition to specifying the `key`, Postgres-based locks allow you to specify e In addition to specifying the `key`, several tuning options are available for `connectionString`-based locks: - `KeepaliveCadence` allows you to have the implementation periodically issue a cheap query on a connection holding a lock. This helps in configurations which are set up to aggressively kill idle connections. Defaults to OFF (`Timeout.InfiniteTimeSpan`). +- `UseTransaction` scopes the lock to an internally-managed transaction under the hood (otherwise it is connection-scoped). Defaults to FALSE because this mode is not compatible with multiplexing and thus consumes more connections. - `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON; you should not disable it unless you suspect that it is causing issues for you (please file an issue here if so!). diff --git a/docs/DistributedLock.SqlServer.md b/docs/DistributedLock.SqlServer.md index 6a7d7449..d3245283 100644 --- a/docs/DistributedLock.SqlServer.md +++ b/docs/DistributedLock.SqlServer.md @@ -28,5 +28,5 @@ SQL-based locks can be constructed with a connection string, an `IDbConnection`, When connecting using a `connectionString`, several other tuning options can also be specified. - `KeepaliveCadence` configures the frequency at which an innocuous query will be issued on the connection while the lock is being held. The purpose of automatic keepalive is to prevent SQL Azure's aggressive connection governor from killing "idle" lock-holding connections. Defaults to 10 minutes. -- `UseTransaction` scopes the lock to an internally-managed transaction under the hood (otherwise it is connection-scoped). Defaults to FALSE because this mode can lead to long-running transactions which can be disruptive on databases using the full recovery model. +- `UseTransaction` scopes the lock to an internally-managed transaction under the hood (otherwise it is connection-scoped). Defaults to FALSE because this mode is not compatible with multiplexing and thus consumes more connections. It can also lead to long-running transactions which can be disruptive on databases using the full recovery model. - `UseMultiplexing` allows the implementation to re-use connections under the hood to hold multiple locks under certain scenarios, leading to lower resource consumption. This behavior defaults to ON except in the case where `UseTransaction` is set to TRUE since the two are not compatible. You should only manually disable `UseMultiplexing` for troubleshooting purposes if you suspect it is causing issues. diff --git a/src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs b/src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs index ee0c51c0..2c5de36f 100644 --- a/src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs +++ b/src/DistributedLock.Core/Internal/Data/DedicatedConnectionOrTransactionDbDistributedLock.cs @@ -22,6 +22,8 @@ sealed class DedicatedConnectionOrTransactionDbDistributedLock : IDbDistributedL /// Constructs an instance using the given EXTERNALLY OWNED . /// public DedicatedConnectionOrTransactionDbDistributedLock(string name, Func externalConnectionFactory) + // MA: useTransaction:true here is a bit weird. However, in practice this value does not impact the external connection + // flow so it doesn't matter what the value is. : this(name, externalConnectionFactory, useTransaction: true, keepaliveCadence: Timeout.InfiniteTimeSpan) { } @@ -52,7 +54,7 @@ public DedicatedConnectionOrTransactionDbDistributedLock( DatabaseConnection connection; if (contextHandle != null) { - connection = GetContextHandleConnection(contextHandle); + connection = this.GetContextHandleConnection(contextHandle); } else { diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 9b6d1053..9d06889b 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -44,15 +44,15 @@ private PostgresAdvisoryLock(bool isShared) return null; } - var hasTransaction = await HasTransactionAsync(connection).ConfigureAwait(false); - if (hasTransaction) + // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end + // of the current transaction instead of just the current batch if we're in a transaction. To make sure + // we don't leak those settings, in the case of a transaction we first set up a save point which we can + // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently + // roll back a save point without knowing that it has been set up, we start the save point in its own + // query before we try-catch + var needsSavePoint = await HasTransactionAsync(connection).ConfigureAwait(false); + if (needsSavePoint) { - // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end - // of the current transaction instead of just the current batch if we're in a transaction. To make sure - // we don't leak those settings, in the case of a transaction we first set up a save point which we can - // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently - // roll back a save point without knowing that it has been set up, we start the save point in its own - // query before we try-catch using var setSavePointCommand = connection.CreateCommand(); setSavePointCommand.SetCommandText("SAVEPOINT " + SavePointName); await setSavePointCommand.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false); @@ -67,13 +67,13 @@ private PostgresAdvisoryLock(bool isShared) } catch (Exception ex) { - await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); + await RollBackTransactionTimeoutVariablesIfNeededAsync(acquired: false).ConfigureAwait(false); if (ex is PostgresException postgresException) { switch (postgresException.SqlState) { - // lock_timeout error code from https://www.postgresql.org/docs/10/errcodes-appendix.html + // lock_timeout error code from https://www.postgresql.org/docs/16/errcodes-appendix.html case "55P03": // Even though we hit a lock timeout, an underlying race condition in Postgres means that we might actually // have acquired the lock right before timing out. To account for this, we simply re-check whether we are @@ -83,13 +83,18 @@ private PostgresAdvisoryLock(bool isShared) return await this.IsHoldingLockAsync(connection, key, CancellationToken.None).ConfigureAwait(false) ? Cookie : null; - // deadlock_detected error code from https://www.postgresql.org/docs/10/errcodes-appendix.html + // deadlock_detected error code from https://www.postgresql.org/docs/16/errcodes-appendix.html case "40P01": throw new DeadlockException($"The request for the distributed lock failed with exit code '{postgresException.SqlState}' (deadlock_detected)", ex); } } - if (ex is OperationCanceledException && cancellationToken.IsCancellationRequested) + if (ex is OperationCanceledException + && cancellationToken.IsCancellationRequested + // There's no way to explicitly release transaction-scoped locks other than a rollback; in our case + // RollBackTransactionTimeoutVariablesIfNeededAsync will have already released by rolling back the savepoint. + // Furthermore the caller will proceed to dispose the transaction. + && !UseTransactionScopedLock(connection)) { // if we bailed in the middle of an acquire, make sure we didn't leave a lock behind await this.ReleaseAsync(connection, key, isTry: true).ConfigureAwait(false); @@ -98,20 +103,31 @@ private PostgresAdvisoryLock(bool isShared) throw; } - await RollBackTransactionTimeoutVariablesIfNeededAsync().ConfigureAwait(false); + var acquired = acquireCommandResult switch + { + DBNull _ => true, // indicates we called pg_advisory_lock and not pg_try_advisory_lock + null => true, // Npgsql 8 returns null instead of DBNull + false => false, + true => true, + _ => default(bool?) + }; + + await RollBackTransactionTimeoutVariablesIfNeededAsync(acquired: acquired == true).ConfigureAwait(false); - return acquireCommandResult switch + return acquired switch { - DBNull _ => Cookie, // indicates we called pg_advisory_lock and not pg_try_advisory_lock - null => Cookie, // Npgsql 8 returns null instead of DBNull false => null, true => Cookie, - _ => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") + null => throw new InvalidOperationException($"Unexpected value '{acquireCommandResult}' from acquire command") }; - async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync() + async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync(bool acquired) { - if (hasTransaction) + if (needsSavePoint + // For transaction scoped locks, we can't roll back the save point on success because that will roll + // back our hold on the lock. It's ok to "leak" the savepoint in that case because it's an internally-owned + // transaction/connection and the savepoint will be cleaned up with the disposal of the transaction. + && !(acquired && UseTransactionScopedLock(connection))) { // attempt to clear the timeout variables we set using var rollBackSavePointCommand = connection.CreateCommand(); @@ -153,7 +169,9 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post var isTry = timeout.IsZero; commandText.Append("pg_catalog.pg"); if (isTry) { commandText.Append("_try"); } - commandText.Append("_advisory_lock"); + commandText.Append("_advisory"); + if (UseTransactionScopedLock(connection)) { commandText.Append("_xact"); } + commandText.Append("_lock"); if (this._isShared) { commandText.Append("_shared"); } commandText.Append('(').Append(AddKeyParametersAndGetKeyArguments(command, key)).Append(')') .Append(" AS result"); @@ -189,6 +207,8 @@ public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, bool isTry) { + Invariant.Require(!UseTransactionScopedLock(connection)); + using var command = connection.CreateCommand(); command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); var result = (bool)await command.ExecuteScalarAsync(CancellationToken.None).ConfigureAwait(false); @@ -214,6 +234,12 @@ private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command } } + private static bool UseTransactionScopedLock(DatabaseConnection connection) => + // This implementation (similar to what we do for SQL Server) is based on the fact that we only create transactions on + // internally-owned connections when doing transaction-scoped locking, and we only support transaction-scoped locking on + // internally-owned connections (since there's no explicit release). + !connection.IsExernallyOwned && connection.HasTransaction; + private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) { // From https://www.postgresql.org/docs/12/view-pg-locks.html diff --git a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs index 8ea25514..a75fee09 100644 --- a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs +++ b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Internal; +using System.Data; namespace Medallion.Threading.Postgres; @@ -8,7 +9,7 @@ namespace Medallion.Threading.Postgres; public sealed class PostgresConnectionOptionsBuilder { private TimeoutValue? _keepaliveCadence; - private bool? _useMultiplexing; + private bool? _useTransaction, _useMultiplexing; internal PostgresConnectionOptionsBuilder() { } @@ -26,6 +27,23 @@ public PostgresConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCaden return this; } + /// + /// Whether the synchronization should use a transaction scope rather than a session scope. Defaults to false. + /// + /// Synchronizing based on a transaction is necessary to do distributed locking with some pgbouncer configurations + /// (see https://github.com/madelson/DistributedLock/issues/168#issuecomment-1823277173). It may also be marginally less + /// expensive than using a connection for a single lock because releasing requires only disposing the + /// underlying . + /// + /// The disadvantage of this strategy is that it is incompatible with and therefore + /// gives up the advantages of that approach. + /// + public PostgresConnectionOptionsBuilder UseTransaction(bool useTransaction = true) + { + this._useTransaction = useTransaction; + return this; + } + /// /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is @@ -48,7 +66,7 @@ public PostgresConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = t return this; } - internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions(Action? optionsBuilder) + internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions(Action? optionsBuilder) { PostgresConnectionOptionsBuilder? options; if (optionsBuilder != null) @@ -62,8 +80,14 @@ internal static (TimeoutValue keepaliveCadence, bool useMultiplexing) GetOptions } var keepaliveCadence = options?._keepaliveCadence ?? Timeout.InfiniteTimeSpan; - var useMultiplexing = options?._useMultiplexing ?? true; + var useTransaction = options?._useTransaction ?? false; + var useMultiplexing = options?._useMultiplexing ?? !options?._useTransaction ?? true; + + if (useMultiplexing && useTransaction) + { + throw new ArgumentException(nameof(UseTransaction) + ": is not compatible with " + nameof(UseMultiplexing)); + } - return (keepaliveCadence, useMultiplexing); + return (keepaliveCadence, useTransaction, useMultiplexing); } } diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index 350101ad..fae80b3c 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -49,14 +49,11 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke { if (connectionString == null) { throw new ArgumentNullException(nameof(connectionString)); } - var (keepaliveCadence, useMultiplexing, useTransaction) = PostgresConnectionOptionsBuilder.GetOptions(options); + var (keepaliveCadence, useTransaction, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options); - if (useMultiplexing) - { - return new OptimisticConnectionMultiplexingDbDistributedLock(key.ToString(), connectionString, PostgresMultiplexedConnectionLockPool.Instance, keepaliveCadence); - } - - return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connectionString), useTransaction: false, keepaliveCadence); + return useMultiplexing + ? new OptimisticConnectionMultiplexingDbDistributedLock(key.ToString(), connectionString, PostgresMultiplexedConnectionLockPool.Instance, keepaliveCadence) + : new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connectionString), useTransaction: useTransaction, keepaliveCadence); } internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, IDbConnection connection) diff --git a/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs b/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs index 625f4069..7bfcf54e 100644 --- a/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs +++ b/src/DistributedLock.SqlServer/SqlConnectionOptionsBuilder.cs @@ -37,8 +37,10 @@ public SqlConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) /// /// Synchronizing based on a transaction is marginally less expensive than using a connection /// because releasing requires only disposing the underlying . + /// /// The disadvantage is that using this strategy may lead to long-running transactions, which can be - /// problematic for databases using the full recovery model. + /// problematic for databases using the full recovery model. Furthermore, this strategy prevents us from + /// taking advantage of and its performance advantages. /// public SqlConnectionOptionsBuilder UseTransaction(bool useTransaction = true) { diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index bedff140..8d89e66d 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -1,4 +1,5 @@ -using Medallion.Threading.Postgres; +using Medallion.Threading.Internal; +using Medallion.Threading.Postgres; using Medallion.Threading.Tests.Data; namespace Medallion.Threading.Tests.Postgres; @@ -23,6 +24,7 @@ public override IDistributedLock CreateLockWithExactName(string name) => internal static Action ToPostgresOptions((bool useMultiplexing, bool useTransaction, TimeSpan? keepaliveCadence) options) => o => { o.UseMultiplexing(options.useMultiplexing); + o.UseTransaction(options.useTransaction); if (options.keepaliveCadence is { } keepaliveCadence) { o.KeepaliveCadence(keepaliveCadence); } }; } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs index 902d5e07..bef6457c 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs @@ -12,6 +12,8 @@ public void TestValidatesArguments() var builder = new PostgresConnectionOptionsBuilder(); Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.FromMilliseconds(-2))); Assert.Throws(() => builder.KeepaliveCadence(TimeSpan.MaxValue)); + + Assert.Throws(() => PostgresConnectionOptionsBuilder.GetOptions(o => o.UseMultiplexing().UseTransaction())); } [Test] @@ -20,6 +22,15 @@ public void TestDefaults() var options = PostgresConnectionOptionsBuilder.GetOptions(null); Assert.IsTrue(options.keepaliveCadence.IsInfinite); Assert.IsTrue(options.useMultiplexing); + Assert.IsFalse(options.useTransaction); options.ShouldEqual(PostgresConnectionOptionsBuilder.GetOptions(o => { })); } + + [Test] + public void TestUseTransactionDoesNotRequireDisablingMultiplexing() + { + var options = PostgresConnectionOptionsBuilder.GetOptions(o => o.UseTransaction()); + Assert.IsTrue(options.useTransaction); + Assert.IsFalse(options.useMultiplexing); + } } From 84efadf052eabea1ce4cdec1d4deea2a9646f192 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:26:16 -0400 Subject: [PATCH 231/399] Fix release build --- src/DistributedLock.Postgres/PublicAPI.Shipped.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt index 43fce916..72be84ec 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt @@ -8,6 +8,7 @@ Medallion.Threading.Postgres.PostgresAdvisoryLockKey.PostgresAdvisoryLockKey(str Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder.KeepaliveCadence(System.TimeSpan keepaliveCadence) -> Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder! Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder.UseMultiplexing(bool useMultiplexing = true) -> Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder! +Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder.UseTransaction(bool useTransaction = true) -> Medallion.Threading.Postgres.PostgresConnectionOptionsBuilder! Medallion.Threading.Postgres.PostgresDistributedLock Medallion.Threading.Postgres.PostgresDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Postgres.PostgresDistributedLockHandle! Medallion.Threading.Postgres.PostgresDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask From 78f3386b403e122565d7396e9b3815de03aea367 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:39:36 -0400 Subject: [PATCH 232/399] packages lock updates --- src/DistributedLock.Azure/packages.lock.json | 32 ++ src/DistributedLock.Core/packages.lock.json | 32 ++ .../packages.lock.json | 32 ++ src/DistributedLock.MySql/packages.lock.json | 18 + src/DistributedLock.Oracle/packages.lock.json | 12 + .../packages.lock.json | 32 ++ src/DistributedLock.Redis/packages.lock.json | 32 ++ .../packages.lock.json | 32 ++ src/DistributedLock.Tests/packages.lock.json | 489 ++++++++++++++++++ .../packages.lock.json | 32 ++ .../packages.lock.json | 32 ++ src/DistributedLock/packages.lock.json | 18 + 12 files changed, 793 insertions(+) diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index 7b54ac2e..c7e4e446 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -12,6 +12,21 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -52,6 +67,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -214,6 +234,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -380,6 +406,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 424c5cd7..c9cc2d2c 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,21 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -32,6 +47,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -61,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -110,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index 3b040d12..7f6f0799 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -2,6 +2,21 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -23,6 +38,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -65,6 +85,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -135,6 +161,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 95bd82c4..a61bbe58 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -120,6 +126,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -233,6 +245,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index fe89e481..07e8a2c3 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -125,6 +131,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 55369b70..7e52b3ae 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -2,6 +2,21 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -32,6 +47,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -125,6 +145,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -259,6 +285,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index 20bd0f33..f5ba1feb 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -2,6 +2,21 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -46,6 +61,11 @@ "System.Memory": "4.5.4" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -144,6 +164,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -281,6 +307,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index e150fd9d..7ee28243 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -14,6 +20,15 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -78,6 +93,11 @@ "Microsoft.IdentityModel.Logging": "6.8.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -129,6 +149,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -1289,6 +1315,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 8330c20c..88f72ca0 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,495 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.1, )", + "resolved": "1.6.1", + "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==", + "dependencies": { + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0" + } + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[16.4.0, )", + "resolved": "16.4.0", + "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", + "dependencies": { + "Microsoft.CodeCoverage": "16.4.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.13.1, )", + "resolved": "4.13.1", + "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", + "dependencies": { + "Castle.Core": "4.4.0", + "System.Threading.Tasks.Extensions": "4.5.1" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.12.0, )", + "resolved": "3.12.0", + "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[3.15.1, )", + "resolved": "3.15.1", + "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.25.0", + "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Memory.Data": "1.0.2", + "System.Net.Http": "4.3.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.12.0", + "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "dependencies": { + "Azure.Core": "1.25.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "16.4.0", + "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.0, )", + "DistributedLock.FileSystem": "[1.0.1, )", + "DistributedLock.MySql": "[1.0.1, )", + "DistributedLock.Oracle": "[1.0.2, )", + "DistributedLock.Postgres": "[1.0.5, )", + "DistributedLock.Redis": "[1.0.2, )", + "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.13.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess": "[21.10.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.13.1, )", + "resolved": "12.13.1", + "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "dependencies": { + "Azure.Storage.Common": "12.12.0", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index 64aa8b81..65b21508 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -2,6 +2,21 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -17,6 +32,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -59,6 +79,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -167,6 +193,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index 60374ce8..e65f0b8b 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -8,6 +8,21 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -35,6 +50,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -83,6 +103,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -165,6 +191,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index c2e5c5d3..8e08f781 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -444,6 +450,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -1837,6 +1849,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", From 428cb6b35946a11efc996581852fac5637998a73 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:39:45 -0400 Subject: [PATCH 233/399] Ubuntu fix attempt --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 29408d72..6b72ef0b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,9 @@ image: - Visual Studio 2022 - Ubuntu +init: + - sh: >- sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 + build_script: - dotnet build src/DistributedLock.sln -c Release From a9a702f0709b891ffee913543cda0c4546eeafa1 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:41:14 -0400 Subject: [PATCH 234/399] yaml fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6b72ef0b..07ea12a5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ image: - Ubuntu init: - - sh: >- sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 + - sh: sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 build_script: - dotnet build src/DistributedLock.sln -c Release From b54f9e29d988508b9e0a13d2d75fa56a4d5d90d8 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:54:23 -0400 Subject: [PATCH 235/399] Appveyor ubuntu attempt 2 https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu#troubleshooting --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 07ea12a5..a7deb3e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ image: - Ubuntu init: - - sh: sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 + - sh: sudo apt-get install -y gpg && wget -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o microsoft.asc.gpg && sudo mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ && wget https://packages.microsoft.com/config/ubuntu/{os-version}/prod.list && sudo mv prod.list /etc/apt/sources.list.d/microsoft-prod.list && sudo chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg && sudo chown root:root /etc/apt/sources.list.d/microsoft-prod.list && sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 build_script: - dotnet build src/DistributedLock.sln -c Release From dc4c9ee0a77ba6bd72b83dec627e640039cc9334 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 12:50:08 -0400 Subject: [PATCH 236/399] Ubuntu fix 3 --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a7deb3e0..643e56e9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,11 +2,8 @@ version: 1.0.{build} image: - Visual Studio 2022 - - Ubuntu - -init: - - sh: sudo apt-get install -y gpg && wget -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o microsoft.asc.gpg && sudo mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ && wget https://packages.microsoft.com/config/ubuntu/{os-version}/prod.list && sudo mv prod.list /etc/apt/sources.list.d/microsoft-prod.list && sudo chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg && sudo chown root:root /etc/apt/sources.list.d/microsoft-prod.list && sudo apt-get update && sudo apt-get install -y dotnet-sdk-8.0 - + - Ubuntu2204 + build_script: - dotnet build src/DistributedLock.sln -c Release From 861912d123fcd03abbc0ae8db116a7145f8d5f55 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 12:59:29 -0400 Subject: [PATCH 237/399] Update CodeGen to run on net8.0 --- appveyor.yml | 7 ++++--- src/DistributedLockCodeGen/DistributedLockCodeGen.csproj | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 643e56e9..ada4319a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,10 @@ version: 1.0.{build} -image: - - Visual Studio 2022 +image: + # Ubuntu2204 needed for .NET 8 for now (see https://www.appveyor.com/docs/linux-images-software/) - Ubuntu2204 - + - Visual Studio 2022 + build_script: - dotnet build src/DistributedLock.sln -c Release diff --git a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 4b1e1f03..2cda37e8 100644 --- a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 Latest false enable From b694e0376dfa507c6c8e5a798355953e7a40b97d Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:15:46 -0400 Subject: [PATCH 238/399] Ubuntu fix 5 --- appveyor.yml | 2 +- src/DistributedLockCodeGen/CodeGenHelpers.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ada4319a..d4cd381d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ build_script: - dotnet build src/DistributedLock.sln -c Release test_script: - - dotnet test src/DistributedLock.sln -c Release -f netcoreapp3.1 --no-build --filter TestCategory=CI + - dotnet test src/DistributedLock.sln -c Release -f net8.0 --no-build --filter TestCategory=CI for: - diff --git a/src/DistributedLockCodeGen/CodeGenHelpers.cs b/src/DistributedLockCodeGen/CodeGenHelpers.cs index c73d419b..190e160a 100644 --- a/src/DistributedLockCodeGen/CodeGenHelpers.cs +++ b/src/DistributedLockCodeGen/CodeGenHelpers.cs @@ -13,7 +13,7 @@ internal static class CodeGenHelpers public static IEnumerable EnumerateSolutionFiles() => Directory.EnumerateFiles(SolutionDirectory, "*.csproj", SearchOption.AllDirectories) .Select(Path.GetDirectoryName) - .Where(d => !Regex.IsMatch(Path.GetFileName(d), "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) + .Where(d => !Regex.IsMatch(Path.GetFileName(d)!, "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) .SelectMany(d => Directory.EnumerateFiles(d, "*.cs", SearchOption.AllDirectories)); public static string NormalizeCodeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); From 13b59fb6d133c217e371a5320844fe55d3016890 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:21:15 -0400 Subject: [PATCH 239/399] Fix #185 --- src/Directory.Packages.props | 2 +- src/DistributedLock.Azure/packages.lock.json | 111 ++-- src/DistributedLock.Core/packages.lock.json | 18 - .../packages.lock.json | 18 - src/DistributedLock.MySql/packages.lock.json | 18 - src/DistributedLock.Oracle/packages.lock.json | 12 - .../packages.lock.json | 18 - src/DistributedLock.Redis/packages.lock.json | 18 - .../packages.lock.json | 18 - .../Infrastructure/Azure/AzureSetUpFixture.cs | 6 +- .../AzureBlobLeaseDistributedLockTest.cs | 5 +- src/DistributedLock.Tests/packages.lock.json | 522 +----------------- .../packages.lock.json | 18 - .../packages.lock.json | 18 - src/DistributedLock/packages.lock.json | 84 ++- src/DistributedLockCodeGen/packages.lock.json | 2 +- src/DistributedLockTaker/Program.cs | 5 - src/DistributedLockTaker/packages.lock.json | 148 +---- 18 files changed, 138 insertions(+), 903 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 9937cc18..7a555e15 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,7 +6,7 @@ - + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index c7e4e446..0f6cc6b9 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -4,20 +4,14 @@ ".NETFramework,Version=v4.6.1": { "Azure.Storage.Blobs": { "type": "Direct", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -39,11 +33,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Net.Http": "4.3.4", "System.Numerics.Vectors": "4.5.0", @@ -55,10 +49,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -84,10 +78,11 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", "dependencies": { - "System.Memory": "4.5.3" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.IO.Hashing": { @@ -133,8 +128,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -226,20 +221,14 @@ ".NETStandard,Version=v2.0": { "Azure.Storage.Blobs": { "type": "Direct", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -261,11 +250,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -275,10 +264,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -304,10 +293,11 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", "dependencies": { - "System.Memory": "4.5.3" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.IO.Hashing": { @@ -345,8 +335,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -398,20 +388,14 @@ ".NETStandard,Version=v2.1": { "Azure.Storage.Blobs": { "type": "Direct", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -424,11 +408,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -438,10 +422,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -470,10 +454,11 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "mbBgoR0rRfl2uimsZ2avZY8g7Xnh1Mza0rJZLPcxqiMWlkGukjmRkuMJ/er+AhQuiRIh80CR/Hpeztr80seV5g==", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", "dependencies": { - "System.Memory": "4.5.3" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.IO.Hashing": { @@ -511,8 +496,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.7.1", - "contentHash": "zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encodings.Web": { "type": "Transitive", diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index c9cc2d2c..334a6f05 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index 7f6f0799..4cbaae69 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -85,12 +79,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -161,12 +149,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index a61bbe58..95bd82c4 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -126,12 +120,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -245,12 +233,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index 07e8a2c3..fe89e481 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -131,12 +125,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 7e52b3ae..d4698076 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -145,12 +139,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -285,12 +273,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index f5ba1feb..a23fa212 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -164,12 +158,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -307,12 +295,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 7ee28243..b234aa31 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -149,12 +143,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -1315,12 +1303,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", diff --git a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs index cfb627ed..9e410d46 100644 --- a/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/Azure/AzureSetUpFixture.cs @@ -35,8 +35,10 @@ public void OneTimeSetUp() // Note: we used to hang on to this command to kill it later; we no longer do that because this process seems to naturally exit // by the end of the test and instead the emulator is running in another process. Therefore, we do a name-based lookup in teardown instead. var command = Command.Run( - emulatorExePaths[0], - ["start"], + emulatorExePaths[0], + // After updating to Azure.Storage.Blobs 12.19.1 I started getting an error saying that I had to update Azurite or pass this flag. + // AFAIK the only way to update Azurite is to update VS, which did not fix the issue. Therefore, I am passing this flag instead. + ["start", "--skipApiVersionCheck"], o => o.StartInfo(i => i.RedirectStandardInput = false) .WorkingDirectory(Path.GetDirectoryName(this.GetType().Assembly.Location)!)) .RedirectTo(Console.Out) diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 7d07e4e9..b9a311fb 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -110,7 +110,10 @@ public void TestCanUseLeaseIdForBlobOperations() .ErrorCode.ShouldEqual(AzureErrors.LeaseIdMissing); Assert.DoesNotThrow( - () => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0, conditions: new PageBlobRequestConditions { LeaseId = handle.LeaseId }) + () => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0, options: new() + { + Conditions = new PageBlobRequestConditions { LeaseId = handle.LeaseId } + }) ); handle.Dispose(); diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 88f72ca0..b735b728 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,495 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.1, )", - "resolved": "1.6.1", - "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==", - "dependencies": { - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0" - } - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[16.4.0, )", - "resolved": "16.4.0", - "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", - "dependencies": { - "Microsoft.CodeCoverage": "16.4.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.13.1, )", - "resolved": "4.13.1", - "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", - "dependencies": { - "Castle.Core": "4.4.0", - "System.Threading.Tasks.Extensions": "4.5.1" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.12.0, )", - "resolved": "3.12.0", - "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[3.15.1, )", - "resolved": "3.15.1", - "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", - "System.Memory.Data": "1.0.2", - "System.Net.Http": "4.3.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", - "dependencies": { - "Azure.Core": "1.25.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "7.0.1", - "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", - "dependencies": { - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.1, )", - "DistributedLock.MySql": "[1.0.1, )", - "DistributedLock.Oracle": "[1.0.2, )", - "DistributedLock.Postgres": "[1.0.5, )", - "DistributedLock.Redis": "[1.0.2, )", - "DistributedLock.SqlServer": "[1.0.3, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess": "[21.10.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Npgsql": "[5.0.4, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", - "dependencies": { - "Azure.Storage.Common": "12.12.0", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[5.0.4, )", - "resolved": "5.0.4", - "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.6.0", - "System.Text.Json": "4.6.0", - "System.Threading.Channels": "4.7.0", - "System.Threading.Tasks.Extensions": "4.5.3", - "System.ValueTuple": "4.5.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -556,11 +67,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -570,10 +81,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -942,8 +453,11 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "oJjw3uFuVDJiJNbCD8HB4a2p3NYLdt1fiT5OGsPLw+WTOuG0KpP4OXelMmmVKpClueMsit6xOlzy4wNKQFiBLg==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1295,8 +809,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.Extensions": { "type": "Transitive", @@ -1587,7 +1101,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -1651,11 +1165,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index 65b21508..d1bd259a 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -79,12 +73,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -193,12 +181,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index e65f0b8b..78947ef8 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -8,12 +8,6 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -103,12 +97,6 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -191,12 +179,6 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 8e08f781..75681111 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -29,11 +23,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Net.Http": "4.3.4", "System.Numerics.Vectors": "4.5.0", @@ -45,10 +39,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -306,7 +300,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -373,11 +367,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, @@ -450,12 +444,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -477,11 +465,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -491,10 +479,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -1697,7 +1685,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -1757,11 +1745,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, @@ -1849,12 +1837,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -1867,11 +1849,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -1881,10 +1863,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -3319,7 +3301,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -3383,11 +3365,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json index 7f700325..e61c81cc 100644 --- a/src/DistributedLockCodeGen/packages.lock.json +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - ".NETCoreApp,Version=v3.1": { + "net8.0": { "Microsoft.NET.Test.Sdk": { "type": "Direct", "requested": "[16.4.0, )", diff --git a/src/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs index e42414db..c15d0a5a 100644 --- a/src/DistributedLockTaker/Program.cs +++ b/src/DistributedLockTaker/Program.cs @@ -15,11 +15,6 @@ using Medallion.Threading.ZooKeeper; using Medallion.Threading.MySql; using Medallion.Threading.Oracle; -#if NET471 -using System.Data.SqlClient; -#elif NETCOREAPP3_1 -using Microsoft.Data.SqlClient; -#endif namespace DistributedLockTaker; diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 147495a2..5456a05f 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -4,15 +4,13 @@ ".NETFramework,Version=v4.7.2": { "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", - "System.Net.Http": "4.3.4", "System.Numerics.Vectors": "4.5.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "System.Text.Encodings.Web": "4.7.2", "System.Text.Json": "4.7.2", "System.Threading.Tasks.Extensions": "4.5.4" @@ -20,10 +18,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -132,11 +130,6 @@ "Microsoft.IdentityModel.Tokens": "6.8.0" } }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" - }, "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", @@ -180,64 +173,16 @@ "System.Text.Json": "4.6.0" } }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "6.0.0", @@ -301,7 +246,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -368,11 +313,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, @@ -440,44 +385,6 @@ "resolved": "4.3.0", "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[2.1.7, )", @@ -494,11 +401,11 @@ "net8.0": { "Azure.Core": { "type": "Transitive", - "resolved": "1.25.0", - "contentHash": "X8Dd4sAggS84KScWIjEbFAdt2U1KDolQopTPoHVubG2y3CM54f9l6asVrP5Uy384NWXjsspPYaJgz5xHc+KvTA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "4.6.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", "System.Text.Encodings.Web": "4.7.2", @@ -508,10 +415,10 @@ }, "Azure.Storage.Common": { "type": "Transitive", - "resolved": "12.12.0", - "contentHash": "Ms0XsZ/D9Pcudfbqj+rWeCkhx/ITEq8isY0jkor9JFmDAEHsItFa2XrWkzP3vmJU6EsXQrk4snH63HkW/Jksvg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Azure.Core": "1.25.0", + "Azure.Core": "1.36.0", "System.IO.Hashing": "6.0.0" } }, @@ -629,8 +536,11 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "oJjw3uFuVDJiJNbCD8HB4a2p3NYLdt1fiT5OGsPLw+WTOuG0KpP4OXelMmmVKpClueMsit6xOlzy4wNKQFiBLg==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -705,8 +615,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -785,7 +695,7 @@ "distributedlock.azure": { "type": "Project", "dependencies": { - "Azure.Storage.Blobs": "[12.13.1, )", + "Azure.Storage.Blobs": "[12.19.1, )", "DistributedLock.Core": "[1.0.5, )" } }, @@ -849,11 +759,11 @@ }, "Azure.Storage.Blobs": { "type": "CentralTransitive", - "requested": "[12.13.1, )", - "resolved": "12.13.1", - "contentHash": "bEJUFBS9wTk/ZJmJBsm/GktZenl2GVkxLHNC7SkeCd0cfKC1MP11EXV7e0NDySsFDEEjjGACb8Fau6lPTmXdsg==", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "Azure.Storage.Common": "12.12.0", + "Azure.Storage.Common": "12.18.1", "System.Text.Json": "4.7.2" } }, From 531092cb9cdb1eec3bf0434f7c4211cb4626261e Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:47:37 -0400 Subject: [PATCH 240/399] Fix build warning --- src/DistributedLockCodeGen/CodeGenHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLockCodeGen/CodeGenHelpers.cs b/src/DistributedLockCodeGen/CodeGenHelpers.cs index 190e160a..80da686b 100644 --- a/src/DistributedLockCodeGen/CodeGenHelpers.cs +++ b/src/DistributedLockCodeGen/CodeGenHelpers.cs @@ -14,7 +14,7 @@ internal static class CodeGenHelpers public static IEnumerable EnumerateSolutionFiles() => Directory.EnumerateFiles(SolutionDirectory, "*.csproj", SearchOption.AllDirectories) .Select(Path.GetDirectoryName) .Where(d => !Regex.IsMatch(Path.GetFileName(d)!, "^(DistributedLock|DistributedLock.Tests|DistributedLockCodeGen)$", RegexOptions.IgnoreCase)) - .SelectMany(d => Directory.EnumerateFiles(d, "*.cs", SearchOption.AllDirectories)); + .SelectMany(d => Directory.EnumerateFiles(d!, "*.cs", SearchOption.AllDirectories)); public static string NormalizeCodeWhitespace(string code) => code.Trim().Replace("\r\n", "\n"); From 229bd7d419eabc176c810c7cf6d9ca218778339b Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:47:57 -0400 Subject: [PATCH 241/399] Improve directory creation resilience on Linux attempt 1 --- .../FileDistributedLock.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index 0cd633af..79f9de40 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -144,10 +144,18 @@ private void EnsureDirectoryExists() } // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. // If we encounter it, assume it is transient unless it persists. - catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } + //catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } catch (Exception ex) { - throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); + if (ex is UnauthorizedAccessException or IOException + && retryCount < MaxUnauthorizedAccessExceptionRetries) + { + ++retryCount; + } + else + { + throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); + } } } } From 607bbe6e27523f24d0dd5188187fd7703f33f95c Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 15:24:24 -0400 Subject: [PATCH 242/399] Improve handling of Directory creation on linux for FileDistributedLocks Fix #195 --- src/DistributedLock.FileSystem/FileDistributedLock.cs | 8 +++++--- .../Tests/FileSystem/FileDistributedLockTest.cs | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index 79f9de40..a1b212b0 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -142,11 +142,13 @@ private void EnsureDirectoryExists() System.IO.Directory.CreateDirectory(this.Directory); return; } - // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. - // If we encounter it, assume it is transient unless it persists. - //catch (UnauthorizedAccessException) when (++retryCount <= MaxUnauthorizedAccessExceptionRetries) { } catch (Exception ex) { + // This can indicate either a transient failure during concurrent creation/deletion or a permissions issue. + // If we encounter it, assume it is transient unless it persists. + // For a long time, I just checked for UnauthorizedAccessException here. However, recent tests on Linux have + // shown that in race conditions we can see IOException as well, presumably because there is some period during + // directory creation where it presents as a file. if (ex is UnauthorizedAccessException or IOException && retryCount < MaxUnauthorizedAccessExceptionRetries) { diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 4e67d4c9..36dda52e 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -120,6 +120,16 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); } + [Test] + public void TestThrowsIfProvidedDirectoryIsAlreadyFile() + { + var tempFile = Path.GetTempFileName(); + + var @lock = new FileDistributedLock(lockFileDirectory: new(tempFile), "some name"); + var exception = Assert.Throws(() => @lock.Acquire().Dispose()); + Assert.That(exception.InnerException!.Message, Does.Match("file .* already exists")); + } + [Test] public void TestEmptyNameIsAllowed() => AssertCanUseName(string.Empty); From 60f8a28470b164a9cfb0d5817de2dd20a275b026 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 15:40:30 -0400 Subject: [PATCH 243/399] Ensure that Helpers.TryAwait() does not result in UnobservedTaskException For #192 --- src/DistributedLock.Azure/packages.lock.json | 18 + src/DistributedLock.Core/DeadlockException.cs | 3 + .../DistributedLock.Core.csproj | 2 +- .../Internal/Data/ConnectionMonitor.cs | 2 +- .../Internal/Data/DatabaseCommand.cs | 6 +- .../Internal/Data/DatabaseConnection.cs | 6 +- src/DistributedLock.Core/Internal/Helpers.cs | 15 +- .../Internal/LeaseMonitor.cs | 2 +- .../Internal/ManagedFinalizerQueue.cs | 2 +- src/DistributedLock.Core/packages.lock.json | 46 ++ .../packages.lock.json | 18 + src/DistributedLock.MySql/packages.lock.json | 18 + src/DistributedLock.Oracle/packages.lock.json | 12 + .../PostgresAdvisoryLock.cs | 6 +- .../packages.lock.json | 18 + src/DistributedLock.Redis/packages.lock.json | 18 + .../packages.lock.json | 18 + .../Tests/Core/HelpersTest.cs | 47 ++ src/DistributedLock.Tests/packages.lock.json | 439 ++++++++++++++++++ .../packages.lock.json | 18 + .../packages.lock.json | 18 + src/DistributedLock/packages.lock.json | 18 + 22 files changed, 735 insertions(+), 15 deletions(-) diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index 0f6cc6b9..85cfde88 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -12,6 +12,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -229,6 +235,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -396,6 +408,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Core/DeadlockException.cs b/src/DistributedLock.Core/DeadlockException.cs index f9fb2336..917b0bf6 100644 --- a/src/DistributedLock.Core/DeadlockException.cs +++ b/src/DistributedLock.Core/DeadlockException.cs @@ -24,5 +24,8 @@ public DeadlockException(string message) : base(message) { } /// public DeadlockException(string message, Exception innerException) : base(message, innerException) { } +#if NET8_0_OR_GREATER + [Obsolete] // calls obsolete constructor +#endif private DeadlockException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index e6fb0864..3638394b 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + net8.0;netstandard2.0;netstandard2.1;net461 Medallion.Threading True 4 diff --git a/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 9615c503..6e87b680 100644 --- a/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -310,7 +310,7 @@ private bool StartMonitorWorkerIfNeededNoLock() // one is spinning down. If we change states in rapid succession we could end up with multiple tasks queued up // but this shouldn't matter since when the active one ultimately stops all the others will follow in rapid succession this._monitoringWorkerTask = this._monitoringWorkerTask - .ContinueWith((_, state) => ((ConnectionMonitor)state).MonitorWorkerLoop(), state: this) + .ContinueWith((_, state) => ((ConnectionMonitor)state!).MonitorWorkerLoop(), state: this) .Unwrap(); this._state = State.Active; return true; diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 624ffb07..45dfc348 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -63,7 +63,7 @@ public ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, internal ValueTask ExecuteNonQueryAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation, bool isConnectionMonitoringQuery) => this.ExecuteAsync((c, t) => c.ExecuteNonQueryAsync(t), c => c.ExecuteNonQuery(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery); - public ValueTask ExecuteScalarAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => + public ValueTask ExecuteScalarAsync(CancellationToken cancellationToken, bool disallowAsyncCancellation = false) => this.ExecuteAsync((c, t) => c.ExecuteScalarAsync(t), c => c.ExecuteScalar(), cancellationToken, disallowAsyncCancellation, isConnectionMonitoringQuery: false); private async ValueTask ExecuteAsync( @@ -113,7 +113,7 @@ private async ValueTask ExecuteAsync( // registrations fire synchronously if the token is already canceled using var registration = cancellationToken.Register(state => Task.Run(async () => { - var commandBox = (StrongBox)state; + var commandBox = (StrongBox)state!; IDbCommand? command; while ((command = Volatile.Read(ref commandBox.Value)) != null) { @@ -178,7 +178,7 @@ private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) { if (this._connection.ShouldPrepareCommands) { -#if NETSTANDARD2_1 +#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1 if (!SyncViaAsync.IsSynchronous && this._command is DbCommand dbCommand) { return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index a52d7806..400d2579 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -60,7 +60,7 @@ public async ValueTask BeginTransactionAsync() using var _ = await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); this._transaction = -#if NETSTANDARD2_1 +#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1 !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) : @@ -105,7 +105,7 @@ private async ValueTask DisposeOrCloseAsync(bool isDispose) try { await this.DisposeTransactionAsync(isClosingOrDisposingConnection: true).ConfigureAwait(false); } finally { -#if NETSTANDARD2_1 +#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1 if (!SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection) { await (isDispose ? dbConnection.DisposeAsync() : dbConnection.CloseAsync().AsValueTask()).ConfigureAwait(false); @@ -143,7 +143,7 @@ private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnect ? null : await this.ConnectionMonitor.AcquireConnectionLockAsync(CancellationToken.None).ConfigureAwait(false); -#if NETSTANDARD2_1 +#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1 if (!SyncViaAsync.IsSynchronous && transaction is DbTransaction dbTransaction) { await dbTransaction.DisposeAsync().ConfigureAwait(false); diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index c3ce854a..d77cd1d0 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -74,7 +74,11 @@ public static NonThrowingAwaitable TryAwait(this TTask task) where public NonThrowingAwaitable(TTask task) { this._task = task; +#if NET8_0_OR_GREATER + this._taskAwaiter = task.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing).GetAwaiter(); +#else this._taskAwaiter = task.ConfigureAwait(false).GetAwaiter(); +#endif } public NonThrowingAwaitable GetAwaiter() => this; @@ -83,9 +87,16 @@ public NonThrowingAwaitable(TTask task) public TTask GetResult() { - // does NOT call _taskAwaiter.GetResult() since that could throw! - Invariant.Require(this._task.IsCompleted); + +#if NET8_0_OR_GREATER + this._taskAwaiter.GetResult(); +#else + // Does NOT call _taskAwaiter.GetResult() since that could throw! + // We do, however, access the Exception property to avoid hitting UnobservedTaskException. + if (this._task.IsFaulted) { _ = this._task.Exception; } +#endif + return this._task; } diff --git a/src/DistributedLock.Core/Internal/LeaseMonitor.cs b/src/DistributedLock.Core/Internal/LeaseMonitor.cs index dc33b459..71549128 100644 --- a/src/DistributedLock.Core/Internal/LeaseMonitor.cs +++ b/src/DistributedLock.Core/Internal/LeaseMonitor.cs @@ -46,7 +46,7 @@ public async ValueTask DisposeAsync() { if (this._cancellationTask != null) { - _ = this._cancellationTask.ContinueWith((_, state) => ((CancellationTokenSource)state).Dispose(), state: this._handleLostSource); + _ = this._cancellationTask.ContinueWith((_, state) => ((CancellationTokenSource)state!).Dispose(), state: this._handleLostSource); } else { diff --git a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs index 89676fdd..55de6170 100644 --- a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs +++ b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs @@ -101,7 +101,7 @@ private void StartFinalizerTask() // necessarily exited yet (and may not for some time). Therefore, we queue a task to run as a // continuation so that we only have one finalizer loop at a time this._finalizerTask = this._finalizerTask.ContinueWith( - (_, @this) => ((ManagedFinalizerQueue)@this).FinalizerLoop(), + (_, @this) => ((ManagedFinalizerQueue)@this!).FinalizerLoop(), state: this, CancellationToken.None ) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 334a6f05..785696e1 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -124,6 +136,40 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.0.0", + "Microsoft.SourceLink.Common": "1.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + } + }, + "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index 4cbaae69..7f6f0799 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -79,6 +85,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -149,6 +161,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 95bd82c4..a61bbe58 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -120,6 +126,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -233,6 +245,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index fe89e481..07e8a2c3 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -125,6 +131,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 9d06889b..2a8f9617 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -60,7 +60,7 @@ private PostgresAdvisoryLock(bool isShared) using var acquireCommand = this.CreateAcquireCommand(connection, key, timeout); - object acquireCommandResult; + object? acquireCommandResult; try { acquireCommandResult = await acquireCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); @@ -150,7 +150,7 @@ JOIN pg_catalog.pg_database d AND l.pid = pg_catalog.pg_backend_pid() AND d.datname = pg_catalog.current_database()" ); - return (long)await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) != 0; + return (long)(await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false))! != 0; } private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, PostgresAdvisoryLockKey key, TimeoutValue timeout) @@ -211,7 +211,7 @@ private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvi using var command = connection.CreateCommand(); command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); - var result = (bool)await command.ExecuteScalarAsync(CancellationToken.None).ConfigureAwait(false); + var result = (bool)(await command.ExecuteScalarAsync(CancellationToken.None).ConfigureAwait(false))!; if (!isTry && !result) { throw new InvalidOperationException("Attempted to release a lock that was not held"); diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index d4698076..7e52b3ae 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -139,6 +145,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -273,6 +285,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index a23fa212..f5ba1feb 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -158,6 +164,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -295,6 +307,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index b234aa31..7ee28243 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -143,6 +149,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -1303,6 +1315,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", diff --git a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs index 8cf74807..c6aba137 100644 --- a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -1,5 +1,7 @@ using Medallion.Threading.Internal; using NUnit.Framework; +using System.Collections.Concurrent; +using System.Runtime.CompilerServices; namespace Medallion.Threading.Tests.Core; @@ -30,4 +32,49 @@ public void TestSafeCreateTaskReturnsCaughtExceptionAsFaultedTask() static Task GetTask(string message) => throw new TimeZoneNotFoundException(message); } + + /// + /// Based on https://github.com/madelson/DistributedLock/issues/192 + /// + [Test] + public async Task TestTryAwaitShouldNotResultInUnobservedTaskException([Values] bool faulted) + { + AsyncLocal scope = new() { Value = true }; + ConcurrentBag unobservedTaskExceptions = []; + EventHandler handler = (_, e) => unobservedTaskExceptions.Add(e.Exception); + + TaskScheduler.UnobservedTaskException += handler; + try + { + await TryAwaitFailedTask(); + GC.Collect(); + GC.WaitForPendingFinalizers(); + } + finally { TaskScheduler.UnobservedTaskException -= handler; } + + foreach (var exception in unobservedTaskExceptions) + { + Assert.That(exception.ToString(), Does.Not.Contain(nameof(TimeZoneNotFoundException))); + Assert.That(exception.ToString(), Does.Not.Contain(nameof(OperationCanceledException))); + Assert.That(exception.ToString(), Does.Not.Contain(nameof(TaskCanceledException))); + } + + [MethodImpl(MethodImplOptions.NoInlining)] + async Task TryAwaitFailedTask() + { + Task task; + if (faulted) + { + task = Task.Run(() => throw new TimeZoneNotFoundException()); + } + else + { + CancellationTokenSource cancellationSource = new(); + task = Task.Delay(TimeSpan.FromSeconds(30), cancellationSource.Token); + cancellationSource.Cancel(); + } + + await task.TryAwait(); + } + } } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index b735b728..3ab570ec 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,445 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.1, )", + "resolved": "1.6.1", + "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==", + "dependencies": { + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0" + } + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[16.4.0, )", + "resolved": "16.4.0", + "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", + "dependencies": { + "Microsoft.CodeCoverage": "16.4.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.13.1, )", + "resolved": "4.13.1", + "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", + "dependencies": { + "Castle.Core": "4.4.0", + "System.Threading.Tasks.Extensions": "4.5.1" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.12.0, )", + "resolved": "3.12.0", + "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[3.15.1, )", + "resolved": "3.15.1", + "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "16.4.0", + "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.1", + "contentHash": "pkeBFx0vqMW/A3aUVHh7MPu3WkBhaVlezhSZeb1c9XD0vUReYH1TLFSy5MxJgZfmz5LZzYoErMorlYZiwpOoNA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.21.1", + "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.8.0", + "System.IdentityModel.Tokens.Jwt": "6.8.0" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.8.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.10.0", + "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "dependencies": { + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.8.0", + "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Tokens": "6.8.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "RLBIxntLaG9pRmmuVDwY1kc8Bvp/FQzSxPU+19VekkScKkWtVP9r8bLhm28ama3usc816UBrmkg3vv3jUea/hw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.0, )", + "DistributedLock.FileSystem": "[1.0.1, )", + "DistributedLock.MySql": "[1.0.1, )", + "DistributedLock.Oracle": "[1.0.2, )", + "DistributedLock.Postgres": "[1.0.5, )", + "DistributedLock.Redis": "[1.0.2, )", + "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Oracle.ManagedDataAccess": "[21.10.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Npgsql": "[5.0.4, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "StackExchange.Redis": "[2.7.20, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "Microsoft.Data.SqlClient": "[2.1.7, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.5, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[2.1.7, )", + "resolved": "2.1.7", + "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", + "dependencies": { + "Microsoft.Data.SqlClient.SNI": "2.1.1", + "Microsoft.Identity.Client": "4.21.1", + "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[5.0.4, )", + "resolved": "5.0.4", + "contentHash": "wuJUsrhOKaR41ZB9Ecw9ZEpQzMQ5bRahl7w+pt4noVMDkDPbw4cMHV8UfNKeZSPLXaN4yWXPR2QgJ+2vG/85VQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Memory": "4.5.3", + "System.Runtime.CompilerServices.Unsafe": "4.6.0", + "System.Text.Json": "4.6.0", + "System.Threading.Channels": "4.7.0", + "System.Threading.Tasks.Extensions": "4.5.3", + "System.ValueTuple": "4.5.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.20, )", + "resolved": "2.7.20", + "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index d1bd259a..65b21508 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -73,6 +79,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -181,6 +193,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index 78947ef8..e65f0b8b 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -8,6 +8,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -97,6 +103,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -179,6 +191,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 75681111..0e7ddab6 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -444,6 +450,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -1837,6 +1849,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", From 2b759aa90b544d3d9d549626a0b7e20233df14c2 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:32:29 -0400 Subject: [PATCH 244/399] Add tiny sleep on final retry for transient file system error in FileDistributedLock --- .../FileDistributedLock.cs | 24 +++++++++++++------ .../ZooKeeperDistributedReaderWriterLock.cs | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index a1b212b0..ad90720f 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -110,7 +110,7 @@ public FileDistributedLock(DirectoryInfo lockFileDirectory, string name) // Frustratingly, this error can be thrown transiently due to concurrent creation/deletion. Initially assume // that it is transient and just retry - if (++retryCount <= MaxUnauthorizedAccessExceptionRetries) + if (CanRetryTransientFileSystemError(ref retryCount)) { continue; } @@ -150,15 +150,25 @@ private void EnsureDirectoryExists() // shown that in race conditions we can see IOException as well, presumably because there is some period during // directory creation where it presents as a file. if (ex is UnauthorizedAccessException or IOException - && retryCount < MaxUnauthorizedAccessExceptionRetries) + && CanRetryTransientFileSystemError(ref retryCount)) { - ++retryCount; - } - else - { - throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); + continue; } + + throw new InvalidOperationException($"Failed to ensure that lock file directory {this.Directory} exists", ex); } } } + + private static bool CanRetryTransientFileSystemError(ref int retryCount) + { + if (retryCount >= MaxUnauthorizedAccessExceptionRetries) { return false; } + + ++retryCount; + + // On the final try, pause for just 1ms to see if that helps escape the race condition + if (retryCount == MaxUnauthorizedAccessExceptionRetries) { Thread.Sleep(1); } + + return true; + } } diff --git a/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs index 3c4cf113..08196fe1 100644 --- a/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs +++ b/src/DistributedLock.ZooKeeper/ZooKeeperDistributedReaderWriterLock.cs @@ -98,7 +98,7 @@ private static async Task WaitForReadLockAcquiredOrChange(ZooKeeper zooKee private static bool HasAcquiredWriteLock(ZooKeeperSynchronizationHelper.State state) => state.SortedChildren[0].Path == state.EphemeralNodePath; - private async Task WaitForWriteLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) + private static async Task WaitForWriteLockAcquiredOrChange(ZooKeeper zooKeeper, ZooKeeperSynchronizationHelper.State state, Watcher watcher) { var ephemeralNodeIndex = Array.FindIndex(state.SortedChildren, t => t.Path == state.EphemeralNodePath); var nextLowestChildNode = state.SortedChildren[ephemeralNodeIndex - 1].Path; From c10f385d72ebbc0858d7acb33ca3cef3ad6c5d63 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:42:49 -0400 Subject: [PATCH 245/399] Revert sleep, it didn't seem to fix anything --- src/DistributedLock.FileSystem/FileDistributedLock.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index ad90720f..c0f23842 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -166,9 +166,6 @@ private static bool CanRetryTransientFileSystemError(ref int retryCount) ++retryCount; - // On the final try, pause for just 1ms to see if that helps escape the race condition - if (retryCount == MaxUnauthorizedAccessExceptionRetries) { Thread.Sleep(1); } - return true; } } From 06da5b07cea384145ce1c364c61c175784f19fa1 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Tue, 19 Mar 2024 22:01:19 -0400 Subject: [PATCH 246/399] Close #111: Upgrade npgsql (Postgres) to the very latest version because the latest minor/patch in the current major version doesn't support CancellationToken in PrepareAsync() --- src/Directory.Packages.props | 4 +- src/DistributedLock.Azure/packages.lock.json | 30 +- .../Internal/Data/DatabaseCommand.cs | 4 +- src/DistributedLock.Core/packages.lock.json | 26 +- .../packages.lock.json | 30 +- src/DistributedLock.MySql/packages.lock.json | 14 +- src/DistributedLock.Oracle/packages.lock.json | 6 +- .../packages.lock.json | 369 +++++++++++------- src/DistributedLock.Redis/packages.lock.json | 30 +- .../packages.lock.json | 30 +- src/DistributedLock.Tests/packages.lock.json | 105 +++-- .../packages.lock.json | 30 +- .../packages.lock.json | 30 +- src/DistributedLock/packages.lock.json | 241 +++++++----- src/DistributedLockTaker/packages.lock.json | 105 +++-- 15 files changed, 586 insertions(+), 468 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 7a555e15..1a0dd5c9 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -11,7 +11,7 @@ - + @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index 85cfde88..719a18ec 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -18,15 +18,6 @@ "resolved": "3.3.4", "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -67,11 +58,6 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -204,15 +190,15 @@ "distributedlock.core": { "type": "Project", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.ValueTuple": "[4.5.0, )" } }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } @@ -384,14 +370,14 @@ "distributedlock.core": { "type": "Project", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )" + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )" } }, "Microsoft.Bcl.AsyncInterfaces": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 45dfc348..310210af 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -153,9 +153,7 @@ private async ValueTask InternalExecuteAndPropagateCancellationAsync Date: Tue, 19 Mar 2024 22:39:10 -0400 Subject: [PATCH 247/399] Close #180: Add build checks for AOT compat --- src/Directory.Build.props | 2 ++ src/DistributedLock.Tests/DistributedLock.Tests.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index dd22cefd..e70e2352 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,5 +1,7 @@ true + + true \ No newline at end of file diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index bf465c79..c1a9174a 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -12,6 +12,8 @@ ..\DistributedLock.snk true 1591 + + false From 449d7e4ffa7d71bafaaa2e7c8498335386970111 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sat, 23 Mar 2024 18:42:15 -0400 Subject: [PATCH 248/399] Drop support for net461 in all projects --- src/Directory.Packages.props | 6 +- .../DistributedLock.Azure.csproj | 2 +- src/DistributedLock.Azure/packages.lock.json | 30 +- .../DistributedLock.Core.csproj | 6 +- .../Internal/Data/DatabaseCommand.cs | 2 +- .../Internal/Data/DatabaseConnection.cs | 6 +- src/DistributedLock.Core/packages.lock.json | 36 +- .../DistributedLock.FileSystem.csproj | 2 +- .../packages.lock.json | 30 +- src/DistributedLock.MySql/packages.lock.json | 46 +- src/DistributedLock.Oracle/packages.lock.json | 40 +- .../DistributedLock.Postgres.csproj | 2 +- .../packages.lock.json | 33 +- .../DistributedLock.Redis.csproj | 2 +- src/DistributedLock.Redis/packages.lock.json | 30 +- .../DistributedLock.SqlServer.csproj | 2 +- .../packages.lock.json | 34 +- src/DistributedLock.Tests/packages.lock.json | 462 ------------------ .../DistributedLock.WaitHandles.csproj | 4 +- .../packages.lock.json | 30 +- .../DistributedLock.ZooKeeper.csproj | 2 +- .../packages.lock.json | 30 +- src/DistributedLock/DistributedLock.csproj | 2 +- src/DistributedLock/packages.lock.json | 46 +- 24 files changed, 172 insertions(+), 713 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 1a0dd5c9..742d5224 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -20,10 +20,10 @@ - + - - + + \ No newline at end of file diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index f411ce1f..989664f4 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.Azure True 4 diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index 719a18ec..b9f7cf67 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { + ".NETFramework,Version=v4.6.2": { "Azure.Storage.Blobs": { "type": "Direct", "requested": "[12.19.1, )", @@ -12,11 +12,14 @@ "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -58,6 +61,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -221,12 +229,6 @@ "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -394,12 +396,6 @@ "System.Text.Json": "4.7.2" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index e7de61ce..53b70ab4 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -1,7 +1,7 @@ - net8.0;netstandard2.0;netstandard2.1;net461 + net8.0;netstandard2.0;netstandard2.1;net462 Medallion.Threading True 4 @@ -44,11 +44,11 @@ TRACE;DEBUG - + - + diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index 310210af..b7d5ebfd 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -181,7 +181,7 @@ private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) { return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); } -#elif !NETSTANDARD2_0 && !NET461 +#elif !NETSTANDARD2_0 && !NET462 ERROR #endif diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 400d2579..6aeba58d 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -64,7 +64,7 @@ public async ValueTask BeginTransactionAsync() !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) : -#elif NETSTANDARD2_0 || NET461 +#elif NETSTANDARD2_0 || NET462 #else ERROR #endif @@ -114,7 +114,7 @@ private async ValueTask DisposeOrCloseAsync(bool isDispose) { SyncDisposeConnection(); } -#elif NETSTANDARD2_0 || NET461 +#elif NETSTANDARD2_0 || NET462 SyncDisposeConnection(); #else ERROR @@ -149,7 +149,7 @@ private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnect await dbTransaction.DisposeAsync().ConfigureAwait(false); return; } -#elif NETSTANDARD2_0 || NET461 +#elif NETSTANDARD2_0 || NET462 #else ERROR #endif diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 9fb7877f..4ba24e3c 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { + ".NETFramework,Version=v4.6.2": { "Microsoft.Bcl.AsyncInterfaces": { "type": "Direct", "requested": "[8.0.0, )", @@ -11,11 +11,14 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -38,6 +41,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -67,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -122,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -150,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index bdfb24a0..bd6116d7 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0;netstandard2.1 + net462;netstandard2.0;netstandard2.1 Medallion.Threading.FileSystem True 4 diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index ebaa679f..a551cf0a 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -1,12 +1,15 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -29,6 +32,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -71,12 +79,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -147,12 +149,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 79dda05e..d354e56d 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -38,14 +32,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -112,26 +98,30 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -245,12 +235,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index 345072d9..c321e1ac 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -36,14 +30,6 @@ "System.Text.Json": "6.0.1" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -117,26 +103,30 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 12e4cd11..6495c776 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.Postgres True 4 diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 45c51394..eca9ef01 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -1,12 +1,15 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -62,6 +65,11 @@ "System.Memory": "4.5.5" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -130,7 +138,8 @@ "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" } }, "System.Threading.Channels": { @@ -173,12 +182,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -351,12 +354,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 949088cb..88aadf65 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0;netstandard2.1 + net462;netstandard2.0;netstandard2.1 Medallion.Threading.Redis True 4 diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index f081ebcb..f7f14762 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -1,12 +1,15 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -52,6 +55,11 @@ "System.Memory": "4.5.4" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -150,12 +158,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -293,12 +295,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 4fce4f15..80be4d87 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.SqlServer True 4 diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 0314c47f..c8ea84df 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -1,13 +1,7 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, + ".NETFramework,Version=v4.6.2": { "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -20,6 +14,15 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -84,6 +87,11 @@ "Microsoft.IdentityModel.Logging": "6.8.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -135,12 +143,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -1301,12 +1303,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 3bcef3c4..ab49e9d2 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,468 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.1, )", - "resolved": "1.6.1", - "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==", - "dependencies": { - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0" - } - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[16.4.0, )", - "resolved": "16.4.0", - "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", - "dependencies": { - "Microsoft.CodeCoverage": "16.4.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.13.1, )", - "resolved": "4.13.1", - "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", - "dependencies": { - "Castle.Core": "4.4.0", - "System.Threading.Tasks.Extensions": "4.5.1" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.12.0, )", - "resolved": "3.12.0", - "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[3.15.1, )", - "resolved": "3.15.1", - "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", - "dependencies": { - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.1, )", - "DistributedLock.MySql": "[1.0.1, )", - "DistributedLock.Oracle": "[1.0.2, )", - "DistributedLock.Postgres": "[1.0.5, )", - "DistributedLock.Redis": "[1.0.2, )", - "DistributedLock.SqlServer": "[1.0.3, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess": "[21.10.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Npgsql": "[8.0.2, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", diff --git a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index f078b27a..c55ef24d 100644 --- a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.WaitHandles True 4 @@ -45,7 +45,7 @@ - + diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index a3ab92ec..437ef6b7 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -1,12 +1,15 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + ".NETFramework,Version=v4.6.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -23,6 +26,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -65,12 +73,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -179,12 +181,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index a3ae4bee..cc02d26a 100644 --- a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.0;netstandard2.1;net462 Medallion.Threading.ZooKeeper True 4 diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index bc6daa73..60e7aa09 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -1,18 +1,21 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.1": { + ".NETFramework,Version=v4.6.2": { "IsExternalInit": { "type": "Direct", "requested": "[1.0.3, )", "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" + } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -41,6 +44,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -89,12 +97,6 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -177,12 +179,6 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 553dfb4c..660eb88d 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -53,7 +53,7 @@ - + diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 03cc0323..8b9a1f42 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -2,12 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -52,14 +46,6 @@ "System.IO.Hashing": "6.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Bcl.HashCode": { "type": "Transitive", "resolved": "1.1.1", @@ -321,11 +307,6 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -404,6 +385,15 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[2.1.7, )", @@ -465,6 +455,12 @@ "System.Threading.Channels": "5.0.0" } }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, "ZooKeeperNetEx": { "type": "CentralTransitive", "requested": "[3.4.12.4, )", @@ -473,12 +469,6 @@ } }, ".NETStandard,Version=v2.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -1891,12 +1881,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", From 3b23ad7ee54bfeef803695420f2aebc28ec02c97 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 24 Mar 2024 10:23:50 -0400 Subject: [PATCH 249/399] Try bumping retry count in FileDistributedLock --- src/DistributedLock.FileSystem/FileDistributedLock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index c0f23842..2001570a 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -12,7 +12,7 @@ public sealed partial class FileDistributedLock : IInternalDistributedLock - private const int MaxUnauthorizedAccessExceptionRetries = 400; + private const int MaxUnauthorizedAccessExceptionRetries = 800; // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks From e559c5c77239b72ee80d572cec6d1c67bbf01e83 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 24 Mar 2024 15:03:13 -0400 Subject: [PATCH 250/399] Adjust Conditions to minimize churns around lock files --- src/Directory.Packages.props | 2 +- .../DistributedLock.Azure.csproj | 2 +- src/DistributedLock.Azure/packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.Core.csproj | 2 +- .../DistributedLock.FileSystem.csproj | 2 +- .../packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.MySql.csproj | 2 +- src/DistributedLock.MySql/packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.Oracle.csproj | 2 +- src/DistributedLock.Oracle/packages.lock.json | 12 ++++++++++++ .../DistributedLock.Postgres.csproj | 2 +- .../packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.Redis.csproj | 2 +- src/DistributedLock.Redis/packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.SqlServer.csproj | 2 +- .../packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.WaitHandles.csproj | 2 +- .../packages.lock.json | 18 ++++++++++++++++++ .../DistributedLock.ZooKeeper.csproj | 2 +- .../packages.lock.json | 18 ++++++++++++++++++ src/DistributedLock/DistributedLock.csproj | 2 +- src/DistributedLock/packages.lock.json | 18 ++++++++++++++++++ 22 files changed, 186 insertions(+), 12 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 742d5224..ba75e62f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 989664f4..46364100 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -44,7 +44,7 @@ - + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index b9f7cf67..c0eb6984 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -12,6 +12,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -229,6 +235,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -396,6 +408,12 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index 53b70ab4..f6e630a9 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index bd6116d7..5a082c96 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -53,7 +53,7 @@ all - + diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index a551cf0a..dbf1727f 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -79,6 +85,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -149,6 +161,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj index dd7b3b9b..2dc168ea 100644 --- a/src/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/src/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index d354e56d..7aefdbee 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -122,6 +128,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -235,6 +247,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 200f17e9..11c08538 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index c321e1ac..f3ba29ee 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -127,6 +133,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 6495c776..11829249 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index eca9ef01..0bde400e 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -182,6 +188,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -354,6 +366,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 88aadf65..77888206 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -54,7 +54,7 @@ all - + diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index f7f14762..f085b6cd 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -158,6 +164,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -295,6 +307,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 80be4d87..eaa2175b 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index c8ea84df..2638baa0 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -143,6 +149,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", @@ -1303,6 +1315,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[2.1.7, )", diff --git a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj index c55ef24d..753171d4 100644 --- a/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj +++ b/src/DistributedLock.WaitHandles/DistributedLock.WaitHandles.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index 437ef6b7..b4a25b15 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -73,6 +79,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -181,6 +193,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj index cc02d26a..cd5c163c 100644 --- a/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj +++ b/src/DistributedLock.ZooKeeper/DistributedLock.ZooKeeper.csproj @@ -57,7 +57,7 @@ - + diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index 60e7aa09..7bdf01c0 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -8,6 +8,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -97,6 +103,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -179,6 +191,12 @@ "resolved": "1.0.3", "contentHash": "jcdN7vpDwjnV7U9KGCv/oNIWHJ/RIbyrpVsLQL2qbj6Cbi5U3iafKsaMn1rP+qCbkLbkB0v6oAwbVEkqrUnlyg==" }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 660eb88d..c40e7613 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -58,6 +58,6 @@ - + \ No newline at end of file diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 8b9a1f42..d0cc6b56 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -2,6 +2,12 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.6.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -469,6 +475,12 @@ } }, ".NETStandard,Version=v2.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -1881,6 +1893,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", From ae4de2169bf8cae312fb87b33a3acb6739b5a568 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 24 Mar 2024 15:03:26 -0400 Subject: [PATCH 251/399] Add missing solution items for VS users --- src/DistributedLock.sln | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.sln b/src/DistributedLock.sln index 699cbe67..5b23aea1 100644 --- a/src/DistributedLock.sln +++ b/src/DistributedLock.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34616.47 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock", "DistributedLock\DistributedLock.csproj", "{C1F56B68-C2EE-48E5-A99B-B40D397AE34F}" EndProject @@ -35,7 +35,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.ZooKeeper", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.MySql", "DistributedLock.MySql\DistributedLock.MySql.csproj", "{6C13E55C-51A7-47CD-88A5-7C8564EBCB3C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.Oracle", "DistributedLock.Oracle\DistributedLock.Oracle.csproj", "{1CAB9A1D-0C02-459C-A90E-47819832BD58}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Oracle", "DistributedLock.Oracle\DistributedLock.Oracle.csproj", "{1CAB9A1D-0C02-459C-A90E-47819832BD58}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FC144BB6-BA58-41E6-BB7E-76069FCDD293}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props + FixDistributedLockCoreDependencyVersion.targets = FixDistributedLockCoreDependencyVersion.targets + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 8366aef6eb04875fce015c6dc32c176a8723a1b9 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 24 Mar 2024 17:29:24 -0400 Subject: [PATCH 252/399] Replace NET462 with NETFRAMEWORK in preprocessor directives --- src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs | 2 +- .../Internal/Data/DatabaseConnection.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs index b7d5ebfd..54ff5b82 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseCommand.cs @@ -181,7 +181,7 @@ private ValueTask PrepareIfNeededAsync(CancellationToken cancellationToken) { return dbCommand.PrepareAsync(cancellationToken).AsValueTask(); } -#elif !NETSTANDARD2_0 && !NET462 +#elif !NETSTANDARD2_0 && !NETFRAMEWORK ERROR #endif diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 6aeba58d..0798d09d 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -64,7 +64,7 @@ public async ValueTask BeginTransactionAsync() !SyncViaAsync.IsSynchronous && this.InnerConnection is DbConnection dbConnection ? await dbConnection.BeginTransactionAsync().ConfigureAwait(false) : -#elif NETSTANDARD2_0 || NET462 +#elif NETSTANDARD2_0 || NETFRAMEWORK #else ERROR #endif @@ -114,7 +114,7 @@ private async ValueTask DisposeOrCloseAsync(bool isDispose) { SyncDisposeConnection(); } -#elif NETSTANDARD2_0 || NET462 +#elif NETSTANDARD2_0 || NETFRAMEWORK SyncDisposeConnection(); #else ERROR @@ -149,7 +149,7 @@ private async ValueTask DisposeTransactionAsync(bool isClosingOrDisposingConnect await dbTransaction.DisposeAsync().ConfigureAwait(false); return; } -#elif NETSTANDARD2_0 || NET462 +#elif NETSTANDARD2_0 || NETFRAMEWORK #else ERROR #endif From e410ba8daee1a7a245694cbb4344dddb48809155 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 24 Mar 2024 17:48:46 -0400 Subject: [PATCH 253/399] Close #198: Elaborate on local ZooKeeper setup --- docs/Developing DistributedLock.md | 2 ++ .../Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index c013b24b..2d84db5d 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -74,3 +74,5 @@ Download a ZooKeeper installation by going to [https://zookeeper.apache.org/](ht Extract the zip archive, and within it copy `zoo_sample.cfg` to `zoo.cfg`. Add the full path of the extracted directory (the one containing README.md, bin, conf, etc) to `DistributedLock.Tests/credentials/zookeeper.txt` as a single line. + +Also, install Java Development Kit (JDK) because ZooKeeper runs on Java. diff --git a/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs index b3c79d1a..13fb8312 100644 --- a/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/ZooKeeper/ZooKeeperSetUpFixture.cs @@ -24,7 +24,12 @@ public void OneTimeSetUp() else { var zooKeeperHome = File.ReadAllText(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "credentials", "zookeeper.txt")).Trim(); - if (!Directory.Exists(zooKeeperHome)) { throw new DirectoryNotFoundException(zooKeeperHome); } + if (!Directory.Exists(zooKeeperHome)) { throw new DirectoryNotFoundException(zooKeeperHome); } + // On Windows, zkServer.cmd calls zkEnv.cmd, which checks for the environment variable JAVA_HOME. + if (Environment.GetEnvironmentVariable("JAVA_HOME") is not { } javaHome || !Directory.Exists(javaHome)) + { + throw new DirectoryNotFoundException("To run ZooKeeper, you should install Java Development Kit (JDK) and set the environment variable 'JAVA_HOME' based on that."); + } var zooKeeperPath = Path.Combine(zooKeeperHome, "bin", "zkServer.cmd"); var command = Command.Run(zooKeeperPath, options: o => o.StartInfo(i => i.RedirectStandardInput = false)) From 1520b7bdd6446c940e9512761f94eabada1cbe98 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 24 Mar 2024 20:50:59 -0400 Subject: [PATCH 254/399] Version bumps, release notes, and other pre-release cleanup --- README.md | 11 +- docs/Developing DistributedLock.md | 2 + src/Directory.Build.props | 6 + src/Directory.Packages.props | 22 +- .../DistributedLock.Azure.csproj | 2 +- src/DistributedLock.Azure/packages.lock.json | 54 +- .../DistributedLock.Core.csproj | 2 +- .../Data/MultiplexedConnectionLock.cs | 2 +- src/DistributedLock.Core/packages.lock.json | 102 +- .../DistributedLock.FileSystem.csproj | 2 +- .../packages.lock.json | 54 +- .../DistributedLock.MySql.csproj | 2 +- src/DistributedLock.MySql/packages.lock.json | 54 +- .../DistributedLock.Oracle.csproj | 2 +- src/DistributedLock.Oracle/packages.lock.json | 69 +- .../DistributedLock.Postgres.csproj | 2 +- .../packages.lock.json | 54 +- .../DistributedLock.Redis.csproj | 2 +- .../RedLock/RedLockRelease.cs | 2 +- src/DistributedLock.Redis/packages.lock.json | 72 +- .../DistributedLock.SqlServer.csproj | 2 +- .../packages.lock.json | 2976 ++++----------- .../Data/DbSemaphoreTestCases.cs | 2 +- .../RedisSynchronizationCoreTestCases.cs | 2 +- .../ZooKeeperSynchronizationCoreTestCases.cs | 2 +- .../Postgres/TestingPostgresDb.cs | 2 +- .../Shared/SqlServerCredentials.cs | 3 +- .../Tests/Azure/AzureBehaviorTest.cs | 6 +- .../AzureBlobLeaseDistributedLockTest.cs | 8 +- .../Tests/Core/DeadlockExceptionTest.cs | 2 +- .../FileSystem/FileDistributedLockTest.cs | 4 +- .../FileDistributedLockWindowsTest.cs | 2 +- .../Tests/MySql/MySqlDistributedLockTest.cs | 2 +- .../Tests/Postgres/PostgresBehaviorTest.cs | 2 +- .../Tests/SqlServer/SqlDistributedLockTest.cs | 2 +- .../SqlServer/SqlDistributedSemaphoreTest.cs | 2 +- .../EventWaitHandleDistributedLockTest.cs | 2 +- .../WaitHandleDistributedSemaphoreTest.cs | 2 +- src/DistributedLock.Tests/packages.lock.json | 1526 ++++---- .../packages.lock.json | 90 +- .../packages.lock.json | 54 +- src/DistributedLock.sln | 1 + src/DistributedLock/packages.lock.json | 3273 ++++------------- src/DistributedLockCodeGen/packages.lock.json | 752 +--- src/DistributedLockTaker/packages.lock.json | 678 +++- src/package.readme.md | 11 + 46 files changed, 3216 insertions(+), 6710 deletions(-) create mode 100644 src/package.readme.md diff --git a/README.md b/README.md index 7cefcc11..afdd2a50 100644 --- a/README.md +++ b/README.md @@ -139,11 +139,20 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.4 + - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) + - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks @Bartleby2718 for helping with this! + - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) + - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks @Bartleby2718 for helping with this! + - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) + - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) + - New API documentation on [dndocs](https://dndocs.com/). Thanks @NeuroXiq! + - New documentation for contributors to get the project running locally (see [Contributing](#contributing)) - 2.3.4 - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! - 2.3.3 - Update Microsoft.Data.SqlClient due to vulnerabilities ([#149](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) - - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) + - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) - 2.3.2 - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! - 2.3.1 diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index c013b24b..f07d7d99 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -47,6 +47,8 @@ You can install Oracle from [here](https://www.oracle.com/database/technologies/ Add your username (e.g. SYSTEM) and password to `DistributedLock.Tests/credentials/oracle.txt`, with the username on line 1 and the password on line 2. +If the Oracle tests fail with `ORA-12541: TNS:no listener`, you may have to start the OracleOraDB21Home1TNSListener service in services.svc and/or restart the OracleServiceXE. After starting these it can take a few minutes for the DB to come online. + ### Postgres You can install Postgres from [here](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e70e2352..7f4a6cc9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,5 +3,11 @@ true true + package.readme.md + + + + + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ba75e62f..7afc0274 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -4,23 +4,23 @@ true - + - - + + - - - - - - + + + + + + - - + + diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index 46364100..cf1c356f 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -11,7 +11,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson Provides a distributed locking implementation based on Azure blob leases diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index c0eb6984..f491b7e4 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -29,12 +29,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Azure.Core": { @@ -64,8 +64,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -74,8 +74,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -243,12 +243,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -285,8 +285,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -295,8 +295,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -416,12 +416,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Azure.Core": { @@ -457,13 +457,13 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index f6e630a9..3f559bda 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -11,7 +11,7 @@ - 1.0.5 + 1.0.6 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index ac960ae5..51870174 100644 --- a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -11,7 +11,7 @@ internal sealed class MultiplexedConnectionLock : IAsyncDisposable /// Protects access to and /// private readonly AsyncLock _mutex = AsyncLock.Create(); - private readonly Dictionary _heldLocksToKeepaliveCadences = new(); + private readonly Dictionary _heldLocksToKeepaliveCadences = []; private readonly DatabaseConnection _connection; /// /// Tracks whether we've successfully opened the connection. We track this explicity instead of just looking at diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 4ba24e3c..0584aab6 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -22,12 +28,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "System.ValueTuple": { @@ -38,8 +44,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -48,8 +54,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -75,14 +81,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -96,8 +108,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -106,8 +118,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -124,47 +136,65 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" } } } diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 5a082c96..5a89109c 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -11,7 +11,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on file locks diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index dbf1727f..adc5221f 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -19,12 +19,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Nullable": { @@ -35,8 +35,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -45,8 +45,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -93,12 +93,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -118,8 +118,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -128,8 +128,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -169,23 +169,23 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "distributedlock.core": { "type": "Project" diff --git a/src/DistributedLock.MySql/DistributedLock.MySql.csproj b/src/DistributedLock.MySql/DistributedLock.MySql.csproj index 2dc168ea..ba277a40 100644 --- a/src/DistributedLock.MySql/DistributedLock.MySql.csproj +++ b/src/DistributedLock.MySql/DistributedLock.MySql.csproj @@ -11,7 +11,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on MySql diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 7aefdbee..2d1d4b8a 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -19,12 +19,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "MySqlConnector": { @@ -40,8 +40,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -59,8 +59,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -136,12 +136,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "MySqlConnector": { @@ -166,8 +166,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -185,8 +185,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -255,12 +255,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "MySqlConnector": { @@ -275,8 +275,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -289,8 +289,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 11c08538..32e0600d 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -11,7 +11,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Oracle Database diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index f3ba29ee..3d6d09dc 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -19,27 +19,28 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Oracle.ManagedDataAccess": { "type": "Direct", - "requested": "[21.10.0, )", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "requested": "[21.13.0, )", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", "dependencies": { + "System.Formats.Asn1": "7.0.0", "System.Text.Json": "6.0.1" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -48,18 +49,28 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.5.0", @@ -141,23 +152,23 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Oracle.ManagedDataAccess.Core": { "type": "Direct", - "requested": "[3.21.100, )", - "resolved": "3.21.100", - "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "requested": "[3.21.130, )", + "resolved": "3.21.130", + "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", "dependencies": { "System.Diagnostics.PerformanceCounter": "6.0.1", "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.2", "System.Text.Json": "6.0.1" } }, @@ -168,13 +179,13 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -199,8 +210,8 @@ }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==", + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 11829249..6e20a5a7 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.0.5 + 1.1.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 0bde400e..4fd8add1 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -19,12 +19,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Npgsql": { @@ -49,8 +49,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -78,8 +78,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -196,12 +196,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -235,8 +235,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -264,8 +264,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -374,12 +374,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Npgsql": { @@ -403,8 +403,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -423,8 +423,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 77888206..334d7bd1 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -11,7 +11,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis diff --git a/src/DistributedLock.Redis/RedLock/RedLockRelease.cs b/src/DistributedLock.Redis/RedLock/RedLockRelease.cs index 3604851c..ce3e383e 100644 --- a/src/DistributedLock.Redis/RedLock/RedLockRelease.cs +++ b/src/DistributedLock.Redis/RedLock/RedLockRelease.cs @@ -31,7 +31,7 @@ public async ValueTask ReleaseAsync() while (true) { var releaseableDatabases = unreleasedTryAcquireOrRenewTasks.Where(kvp => kvp.Value.IsCompleted) - // work through completed tasks first TODO necessary? + // work through completed tasks first .OrderByDescending(kvp => kvp.Value.IsCompleted) // among those prioritize successful completions since faults are likely to be slow to process .ThenByDescending(kvp => kvp.Value.Status == TaskStatus.RanToCompletion) diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index f085b6cd..85f211fd 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -19,12 +19,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Nullable": { @@ -35,9 +35,9 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -49,8 +49,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -68,8 +68,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", @@ -172,12 +172,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -197,9 +197,9 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -209,8 +209,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -228,8 +228,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", @@ -315,19 +315,19 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -342,8 +342,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", @@ -356,8 +356,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index eaa2175b..ae83832d 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -11,7 +11,7 @@ - 1.0.3 + 1.0.4 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 2638baa0..c97f9b91 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -10,14 +10,19 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -31,66 +36,126 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.35.0", + "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Net.Http": "4.3.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { @@ -100,22 +165,173 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "System.Security.Cryptography.X509Certificates": "4.3.0" } }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -157,30 +373,36 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "Microsoft.Win32.Registry": "5.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Runtime.Caching": "6.0.0", + "System.Runtime.Loader": "4.3.0", + "System.Security.Cryptography.Cng": "5.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -192,10 +414,38 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.35.0", + "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -204,657 +454,656 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Private.Uri": "4.3.2", - "System.Runtime.Serialization.Formatters": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.SecureString": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" } }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Security.Cryptography.Cng": "4.5.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Microsoft.Win32.Primitives": { + "Microsoft.SqlServer.Server": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Buffers": "4.5.0", - "System.Memory": "4.5.3", - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" + } }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, - "runtime.native.System": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "runtime.native.System.Net.Http": { + "System.IO": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" } }, - "runtime.native.System.Security.Cryptography.Apple": { + "System.IO.FileSystem.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Memory": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Memory.Data": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Runtime": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + "resolved": "6.0.0", + "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + } }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Runtime.Loader": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", + "dependencies": { + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } }, - "System.Buffers": { + "System.Security.AccessControl": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Collections.Concurrent": { + "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.Collections.NonGeneric": { + "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Memory": "4.5.4" } }, - "System.Collections.Specialized": { + "System.Security.Permissions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Security.AccessControl": "6.0.0" } }, - "System.ComponentModel": { + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.ComponentModel.Primitives": { + "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.ComponentModel.TypeConverter": { + "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Configuration.ConfigurationManager": { + "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.Debug": { + "System.Threading.Tasks": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.Diagnostics.Process": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "distributedlock.core": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )" } }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Threading.Tasks.Extensions": "4.5.4" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.Data.SqlClient": { + "type": "Direct", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Runtime.Caching": "6.0.0", + "System.Runtime.Loader": "4.3.0", + "System.Security.Cryptography.Cng": "5.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, - "System.Dynamic.Runtime": { + "Azure.Core": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "resolved": "1.35.0", + "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Globalization": { + "Azure.Identity": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Globalization.Calendars": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "resolved": "1.1.1", + "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Globalization.Extensions": { + "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.22.0" } }, - "System.IdentityModel.Tokens.Jwt": { + "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" } }, - "System.IO": { + "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", + "Microsoft.IdentityModel.Tokens": "6.35.0", "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.IO.FileSystem": { + "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, - "System.IO.FileSystem.Primitives": { + "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "System.Runtime": "4.3.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.Linq": { + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.Linq.Expressions": { + "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Security.Cryptography.Cng": "4.5.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.Memory": { + "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.SqlServer.Server": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Numerics.Vectors": { + "System.Buffers": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.ObjectModel": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" } }, - "System.Private.DataContractSerialization": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Private.Uri": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.Reflection": { + "System.IO": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" } }, - "System.Reflection.Emit": { + "System.IO.FileSystem.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Reflection.Emit.ILGeneration": { + "System.Memory": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Reflection.Emit.Lightweight": { + "System.Memory.Data": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" } }, - "System.Reflection.Extensions": { + "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "System.Reflection.Primitives": { + "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { + "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", "System.Runtime": "4.3.0" } }, @@ -869,266 +1118,60 @@ }, "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "resolved": "6.0.0", + "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" + "System.Configuration.ConfigurationManager": "6.0.0" } }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "IpU1lcHz8/09yDr9N+Juc7SCgNUz+RohkCQI+KsWKR67XxpFr8Z6c8t1iENCXZuRuNCc4HBwme/MDHNVCwyAKg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Runtime.Serialization.Formatters": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" - } + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Runtime.Serialization.Json": { + "System.Runtime.Loader": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", "dependencies": { "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", + "System.Reflection": "4.3.0", "System.Runtime": "4.3.0" } }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", - "dependencies": { - "System.Security.Principal.Windows": "4.7.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Security.Principal.Windows": "5.0.0" } }, "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", - "dependencies": { - "System.Memory": "4.5.3" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Memory": "4.5.4" } }, "System.Security.Permissions": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", "dependencies": { - "System.Security.AccessControl": "4.7.0" + "System.Security.AccessControl": "6.0.0" } }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" - }, - "System.Security.SecureString": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Text.Encoding": { "type": "Transitive", @@ -1142,43 +1185,35 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Text.RegularExpressions": { + "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Threading": { + "System.Text.Json": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "resolved": "4.7.2", + "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Text.Encodings.Web": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" } }, "System.Threading.Tasks": { @@ -1199,1475 +1234,6 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - } - }, - ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, - "Microsoft.Data.SqlClient": { - "type": "Direct", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, - "Microsoft.SourceLink.GitHub": { - "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" - } - }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" - }, - "Microsoft.Data.SqlClient.SNI.runtime": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", - "dependencies": { - "Microsoft.CSharp": "4.5.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Private.Uri": "4.3.2", - "System.Runtime.Serialization.Formatters": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.SecureString": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", - "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", - "System.Security.Cryptography.Cng": "4.5.0" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" - }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", - "dependencies": { - "System.Buffers": "4.5.0", - "System.Memory": "4.5.3", - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" - } - }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" - } - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", - "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" - } - }, - "System.Console": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Diagnostics.Process": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - } - }, - "System.IO.Compression.ZipFile": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Net.Sockets": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Private.DataContractSerialization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", - "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "IpU1lcHz8/09yDr9N+Juc7SCgNUz+RohkCQI+KsWKR67XxpFr8Z6c8t1iENCXZuRuNCc4HBwme/MDHNVCwyAKg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Runtime.Serialization.Formatters": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" - } - }, - "System.Runtime.Serialization.Json": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", - "dependencies": { - "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", - "dependencies": { - "System.Security.Principal.Windows": "4.7.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", - "dependencies": { - "System.Memory": "4.5.3" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", - "dependencies": { - "System.Security.AccessControl": "4.7.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" - }, - "System.Security.SecureString": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, "distributedlock.core": { "type": "Project" } diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs index 17456fcd..91240ac4 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/DbSemaphoreTestCases.cs @@ -24,7 +24,7 @@ public void TestSelfDeadlockThrowsOnInfiniteWait() semaphore.Acquire(); semaphore.Acquire(); var ex = Assert.Catch(() => semaphore.Acquire()); - ex.Message.Contains("Deadlock").ShouldEqual(true, ex.Message); + ex!.Message.Contains("Deadlock").ShouldEqual(true, ex.Message); } [Test] diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 10748eea..16b4c90d 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -66,7 +66,7 @@ public void TestMajorityFaultingDatabasesCauseReleaseToThrow() using var handle = @lock.Acquire(); new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); - var aggregateException = Assert.Throws(() => handle.Dispose()); + var aggregateException = Assert.Throws(() => handle.Dispose())!; Assert.IsInstanceOf(aggregateException.InnerException); } diff --git a/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 16bbde6f..6369d60a 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -39,7 +39,7 @@ public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() var @lock = this._provider.CreateLockWithExactName(path.ToString()); Assert.That( - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()).Message, + Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask())!.Message, Does.Contain("does not exist") ); diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs index 4e898168..46a137aa 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresDb.cs @@ -63,7 +63,7 @@ @idleSince IS NULL OR (state = 'idle' AND state_change < @idleSince) )"; command.Parameters.AddWithValue("applicationName", applicationName); - command.Parameters.Add(new NpgsqlParameter("idleSince", idleSince ?? DBNull.Value.As()) { NpgsqlDbType = NpgsqlDbType.TimestampTz }); + command.Parameters.Add(new NpgsqlParameter("idleSince", idleSince?.ToUniversalTime() ?? DBNull.Value.As()) { NpgsqlDbType = NpgsqlDbType.TimestampTz }); await command.ExecuteNonQueryAsync(); } diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs index 0929c5a0..0130a364 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs @@ -4,7 +4,7 @@ internal static class SqlServerCredentials { public static readonly string ApplicationName = $"{typeof(SqlServerCredentials).Assembly.GetName().Name} ({TargetFramework.Current})"; - public static readonly string ConnectionString = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder + public static readonly string ConnectionString = new System.Data.SqlClient.SqlConnectionStringBuilder { DataSource = @"localhost", // localhost for SQL Developer, .\SQLEXPRESS for express InitialCatalog = "master", @@ -12,6 +12,7 @@ internal static class SqlServerCredentials ApplicationName = ApplicationName, // set a high pool size so that we don't empty the pool through things like lock abandonment tests MaxPoolSize = 10000, + TrustServerCertificate = true, } .ConnectionString; } diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs index 9dc7956d..8dbe0f59 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs @@ -16,11 +16,11 @@ public void TestAttemptToLeaseBlobIfDoesNotExist() { var blobClient = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, Guid.NewGuid().ToString()); - Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) + Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1)))! .ErrorCode.ShouldEqual(AzureErrors.BlobNotFound); blobClient = new BlobClient(AzureCredentials.ConnectionString, "dne-container", Guid.NewGuid().ToString()); - Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1))) + Assert.Throws(() => blobClient.GetBlobLeaseClient().Acquire(TimeSpan.FromMinutes(1)))! .ErrorCode.ShouldEqual("ContainerNotFound"); } @@ -46,7 +46,7 @@ public void TestThrowsIfLeaseAlreadyHeld() client1.Upload(Stream.Null); var client2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); Assert.DoesNotThrow(() => client1.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))); - Assert.Throws(() => client2.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15))) + Assert.Throws(() => client2.GetBlobLeaseClient().Acquire(TimeSpan.FromSeconds(15)))! .ErrorCode.ShouldEqual("LeaseAlreadyPresent"); } } diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index b9a311fb..93fb16a7 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -81,7 +81,7 @@ public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) if (client.GetType() == typeof(BlobBaseClient)) { Assert.That( - Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)).ToString(), + Assert.ThrowsAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None))!.ToString(), Does.Contain("Either ensure that the blob exists or use a non-base client type") ); return; @@ -106,7 +106,7 @@ public void TestCanUseLeaseIdForBlobOperations() var @lock = new AzureBlobLeaseDistributedLock(client); using var handle = @lock.Acquire(); - Assert.Throws(() => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0)) + Assert.Throws(() => client.UploadPages(new MemoryStream(new byte[BlobSize]), offset: 0))! .ErrorCode.ShouldEqual(AzureErrors.LeaseIdMissing); Assert.DoesNotThrow( @@ -127,7 +127,7 @@ public void TestThrowsIfContainerDoesNotExist() provider.Strategy.ContainerName = "does-not-exist"; var @lock = provider.CreateLock(nameof(TestThrowsIfContainerDoesNotExist)); - Assert.Throws(() => @lock.TryAcquire()?.Dispose()) + Assert.Throws(() => @lock.TryAcquire()?.Dispose())! .ErrorCode.ShouldEqual("ContainerNotFound"); } @@ -183,7 +183,7 @@ public void TestTriggersHandleLostIfLeaseExpiresNaturally() Assert.IsTrue(@event.Wait(TimeSpan.FromSeconds(15.1))); - Assert.Throws(handle.Dispose) + Assert.Throws(handle.Dispose)! .ErrorCode.ShouldEqual("LeaseNotPresentWithBlobOperation"); } diff --git a/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs b/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs index 4f6cc540..5e26d4a6 100644 --- a/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/DeadlockExceptionTest.cs @@ -11,7 +11,7 @@ public class DeadlockExceptionTest public void TestDeadlockExceptionSerialization() { void ThrowDeadlockException() => throw new DeadlockException(nameof(TestDeadlockExceptionSerialization), new InvalidOperationException("foo")); - var deadlockException = Assert.Throws(ThrowDeadlockException); + var deadlockException = Assert.Throws(ThrowDeadlockException)!; var formatter = new BinaryFormatter(); var stream = new MemoryStream(); diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 36dda52e..0005e0fb 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -116,7 +116,7 @@ public void TestThrowsIfProvidedFileNameIsAlreadyADirectory() var @lock = new FileDistributedLock(LockFileDirectoryInfo, nameof(TestThrowsIfProvidedFileNameIsAlreadyADirectory)); Directory.CreateDirectory(@lock.Name); - var exception = Assert.Throws(() => @lock.Acquire().Dispose()); + var exception = Assert.Throws(() => @lock.Acquire().Dispose())!; Assert.That(exception.Message, Does.Contain("because it is already the name of a directory")); } @@ -126,7 +126,7 @@ public void TestThrowsIfProvidedDirectoryIsAlreadyFile() var tempFile = Path.GetTempFileName(); var @lock = new FileDistributedLock(lockFileDirectory: new(tempFile), "some name"); - var exception = Assert.Throws(() => @lock.Acquire().Dispose()); + var exception = Assert.Throws(() => @lock.Acquire().Dispose())!; Assert.That(exception.InnerException!.Message, Does.Match("file .* already exists")); } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs index 2ca51744..174bf2e8 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -24,7 +24,7 @@ public void TestThrowsUnauthorizedAccessExceptionInCaseOfFilePermissionViolation public void TestThrowsUnauthorizedAccessExceptionInCaseOfDirectoryPermissionViolation() { var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows\MedallionDistributedLock"), Guid.NewGuid().ToString()); - var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose()); + var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose())!; Assert.IsInstanceOf(exception.InnerException); Assert.IsFalse(Directory.Exists(Path.GetDirectoryName(@lock.Name))); } diff --git a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs index bbe4e53f..a706f1f6 100644 --- a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedLockTest.cs @@ -63,7 +63,7 @@ public async Task TestMySqlCommandMustExplicitlyParticipateInTransaction(Type te using var commandOutsideTransaction = connection.CreateCommand(); commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM distributed_lock.temp"; - var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); + var exception = Assert.ThrowsAsync(commandOutsideTransaction.ExecuteScalarAsync)!; Assert.That(exception.Message, Does.Contain("The transaction associated with this command is not the connection's active transaction")); commandInTransaction.CommandText = "SELECT COUNT(*) FROM distributed_lock.temp"; diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index 64468616..dd753f8a 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -109,7 +109,7 @@ public async Task TestCanDetectTransactionWithBeginTransactionException() using var transaction = connection.BeginTransaction(); - var ex = Assert.Throws(() => connection.BeginTransaction().Dispose()); + var ex = Assert.Throws(() => connection.BeginTransaction().Dispose())!; Assert.That(ex.Message, Does.Contain("A transaction is already in progress")); } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs index bea7104d..b3f3cf29 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedLockTest.cs @@ -50,7 +50,7 @@ public async Task TestSqlCommandMustParticipateInTransaction() using var commandOutsideTransaction = connection.CreateCommand(); commandOutsideTransaction.CommandText = "SELECT 2"; - var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync()); + var exception = Assert.ThrowsAsync(() => commandOutsideTransaction.ExecuteScalarAsync())!; Assert.That(exception.Message, Does.Contain("requires the command to have a transaction when the connection assigned to the command is in a pending local transaction")); commandInTransaction.CommandText = "SELECT COUNT(*) FROM foo"; diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs index 8c675f61..75367044 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs @@ -88,7 +88,7 @@ public void TestTicketsTakenOnBothConnectionAndTransactionForThatConnection() ); var handle2 = semaphore2.Acquire(); semaphore2.TryAcquire().ShouldEqual(null); - var ex = Assert.Catch(() => semaphore2.Acquire()); + var ex = Assert.Catch(() => semaphore2.Acquire())!; ex.Message.Contains("Deadlock").ShouldEqual(true, ex.ToString()); } diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index adf605d6..842a3814 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -20,7 +20,7 @@ public Type TestBadName(string? name, NameStyle nameStyle) this.TestWorkingName(name, NameStyle.Safe); // should always work } - return Assert.Catch(() => CreateLock(name!, nameStyle)).GetType(); + return Assert.Catch(() => CreateLock(name!, nameStyle))!.GetType(); } [TestCase(" \t", NameStyle.AddPrefix)] diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 4dc082f6..2e145242 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -21,7 +21,7 @@ public Type TestBadName(string? name, NameStyle nameStyle) this.TestWorkingName(name, NameStyle.Safe); // should always work } - return Assert.Catch(() => CreateAsLock(name!, nameStyle)).GetType(); + return Assert.Catch(() => CreateAsLock(name!, nameStyle))!.GetType(); } [TestCase(" \t", NameStyle.AddPrefix)] diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index ab49e9d2..5d05f889 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,58 +1,613 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "dependencies": { + "System.Formats.Asn1": "7.0.0", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Npgsql": "[8.0.2, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", - "requested": "[1.6.1, )", - "resolved": "1.6.1", - "contentHash": "kqBRKaWWDoOV0TCaPJ0Ay7a31cBvgW2e0i5+TRlj1JPADxwl23hzLsyXw+zXM6eVvd1KHy04deFd7EDuiyUUZA==" + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[16.4.0, )", - "resolved": "16.4.0", - "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", "dependencies": { - "Microsoft.CodeCoverage": "16.4.0", - "Microsoft.TestPlatform.TestHost": "16.4.0" + "Microsoft.CodeCoverage": "17.9.0", + "Microsoft.TestPlatform.TestHost": "17.9.0" } }, "Moq": { "type": "Direct", - "requested": "[4.13.1, )", - "resolved": "4.13.1", - "contentHash": "ic4m9/b10tz9oRB1Oi5bW7E/FS6Pd2SH5OJFhlmhUJkQhiV5FyrIRxVUEaG5KOpSpcfSPGAVW4rRZt6OzrS5zg==", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", "dependencies": { - "Castle.Core": "4.4.0", - "System.Threading.Tasks.Extensions": "4.5.1" + "Castle.Core": "5.1.1" } }, "NUnit": { "type": "Direct", - "requested": "[3.12.0, )", - "resolved": "3.12.0", - "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==", "dependencies": { "NETStandard.Library": "2.0.0" } }, "NUnit3TestAdapter": { "type": "Direct", - "requested": "[3.15.1, )", - "resolved": "3.15.1", - "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==", - "dependencies": { - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "System.ComponentModel.EventBasedAsync": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.XPath.XmlDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" }, "System.Data.SqlClient": { "type": "Direct", @@ -79,6 +634,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.18.1", @@ -90,19 +659,10 @@ }, "Castle.Core": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "b5rRL5zeaau1y/5hIbI+6mGw3cwun16YjkHZnV9RRT5UyUIFsgLmNXJ0YnIN9p8Hw7K7AbG1q1UclQVU3DinAQ==", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.TraceSource": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" + "System.Diagnostics.EventLog": "6.0.0" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -112,8 +672,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -122,23 +682,8 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" - }, - "Microsoft.DotNet.InternalAbstractions": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -155,85 +700,104 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Logging": "6.35.0", "System.Security.Cryptography.Cng": "4.5.0" } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, + "Microsoft.SqlServer.Server": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" + }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "4geKywSUJHHrfBTr1wJXUVWP0Vx1X03oFQAdZdGa8jK8p5MSwsJ4Vd0/mqN0dB2YXaIXIhDT94ti5WQ1KZ4jdw==", + "resolved": "17.9.0", + "contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "tMlz3uc7VUZSYYslyVOVXH40KexTptZMAi8gIE+5w+SIt8I0qLPObpqX6QVLWszPr7sxX4WAKTiFgqgBB1MxjA==", + "resolved": "17.9.0", + "contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.4.0", - "Newtonsoft.Json": "9.0.1" - } - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.TestPlatform.ObjectModel": "17.9.0", + "Newtonsoft.Json": "13.0.1" } }, "Microsoft.Win32.Registry": { @@ -260,46 +824,17 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" - } - }, - "NuGet.Frameworks": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", - "resolved": "3.21.100", - "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "resolved": "3.21.130", + "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", "dependencies": { "System.Diagnostics.PerformanceCounter": "6.0.1", "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.1" + "System.DirectoryServices.Protocols": "6.0.2" } }, "Pipelines.Sockets.Unofficial": { @@ -310,15 +845,6 @@ "System.IO.Pipelines": "5.0.1" } }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, "runtime.native.System.Data.SqlClient.sni": { "type": "Transitive", "resolved": "4.7.0", @@ -334,129 +860,23 @@ "resolved": "4.4.0", "contentHash": "LbrynESTp3bm5O/+jGL8v0Qg5SJlTV08lpIpFesXjF6uGNMWqFnUQbYBJwZTeua6E/Y7FIM1C54Ey1btLWupdg==" }, - "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "38ugOfkYJqJoX9g6EYRlZB5U2ZJH51UP8ptxZgdpS07FgOEToV+lS11ouNK2PM12Pr6X/PpT5jK82G3DwH/SxQ==" - }, - "runtime.win-x86.runtime.native.System.Data.SqlClient.sni": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.EventBasedAsync": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fCFl8f0XdwA/BuoNrVBB5D0Y48/hv2J+w4xSDdXQitXZsR6UCSOrDVE7TCUraY802ENwcHUnUCv4En8CupDU1g==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { + "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.4.0", + "contentHash": "38ugOfkYJqJoX9g6EYRlZB5U2ZJH51UP8ptxZgdpS07FgOEToV+lS11ouNK2PM12Pr6X/PpT5jK82G3DwH/SxQ==" }, - "System.Configuration.ConfigurationManager": { + "runtime.win-x86.runtime.native.System.Data.SqlClient.sni": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", - "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" - } + "resolved": "4.4.0", + "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" }, - "System.Diagnostics.Debug": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "resolved": "8.0.0", + "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Diagnostics.EventLog": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { @@ -467,6 +887,11 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", "resolved": "6.0.1", @@ -475,60 +900,6 @@ "System.Configuration.ConfigurationManager": "6.0.0" } }, - "System.Diagnostics.Process": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "xBfJ8pnd4C17dWaC9FM6aShzbJcRNMChUMD42I6772KGGrqaFdumwhn9OdM68erj1ueNo3xdQ1EwiFjK5k8p0g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Diagnostics.TraceSource": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VnYp1NxGx8Ww731y2LJ1vpfb/DKVNKEZ8Jsh5SgQTZREL/YpWRArgh9pI8CDLmgHspZmLL697CaLvH85qQpRiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, "System.DirectoryServices": { "type": "Transitive", "resolved": "6.0.1", @@ -540,8 +911,8 @@ }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" }, "System.Drawing.Common": { "type": "Transitive", @@ -551,92 +922,22 @@ "Microsoft.Win32.SystemEvents": "6.0.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.IO.FileSystem.Primitives": { + "System.IO.FileSystem.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", "dependencies": { - "System.Runtime": "4.3.0" + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "System.IO.Hashing": { @@ -649,41 +950,10 @@ "resolved": "5.0.1", "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Linq.Expressions": { + "System.Memory": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" }, "System.Memory.Data": { "type": "Transitive", @@ -699,104 +969,10 @@ "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { + "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" }, "System.Runtime": { "type": "Transitive", @@ -809,10 +985,10 @@ }, "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "resolved": "8.0.0", + "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -820,62 +996,6 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", - "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "6.0.0", @@ -888,8 +1008,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "System.Security.Permissions": { "type": "Transitive", @@ -915,25 +1035,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "4.7.2", @@ -944,55 +1045,11 @@ "resolved": "4.7.2", "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, "System.Windows.Extensions": { "type": "Transitive", "resolved": "6.0.0", @@ -1001,107 +1058,16 @@ "System.Drawing.Common": "6.0.0" } }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "Mk2mKmPi0nWaoiYeotq1dgeNK1fqWh61+EK+w4Wu8SWuTYLzpUnschb59bJtGywaPq7SmTuPf44wrXRwbIrukg==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XPath": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XPath.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "A/uxsWi/Ifzkmd4ArTLISMbfFs6XpRPsXZonrIqyTY70xi8t+mDtvSM5Os0RqyRDobjMBwIDHDL4NOIbkDwf7A==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XPath": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.1, )", - "DistributedLock.MySql": "[1.0.1, )", - "DistributedLock.Oracle": "[1.0.2, )", - "DistributedLock.Postgres": "[1.0.5, )", - "DistributedLock.Redis": "[1.0.2, )", - "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -1110,7 +1076,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.core": { @@ -1119,55 +1085,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "Npgsql": "[8.0.2, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "System.Threading.AccessControl": "[5.0.0, )" + "DistributedLock.Core": "[1.0.6, )", + "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1183,20 +1149,18 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Runtime.Caching": "8.0.0" } }, "MySqlConnector": { @@ -1219,9 +1183,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "6.0.0", "Pipelines.Sockets.Unofficial": "2.2.8" @@ -1229,13 +1193,9 @@ }, "System.Threading.AccessControl": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==" }, "ZooKeeperNetEx": { "type": "CentralTransitive", diff --git a/src/DistributedLock.WaitHandles/packages.lock.json b/src/DistributedLock.WaitHandles/packages.lock.json index b4a25b15..558f1adb 100644 --- a/src/DistributedLock.WaitHandles/packages.lock.json +++ b/src/DistributedLock.WaitHandles/packages.lock.json @@ -19,18 +19,18 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -39,8 +39,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -87,12 +87,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -106,19 +106,19 @@ }, "System.Threading.AccessControl": { "type": "Direct", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==", "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", + "System.Memory": "4.5.5", + "System.Security.AccessControl": "6.0.0", "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -127,8 +127,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -137,8 +137,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.4.0", @@ -157,8 +157,8 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -201,34 +201,34 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "System.Threading.AccessControl": { "type": "Direct", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==", "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", + "System.Memory": "4.5.5", + "System.Security.AccessControl": "6.0.0", "System.Security.Principal.Windows": "5.0.0" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Buffers": { "type": "Transitive", @@ -237,8 +237,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { "System.Buffers": "4.5.1", "System.Numerics.Vectors": "4.4.0", @@ -257,8 +257,8 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } diff --git a/src/DistributedLock.ZooKeeper/packages.lock.json b/src/DistributedLock.ZooKeeper/packages.lock.json index 7bdf01c0..e42ccc8f 100644 --- a/src/DistributedLock.ZooKeeper/packages.lock.json +++ b/src/DistributedLock.ZooKeeper/packages.lock.json @@ -25,12 +25,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Nullable": { @@ -47,8 +47,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", @@ -57,8 +57,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -111,12 +111,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -142,8 +142,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -152,8 +152,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", @@ -199,12 +199,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "ZooKeeperNetEx": { @@ -215,13 +215,13 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "distributedlock.core": { "type": "Project" diff --git a/src/DistributedLock.sln b/src/DistributedLock.sln index 5b23aea1..61d17d38 100644 --- a/src/DistributedLock.sln +++ b/src/DistributedLock.sln @@ -44,6 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props FixDistributedLockCoreDependencyVersion.targets = FixDistributedLockCoreDependencyVersion.targets + package.readme.md = package.readme.md EndProjectSection EndProject Global diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index d0cc6b56..b2d434bb 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -19,12 +19,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "Azure.Core": { @@ -43,6 +43,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.18.1", @@ -59,13 +73,13 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -88,46 +102,76 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { @@ -137,8 +181,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", @@ -162,6 +206,14 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "8.0.0", @@ -171,13 +223,23 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "System.IO.Compression": { @@ -185,6 +247,15 @@ "resolved": "4.3.0", "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.IO.Hashing": { "type": "Transitive", "resolved": "6.0.0", @@ -246,6 +317,14 @@ "resolved": "4.3.0", "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Security.Cryptography.Algorithms": { "type": "Transitive", "resolved": "4.3.0", @@ -264,6 +343,11 @@ "resolved": "4.3.0", "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", "resolved": "4.3.0", @@ -273,6 +357,24 @@ "System.Security.Cryptography.Encoding": "4.3.0" } }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -317,7 +419,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.core": { @@ -330,54 +432,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess": "[21.10.0, )" + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "Npgsql": "[8.0.2, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -402,14 +504,19 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" } }, "MySqlConnector": { @@ -440,18 +547,19 @@ }, "Oracle.ManagedDataAccess": { "type": "CentralTransitive", - "requested": "[21.10.0, )", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "requested": "[21.13.0, )", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", "dependencies": { + "System.Formats.Asn1": "7.0.0", "System.Text.Json": "6.0.1" } }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -483,12 +591,12 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, "NETStandard.Library": { @@ -514,6 +622,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.18.1", @@ -530,8 +652,8 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -540,8 +662,8 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -564,99 +686,109 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Private.Uri": "4.3.2", - "System.Runtime.Serialization.Formatters": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.SecureString": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" } }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Security.Cryptography.Cng": "4.5.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Microsoft.Win32.Primitives": { + "Microsoft.SqlServer.Server": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Buffers": "4.5.0", - "System.Memory": "4.5.3", - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "Pipelines.Sockets.Unofficial": { @@ -667,2477 +799,837 @@ "System.IO.Pipelines": "5.0.1" } }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "runtime.native.System": { + "System.Collections.Immutable": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "runtime.native.System.Net.Http": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" } }, - "runtime.native.System.Security.Cryptography.Apple": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "runtime.native.System.Security.Cryptography.OpenSsl": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.IO": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.IO.FileSystem.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "System.IO.Hashing": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.IO.Pipelines": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Memory": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Memory.Data": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } }, - "System.Collections": { + "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.Collections.Concurrent": { + "System.Runtime": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" } }, - "System.Collections.Immutable": { + "System.Runtime.Caching": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "resolved": "6.0.0", + "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "System.Configuration.ConfigurationManager": "6.0.0" } }, - "System.Collections.NonGeneric": { + "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Collections.Specialized": { + "System.Runtime.Loader": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" } }, - "System.ComponentModel": { + "System.Security.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { - "System.Runtime": "4.3.0" + "System.Security.Principal.Windows": "5.0.0" } }, - "System.ComponentModel.Primitives": { + "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.ComponentModel.TypeConverter": { + "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", + "dependencies": { + "System.Memory": "4.5.4" } }, - "System.Configuration.ConfigurationManager": { + "System.Security.Permissions": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" + "System.Security.AccessControl": "6.0.0" } }, - "System.Diagnostics.Debug": { + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource": { + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", "dependencies": { + "System.Buffers": "4.5.1", "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.Process": { + "System.Text.Json": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.Tools": { + "System.Threading.Channels": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.Tracing": { + "System.Threading.Tasks": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.Dynamic.Runtime": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "distributedlock.azure": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.6, )" } }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "distributedlock.core": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )" } }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "distributedlock.filesystem": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "DistributedLock.Core": "[1.0.6, )" } }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "distributedlock.mysql": { + "type": "Project", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "DistributedLock.Core": "[1.0.6, )", + "MySqlConnector": "[2.3.5, )" } }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "distributedlock.postgres": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "DistributedLock.Core": "[1.0.6, )", + "Npgsql": "[8.0.2, )" } }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "distributedlock.redis": { + "type": "Project", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "distributedlock.sqlserver": { + "type": "Project", "dependencies": { - "System.Runtime": "4.3.0" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "distributedlock.waithandles": { + "type": "Project", "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "DistributedLock.Core": "[1.0.6, )", + "System.Threading.AccessControl": "[8.0.0, )" } }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "distributedlock.zookeeper": { + "type": "Project", "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" + "DistributedLock.Core": "[1.0.6, )", + "ZooKeeperNetEx": "[3.4.12.4, )" } }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" } }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "Microsoft.Win32.Registry": "5.0.0", "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Runtime.Caching": "6.0.0", + "System.Runtime.Loader": "4.3.0", + "System.Security.Cryptography.Cng": "5.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" } }, - "System.Private.DataContractSerialization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.Threading.Channels": "5.0.0" } }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" + "System.Memory": "4.5.5", + "System.Security.AccessControl": "6.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", - "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Runtime.Serialization.Formatters": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" - } - }, - "System.Runtime.Serialization.Json": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", - "dependencies": { - "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, - "System.Security.Cryptography.Csp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", - "dependencies": { - "System.Memory": "4.5.3" - } - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", - "dependencies": { - "System.Security.AccessControl": "4.7.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Security.SecureString": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Npgsql": "[8.0.2, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "System.Threading.AccessControl": "[5.0.0, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.Threading.Channels": "5.0.0" - } - }, - "System.Threading.AccessControl": { - "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, - ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, - "Microsoft.SourceLink.GitHub": { - "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "aZyGyGg2nFSxix+xMkPmlmZSsnGQ3w+mIG23LTxJZHN+GPwTQ5FpPgDo7RMOq+Kcf5D4hFWfXkGhoGstawX13Q==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "1.0.0", - "Microsoft.SourceLink.Common": "1.0.0" - } - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" - }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" - }, - "Microsoft.Data.SqlClient.SNI.runtime": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==", - "dependencies": { - "Microsoft.CSharp": "4.5.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Private.Uri": "4.3.2", - "System.Runtime.Serialization.Formatters": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.SecureString": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", - "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", - "System.Security.Cryptography.Cng": "4.5.0" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" - }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", - "dependencies": { - "System.Buffers": "4.5.0", - "System.Memory": "4.5.3", - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" - } - }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", - "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" - } - }, - "System.Console": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" - }, - "System.Diagnostics.Process": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Tracing": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.DirectoryServices": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", - "dependencies": { - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.DirectoryServices.Protocols": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" } }, - "System.IdentityModel.Tokens.Jwt": { + "Azure.Core": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.IO": { + "Azure.Identity": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.IO.Compression": { + "Azure.Storage.Common": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" } }, - "System.IO.Compression.ZipFile": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" }, - "System.IO.FileSystem": { + "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "System.IO.FileSystem.AccessControl": { + "Microsoft.CSharp": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "resolved": "4.5.0", + "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" }, - "System.IO.FileSystem.Primitives": { + "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, - "System.IO.Hashing": { + "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" }, - "System.IO.Pipelines": { + "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "System.Memory": "4.5.5" } }, - "System.Linq.Expressions": { + "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.22.0" } }, - "System.Memory": { + "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" } }, - "System.Memory.Data": { + "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, - "System.Net.Http": { + "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", + "Microsoft.IdentityModel.Tokens": "6.35.0", "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" - } - }, - "System.Net.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.Net.Sockets": { + "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.ObjectModel": { + "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.Private.DataContractSerialization": { + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yDaJ2x3mMmjdZEDB4IbezSnCsnjQ4BxinKhRAaP6kEgL6Bb6jANWphs5SzyD8imqeC/3FxgsuXT6ykkiH1uUmA==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.Private.Uri": { + "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3" + "Microsoft.CSharp": "4.5.0", + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Security.Cryptography.Cng": "4.5.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, - "System.Reflection": { + "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "System.Reflection.Emit": { + "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "System.Reflection.Emit.ILGeneration": { + "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "System.Reflection.Emit.Lightweight": { + "Microsoft.SqlServer.Server": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, - "System.Reflection.Extensions": { + "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Reflection.Primitives": { + "Pipelines.Sockets.Unofficial": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.IO.Pipelines": "5.0.1" } }, - "System.Reflection.TypeExtensions": { + "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Resources.ResourceManager": { + "System.Collections.Immutable": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Runtime": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "System.Security.Cryptography.ProtectedData": "6.0.0", + "System.Security.Permissions": "6.0.0" } }, - "System.Runtime.Caching": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Runtime.CompilerServices.Unsafe": { + "System.Diagnostics.PerformanceCounter": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" }, - "System.Runtime.Extensions": { + "System.DirectoryServices": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Runtime.Handles": { + "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Runtime.InteropServices": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.Runtime.InteropServices.RuntimeInformation": { + "System.IO": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" } }, - "System.Runtime.Numerics": { + "System.IO.FileSystem.AccessControl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Runtime.Serialization.Formatters": { + "System.IO.Hashing": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KT591AkTNFOTbhZlaeMVvfax3RqhH1EJlcwF50Wm7sfnBLuHiOeZRRKrr1ns3NESkM20KPZ5Ol/ueMq5vg4QoQ==", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", "dependencies": { - "System.Collections": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" } }, - "System.Runtime.Serialization.Json": { + "System.IO.Pipelines": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "CpVfOH0M/uZ5PH+M9+Gu56K0j9lJw3M+PKRegTkcrY/stOIvRUeonggxNrfBYLA5WOHL2j15KNJuTuld3x4o9w==", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", "dependencies": { - "System.IO": "4.3.0", - "System.Private.DataContractSerialization": "4.3.0", - "System.Runtime": "4.3.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Runtime.Serialization.Primitives": { + "System.Memory": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Security.AccessControl": { + "System.Memory.Data": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", "dependencies": { - "System.Security.Principal.Windows": "5.0.0" + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" } }, - "System.Security.Cryptography.Algorithms": { + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", + "Microsoft.NETCore.Targets": "1.1.0", "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, - "System.Security.Cryptography.Csp": { + "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" } }, - "System.Security.Cryptography.Encoding": { + "System.Runtime": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "Microsoft.NETCore.Targets": "1.1.0" } }, - "System.Security.Cryptography.OpenSsl": { + "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "resolved": "6.0.0", + "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Configuration.ConfigurationManager": "6.0.0" } }, - "System.Security.Cryptography.Primitives": { + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.Loader": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" } }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.AccessControl": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", "dependencies": { - "System.Memory": "4.5.3" + "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.X509Certificates": { + "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "resolved": "5.0.0", + "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "System.Memory": "4.5.4" } }, "System.Security.Permissions": { @@ -3153,21 +1645,6 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Security.SecureString": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PnXp38O9q/2Oe4iZHMH60kinScv6QiiL2XH54Pj2t0Y6c2zKPEiAZsM/M3wBOHLNTBDFP0zfy13WN2M0qFz5jg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -3180,21 +1657,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -3220,28 +1687,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, "System.Threading.Channels": { "type": "Transitive", "resolved": "8.0.0", @@ -3265,120 +1710,11 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XmlSerializer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "MYoTCP7EZ98RrANESW05J5ZwskKDoN0AuZ06ZflnowE50LTpbR5yRg3tHckTVm5j/m47stuGgCrCHWePyHS70Q==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } - }, "distributedlock.azure": { "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.core": { @@ -3387,55 +1723,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "Npgsql": "[8.0.2, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "System.Threading.AccessControl": "[5.0.0, )" + "DistributedLock.Core": "[1.0.6, )", + "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -3451,20 +1787,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "Microsoft.Win32.Registry": "5.0.0", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Runtime.Caching": "6.0.0", + "System.Runtime.Loader": "4.3.0", + "System.Security.Cryptography.Cng": "5.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" } }, "MySqlConnector": { @@ -3493,21 +1834,21 @@ }, "Oracle.ManagedDataAccess.Core": { "type": "CentralTransitive", - "requested": "[3.21.100, )", - "resolved": "3.21.100", - "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "requested": "[3.21.130, )", + "resolved": "3.21.130", + "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", "dependencies": { "System.Diagnostics.PerformanceCounter": "6.0.1", "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.1", + "System.DirectoryServices.Protocols": "6.0.2", "System.Text.Json": "6.0.1" } }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -3517,12 +1858,12 @@ }, "System.Threading.AccessControl": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==", "dependencies": { - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", + "System.Memory": "4.5.5", + "System.Security.AccessControl": "6.0.0", "System.Security.Principal.Windows": "5.0.0" } }, diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json index e61c81cc..3fd1f687 100644 --- a/src/DistributedLockCodeGen/packages.lock.json +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -4,133 +4,54 @@ "net8.0": { "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[16.4.0, )", - "resolved": "16.4.0", - "contentHash": "gjjqS3rCzg4DrSQq4YwJwUUvc49HtXpXrZkW9fu5VG+K4X+Ztn4+UzolyML7wPnl/EAIufk4hu628bJB4WtpFg==", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", "dependencies": { - "Microsoft.CodeCoverage": "16.4.0", - "Microsoft.TestPlatform.TestHost": "16.4.0" + "Microsoft.CodeCoverage": "17.9.0", + "Microsoft.TestPlatform.TestHost": "17.9.0" } }, "NUnit": { "type": "Direct", - "requested": "[3.12.0, )", - "resolved": "3.12.0", - "contentHash": "3oJTrcUcT9wmweBUwgUf0f1XIYy6RZq2ziV+RM95HMKAJGsHPN2i3MKK1dAPvDPMRLz799Llj4eyu/STB9Q7OA==", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==", "dependencies": { "NETStandard.Library": "2.0.0" } }, "NUnit3TestAdapter": { "type": "Direct", - "requested": "[3.15.1, )", - "resolved": "3.15.1", - "contentHash": "gqy0llGjhJYq9ebFvtbmBcF/MY8z5kcTIxYs+eXwp2d4Ntha8pSPxUzryvBm7H46VbWI6FS5/XNbxwiQpe88vQ==", - "dependencies": { - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "System.ComponentModel.EventBasedAsync": "4.3.0", - "System.ComponentModel.TypeConverter": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.XPath.XmlDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "qb7PMVZMAY5iUCvB/kDUEt9xqazWKZoKY/sGpAJO4VtwgN5IcEgipCu3n0i1GPCwGbWVL6k4a8a9F+FqmADJng==" - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "Microsoft.DotNet.InternalAbstractions": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "AAguUq7YyKk3yDWPoWA8DrLZvURxB/LrDdTn1h5lmPeznkFUpfC3p459w5mQYQE0qpquf/CkSQZ0etiV5vRHFA==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "4geKywSUJHHrfBTr1wJXUVWP0Vx1X03oFQAdZdGa8jK8p5MSwsJ4Vd0/mqN0dB2YXaIXIhDT94ti5WQ1KZ4jdw==", + "resolved": "17.9.0", + "contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.4.0", - "contentHash": "tMlz3uc7VUZSYYslyVOVXH40KexTptZMAi8gIE+5w+SIt8I0qLPObpqX6QVLWszPr7sxX4WAKTiFgqgBB1MxjA==", + "resolved": "17.9.0", + "contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.4.0", - "Newtonsoft.Json": "9.0.1" - } - }, - "Microsoft.Win32.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" + "Microsoft.TestPlatform.ObjectModel": "17.9.0", + "Newtonsoft.Json": "13.0.1" } }, "NETStandard.Library": { @@ -143,636 +64,13 @@ }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" - } - }, - "NuGet.Frameworks": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.NonGeneric": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Collections.Specialized": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", - "dependencies": { - "System.Collections.NonGeneric": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.ComponentModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.EventBasedAsync": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fCFl8f0XdwA/BuoNrVBB5D0Y48/hv2J+w4xSDdXQitXZsR6UCSOrDVE7TCUraY802ENwcHUnUCv4En8CupDU1g==", - "dependencies": { - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.ComponentModel.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", - "dependencies": { - "System.ComponentModel": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.ComponentModel.TypeConverter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.3.0", - "System.Collections.Specialized": "4.3.0", - "System.ComponentModel": "4.3.0", - "System.ComponentModel.Primitives": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Process": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "xBfJ8pnd4C17dWaC9FM6aShzbJcRNMChUMD42I6772KGGrqaFdumwhn9OdM68erj1ueNo3xdQ1EwiFjK5k8p0g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "System.IO.FileSystem.Primitives": { + "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - } - }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", - "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Thread": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, - "System.Threading.ThreadPool": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "Mk2mKmPi0nWaoiYeotq1dgeNK1fqWh61+EK+w4Wu8SWuTYLzpUnschb59bJtGywaPq7SmTuPf44wrXRwbIrukg==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11" - } - }, - "System.Xml.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XPath": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" - } - }, - "System.Xml.XPath.XmlDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "A/uxsWi/Ifzkmd4ArTLISMbfFs6XpRPsXZonrIqyTY70xi8t+mDtvSM5Os0RqyRDobjMBwIDHDL4NOIbkDwf7A==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XPath": "4.3.0", - "System.Xml.XmlDocument": "4.3.0" - } + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" } } } diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index d5a132da..bc719454 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -16,6 +16,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.18.1", @@ -40,8 +54,8 @@ }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "LWQDEwSS0y2VqQ0FhbUkf07lQeGaOAm/HKDIHvW1gX6MHrYdjrDRIXNhmtsmSK6AVCkCj/k3xTOsjCgXWdYG+Q==" + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -64,53 +78,84 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Oracle.ManagedDataAccess": { "type": "Transitive", - "resolved": "21.10.0", - "contentHash": "7ddObNDUkj1JinF16OmL5rTizmsrcbWDWrN5FAGrt0fWB3vxdLi2XExTq2mAk8Y3ESGWaQXn+9Mx5mTzjGHErA==", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", "dependencies": { + "System.Formats.Asn1": "7.0.0", "System.Text.Json": "6.0.1" } }, @@ -136,6 +181,14 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "8.0.0", @@ -145,13 +198,23 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "System.IO.Compression": { @@ -159,6 +222,15 @@ "resolved": "4.3.0", "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.IO.Hashing": { "type": "Transitive", "resolved": "6.0.0", @@ -207,6 +279,42 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -255,13 +363,13 @@ "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.1, )", - "DistributedLock.MySql": "[1.0.1, )", - "DistributedLock.Oracle": "[1.0.2, )", - "DistributedLock.Postgres": "[1.0.5, )", - "DistributedLock.Redis": "[1.0.2, )", - "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -270,7 +378,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.core": { @@ -283,54 +391,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess": "[21.10.0, )" + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "Npgsql": "[8.0.2, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -346,14 +454,19 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" } }, "MySqlConnector": { @@ -384,9 +497,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -403,25 +516,84 @@ } }, ".NETFramework,Version=v4.7.2/win7-x86": { + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" } } }, "net8.0": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A==" + }, "Azure.Core": { "type": "Transitive", "resolved": "1.36.0", @@ -436,6 +608,20 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Azure.Storage.Common": { "type": "Transitive", "resolved": "12.18.1", @@ -457,8 +643,8 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", @@ -475,63 +661,88 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.21.1", - "contentHash": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==" + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==" + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.8.0", - "System.IdentityModel.Tokens.Jwt": "6.8.0" + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.8.0", + "Microsoft.IdentityModel.Logging": "6.35.0", "System.Security.Cryptography.Cng": "4.5.0" } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "Microsoft.Win32.Registry": { + "Microsoft.NETCore.Targets": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", - "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" - } + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Microsoft.SqlServer.Server": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, "Microsoft.Win32.SystemEvents": { "type": "Transitive", @@ -540,12 +751,12 @@ }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", - "resolved": "3.21.100", - "contentHash": "nsqyUE+v246WB0SOnR1u9lfZxYoNcdj1fRjTt7TOhCN0JurEc6+qu+mMe+dl1sySB2UpyWdfqHG1iSQJYaXEfA==", + "resolved": "3.21.130", + "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", "dependencies": { "System.Diagnostics.PerformanceCounter": "6.0.1", "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.1" + "System.DirectoryServices.Protocols": "6.0.2" } }, "Pipelines.Sockets.Unofficial": { @@ -558,11 +769,11 @@ }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "7T+m0kDSlIPTHIkPMIu6m6tV6qsMqJpvQWW2jIc2qi7sn40qxFo0q+7mEQAhMPXZHMKnWrnv47ntGlM/ejvw3g==", + "resolved": "8.0.0", + "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Diagnostics.EventLog": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { @@ -573,6 +784,11 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", "resolved": "6.0.1", @@ -592,8 +808,8 @@ }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" }, "System.Drawing.Common": { "type": "Transitive", @@ -605,11 +821,20 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.8.0", - "contentHash": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Tokens": "6.8.0" + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "System.IO.Hashing": { @@ -622,6 +847,11 @@ "resolved": "5.0.1", "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + }, "System.Memory.Data": { "type": "Transitive", "resolved": "1.0.2", @@ -636,12 +866,21 @@ "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "resolved": "8.0.0", + "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -661,8 +900,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "System.Security.Permissions": { "type": "Transitive", @@ -678,12 +917,14 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding.CodePages": { + "System.Text.Encoding": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" } }, "System.Text.Encodings.Web": { @@ -712,13 +953,13 @@ "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.0, )", - "DistributedLock.FileSystem": "[1.0.1, )", - "DistributedLock.MySql": "[1.0.1, )", - "DistributedLock.Oracle": "[1.0.2, )", - "DistributedLock.Postgres": "[1.0.5, )", - "DistributedLock.Redis": "[1.0.2, )", - "DistributedLock.SqlServer": "[1.0.3, )", + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -727,7 +968,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.core": { @@ -736,55 +977,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )" + "DistributedLock.Core": "[1.0.6, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Oracle.ManagedDataAccess.Core": "[3.21.100, )" + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "Npgsql": "[8.0.2, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "StackExchange.Redis": "[2.7.20, )" + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "Microsoft.Data.SqlClient": "[2.1.7, )" + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", - "System.Threading.AccessControl": "[5.0.0, )" + "DistributedLock.Core": "[1.0.6, )", + "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.5, )", + "DistributedLock.Core": "[1.0.6, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -800,20 +1041,18 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Runtime.Caching": "8.0.0" } }, "MySqlConnector": { @@ -836,9 +1075,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.20, )", - "resolved": "2.7.20", - "contentHash": "4ogjXwVp/7Gi/dNjGn1SWVxjrS0J0izVg8LeMVWSF3/zS3GH4lwtEMehQ9VEatQAqRbZ0i+OU+Z2obLUTYEoYg==", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "6.0.0", "Pipelines.Sockets.Unofficial": "2.2.8" @@ -846,13 +1085,9 @@ }, "System.Threading.AccessControl": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==" }, "ZooKeeperNetEx": { "type": "CentralTransitive", @@ -864,22 +1099,36 @@ "net8.0/win7-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==" + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, - "Microsoft.Win32.Registry": { + "Microsoft.Win32.SystemEvents": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "runtime.any.System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Private.Uri": "4.3.0" } }, - "Microsoft.Win32.SystemEvents": { + "runtime.any.System.Text.Encoding": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + "resolved": "4.3.0", + "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" + }, + "runtime.win7.System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -900,8 +1149,8 @@ }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "ndUZlEkAMc1XzM0xGN++SsJrNhRkIHaKI8+te325vrUgoLT1ufWNI6KB8FFrL7NpRMHPrdxP99aF3fHbAPxW0A==" + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" }, "System.Drawing.Common": { "type": "Transitive", @@ -911,12 +1160,41 @@ "Microsoft.Win32.SystemEvents": "6.0.0" } }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7.System.Private.Uri": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.any.System.Runtime": "4.3.0" + } + }, "System.Runtime.Caching": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==", + "resolved": "8.0.0", + "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", "dependencies": { - "System.Configuration.ConfigurationManager": "4.7.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.Security.AccessControl": { @@ -929,22 +1207,20 @@ "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==" - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding.CodePages": { + "System.Text.Encoding": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "aeu4FlaUTemuT1qOd1MyU4T516QR4Fy+9yDbwWMPHOHy7U8FD6SgTzdZFO7gHcfAPHtECqInbwklVvUK4RHcNg==", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "runtime.any.System.Text.Encoding": "4.3.0" } }, "System.Windows.Extensions": { @@ -957,31 +1233,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[2.1.7, )", - "resolved": "2.1.7", - "contentHash": "dSdlcXPszeOjjDX9a0buMFgYqKrI5bTxdSgX3JyCa+OL80NUstJSxOJr0j9oOn8mpP5PgWeRC2bVf/Zf2Cjv+g==", - "dependencies": { - "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1", - "Microsoft.Identity.Client": "4.21.1", - "Microsoft.IdentityModel.JsonWebTokens": "6.8.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", - "Microsoft.Win32.Registry": "4.7.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", - "System.Runtime.Caching": "4.7.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.7.0" + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Runtime.Caching": "8.0.0" } }, "System.Threading.AccessControl": { "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "5.0.0", - "contentHash": "WJ9w9m4iHJVq0VoH7hZvYAccbRq95itYRhAAXd6M4kVCzLmT6NqTwmSXKwp3oQilWHhYTXgqaIXxBfg8YaqtmA==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==" } } } diff --git a/src/package.readme.md b/src/package.readme.md new file mode 100644 index 00000000..0b319fcb --- /dev/null +++ b/src/package.readme.md @@ -0,0 +1,11 @@ +DistributedLock is a .NET library that provides robust and easy-to-use distributed mutexes, reader-writer locks, and semaphores based on a variety of underlying technologies. + +With DistributedLock, synchronizing access to a region of code across multiple applications/machines is as simple as: +```C# +await using (await myDistributedLock.AcquireAsync()) +{ + // I hold the lock here +} +``` + +**Read the documentation [here](https://github.com/madelson/DistributedLock).** \ No newline at end of file From 75868f55163547eb15e4170ff4c5bf8c29a3032e Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 03:36:09 -0400 Subject: [PATCH 255/399] Fix SqlServer test connection string --- .../Infrastructure/Shared/SqlServerCredentials.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs index 0130a364..d9598e32 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/SqlServerCredentials.cs @@ -4,7 +4,7 @@ internal static class SqlServerCredentials { public static readonly string ApplicationName = $"{typeof(SqlServerCredentials).Assembly.GetName().Name} ({TargetFramework.Current})"; - public static readonly string ConnectionString = new System.Data.SqlClient.SqlConnectionStringBuilder + public static readonly string ConnectionString = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder { DataSource = @"localhost", // localhost for SQL Developer, .\SQLEXPRESS for express InitialCatalog = "master", @@ -12,7 +12,10 @@ internal static class SqlServerCredentials ApplicationName = ApplicationName, // set a high pool size so that we don't empty the pool through things like lock abandonment tests MaxPoolSize = 10000, - TrustServerCertificate = true, + // Allows us to connect to SQLExpress with Microsoft.Data.SqlClient while still being compatible + // with System.Data.SqlClient (alternative would be building the connection string with System.Data.SqlClient + // and doing TrustServerCertificate = true). + Encrypt = false, } .ConnectionString; } From 9bcc32a746055c858b7f6d93b97fbb259ab2c7f0 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 03:43:59 -0400 Subject: [PATCH 256/399] Pass abortConnect=false to make Redis tests more resilient --- src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs index 18e2e6c4..d524205a 100644 --- a/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/RedisServer.cs @@ -35,7 +35,7 @@ private RedisServer(int? port, bool allowAdmin) .RedirectStandardErrorTo(Console.Error); ActiveServersByPort.Add(this.Port, this); } - this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port}{(allowAdmin ? ",allowAdmin=true" : string.Empty)}"); + this.Multiplexer = ConnectionMultiplexer.Connect($"localhost:{this.Port},abortConnect=false{(allowAdmin ? ",allowAdmin=true" : string.Empty)}"); // Clean the db to ensure it is empty. Running an arbitrary command also ensures that // the db successfully spun up before we proceed (Connect seemingly can complete before that happens). // This is particularly important for cross-process locking where the lock taker process From 5b1e99e0bbffa008a19f87888f82571682210170 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:09:42 -0400 Subject: [PATCH 257/399] Add dndocs links --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index afdd2a50..657f8062 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,17 @@ await using (await myDistributedLock.AcquireAsync()) DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. -- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/): uses Microsoft SQL Server -- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/): uses Postgresql -- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/): uses MySQL or MariaDB -- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/): uses Oracle -- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/): uses Redis -- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/): uses Azure blobs -- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/): uses Apache ZooKeeper -- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/): uses lock files -- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/): uses operating system global `WaitHandle`s (Windows only) +- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) +: uses Microsoft SQL Server +- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) +: uses Postgresql +- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.MySql.html): uses MySQL or MariaDB +- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html): uses Oracle +- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Redis.html): uses Redis +- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Azure.html): uses Azure blobs +- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.ZooKeeper.html): uses Apache ZooKeeper +- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.FileSystem.html): uses lock files +- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.WaitHandles.html): uses operating system global `WaitHandle`s (Windows only) **Click on the name** of any of the above packages to see the documentation specific to that implementation, or read on for general documentation that applies to all implementations. From 3d325da9ebe0680f0b2646e0c2619ef3fc427b7d Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:13:58 -0400 Subject: [PATCH 258/399] Version bump for umbrella package --- src/DistributedLock/DistributedLock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index c40e7613..1890d088 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.3.4 + 2.4 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 238c3ec6ca506085700bfacb3a973f67261c7f8c Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:29:30 -0400 Subject: [PATCH 259/399] Fix version formatting --- src/DistributedLock/DistributedLock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 1890d088..495f84a5 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.4 + 2.4.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 3c0a3fbc9c325c976fdefd0f194a7235ea33a44d Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:32:12 -0400 Subject: [PATCH 260/399] Minor cleanup --- .../Data/ExternalConnectionOrTransactionStrategyTestCases.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index ad6c4fef..538c04b8 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -25,7 +25,7 @@ public void TestDeadlockDetection() const string LockName1 = nameof(TestDeadlockDetection) + "_1", LockName2 = nameof(TestDeadlockDetection) + "_2"; - Task RunDeadlock(bool isFirst) + Task RunDeadlockAsync(bool isFirst) { this._lockProvider.Strategy.StartAmbient(); var lock1 = this._lockProvider.CreateLock(isFirst ? LockName1 : LockName2); @@ -40,7 +40,7 @@ Task RunDeadlock(bool isFirst) }); } - var tasks = new[] { RunDeadlock(isFirst: true), RunDeadlock(isFirst: false) }; + var tasks = new[] { RunDeadlockAsync(isFirst: true), RunDeadlockAsync(isFirst: false) }; Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); From 0a74e73a70266b269e896a8277b7b4a79aaf6b35 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:48:02 -0400 Subject: [PATCH 261/399] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 657f8062..bc63a30b 100644 --- a/README.md +++ b/README.md @@ -143,9 +143,9 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks @Bartleby2718 for helping with this! + - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks @Bartleby2718 for helping with this! + - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) - New API documentation on [dndocs](https://dndocs.com/). Thanks @NeuroXiq! From 27f6f8a612696dfd315e95ff6a68e75fb5fe3b66 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:50:25 -0400 Subject: [PATCH 262/399] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bc63a30b..5755a837 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! + - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) From 9564a6244168dee1c2a3d047f799f5994b436324 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:51:04 -0400 Subject: [PATCH 263/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5755a837..06bc2046 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! + - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) From 284c0b22a183e64f3de11279ed8f8061a93af895 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:52:07 -0400 Subject: [PATCH 264/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 06bc2046..5dc9e4d3 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) - - New API documentation on [dndocs](https://dndocs.com/). Thanks @NeuroXiq! + - New API documentation on [dndocs](https://dndocs.com/). Thanks [@NeuroXiq](https://github.com/NeuroXiq)! - New documentation for contributors to get the project running locally (see [Contributing](#contributing)) - 2.3.4 - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! From e56800a96e49eb321531ee8841da022e563239f7 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sat, 30 Mar 2024 21:56:00 -0400 Subject: [PATCH 265/399] Install NUnit.Analyzers 4.1.0 and follow all suggested autofixes --- src/Directory.Packages.props | 3 +- src/DistributedLock.Core/packages.lock.json | 24 - .../DistributedLockCoreTestCases.cs | 8 +- .../DistributedSemaphoreCoreTestCases.cs | 2 +- .../DistributedLock.Tests.csproj | 4 + .../Infrastructure/TestHelper.cs | 2 +- src/DistributedLock.Tests/Tests/ApiTest.cs | 5 +- .../AzureBlobLeaseDistributedLockTest.cs | 2 +- .../Tests/Core/HelpersTest.cs | 4 +- .../Tests/Core/SyncViaAsyncTest.cs | 10 +- .../Tests/Core/TimeoutValueTest.cs | 18 +- .../FileSystem/FileDistributedLockTest.cs | 4 +- .../Postgres/PostgresAdvisoryLockKeyTest.cs | 34 +- .../Tests/Postgres/PostgresBehaviorTest.cs | 4 +- .../SqlServer/SqlDistributedSemaphoreTest.cs | 2 +- .../ZooKeeper/ZooKeeperConnectionInfoTest.cs | 2 +- .../ZooKeeper/ZooKeeperConnectionTest.cs | 10 +- .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 7 +- .../ZooKeeperSequentialPathHelperTest.cs | 2 +- src/DistributedLock.Tests/packages.lock.json | 573 +----------------- 20 files changed, 69 insertions(+), 651 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 7afc0274..a7d2f366 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -9,8 +9,9 @@ + - + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 0584aab6..6d32472d 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.2, )", diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index ba0d6d75..708ade9c 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -202,8 +202,8 @@ public async Task TestParallelism() var timeout = Task.Delay(TimeSpan.FromSeconds(30)); var completed = await Task.WhenAny(Task.WhenAll(tasks), failure.Task, timeout); - Assert.AreNotSame(failure.Task, completed, $"Failed with {(failure.Task.IsFaulted ? failure.Task.Exception!.ToString() : null)}"); - Assert.AreNotSame(timeout, completed, $"Timed out! (only {tasks.Count(t => t.IsCompleted)}/{taskCount} completed)"); + Assert.That(completed, Is.Not.SameAs(failure.Task), $"Failed with {(failure.Task.IsFaulted ? failure.Task.Exception!.ToString() : null)}"); + Assert.That(completed, Is.Not.SameAs(timeout), $"Timed out! (only {tasks.Count(t => t.IsCompleted)}/{taskCount} completed)"); tasks.ForEach(t => t.Result.ShouldEqual(0)); } @@ -228,7 +228,7 @@ public void TestGetSafeLockNameIsCaseSensitive() var longName2 = new string('a', longName1.Length - 1) + "A"; StringComparer.OrdinalIgnoreCase.Equals(longName1, longName2).ShouldEqual(true, "sanity check"); - Assert.AreNotEqual(this._lockProvider.GetSafeName(longName1), this._lockProvider.GetSafeName(longName2)); + Assert.That(this._lockProvider.GetSafeName(longName2), Is.Not.EqualTo(this._lockProvider.GetSafeName(longName1))); } [Test] @@ -248,7 +248,7 @@ public async Task TestLockNamesAreCaseSensitive() var upperBaseName = $"{uniqueHashName.Substring(0, 6)}_A"; var upperName = this._lockProvider.GetSafeName(upperBaseName); // make sure we succeeded in generating what we set out to generate - Assert.AreNotEqual(lowerName, upperName); + Assert.That(upperName, Is.Not.EqualTo(lowerName)); if (StringComparer.OrdinalIgnoreCase.Equals(lowerName, upperName)) { // if the names vary only by case, test that they are different locks diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs index 798d2bf6..c0c934a1 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedSemaphoreCoreTestCases.cs @@ -52,7 +52,7 @@ public void TestConcurrencyHandling() .ToArray(); Task.WaitAll(threads); - CollectionAssert.AreEquivalent(new[] { 1, 2, 3 }, seenCounterValues.ToArray()); + Assert.That(seenCounterValues.ToArray(), Is.EquivalentTo(new[] { 1, 2, 3 })); } [Test] diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index c1a9174a..be82219e 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -18,6 +18,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs index 43174adc..4a03f688 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -13,7 +13,7 @@ internal static class TestHelper public static T ShouldEqual(this T @this, T that, string? message = null) { - Assert.AreEqual(actual: @this, expected: that, message: message); + Assert.That(that, Is.EqualTo(@this), message: message); return @this; } diff --git a/src/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs index 1e188bae..dc02aa47 100644 --- a/src/DistributedLock.Tests/Tests/ApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ApiTest.cs @@ -57,9 +57,8 @@ public void TestProviderApisAreAvailable(AssemblyName assemblyName) { var providers = types.Where(t => !t.IsInterface && kvp.Key.IsAssignableFrom(t)).ToArray(); var provided = types.Where(t => !t.IsInterface && kvp.Value.IsAssignableFrom(t)).ToArray(); - CollectionAssert.AreEquivalent( - provided, - providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType)); + Assert.That( + providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType), Is.EquivalentTo(provided)); foreach (var provider in providers) { diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 93fb16a7..9abc3efb 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -89,7 +89,7 @@ public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None); Assert.IsTrue((await client.ExistsAsync()).Value); - CollectionAssert.AreEqual(metadata, (await client.GetPropertiesAsync()).Value.Metadata); + Assert.That((await client.GetPropertiesAsync()).Value.Metadata, Is.EqualTo(metadata).AsCollection); Assert.DoesNotThrowAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)); Assert.IsTrue((await client.ExistsAsync()).Value); diff --git a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs index c6aba137..a2ca3b44 100644 --- a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -13,10 +13,10 @@ public void TestSafeCreateTaskPassesThroughSafeTasks() { var tasks = new[] { Task.FromResult(14), Task.FromResult(24) }; var safeTask = Helpers.SafeCreateTask(state => tasks[state], 1); - Assert.AreSame(tasks[1], safeTask); + Assert.That(safeTask, Is.SameAs(tasks[1])); var safeNonGenericTask = Helpers.SafeCreateTask(state => tasks[state], 1); - Assert.AreSame(safeNonGenericTask, tasks[1]); + Assert.That(tasks[1], Is.SameAs(safeNonGenericTask)); } [Test] diff --git a/src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs b/src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs index baa7c8f1..0d458710 100644 --- a/src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/SyncViaAsyncTest.cs @@ -24,19 +24,19 @@ public void TestSyncOverAsyncWithResult() async ((int a, int b, Thread startingThread, bool expectAsync) state) => await AddAsync(state.a, state.b, state.startingThread, state.expectAsync), (1, 2, currentThread, false) ); - Assert.AreEqual(3, result); + Assert.That(result, Is.EqualTo(3)); } - private async ValueTask AddAsync(int a, int b, Thread startingThread, bool expectAsync) + private static async ValueTask AddAsync(int a, int b, Thread startingThread, bool expectAsync) { var result = await AddHelperAsync(a, expectAsync) + await AddHelperAsync(b, expectAsync); - Assert.AreEqual(expectAsync, Thread.CurrentThread != startingThread); + Assert.That(Thread.CurrentThread != startingThread, Is.EqualTo(expectAsync)); return result; } - private async ValueTask AddHelperAsync(int a, bool expectAsync) + private static async ValueTask AddHelperAsync(int a, bool expectAsync) { - Assert.AreNotEqual(expectAsync, SyncViaAsync.IsSynchronous); + Assert.That(SyncViaAsync.IsSynchronous, Is.Not.EqualTo(expectAsync)); if (expectAsync) { await Task.Delay(1); } else { Thread.Sleep(1); } diff --git a/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs b/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs index 58f58a5d..4e6e5a20 100644 --- a/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs @@ -18,33 +18,33 @@ public void TestProperties() { Assert.IsTrue(default(TimeoutValue).IsZero); Assert.IsFalse(default(TimeoutValue).IsInfinite); - Assert.AreEqual(0, default(TimeoutValue).InMilliseconds); - Assert.AreEqual(0, default(TimeoutValue).InSeconds); + Assert.That(default(TimeoutValue).InMilliseconds, Is.EqualTo(0)); + Assert.That(default(TimeoutValue).InSeconds, Is.EqualTo(0)); TimeoutValue infinite = Timeout.InfiniteTimeSpan; Assert.IsFalse(infinite.IsZero); Assert.IsTrue(infinite.IsInfinite); - Assert.AreEqual(-1, infinite.InMilliseconds); + Assert.That(infinite.InMilliseconds, Is.EqualTo(-1)); Assert.Throws(() => infinite.InSeconds.ToString()); TimeoutValue normal = TimeSpan.FromSeconds(10.4); Assert.IsFalse(normal.IsZero); Assert.IsFalse(normal.IsInfinite); - Assert.AreEqual(10400, normal.InMilliseconds); - Assert.AreEqual(10, normal.InSeconds); + Assert.That(normal.InMilliseconds, Is.EqualTo(10400)); + Assert.That(normal.InSeconds, Is.EqualTo(10)); } [Test] public void TestConversion() { - Assert.AreEqual((TimeoutValue)default(TimeSpan?), new TimeoutValue(Timeout.InfiniteTimeSpan)); + Assert.That(new TimeoutValue(Timeout.InfiniteTimeSpan), Is.EqualTo((TimeoutValue)default(TimeSpan?))); CheckEquality(Timeout.InfiniteTimeSpan); CheckEquality(TimeSpan.FromSeconds(101.3)); CheckEquality(TimeSpan.FromTicks(1)); CheckEquality(TimeSpan.Zero); - static void CheckEquality(TimeSpan value) => Assert.AreEqual((int)value.TotalMilliseconds, ((TimeoutValue)value).InMilliseconds); + static void CheckEquality(TimeSpan value) => Assert.That(((TimeoutValue)value).InMilliseconds, Is.EqualTo((int)value.TotalMilliseconds)); } [Test] @@ -66,7 +66,7 @@ public void TestEquality() Assert.IsTrue(aValue.Equals(bValue)); Assert.IsTrue(aValue.Equals((object)bValue)); Assert.IsTrue(Equals(aValue, bValue)); - Assert.AreEqual(aValue.GetHashCode(), bValue.GetHashCode()); + Assert.That(bValue.GetHashCode(), Is.EqualTo(aValue.GetHashCode())); } else { @@ -75,7 +75,7 @@ public void TestEquality() Assert.IsFalse(aValue.Equals(bValue)); Assert.IsFalse(aValue.Equals((object)bValue)); Assert.IsFalse(Equals(aValue, bValue)); - Assert.AreNotEqual(aValue.GetHashCode(), bValue.GetHashCode()); + Assert.That(bValue.GetHashCode(), Is.Not.EqualTo(aValue.GetHashCode())); } } } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 0005e0fb..5d261cb7 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -254,7 +254,7 @@ public void TestReservedWindowsNamesAreAllowed(string name) && Environment.OSVersion.Version.Build < 22000) { Assert.IsFalse(CanCreateFileWithName(variant), variant); - Assert.AreNotEqual(name, Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), variant); + Assert.That(Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), Is.Not.EqualTo(name), variant); } } } @@ -364,7 +364,7 @@ public void TestBase32Hashing() { if ((@char >= '2' && @char <= '7') || (@char >= 'A' && @char <= 'Z')) { - Assert.AreEqual(actual: charCounts[@char], expected: expectedCount, delta: .1 * expectedCount); + Assert.That(charCounts[@char], Is.EqualTo(expectedCount).Within(.1 * expectedCount)); } else { diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs index 5a3585d4..9f2113bc 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs @@ -16,9 +16,9 @@ public void TestArgumentValidation() [Test] public void TestDefault() { - Assert.AreEqual(new string('0', 16), default(PostgresAdvisoryLockKey).ToString()); + Assert.That(default(PostgresAdvisoryLockKey).ToString(), Is.EqualTo(new string('0', 16))); Assert.IsTrue(default(PostgresAdvisoryLockKey).HasSingleKey); - Assert.AreEqual(0, default(PostgresAdvisoryLockKey).Key); + Assert.That(default(PostgresAdvisoryLockKey).Key, Is.EqualTo(0)); AssertEquality(new PostgresAdvisoryLockKey(0), default); } @@ -45,8 +45,8 @@ public void TestInt64Construction() { var key = new PostgresAdvisoryLockKey(1); Assert.IsTrue(key.HasSingleKey); - Assert.AreEqual(1L, key.Key); - Assert.AreEqual("0000000000000001", key.ToString()); + Assert.That(key.Key, Is.EqualTo(1L)); + Assert.That(key.ToString(), Is.EqualTo("0000000000000001")); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); } @@ -55,8 +55,8 @@ public void TestInt32PairConstruction() { var key = new PostgresAdvisoryLockKey(3, -1); Assert.IsFalse(key.HasSingleKey); - Assert.AreEqual((3, -1), key.Keys); - Assert.AreEqual("00000003,ffffffff", key.ToString()); + Assert.That(key.Keys, Is.EqualTo((3, -1))); + Assert.That(key.ToString(), Is.EqualTo("00000003,ffffffff")); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); } @@ -65,7 +65,7 @@ public void TestNameHashing() { var key = new PostgresAdvisoryLockKey(new string('漢', 2 * PostgresAdvisoryLockKey.MaxAsciiLength), allowHashing: true); Assert.IsTrue(key.HasSingleKey); - Assert.AreEqual(-5707277204051710361, key.Key); + Assert.That(key.Key, Is.EqualTo(-5707277204051710361)); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); } @@ -105,33 +105,33 @@ public void TestEquality() private static void AssertInequality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) { - Assert.AreNotEqual(a, b); + Assert.That(b, Is.Not.EqualTo(a)); Assert.IsFalse(a == b); Assert.IsTrue(a != b); - Assert.AreNotEqual(a.GetHashCode(), b.GetHashCode()); + Assert.That(b.GetHashCode(), Is.Not.EqualTo(a.GetHashCode())); if (a.HasSingleKey && b.HasSingleKey) { - Assert.AreNotEqual(a.Key, b.Key); + Assert.That(b.Key, Is.Not.EqualTo(a.Key)); } else if (!a.HasSingleKey && !b.HasSingleKey) { - Assert.AreNotEqual(a.Keys, b.Keys); + Assert.That(b.Keys, Is.Not.EqualTo(a.Keys)); } } private static void AssertEquality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) { - Assert.AreEqual(a, b); + Assert.That(b, Is.EqualTo(a)); Assert.IsTrue(a == b); Assert.IsFalse(a != b); - Assert.AreEqual(a.GetHashCode(), b.GetHashCode()); + Assert.That(b.GetHashCode(), Is.EqualTo(a.GetHashCode())); if (a.HasSingleKey) { - Assert.AreEqual(a.Key, b.Key); + Assert.That(b.Key, Is.EqualTo(a.Key)); } else { - Assert.AreEqual(a.Keys, b.Keys); + Assert.That(b.Keys, Is.EqualTo(a.Keys)); } } @@ -142,8 +142,8 @@ private static PostgresAdvisoryLockKey AssertRoundTrips(string name) var key3 = new PostgresAdvisoryLockKey(name, allowHashing: true); AssertEquality(key1, key2); AssertEquality(key1, key3); - Assert.AreEqual(key1.ToString(), key2.ToString()); - Assert.AreEqual(key1.ToString(), key3.ToString()); + Assert.That(key2.ToString(), Is.EqualTo(key1.ToString())); + Assert.That(key3.ToString(), Is.EqualTo(key1.ToString())); return key1; } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index dd753f8a..3a2e4e70 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -153,7 +153,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() getPidCommand.CommandText = "SELECT pg_backend_pid()"; var pid = (int)(await getPidCommand.ExecuteScalarAsync())!; - Assert.AreEqual(ConnectionState.Open, connection.State); + Assert.That(connection.State, Is.EqualTo(ConnectionState.Open)); // kill the connection from the back end using var killingConnection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); @@ -163,7 +163,7 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() await killCommand.ExecuteNonQueryAsync(); Assert.ThrowsAsync(getPidCommand.ExecuteScalarAsync); - Assert.AreNotEqual(ConnectionState.Open, connection.State); + Assert.That(connection.State, Is.Not.EqualTo(ConnectionState.Open)); Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs index 75367044..f13a3155 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSemaphoreTest.cs @@ -43,7 +43,7 @@ static string ToSafeNameChecked(string name) ToSafeNameChecked(new string('a', 1000)); ToSafeNameChecked(string.Join(string.Empty, Enumerable.Range(0, byte.MaxValue).Select(i => (char)i))); - Assert.AreNotEqual(ToSafeNameChecked(new string('b', 500)), ToSafeNameChecked(new string('b', 499) + "B")); + Assert.That(ToSafeNameChecked(new string('b', 499) + "B"), Is.Not.EqualTo(ToSafeNameChecked(new string('b', 500)))); ToSafeNameChecked(new string('x', 200)).Length.ShouldEqual(115 - 30); diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs index 4db568dd..34950636 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs @@ -32,6 +32,6 @@ public void TestEquality() Assert.IsTrue(connectionA == connectionB); connectionA.GetHashCode().ShouldEqual(connectionB.GetHashCode()); Assert.IsFalse(connectionA == connectionC); - Assert.AreNotEqual(connectionA.GetHashCode(), connectionC.GetHashCode()); + Assert.That(connectionC.GetHashCode(), Is.Not.EqualTo(connectionA.GetHashCode())); } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs index bf0158e2..3654774d 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -15,8 +15,8 @@ public async Task TestSharesConnections() using var connection1 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - Assert.AreNotSame(connection1, connection2); - Assert.AreSame(connection1.ZooKeeper, connection2.ZooKeeper); + Assert.That(connection2, Is.Not.SameAs(connection1)); + Assert.That(connection2.ZooKeeper, Is.SameAs(connection1.ZooKeeper)); connection1.Dispose(); connection2.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); @@ -29,8 +29,8 @@ public async Task TestDoesNotShareDifferentConnections() using var connection1 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(30)), CancellationToken.None); using var connection2 = await pool.ConnectAsync(GetConnectionInfo(connectTimeout: TimeSpan.FromSeconds(20)), CancellationToken.None); - Assert.AreNotSame(connection1, connection2); - Assert.AreNotSame(connection1.ZooKeeper, connection2.ZooKeeper); + Assert.That(connection2, Is.Not.SameAs(connection1)); + Assert.That(connection2.ZooKeeper, Is.Not.SameAs(connection1.ZooKeeper)); } [Test] @@ -46,7 +46,7 @@ public async Task TestConnectionIsClosedAndNotSharedAfterMaxAgeElapses() Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3))); using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - Assert.AreNotSame(zooKeeper1, connection2.ZooKeeper); + Assert.That(connection2.ZooKeeper, Is.Not.SameAs(zooKeeper1)); } [Test] diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index 9d999b93..31109db1 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -82,7 +82,7 @@ public void TestEquality() Assert.IsTrue(paths[i] != paths[j]); Assert.IsFalse(paths[i].Equals(paths[j])); Assert.IsFalse(Equals(paths[i], paths[j])); - Assert.AreNotEqual(paths[i].GetHashCode(), paths[j].GetHashCode()); + Assert.That(paths[j].GetHashCode(), Is.Not.EqualTo(paths[i].GetHashCode())); } } } @@ -93,9 +93,8 @@ public void TestExposesMinimalApi() { var publicMembers = typeof(ZooKeeperPath).GetMembers() .Where(m => m.DeclaringType == typeof(ZooKeeperPath)); - CollectionAssert.AreEquivalent( - new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" }, + Assert.That( publicMembers.Select(m => m.Name) - ); +, Is.EquivalentTo(new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" })); } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs index c9ed849e..4457b240 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperSequentialPathHelperTest.cs @@ -195,7 +195,7 @@ private static async Task TestFilterAndSortHelper( alternatePrefix: "b" ); - CollectionAssert.AreEqual(expectedSequenceNumbers, result.Select(t => t.SequenceNumber)); + Assert.That(result.Select(t => t.SequenceNumber), Is.EqualTo(expectedSequenceNumbers).AsCollection); foreach (var info in result) { info.Path.ShouldEqual($"{parentNode}/{MakeName(info.Prefix, info.SequenceNumber)}"); diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 5d05f889..7ec709b7 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,573 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", - "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", - "dependencies": { - "Microsoft.Identity.Client": "4.56.0", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", - "DistributedLock.FileSystem": "[1.0.2, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", - "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "StackExchange.Redis": "[2.7.27, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", - "dependencies": { - "Azure.Identity": "1.10.3", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -603,6 +36,12 @@ "NETStandard.Library": "2.0.0" } }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, "NUnit3TestAdapter": { "type": "Direct", "requested": "[4.5.0, )", From b0174ff61dbb4bb32465dec3fc6ef03e3877146d Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 31 Mar 2024 11:59:19 -0400 Subject: [PATCH 266/399] Add NUnit.Analyzers to CodeGen and fix classic assertions whose severities were info --- .../Data/ConnectionStringStrategyTestCases.cs | 4 +- ...onnectionOrTransactionStrategyTestCases.cs | 12 ++-- .../ExternalTransactionStrategyTestCases.cs | 8 +-- ...MultiplexingConnectionStrategyTestCases.cs | 4 +- .../DistributedLockCoreTestCases.cs | 60 +++++++++---------- ...istributedReaderWriterLockCoreTestCases.cs | 22 +++---- ...pgradeableReaderWriterLockCoreTestCases.cs | 16 ++--- .../Redis/RedisExtensionTestCases.cs | 4 +- .../RedisSynchronizationCoreTestCases.cs | 18 +++--- .../ZooKeeperSynchronizationCoreTestCases.cs | 10 ++-- .../Redis/TestingRedisDatabaseProvider.cs | 2 +- src/DistributedLock.Tests/Tests/ApiTest.cs | 30 +++++----- .../Tests/Azure/AzureBehaviorTest.cs | 6 +- .../AzureBlobLeaseDistributedLockTest.cs | 16 ++--- ...eDistributedSynchronizationProviderTest.cs | 2 +- .../Azure/AzureBlobLeaseOptionsBuilderTest.cs | 2 +- .../Tests/Core/Data/DatabaseConnectionTest.cs | 4 +- .../Tests/Core/HelpersTest.cs | 4 +- .../Tests/Core/InternalVisibilityTest.cs | 4 +- .../Tests/Core/TimeoutValueTest.cs | 32 +++++----- .../FileSystem/FileDistributedLockTest.cs | 16 ++--- .../FileDistributedLockWindowsTest.cs | 4 +- ...eDistributedSynchronizationProviderTest.cs | 2 +- .../MySqlConnectionOptionsBuilderTest.cs | 2 +- ...lDistributedSynchronizationProviderTest.cs | 2 +- .../OracleConnectionOptionsBuilderTest.cs | 2 +- ...eDistributedSynchronizationProviderTest.cs | 10 ++-- .../Postgres/PostgresAdvisoryLockKeyTest.cs | 22 +++---- .../Tests/Postgres/PostgresBehaviorTest.cs | 10 ++-- .../PostgresConnectionOptionsBuilderTest.cs | 10 ++-- .../Postgres/PostgresDistributedLockTest.cs | 6 +- ...sDistributedSynchronizationProviderTest.cs | 4 +- .../RedisDistributedReaderWriterLockTest.cs | 6 +- ...sDistributedSynchronizationProviderTest.cs | 8 +-- .../Tests/Redis/RedisLibraryTest.cs | 2 +- .../SqlConnectionOptionsBuilderTest.cs | 8 +-- .../SqlServer/SqlDatabaseConnectionTest.cs | 4 +- ...lDistributedSynchronizationProviderTest.cs | 8 +-- .../Tests/TestSetupTest.cs | 2 +- .../EventWaitHandleDistributedLockTest.cs | 2 +- .../WaitHandleDistributedSemaphoreTest.cs | 8 +-- ...eDistributedSynchronizationProviderTest.cs | 6 +- .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 10 ++-- .../ZooKeeper/ZooKeeperConnectionInfoTest.cs | 4 +- .../ZooKeeper/ZooKeeperConnectionTest.cs | 8 +-- ...rDistributedSynchronizationProviderTest.cs | 16 ++--- .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 16 ++--- .../DistributedLockCodeGen.csproj | 6 +- .../DocCommentGenerator.cs | 2 +- ...GenerateIDistributedLockImplementations.cs | 4 +- .../GenerateProviders.cs | 2 +- src/DistributedLockCodeGen/packages.lock.json | 6 ++ 52 files changed, 244 insertions(+), 234 deletions(-) diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs index 9807af48..e9cc4ce5 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ConnectionStringStrategyTestCases.cs @@ -34,7 +34,7 @@ public void TestConnectionDoesNotLeak() this._lockProvider.Strategy.Db.CountActiveSessions(applicationName).ShouldEqual(1, this.GetType().Name); } // still alive due to pooling, except in Oracle where the application name (client info) is not part of the pool key - Assert.LessOrEqual(this._lockProvider.Strategy.Db.CountActiveSessions(applicationName), 1, this.GetType().Name); + Assert.That(this._lockProvider.Strategy.Db.CountActiveSessions(applicationName), Is.LessThanOrEqualTo(1), this.GetType().Name); } using (var connection = this._lockProvider.Strategy.Db.CreateConnection()) @@ -110,7 +110,7 @@ public async Task TestAccessingHandleLostTokenWhileKeepaliveActiveDoesNotBlock() handle.HandleLostToken.Register(() => { }); } }); - Assert.IsTrue(await accessHandleLostTokenTask.TryWaitAsync(TimeSpan.FromSeconds(5))); + Assert.That(await accessHandleLostTokenTask.TryWaitAsync(TimeSpan.FromSeconds(5)), Is.True); // do this only on success; on failure we're likely deadlocked and dispose will hang await handle.DisposeAsync(); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index 538c04b8..7a6d1e37 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -45,14 +45,14 @@ Task RunDeadlockAsync(bool isFirst) Task.WhenAll(tasks).ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); // MariaDB fails both tasks due to deadlock instead of just picking a single victim - Assert.GreaterOrEqual(tasks.Count(t => t.IsFaulted), 1); - Assert.LessOrEqual(tasks.Count(t => t.Status == TaskStatus.RanToCompletion), 1); - Assert.IsEmpty(tasks.Where(t => t.IsCanceled)); + Assert.That(tasks.Count(t => t.IsFaulted), Is.GreaterThanOrEqualTo(1)); + Assert.That(tasks.Count(t => t.Status == TaskStatus.RanToCompletion), Is.LessThanOrEqualTo(1)); + Assert.That(tasks.Where(t => t.IsCanceled), Is.Empty); foreach (var deadlockVictim in tasks.Where(t => t.IsFaulted)) { - Assert.IsInstanceOf(deadlockVictim.Exception!.GetBaseException()); // backwards compat check - Assert.IsInstanceOf(deadlockVictim.Exception.GetBaseException()); + Assert.That(deadlockVictim.Exception!.GetBaseException(), Is.InstanceOf()); // backwards compat check + Assert.That(deadlockVictim.Exception.GetBaseException(), Is.InstanceOf()); } } @@ -81,7 +81,7 @@ public void TestStateChangeHandlerIsNotLeaked() using (@lock.Acquire()) { - Assert.IsNotNull(GetStateChanged(this._lockProvider.Strategy.AmbientConnection!)); + Assert.That(GetStateChanged(this._lockProvider.Strategy.AmbientConnection!), Is.Not.Null); } GetStateChanged(this._lockProvider.Strategy.AmbientConnection!).ShouldEqual(initialHandler); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs index b596f1ef..ea4595a3 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalTransactionStrategyTestCases.cs @@ -21,7 +21,7 @@ public void TestScopedToTransactionOnly() var ambientTransactionLock = this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)); using (ambientTransactionLock.Acquire()) { - Assert.IsTrue(this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)).IsHeld()); + Assert.That(this._lockProvider.CreateLock(nameof(TestScopedToTransactionOnly)).IsHeld(), Is.True); // create a lock of the same type on the underlying connection of the ambient transaction using dynamic specificConnectionProvider = Activator.CreateInstance( @@ -70,7 +70,7 @@ public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] boo var ambientTransactionLock = this._lockProvider.CreateLock(lockName); using var handle = ambientTransactionLock.Acquire(); - Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); + Assert.That(nonAmbientTransactionLock.IsHeld(), Is.True); if (closeConnection) { @@ -83,7 +83,7 @@ public void TestCloseTransactionLockOnClosedConnectionOrTransaction([Values] boo Assert.DoesNotThrow(handle.Dispose); // now lock can be re-acquired - Assert.IsFalse(nonAmbientTransactionLock.IsHeld()); + Assert.That(nonAmbientTransactionLock.IsHeld(), Is.False); } [Test] @@ -107,7 +107,7 @@ private void TestLockOnCompletedTransactionHelper(Action complete var ambientTransactionLock = this._lockProvider.CreateLock(lockName); using var handle = ambientTransactionLock.Acquire(); - Assert.IsTrue(nonAmbientTransactionLock.IsHeld()); + Assert.That(nonAmbientTransactionLock.IsHeld(), Is.True); complete(this._lockProvider.Strategy.AmbientTransaction!); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index 00a99344..d226de6d 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -49,7 +49,7 @@ private WeakReference TestCleanupHelper(IDistributedLock lock1, IDistributedLock { var handle = lock1.Acquire(); - Assert.IsNull(lock2.TryAcquireAsync().Result); + Assert.That(lock2.TryAcquireAsync().Result, Is.Null); return new WeakReference(handle); } @@ -114,7 +114,7 @@ async Task Test() } }; - Assert.IsTrue(Task.Run(Test).Wait(Debugger.IsAttached ? TimeSpan.FromMinutes(10) : TimeSpan.FromSeconds(10))); + Assert.That(Task.Run(Test).Wait(Debugger.IsAttached ? TimeSpan.FromMinutes(10) : TimeSpan.FromSeconds(10)), Is.True); string MakeLockName(int i) => $"{nameof(TestHighConcurrencyWithSmallPool)}_{i}"; } diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 708ade9c..66920ba1 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -32,20 +32,20 @@ public void BasicTest() using (var handle = @lock.TryAcquire()) { - Assert.IsNotNull(handle, this.GetType() + ": should be able to acquire new lock"); + Assert.That(handle, Is.Not.Null, this.GetType() + ": should be able to acquire new lock"); using (var nestedHandle = @lock.TryAcquire()) { - Assert.IsNull(nestedHandle, "should not be reentrant"); + Assert.That(nestedHandle, Is.Null, "should not be reentrant"); } using var nestedHandle2 = lock2.TryAcquire(); - Assert.IsNotNull(nestedHandle2, this.GetType() + ": should be able to acquire a different lock"); + Assert.That(nestedHandle2, Is.Not.Null, this.GetType() + ": should be able to acquire a different lock"); } using (var handle = @lock.TryAcquire()) { - Assert.IsNotNull(handle, this.GetType() + ": should be able to re-acquire after releasing"); + Assert.That(handle, Is.Not.Null, this.GetType() + ": should be able to re-acquire after releasing"); } } @@ -60,20 +60,20 @@ public async Task BasicAsyncTest() await using (var handle = await @lock.TryAcquireAsync()) { - Assert.IsNotNull(handle, this.GetType().Name); + Assert.That(handle, Is.Not.Null, this.GetType().Name); using (var nestedHandle = await @lock.TryAcquireAsync()) { - Assert.IsNull(nestedHandle, this.GetType().Name); + Assert.That(nestedHandle, Is.Null, this.GetType().Name); } await using var nestedHandle2 = lock2.TryAcquireAsync().AsTask().Result; - Assert.IsNotNull(nestedHandle2, this.GetType().Name); + Assert.That(nestedHandle2, Is.Not.Null, this.GetType().Name); } await using (var handle = await @lock.TryAcquireAsync()) { - Assert.IsNotNull(handle, this.GetType().Name); + Assert.That(handle, Is.Not.Null, this.GetType().Name); } } @@ -96,7 +96,7 @@ public void TestDisposeHandleIsIdempotent() { var @lock = this._lockProvider.CreateLock(nameof(TestDisposeHandleIsIdempotent)); var handle = @lock.Acquire(TimeSpan.FromSeconds(30)); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); handle.Dispose(); var handle2 = @lock.Acquire(TimeSpan.FromSeconds(30)); Assert.DoesNotThrow(handle.Dispose); @@ -119,11 +119,11 @@ public void TestTimeouts() var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire"); - Assert.IsInstanceOf(syncAcquireTask.Exception?.InnerException, "sync acquire"); + Assert.That(syncAcquireTask.Exception?.InnerException, Is.InstanceOf(), "sync acquire"); var asyncAcquireTask = @lock.AcquireAsync(timeout).AsTask(); asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire"); - Assert.IsInstanceOf(asyncAcquireTask.Exception!.InnerException, "async acquire"); + Assert.That(asyncAcquireTask.Exception!.InnerException, Is.InstanceOf(), "async acquire"); var syncTryAcquireTask = Task.Run(() => @lock.TryAcquire(timeout)); syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire"); @@ -255,14 +255,14 @@ public async Task TestLockNamesAreCaseSensitive() await using (await this._lockProvider.CreateLockWithExactName(lowerName).AcquireAsync()) await using (var handle = await this._lockProvider.CreateLockWithExactName(upperName).TryAcquireAsync()) { - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } } else { // otherwise, check that the names still contain the suffixes we added - Assert.IsTrue(lowerName.IndexOf(lowerBaseName, StringComparison.OrdinalIgnoreCase) >= 0); - Assert.IsTrue(upperName.IndexOf(upperBaseName, StringComparison.OrdinalIgnoreCase) >= 0); + Assert.That(lowerName.IndexOf(lowerBaseName, StringComparison.OrdinalIgnoreCase) >= 0, Is.True); + Assert.That(upperName.IndexOf(upperBaseName, StringComparison.OrdinalIgnoreCase) >= 0, Is.True); } } @@ -301,19 +301,19 @@ public async Task TestHandleLostTriggersCorrectly() try { handle.HandleLostToken.CanBeCanceled.ShouldEqual(handleLostHelper != null); - Assert.IsFalse(handle.HandleLostToken.IsCancellationRequested); + Assert.That(handle.HandleLostToken.IsCancellationRequested, Is.False); if (handleLostHelper != null) { using var canceledEvent = new ManualResetEventSlim(initialState: false); using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(.05)), Is.False); handleLostHelper.Dispose(); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); - Assert.IsTrue(handle.HandleLostToken.IsCancellationRequested); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(10)), Is.True); + Assert.That(handle.HandleLostToken.IsCancellationRequested, Is.True); } } finally @@ -344,7 +344,7 @@ public async Task TestHandleLostReturnsAlreadyCanceledIfHandleAlreadyLost() using var canceledEvent = new ManualResetEventSlim(initialState: false); handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(5))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(5)), Is.True); // when the handle is lost, Dispose() may throw try { handle.Dispose(); } @@ -361,7 +361,7 @@ public void TestCanSafelyDisposeWhileMonitoring() // force monitoring to happen using var canceledEvent = new ManualResetEventSlim(initialState: false); using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(.05)), Is.False); Assert.DoesNotThrow(handle.Dispose); } @@ -383,7 +383,7 @@ public async Task TestLockAbandonment() this._lockProvider.Strategy.PerformAdditionalCleanupForHandleAbandonment(); using var handle = this._lockProvider.CreateLock(LockName).TryAcquire(); - Assert.IsNotNull(handle, this.GetType().Name); + Assert.That(handle, Is.Not.Null, this.GetType().Name); } [Test] @@ -391,8 +391,8 @@ public void TestCrossProcess() { var lockName = this._lockProvider.GetUniqueSafeName(); var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), lockName); - Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); - Assert.IsFalse(command.Task.Wait(TimeSpan.FromSeconds(.1))); + Assert.That(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10)), Is.True); + Assert.That(command.Task.Wait(TimeSpan.FromSeconds(.1)), Is.False); var @lock = this._lockProvider.CreateLockWithExactName(lockName); @lock.TryAcquire().ShouldEqual(null, this.GetType().Name); @@ -401,9 +401,9 @@ public void TestCrossProcess() command.StandardInput.Flush(); using var handle = @lock.TryAcquire(TimeSpan.FromSeconds(10)); - Assert.IsNotNull(handle, this.GetType().Name); + Assert.That(handle, Is.Not.Null, this.GetType().Name); - Assert.IsTrue(command.Task.Wait(TimeSpan.FromSeconds(10))); + Assert.That(command.Task.Wait(TimeSpan.FromSeconds(10)), Is.True); } [Test] @@ -422,8 +422,8 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) { var name = this._lockProvider.GetUniqueSafeName($"cpl-{asyncWait}-{kill}"); var command = this.RunLockTaker(this._lockProvider, this._lockProvider.GetCrossProcessLockType(), name); - Assert.IsTrue(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10))); - Assert.IsFalse(command.Task.IsCompleted); + Assert.That(command.StandardOutput.ReadLineAsync().Wait(TimeSpan.FromSeconds(10)), Is.True); + Assert.That(command.Task.IsCompleted, Is.False); var @lock = this._lockProvider.CreateLockWithExactName(name); @@ -443,16 +443,16 @@ private void CrossProcessAbandonmentHelper(bool asyncWait, bool kill) command.StandardInput.Flush(); } // make sure it actually exits - Assert.IsTrue(command.Task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), "lock taker should exit"); + Assert.That(command.Task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), Is.True, "lock taker should exit"); if (this._lockProvider.SupportsCrossProcessAbandonment) { using var handle = acquireTask.Result; - Assert.IsNotNull(handle, this.GetType().Name); + Assert.That(handle, Is.Not.Null, this.GetType().Name); } else { - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromSeconds(1))); + Assert.That(acquireTask.Wait(TimeSpan.FromSeconds(1)), Is.False); } } diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs index 22e3b862..fcfb8686 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedReaderWriterLockCoreTestCases.cs @@ -18,30 +18,30 @@ IDistributedReaderWriterLock Lock() => this._lockProvider.CreateReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); using var readHandle1 = await Lock().TryAcquireReadLockAsync(); - Assert.IsNotNull(readHandle1, this.GetType().ToString()); + Assert.That(readHandle1, Is.Not.Null, this.GetType().ToString()); using var readHandle2 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle2, this.GetType().ToString()); + Assert.That(readHandle2, Is.Not.Null, this.GetType().ToString()); using var writeHandle1 = Lock().TryAcquireWriteLock(); - Assert.IsNull(writeHandle1); + Assert.That(writeHandle1, Is.Null); var writeHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); - Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(writeHandleTask.Wait(TimeSpan.FromSeconds(.05)), Is.False); readHandle1!.Dispose(); - Assert.IsFalse(writeHandleTask.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(writeHandleTask.Wait(TimeSpan.FromSeconds(.05)), Is.False); readHandle2!.Dispose(); - Assert.IsTrue(writeHandleTask.Wait(TimeSpan.FromSeconds(10))); + Assert.That(writeHandleTask.Wait(TimeSpan.FromSeconds(10)), Is.True); using var writeHandle2 = writeHandleTask.Result; using var writeHandle3 = Lock().TryAcquireWriteLock(); - Assert.IsNull(writeHandle3); + Assert.That(writeHandle3, Is.Null); writeHandle2.Dispose(); using var writeHandle4 = Lock().TryAcquireWriteLock(); - Assert.IsNotNull(writeHandle4); + Assert.That(writeHandle4, Is.Not.Null); } [Test] @@ -53,15 +53,15 @@ IDistributedReaderWriterLock Lock() => await using var readerHandle = await Lock().AcquireReadLockAsync(); var writerHandleTask = Task.Run(() => Lock().AcquireWriteLockAsync().AsTask()); - Assert.IsFalse(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(0.2))); + Assert.That(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(0.2)), Is.False); // trying to take a read lock here fails because there is a writer waiting await using var readerHandle2 = await Lock().TryAcquireReadLockAsync(); - Assert.IsNull(readerHandle2); + Assert.That(readerHandle2, Is.Null); await readerHandle.DisposeAsync(); - Assert.IsTrue(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); + Assert.That(await writerHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5)), Is.True); await writerHandleTask.Result.DisposeAsync(); } diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs index ae207b6d..dd316422 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedUpgradeableReaderWriterLockCoreTestCases.cs @@ -18,16 +18,16 @@ IDistributedUpgradeableReaderWriterLock Lock() => this._lockProvider.CreateUpgradeableReaderWriterLock(nameof(TestMultipleReadersSingleWriter)); using var readHandle1 = Lock().TryAcquireReadLockAsync().AsTask().Result; - Assert.IsNotNull(readHandle1, this.GetType().ToString()); + Assert.That(readHandle1, Is.Not.Null, this.GetType().ToString()); using var readHandle2 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle2, this.GetType().ToString()); + Assert.That(readHandle2, Is.Not.Null, this.GetType().ToString()); using (var handle = Lock().TryAcquireUpgradeableReadLock()) { - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); using var readHandle3 = Lock().TryAcquireReadLock(); - Assert.IsNotNull(readHandle3); + Assert.That(readHandle3, Is.Not.Null); Lock().TryAcquireUpgradeableReadLock().ShouldEqual(null); Lock().TryAcquireWriteLock().ShouldEqual(null); @@ -39,7 +39,7 @@ IDistributedUpgradeableReaderWriterLock Lock() => readHandle2!.Dispose(); using var upgradeHandle = Lock().TryAcquireUpgradeableReadLock(); - Assert.IsNotNull(upgradeHandle); + Assert.That(upgradeHandle, Is.Not.Null); } [Test] @@ -127,16 +127,16 @@ public async Task TestCanUpgradeHandleWhileMonitoring() // start monitoring using var canceledEvent = new ManualResetEventSlim(initialState: false); using var registration = handle.HandleLostToken.Register(canceledEvent.Set); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(.05)), Is.False); Assert.DoesNotThrowAsync(() => handle.UpgradeToWriteLockAsync().AsTask()); - Assert.IsFalse(canceledEvent.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(.05)), Is.False); if (handleLostHelper != null) { handleLostHelper.Dispose(); - Assert.IsTrue(canceledEvent.Wait(TimeSpan.FromSeconds(10))); + Assert.That(canceledEvent.Wait(TimeSpan.FromSeconds(10)), Is.True); } // when the handle is lost, Dispose() may throw diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs index eae06598..913fb918 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisExtensionTestCases.cs @@ -25,10 +25,10 @@ public async Task TestCanExtendLock() var secondHandleTask = @lock.AcquireAsync().AsTask(); _ = secondHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(2))); + Assert.That(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(2)), Is.False); await handle.DisposeAsync(); - Assert.IsTrue(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); + Assert.That(await secondHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5)), Is.True); } } diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 16b4c90d..1cc53335 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -52,7 +52,7 @@ public async Task TestMajorityHangingDatabasesCauseAcquireToFail() this._provider.Strategy.SetOptions(o => o.MinValidityTime(RedisDistributedSynchronizationOptionsBuilder.DefaultExpiry.TimeSpan - TimeSpan.FromSeconds(.2))); var @lock = this._provider.CreateLock("lock"); - Assert.IsNull(await @lock.TryAcquireAsync()); + Assert.That(await @lock.TryAcquireAsync(), Is.Null); @event.Set(); // just to free the waiting threads } @@ -67,7 +67,7 @@ public void TestMajorityFaultingDatabasesCauseReleaseToThrow() new List { 1, 2, 4 }.ForEach(i => MockDatabase(databases[i], () => throw new DataMisalignedException())); var aggregateException = Assert.Throws(() => handle.Dispose())!; - Assert.IsInstanceOf(aggregateException.InnerException); + Assert.That(aggregateException.InnerException, Is.InstanceOf()); } [Test] @@ -93,7 +93,7 @@ public async Task TestAcquireFailsIfItTakesTooLong([Values] bool synchronous) var @lock = this._provider.CreateLock("lock"); // single sync acquire has different timeout logic, so we test it separately - Assert.IsNull(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync()); + Assert.That(synchronous ? @lock.TryAcquire() : await @lock.TryAcquireAsync(), Is.Null); } [Test] @@ -108,14 +108,14 @@ public async Task TestFailedAcquireReleasesWhatHasAlreadyBeenAcquired() var @lock = this._provider.CreateLock("lock"); var acquireTask = @lock.TryAcquireAsync().AsTask(); - Assert.IsFalse(acquireTask.Wait(TimeSpan.FromMilliseconds(50))); + Assert.That(acquireTask.Wait(TimeSpan.FromMilliseconds(50)), Is.False); @event.Set(); - Assert.IsNull(await acquireTask); + Assert.That(await acquireTask, Is.Null); this._provider.Strategy.DatabaseProvider.Databases = new[] { RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase() }; var singleDatabaseLock = this._provider.CreateLock("lock"); using var handle = await singleDatabaseLock.TryAcquireAsync(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } [Test] @@ -129,11 +129,11 @@ public void TestAcquireWithLockPrefix() var explicitPrefixLock = this._provider.CreateLock("PN"); using var implicitPrefixHandle = implicitPrefixLock.TryAcquire(); - Assert.IsNotNull(implicitPrefixHandle); + Assert.That(implicitPrefixHandle, Is.Not.Null); using var noPrefixHandle = noPrefixLock.TryAcquire(); - Assert.IsNotNull(noPrefixHandle); + Assert.That(noPrefixHandle, Is.Not.Null); using var explicitPrefixHandle = explicitPrefixLock.TryAcquire(); - Assert.IsNull(explicitPrefixHandle); + Assert.That(explicitPrefixHandle, Is.Null); static IDatabase CreateDatabase(string? keyPrefix = null) { diff --git a/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs index 6369d60a..b6aa6426 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/ZooKeeper/ZooKeeperSynchronizationCoreTestCases.cs @@ -48,10 +48,10 @@ public async Task TestDoesNotAttemptToCreateOrDeleteExistingNode() { await using (var handle = await @lock.TryAcquireAsync()) { - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(path.ToString())); + Assert.That(await connection.ZooKeeper.existsAsync(path.ToString()), Is.Not.Null); } finally { @@ -128,7 +128,7 @@ public async Task TestInvalidAclDoesNotCorruptStore() Assert.ThrowsAsync(() => invalidAclLock.AcquireAsync().AsTask()); - Assert.IsNull(await connection.ZooKeeper.existsAsync(invalidAclLock.Name)); + Assert.That(await connection.ZooKeeper.existsAsync(invalidAclLock.Name), Is.Null); this._provider.Strategy.Options = null; var validLock = this._provider.CreateLock(string.Empty); @@ -155,10 +155,10 @@ public async Task TestDeepDirectoryCreation() await using (await @lock.AcquireAsync()) { - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString())); + Assert.That(await connection.ZooKeeper.existsAsync(directory.ToString()), Is.Not.Null); } - Assert.IsNotNull(await connection.ZooKeeper.existsAsync(directory.ToString()), "directory still exists"); + Assert.That(await connection.ZooKeeper.existsAsync(directory.ToString()), Is.Not.Null, "directory still exists"); } [Test] diff --git a/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs index 92a00ff3..875ec6c5 100644 --- a/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisDatabaseProvider.cs @@ -51,7 +51,7 @@ static TestingRedis2x1DatabaseProvider() DeadDatabase = server.Multiplexer.GetDatabase(); using var process = Process.GetProcessById(server.ProcessId); server.Multiplexer.GetServer($"localhost:{server.Port}").Shutdown(ShutdownMode.Never); - Assert.IsTrue(process.WaitForExit(5000)); + Assert.That(process.WaitForExit(5000), Is.True); } public TestingRedis2x1DatabaseProvider() diff --git a/src/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs index dc02aa47..a38152b9 100644 --- a/src/DistributedLock.Tests/Tests/ApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ApiTest.cs @@ -31,14 +31,14 @@ public void TestPublicApisAreSealed(AssemblyName assemblyName) { if (!type.IsAbstract) { - Assert.IsTrue(type.IsSealed, $"{type} should be sealed"); + Assert.That(type.IsSealed, Is.True, $"{type} should be sealed"); } else { - Assert.IsEmpty( + Assert.That( type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)) - ); +, Is.Empty); } } } @@ -73,14 +73,14 @@ public void TestPublicHandleTypesDoNotHaveVisibleConstructors(AssemblyName assem var publicHandleTypes = GetPublicTypes(Assembly.Load(assemblyName)) .Where(t => typeof(IDistributedSynchronizationHandle).IsAssignableFrom(t)) .ToArray(); - Assert.IsNotEmpty(publicHandleTypes); // sanity check + Assert.That(publicHandleTypes, Is.Not.Empty); // sanity check foreach (var publicHandleType in publicHandleTypes) { - Assert.IsEmpty( + Assert.That( publicHandleType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly) - ); +, Is.Empty); } } @@ -89,7 +89,7 @@ public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) { var projectDirectory = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(CurrentFilePath())!, "..", "..", assemblyName.Name!)); var codeFiles = Directory.GetFiles(projectDirectory, "*.cs", SearchOption.AllDirectories); - Assert.IsNotEmpty(codeFiles); + Assert.That(codeFiles, Is.Not.Empty); var awaitRegex = new Regex(@"//.*|(?\bawait\s)"); var configureAwaitRegex = new Regex(@"\.ConfigureAwait\(false\)|\.TryAwait\(\)"); @@ -98,7 +98,7 @@ public void TestLibrariesUseConfigureAwaitFalse(AssemblyName assemblyName) var code = File.ReadAllText(codeFile); var awaitCount = awaitRegex.Matches(code).Cast().Count(m => m.Groups["await"].Success); var configureAwaitCount = configureAwaitRegex.Matches(code).Count; - Assert.IsTrue(configureAwaitCount >= awaitCount, $"ConfigureAwait(false) count ({configureAwaitCount}) < await count ({awaitCount}) in {codeFile}"); + Assert.That(configureAwaitCount >= awaitCount, Is.True, $"ConfigureAwait(false) count ({configureAwaitCount}) < await count ({awaitCount}) in {codeFile}"); } } @@ -109,10 +109,10 @@ public void TestLibraryFilesDoNotWriteToConsole() var solutionDirectory = Path.GetDirectoryName(projectDirectory!); var libraryCsFiles = Directory.GetFiles(solutionDirectory!, "*.cs", SearchOption.AllDirectories) .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); - Assert.IsEmpty( + Assert.That( libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) .Select(Path.GetFileName) - ); +, Is.Empty); } [TestCaseSource(nameof(DistributedLockAssemblies))] @@ -122,10 +122,10 @@ public void TestInternalNamedMembersAreInternal(AssemblyName assemblyName) var publicTypes = GetPublicTypes(assembly); foreach (var publicType in publicTypes) { - Assert.IsEmpty( + Assert.That( publicType.GetMembers(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance) .Where(m => m.Name.Contains("Internal")) - ); +, Is.Empty); } } @@ -136,8 +136,8 @@ public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) var publicTypes = GetPublicTypes(assembly); foreach (var publicType in publicTypes) { - Assert.IsNull(publicType.GetMethod("GetSafeName", BindingFlags.Public | BindingFlags.Static)); - Assert.IsNull(publicType.GetProperty("MaxNameLength", BindingFlags.Public | BindingFlags.Static)); + Assert.That(publicType.GetMethod("GetSafeName", BindingFlags.Public | BindingFlags.Static), Is.Null); + Assert.That(publicType.GetProperty("MaxNameLength", BindingFlags.Public | BindingFlags.Static), Is.Null); } } @@ -145,7 +145,7 @@ public void TestLegacyGetSafeNameApisAreRemoved(AssemblyName assemblyName) public void TestAssemblyVersioning(AssemblyName assemblyName) { var assembly = Assembly.Load(assemblyName); - Assert.IsNotNull(assembly.GetName().GetPublicKeyToken(), "Should be signed"); + Assert.That(assembly.GetName().GetPublicKeyToken(), Is.Not.Null, "Should be signed"); // scheme based on https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/ var version = assembly.GetName().Version; diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs index 8dbe0f59..398ac9d6 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBehaviorTest.cs @@ -30,12 +30,12 @@ public void TestSlashEquivalence() var name = Guid.NewGuid() + "/a"; var blobClient1 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name); - Assert.IsFalse(blobClient1.Exists()); + Assert.That((bool)blobClient1.Exists(), Is.False); blobClient1.Upload(Stream.Null); - Assert.IsTrue(blobClient1.Exists()); + Assert.That((bool)blobClient1.Exists(), Is.True); var blobClient2 = new BlobClient(AzureCredentials.ConnectionString, AzureCredentials.DefaultBlobContainerName, name.Replace('/', '\\')); - Assert.IsTrue(blobClient2.Exists()); + Assert.That((bool)blobClient2.Exists(), Is.True); } [Test] diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs index 9abc3efb..409e475d 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedLockTest.cs @@ -62,9 +62,9 @@ async ValueTask TestAsync() var @lock = new AzureBlobLeaseDistributedLock(client); await using var handle = await @lock.TryAcquireAsync(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); await using var nestedHandle = await @lock.TryAcquireAsync(); - Assert.IsNull(nestedHandle); + Assert.That(nestedHandle, Is.Null); } } @@ -88,11 +88,11 @@ public async Task TestWrapperCreateIfNotExists([Values] BlobClientType type) } await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None); - Assert.IsTrue((await client.ExistsAsync()).Value); + Assert.That((await client.ExistsAsync()).Value, Is.True); Assert.That((await client.GetPropertiesAsync()).Value.Metadata, Is.EqualTo(metadata).AsCollection); Assert.DoesNotThrowAsync(async () => await wrapper.CreateIfNotExistsAsync(metadata, CancellationToken.None)); - Assert.IsTrue((await client.ExistsAsync()).Value); + Assert.That((await client.ExistsAsync()).Value, Is.True); } [Test] @@ -147,7 +147,7 @@ public void TestCanAcquireIfContainerLeased() var @lock = provider.CreateLock(nameof(TestCanAcquireIfContainerLeased)); using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } finally { @@ -181,7 +181,7 @@ public void TestTriggersHandleLostIfLeaseExpiresNaturally() using var registration = handle.HandleLostToken.Register(@event.Set); using var faultingRegistration = handle.HandleLostToken.Register(() => throw new TimeZoneNotFoundException()); - Assert.IsTrue(@event.Wait(TimeSpan.FromSeconds(15.1))); + Assert.That(@event.Wait(TimeSpan.FromSeconds(15.1)), Is.True); Assert.Throws(handle.Dispose)! .ErrorCode.ShouldEqual("LeaseNotPresentWithBlobOperation"); @@ -197,10 +197,10 @@ public void TestExitsDespiteLongSleepTime() using var handle1 = @lock.Acquire(); var handle2Task = @lock.TryAcquireAsync(TimeSpan.FromSeconds(2)).AsTask(); - Assert.IsFalse(handle2Task.Wait(TimeSpan.FromSeconds(.05))); + Assert.That(handle2Task.Wait(TimeSpan.FromSeconds(.05)), Is.False); handle1.Dispose(); - Assert.IsTrue(handle2Task.Wait(TimeSpan.FromSeconds(5))); + Assert.That(handle2Task.Wait(TimeSpan.FromSeconds(5)), Is.True); } private static BlobBaseClient CreateClient([Values] BlobClientType type, string name) => type switch diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs index e8205b84..9a13cbd7 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseDistributedSynchronizationProviderTest.cs @@ -22,7 +22,7 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs index fa55f33d..e062ad3f 100644 --- a/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/Azure/AzureBlobLeaseOptionsBuilderTest.cs @@ -55,6 +55,6 @@ public void TestValidatesBusyWaitSleepTime() public void TestDisablesAutoRenewalIfDurationIsInfinite() { var options = AzureBlobLeaseOptionsBuilder.GetOptions(b => b.Duration(Timeout.InfiniteTimeSpan)); - Assert.IsTrue(options.renewalCadence.IsInfinite); + Assert.That(options.renewalCadence.IsInfinite, Is.True); } } diff --git a/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs index 0122d1ea..ec2cf92d 100644 --- a/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs @@ -22,8 +22,8 @@ public async Task TestConnectionMonitorStaysSubscribedAfterClose() await connection.OpenAsync(CancellationToken.None); using var handle = connection.ConnectionMonitor.GetMonitoringHandle(); - Assert.IsFalse(handle.ConnectionLostToken.IsCancellationRequested); + Assert.That(handle.ConnectionLostToken.IsCancellationRequested, Is.False); await db.KillSessionsAsync(db.ApplicationName, idleSince: null); - Assert.IsTrue(await TestHelper.WaitForAsync(() => new(handle.ConnectionLostToken.IsCancellationRequested), timeout: TimeSpan.FromSeconds(5))); + Assert.That(await TestHelper.WaitForAsync(() => new(handle.ConnectionLostToken.IsCancellationRequested), timeout: TimeSpan.FromSeconds(5)), Is.True); } } diff --git a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs index a2ca3b44..abd79610 100644 --- a/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/HelpersTest.cs @@ -23,11 +23,11 @@ public void TestSafeCreateTaskPassesThroughSafeTasks() public void TestSafeCreateTaskReturnsCaughtExceptionAsFaultedTask() { var safeTask = Helpers.SafeCreateTask(state => GetTask(state), "m1"); - Assert.IsInstanceOf(safeTask.Exception!.InnerException); + Assert.That(safeTask.Exception!.InnerException, Is.InstanceOf()); safeTask.Exception.InnerException!.Message.ShouldEqual("m1"); var safeNonGenericTask = Helpers.SafeCreateTask(state => GetTask(state), "m2"); - Assert.IsInstanceOf(safeNonGenericTask.Exception!.InnerException); + Assert.That(safeNonGenericTask.Exception!.InnerException, Is.InstanceOf()); safeNonGenericTask.Exception.InnerException!.Message.ShouldEqual("m2"); static Task GetTask(string message) => throw new TimeZoneNotFoundException(message); diff --git a/src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs b/src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs index 0f9c4907..d068e000 100644 --- a/src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/InternalVisibilityTest.cs @@ -11,10 +11,10 @@ public void TestInternalNamespaceMethodsHaveCorrectVisibility() var internalNamespaceTypes = typeof(IDistributedLock).Assembly.GetTypes() .Where(t => t.Namespace?.Contains(".Internal") ?? false) .ToList(); - Assert.IsNotEmpty(internalNamespaceTypes); + Assert.That(internalNamespaceTypes, Is.Not.Empty); #if !DEBUG - Assert.IsEmpty(internalNamespaceTypes.Where(t => t.IsPublic)); + Assert.That(internalNamespaceTypes.Where(t => t.IsPublic), Is.Empty); #endif } } diff --git a/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs b/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs index 4e6e5a20..f48ce01f 100644 --- a/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/TimeoutValueTest.cs @@ -16,20 +16,20 @@ public void TestArgumentValidation() [Test] public void TestProperties() { - Assert.IsTrue(default(TimeoutValue).IsZero); - Assert.IsFalse(default(TimeoutValue).IsInfinite); + Assert.That(default(TimeoutValue).IsZero, Is.True); + Assert.That(default(TimeoutValue).IsInfinite, Is.False); Assert.That(default(TimeoutValue).InMilliseconds, Is.EqualTo(0)); Assert.That(default(TimeoutValue).InSeconds, Is.EqualTo(0)); TimeoutValue infinite = Timeout.InfiniteTimeSpan; - Assert.IsFalse(infinite.IsZero); - Assert.IsTrue(infinite.IsInfinite); + Assert.That(infinite.IsZero, Is.False); + Assert.That(infinite.IsInfinite, Is.True); Assert.That(infinite.InMilliseconds, Is.EqualTo(-1)); Assert.Throws(() => infinite.InSeconds.ToString()); TimeoutValue normal = TimeSpan.FromSeconds(10.4); - Assert.IsFalse(normal.IsZero); - Assert.IsFalse(normal.IsInfinite); + Assert.That(normal.IsZero, Is.False); + Assert.That(normal.IsInfinite, Is.False); Assert.That(normal.InMilliseconds, Is.EqualTo(10400)); Assert.That(normal.InSeconds, Is.EqualTo(10)); } @@ -61,20 +61,20 @@ public void TestEquality() if (a == b) { - Assert.IsTrue(aValue == bValue); - Assert.IsFalse(aValue != bValue); - Assert.IsTrue(aValue.Equals(bValue)); - Assert.IsTrue(aValue.Equals((object)bValue)); - Assert.IsTrue(Equals(aValue, bValue)); + Assert.That(aValue == bValue, Is.True); + Assert.That(aValue != bValue, Is.False); + Assert.That(aValue.Equals(bValue), Is.True); + Assert.That(aValue.Equals((object)bValue), Is.True); + Assert.That(Equals(aValue, bValue), Is.True); Assert.That(bValue.GetHashCode(), Is.EqualTo(aValue.GetHashCode())); } else { - Assert.IsFalse(aValue == bValue); - Assert.IsTrue(aValue != bValue); - Assert.IsFalse(aValue.Equals(bValue)); - Assert.IsFalse(aValue.Equals((object)bValue)); - Assert.IsFalse(Equals(aValue, bValue)); + Assert.That(aValue == bValue, Is.False); + Assert.That(aValue != bValue, Is.True); + Assert.That(aValue.Equals(bValue), Is.False); + Assert.That(aValue.Equals((object)bValue), Is.False); + Assert.That(Equals(aValue, bValue), Is.False); Assert.That(bValue.GetHashCode(), Is.Not.EqualTo(aValue.GetHashCode())); } } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs index 5d261cb7..8cfd4b74 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockTest.cs @@ -72,12 +72,12 @@ public void TestDirectoryIsCreatedIfNeededAndFileIsCreatedIfNeededAndAlwaysDelet using (@lock.Acquire()) { - Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsTrue(File.Exists(@lock.Name)); + Assert.That(Directory.Exists(directoryName), Is.True); + Assert.That(File.Exists(@lock.Name), Is.True); } - Assert.IsTrue(Directory.Exists(directoryName)); - Assert.IsFalse(File.Exists(@lock.Name)); + Assert.That(Directory.Exists(directoryName), Is.True); + Assert.That(File.Exists(@lock.Name), Is.False); static string Hash(string text) { @@ -105,7 +105,7 @@ public void TestFileCannotBeModifiedOrDeletedWhileHeld() // https://stackoverflow.com/questions/2028874/what-happens-to-an-open-file-handle-on-linux-if-the-pointed-file-gets-moved-or-d Assert.DoesNotThrow(() => File.Delete(@lock.Name)); using var reaquireHandle = @lock.TryAcquire(); - Assert.IsNotNull(reaquireHandle); + Assert.That(reaquireHandle, Is.Not.Null); } } } @@ -208,7 +208,7 @@ public void TestTrailingWhitespaceOrDotDoesNotCauseCollision(string name) using (@lock.Acquire()) { using var handle = new FileDistributedLock(LockFileDirectoryInfo, name.Trim('.').Trim(' ')).TryAcquire(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } } @@ -253,7 +253,7 @@ public void TestReservedWindowsNamesAreAllowed(string name) // Win <= 10 detection: see https://stackoverflow.com/a/69038652/1142970 && Environment.OSVersion.Version.Build < 22000) { - Assert.IsFalse(CanCreateFileWithName(variant), variant); + Assert.That(CanCreateFileWithName(variant), Is.False, variant); Assert.That(Path.GetFileName(new FileDistributedLock(LockFileDirectoryInfo, name).Name), Is.Not.EqualTo(name), variant); } } @@ -498,7 +498,7 @@ private static void AssertCanUseName(string name, DirectoryInfo? directory = nul var @lock = new FileDistributedLock(directory ?? LockFileDirectoryInfo, name); IDistributedSynchronizationHandle? handle = null; Assert.DoesNotThrow(() => handle = @lock.TryAcquire(), name); - Assert.IsNotNull(handle, name); + Assert.That(handle, Is.Not.Null, name); handle!.Dispose(); } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs index 174bf2e8..8910c96c 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedLockWindowsTest.cs @@ -25,7 +25,7 @@ public void TestThrowsUnauthorizedAccessExceptionInCaseOfDirectoryPermissionViol { var @lock = new FileDistributedLock(new DirectoryInfo(@"C:\Windows\MedallionDistributedLock"), Guid.NewGuid().ToString()); var exception = Assert.Throws(() => @lock.TryAcquire()?.Dispose())!; - Assert.IsInstanceOf(exception.InnerException); - Assert.IsFalse(Directory.Exists(Path.GetDirectoryName(@lock.Name))); + Assert.That(exception.InnerException, Is.InstanceOf()); + Assert.That(Directory.Exists(Path.GetDirectoryName(@lock.Name)), Is.False); } } diff --git a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs index d74b9f78..f6764f48 100644 --- a/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/FileSystem/FileDistributedSynchronizationProviderTest.cs @@ -30,7 +30,7 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync("ProviderBasicTest")) { await using var handle = await provider.TryAcquireLockAsync("ProviderBasicTest"); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs index 9d03c7c2..da0e3a45 100644 --- a/src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/MySql/MySqlConnectionOptionsBuilderTest.cs @@ -19,7 +19,7 @@ public void TestDefaults() { var options = MySqlConnectionOptionsBuilder.GetOptions(null); options.keepaliveCadence.ShouldEqual(TimeSpan.FromHours(3.5)); - Assert.IsTrue(options.useMultiplexing); + Assert.That(options.useMultiplexing, Is.True); options.ShouldEqual(MySqlConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs index a7a64059..ae918f57 100644 --- a/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/MySql/MySqlDistributedSynchronizationProviderTest.cs @@ -25,7 +25,7 @@ public async Task BasicTest([Values(typeof(TestingMySqlDb), typeof(TestingMariaD await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle, db.GetType().Name); + Assert.That(handle, Is.Null, db.GetType().Name); } } } diff --git a/src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs index e678bdba..efb19d99 100644 --- a/src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/Oracle/OracleConnectionOptionsBuilderTest.cs @@ -19,7 +19,7 @@ public void TestDefaults() { var options = OracleConnectionOptionsBuilder.GetOptions(null); options.keepaliveCadence.ShouldEqual(Timeout.InfiniteTimeSpan); - Assert.IsTrue(options.useMultiplexing); + Assert.That(options.useMultiplexing, Is.True); options.ShouldEqual(OracleConnectionOptionsBuilder.GetOptions(o => { })); } } diff --git a/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs index bede063a..9d93271c 100644 --- a/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Oracle/OracleDistributedSynchronizationProviderTest.cs @@ -23,22 +23,22 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } await using (await provider.AcquireReadLockAsync(LockName)) { await using var readHandle = await provider.TryAcquireReadLockAsync(LockName); - Assert.IsNotNull(readHandle); + Assert.That(readHandle, Is.Not.Null); await using (var upgradeHandle = await provider.TryAcquireUpgradeableReadLockAsync(LockName)) { - Assert.IsNotNull(upgradeHandle); - Assert.IsFalse(await upgradeHandle!.TryUpgradeToWriteLockAsync()); + Assert.That(upgradeHandle, Is.Not.Null); + Assert.That(await upgradeHandle!.TryUpgradeToWriteLockAsync(), Is.False); } await using var writeHandle = await provider.TryAcquireWriteLockAsync(LockName); - Assert.IsNull(writeHandle); + Assert.That(writeHandle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs index 9f2113bc..dddc63e1 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresAdvisoryLockKeyTest.cs @@ -17,7 +17,7 @@ public void TestArgumentValidation() public void TestDefault() { Assert.That(default(PostgresAdvisoryLockKey).ToString(), Is.EqualTo(new string('0', 16))); - Assert.IsTrue(default(PostgresAdvisoryLockKey).HasSingleKey); + Assert.That(default(PostgresAdvisoryLockKey).HasSingleKey, Is.True); Assert.That(default(PostgresAdvisoryLockKey).Key, Is.EqualTo(0)); AssertEquality(new PostgresAdvisoryLockKey(0), default); } @@ -26,7 +26,7 @@ public void TestDefault() public void TestAscii() { var emptyKey = AssertRoundTrips(string.Empty); - Assert.IsFalse(emptyKey.HasSingleKey); + Assert.That(emptyKey.HasSingleKey, Is.False); var keys = new HashSet<(int, int)> { emptyKey.Keys }; for (var i = (char)1; i < 128; ++i) @@ -34,8 +34,8 @@ public void TestAscii() for (var j = 1; j <= PostgresAdvisoryLockKey.MaxAsciiLength; ++j) { var key = AssertRoundTrips(new string(i, j)); - Assert.IsFalse(key.HasSingleKey); - Assert.IsTrue(keys.Add(key.Keys)); + Assert.That(key.HasSingleKey, Is.False); + Assert.That(keys.Add(key.Keys), Is.True); } } } @@ -44,7 +44,7 @@ public void TestAscii() public void TestInt64Construction() { var key = new PostgresAdvisoryLockKey(1); - Assert.IsTrue(key.HasSingleKey); + Assert.That(key.HasSingleKey, Is.True); Assert.That(key.Key, Is.EqualTo(1L)); Assert.That(key.ToString(), Is.EqualTo("0000000000000001")); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); @@ -54,7 +54,7 @@ public void TestInt64Construction() public void TestInt32PairConstruction() { var key = new PostgresAdvisoryLockKey(3, -1); - Assert.IsFalse(key.HasSingleKey); + Assert.That(key.HasSingleKey, Is.False); Assert.That(key.Keys, Is.EqualTo((3, -1))); Assert.That(key.ToString(), Is.EqualTo("00000003,ffffffff")); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); @@ -64,7 +64,7 @@ public void TestInt32PairConstruction() public void TestNameHashing() { var key = new PostgresAdvisoryLockKey(new string('漢', 2 * PostgresAdvisoryLockKey.MaxAsciiLength), allowHashing: true); - Assert.IsTrue(key.HasSingleKey); + Assert.That(key.HasSingleKey, Is.True); Assert.That(key.Key, Is.EqualTo(-5707277204051710361)); AssertEquality(key, new PostgresAdvisoryLockKey(key.ToString())); } @@ -106,8 +106,8 @@ public void TestEquality() private static void AssertInequality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) { Assert.That(b, Is.Not.EqualTo(a)); - Assert.IsFalse(a == b); - Assert.IsTrue(a != b); + Assert.That(a == b, Is.False); + Assert.That(a != b, Is.True); Assert.That(b.GetHashCode(), Is.Not.EqualTo(a.GetHashCode())); if (a.HasSingleKey && b.HasSingleKey) { @@ -122,8 +122,8 @@ private static void AssertInequality(PostgresAdvisoryLockKey a, PostgresAdvisory private static void AssertEquality(PostgresAdvisoryLockKey a, PostgresAdvisoryLockKey b) { Assert.That(b, Is.EqualTo(a)); - Assert.IsTrue(a == b); - Assert.IsFalse(a != b); + Assert.That(a == b, Is.True); + Assert.That(a != b, Is.False); Assert.That(b.GetHashCode(), Is.EqualTo(a.GetHashCode())); if (a.HasSingleKey) { diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs index 3a2e4e70..74ff8e6b 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresBehaviorTest.cs @@ -34,7 +34,7 @@ public async Task TestPostgresCommandAutomaticallyParticipatesInTransaction() (await commandInTransaction.ExecuteScalarAsync()).ShouldEqual("0"); using var commandOutsideTransaction = connection.CreateCommand(); - Assert.IsNull(commandOutsideTransaction.Transaction); + Assert.That(commandOutsideTransaction.Transaction, Is.Null); commandOutsideTransaction.CommandText = "SELECT COUNT(*) FROM foo"; (await commandOutsideTransaction.ExecuteScalarAsync()).ShouldEqual(0); @@ -85,7 +85,7 @@ async Task RunTransactionWithAbortAsync(bool useSavePoint) else { cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(.5)); } var exception = Assert.CatchAsync(() => command.ExecuteNonQueryAsync(cancellationTokenSource.Token)); - Assert.IsInstanceOf(useTimeout ? typeof(PostgresException) : typeof(OperationCanceledException), exception); + Assert.That(exception, Is.InstanceOf(useTimeout ? typeof(PostgresException) : typeof(OperationCanceledException))); if (useSavePoint) { @@ -133,10 +133,10 @@ public async Task TestDoesNotDetectConnectionBreakViaState() killCommand.CommandText = $"SELECT pg_terminate_backend({pid})"; await killCommand.ExecuteNonQueryAsync(); - Assert.IsFalse(stateChangedEvent.Wait(TimeSpan.FromSeconds(.1))); + Assert.That(stateChangedEvent.Wait(TimeSpan.FromSeconds(.1)), Is.False); Assert.Throws(() => getPidCommand.ExecuteScalar()); - Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); + Assert.That(stateChangedEvent.Wait(TimeSpan.FromSeconds(5)), Is.True); } // Effective test for https://github.com/npgsql/npgsql/issues/3442, which broke monitoring @@ -165,6 +165,6 @@ public async Task TestExecutingQueryOnKilledConnectionFiresStateChanged() Assert.ThrowsAsync(getPidCommand.ExecuteScalarAsync); Assert.That(connection.State, Is.Not.EqualTo(ConnectionState.Open)); - Assert.IsTrue(stateChangedEvent.Wait(TimeSpan.FromSeconds(5))); + Assert.That(stateChangedEvent.Wait(TimeSpan.FromSeconds(5)), Is.True); } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs index bef6457c..9782aa29 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresConnectionOptionsBuilderTest.cs @@ -20,9 +20,9 @@ public void TestValidatesArguments() public void TestDefaults() { var options = PostgresConnectionOptionsBuilder.GetOptions(null); - Assert.IsTrue(options.keepaliveCadence.IsInfinite); - Assert.IsTrue(options.useMultiplexing); - Assert.IsFalse(options.useTransaction); + Assert.That(options.keepaliveCadence.IsInfinite, Is.True); + Assert.That(options.useMultiplexing, Is.True); + Assert.That(options.useTransaction, Is.False); options.ShouldEqual(PostgresConnectionOptionsBuilder.GetOptions(o => { })); } @@ -30,7 +30,7 @@ public void TestDefaults() public void TestUseTransactionDoesNotRequireDisablingMultiplexing() { var options = PostgresConnectionOptionsBuilder.GetOptions(o => o.UseTransaction()); - Assert.IsTrue(options.useTransaction); - Assert.IsFalse(options.useMultiplexing); + Assert.That(options.useTransaction, Is.True); + Assert.That(options.useMultiplexing, Is.False); } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index 4a823f05..ebba92a1 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -24,10 +24,10 @@ public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() var @lock2 = new PostgresDistributedLock(key2, connectionString); using var handle1 = await lock1.TryAcquireAsync(); - Assert.IsNotNull(handle1); + Assert.That(handle1, Is.Not.Null); using var handle2 = await lock2.TryAcquireAsync(); - Assert.IsNotNull(handle2); + Assert.That(handle2, Is.Not.Null); } [Test] @@ -50,7 +50,7 @@ public async Task TestWorksWithAmbientTransaction() using (var timedOutHandle = await connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(.2))) { - Assert.IsNull(timedOutHandle); + Assert.That(timedOutHandle, Is.Null); } (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index 30fae2fe..27074811 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -22,14 +22,14 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs index cc5189b1..0a8ea930 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedReaderWriterLockTest.cs @@ -44,11 +44,11 @@ public async Task TestCanExtendReadLock() var writeHandleTask = @lock.AcquireWriteLockAsync().AsTask(); _ = writeHandleTask.ContinueWith(t => t.Result.Dispose()); // ensure cleanup - Assert.IsFalse(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(.5))); + Assert.That(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(.5)), Is.False); await readHandle.DisposeAsync(); - Assert.IsTrue(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5))); + Assert.That(await writeHandleTask.TryWaitAsync(TimeSpan.FromSeconds(5)), Is.True); } [Test] @@ -69,7 +69,7 @@ public async Task TestReadLockAbandonment() GC.WaitForPendingFinalizers(); await using var writeHandle = await @lock.TryAcquireWriteLockAsync(TimeSpan.FromSeconds(10)); - Assert.IsNotNull(writeHandle); // indicates read lock was released + Assert.That(writeHandle, Is.Not.Null); // indicates read lock was released async Task AcquireReadLockAsync() => await @lock.AcquireReadLockAsync(); } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs index c0893a27..4cdd3f6d 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSynchronizationProviderTest.cs @@ -24,24 +24,24 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) { await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); + Assert.That(failedHandle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs index 0569cdb8..05158932 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisLibraryTest.cs @@ -19,7 +19,7 @@ public void TestAllRedisScriptFieldsAreStatic() .Where(f => f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == typeof(RedisScript<>)); foreach (var field in redisScriptFields) { - Assert.IsTrue(field.IsStatic, field.ToString()); + Assert.That(field.IsStatic, Is.True, field.ToString()); } } } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs index cb167f6c..aad31393 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlConnectionOptionsBuilderTest.cs @@ -21,8 +21,8 @@ public void TestDefaults() { var options = SqlConnectionOptionsBuilder.GetOptions(null); options.keepaliveCadence.ShouldEqual(TimeSpan.FromMinutes(10)); - Assert.IsTrue(options.useMultiplexing); - Assert.IsFalse(options.useTransaction); + Assert.That(options.useMultiplexing, Is.True); + Assert.That(options.useTransaction, Is.False); options.ShouldEqual(SqlConnectionOptionsBuilder.GetOptions(o => { })); } @@ -30,7 +30,7 @@ public void TestDefaults() public void TestUseTransactionDoesNotRequireDisablingMultiplexing() { var options = SqlConnectionOptionsBuilder.GetOptions(o => o.UseTransaction()); - Assert.IsTrue(options.useTransaction); - Assert.IsFalse(options.useMultiplexing); + Assert.That(options.useTransaction, Is.True); + Assert.That(options.useMultiplexing, Is.False); } } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs index 3e8b2dc8..6ec43b83 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDatabaseConnectionTest.cs @@ -58,10 +58,10 @@ public async Task TestExecuteNonQueryCanCancel([Values] bool isAsync, [Values] b if (isAsync) { await command.ExecuteNonQueryAsync(cancellationTokenSource.Token, disallowAsyncCancellation: true); } else { SyncViaAsync.Run(_ => command.ExecuteNonQueryAsync(cancellationTokenSource.Token), 0); } }); - Assert.IsFalse(task.Wait(TimeSpan.FromSeconds(.1))); + Assert.That(task.Wait(TimeSpan.FromSeconds(.1)), Is.False); cancellationTokenSource.Cancel(); - Assert.IsTrue(task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5))); + Assert.That(task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)), Is.True); task.Status.ShouldEqual(TaskStatus.Canceled); } diff --git a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs index 63c6d2ab..473e7a44 100644 --- a/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/SqlServer/SqlDistributedSynchronizationProviderTest.cs @@ -23,24 +23,24 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string ReaderWriterLockName = TargetFramework.Current + "ProviderBasicTest_ReaderWriter"; await using (await provider.AcquireReadLockAsync(ReaderWriterLockName)) { await using var handle = await provider.TryAcquireWriteLockAsync(ReaderWriterLockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) { await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); + Assert.That(failedHandle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/TestSetupTest.cs b/src/DistributedLock.Tests/Tests/TestSetupTest.cs index 96b32667..b683cba9 100644 --- a/src/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/src/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -60,7 +60,7 @@ public void TestTestNamespaces() { // these can be auto-added by VS but they can mess up our SetUpFixtures var badNamespaceSegments = new[] { "Tests.Tests", "AbstractTestCases", "Infrastructure" }; - Assert.IsEmpty(this.GetType().Assembly.GetTypes().Where(t => t.Namespace != null && badNamespaceSegments.Any(s => t.Namespace.Contains(s)))); + Assert.That(this.GetType().Assembly.GetTypes().Where(t => t.Namespace != null && badNamespaceSegments.Any(s => t.Namespace.Contains(s))), Is.Empty); } private static (string declaration, string @namespace) GetTestClassDeclaration(Type testClassType) diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs index 842a3814..92d7e809 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/EventWaitHandleDistributedLockTest.cs @@ -50,7 +50,7 @@ public void TestGarbageCollection() weakHandle.IsAlive.ShouldEqual(false); using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } [Test] diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index 2e145242..ff28e9ea 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -52,7 +52,7 @@ public async Task TestGarbageCollection() weakHandle.IsAlive.ShouldEqual(false); using var handle = @lock.TryAcquire(); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); } [Test] @@ -90,7 +90,7 @@ public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) for (var i = 0; i < 50; ++i) { using var blockingHandle = semaphore.TryAcquire(TimeSpan.Zero); // claim the last slot on the semaphore - Assert.IsNotNull(blockingHandle); + Assert.That(blockingHandle, Is.Not.Null); using CancellationTokenSource source = new(); @@ -114,7 +114,7 @@ public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) catch (OperationCanceledException) { } }); await acquiringEvent.WaitAsync(); - Assert.IsFalse(acquireTask.IsCompleted); + Assert.That(acquireTask.IsCompleted, Is.False); using Barrier barrier = new(participantCount: 2); var releaseTask = Task.Run(() => @@ -133,7 +133,7 @@ public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) } await using var handle = await semaphore.TryAcquireAsync(); - Assert.IsNotNull(handle); // if we lost even a single signal due to cancellation in the loop above, this will fail + Assert.That(handle, Is.Not.Null); // if we lost even a single signal due to cancellation in the loop above, this will fail } private static WaitHandleDistributedSemaphore CreateAsLock(string name, NameStyle nameStyle) => diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs index af1412cd..9b28362d 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSynchronizationProviderTest.cs @@ -14,17 +14,17 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(LockName)) { await using var handle = await provider.TryAcquireLockAsync(LockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } const string SemaphoreName = TargetFramework.Current + "ProviderBasicTest_Semaphore"; await using (await provider.AcquireSemaphoreAsync(SemaphoreName, 2)) { await using var handle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); await using var failedHandle = await provider.TryAcquireSemaphoreAsync(SemaphoreName, 2); - Assert.IsNull(failedHandle); + Assert.That(failedHandle, Is.Null); } } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs index 929c07f0..398d73b9 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -10,23 +10,23 @@ public class ZooKeeperApiTest [Test] public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() { - Assert.IsEmpty( + Assert.That( GetPublicTypes().SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance)) .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))) - ); +, Is.Empty); } [Test] public void TestNamePropertyIsImplementedExplicitlyInFavorOfPath() { - Assert.IsEmpty(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null)); + Assert.That(GetPublicTypes().Select(t => t.GetProperty("Name")).Where(p => p != null), Is.Empty); foreach (var lockType in GetPublicTypes() .Where(t => t.GetInterfaces().Any(i => i.GetProperty("Name") != null))) { var pathProperty = lockType.GetProperty("Path"); - Assert.IsNotNull(pathProperty, $"{lockType} missing Path"); + Assert.That(pathProperty, Is.Not.Null, $"{lockType} missing Path"); pathProperty!.PropertyType.ShouldEqual(typeof(ZooKeeperPath)); - Assert.IsNull(lockType.GetProperty("Name")); + Assert.That(lockType.GetProperty("Name"), Is.Null); } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs index 34950636..8b0eb4ff 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionInfoTest.cs @@ -29,9 +29,9 @@ public void TestEquality() }) }; - Assert.IsTrue(connectionA == connectionB); + Assert.That(connectionA == connectionB, Is.True); connectionA.GetHashCode().ShouldEqual(connectionB.GetHashCode()); - Assert.IsFalse(connectionA == connectionC); + Assert.That(connectionA == connectionC, Is.False); Assert.That(connectionC.GetHashCode(), Is.Not.EqualTo(connectionA.GetHashCode())); } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs index 3654774d..c39e37a6 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperConnectionTest.cs @@ -43,7 +43,7 @@ public async Task TestConnectionIsClosedAndNotSharedAfterMaxAgeElapses() var zooKeeper1 = connection1.ZooKeeper; connection1.Dispose(); - Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3))); + Assert.That(await TestHelper.WaitForAsync(() => (zooKeeper1.getState() == ZooKeeper.States.CLOSED).AsValueTask(), TimeSpan.FromSeconds(3)), Is.True); using var connection2 = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); Assert.That(connection2.ZooKeeper, Is.Not.SameAs(zooKeeper1)); @@ -56,19 +56,19 @@ public async Task TestConnectionCanBeHeldOpenAfterMaxAgeButDoesNotShareAndCloses var pool = new ZooKeeperConnection.Pool(maxAge: TimeSpan.FromSeconds(2)); using var connection = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); - Assert.IsTrue(await TestHelper.WaitForAsync( + Assert.That(await TestHelper.WaitForAsync( async () => { using var testConnectionInfo = await pool.ConnectAsync(GetConnectionInfo(), CancellationToken.None); return testConnectionInfo.ZooKeeper != connection.ZooKeeper; }, TimeSpan.FromSeconds(3) - )); + ), Is.True); connection.ZooKeeper.getState().ShouldEqual(ZooKeeper.States.CONNECTED); var zooKeeper = connection.ZooKeeper; connection.Dispose(); - Assert.IsTrue(await TestHelper.WaitForAsync(() => (zooKeeper.getState() != ZooKeeper.States.CONNECTED).AsValueTask(), TimeSpan.FromSeconds(1))); + Assert.That(await TestHelper.WaitForAsync(() => (zooKeeper.getState() != ZooKeeper.States.CONNECTED).AsValueTask(), TimeSpan.FromSeconds(1)), Is.True); } [Test] diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs index e225b9f1..8c4cdba3 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperDistributedSynchronizationProviderTest.cs @@ -21,24 +21,24 @@ public async Task BasicTest() await using (await provider.AcquireLockAsync(lockName)) { await using var handle = await provider.TryAcquireLockAsync(lockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } var readerWriterLockName = TestHelper.UniqueName + "ReaderWriterLock"; await using (await provider.AcquireReadLockAsync(readerWriterLockName)) { await using var handle = await provider.TryAcquireWriteLockAsync(readerWriterLockName); - Assert.IsNull(handle); + Assert.That(handle, Is.Null); } var semaphoreName = TestHelper.UniqueName + "Semaphore"; await using (await provider.AcquireSemaphoreAsync(semaphoreName, 2)) { await using var handle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); - Assert.IsNotNull(handle); + Assert.That(handle, Is.Not.Null); await using var failedHandle = await provider.TryAcquireSemaphoreAsync(semaphoreName, 2); - Assert.IsNull(failedHandle); + Assert.That(failedHandle, Is.Null); } } @@ -56,15 +56,15 @@ public async Task TestDifferentPrimitivesDoNotCollide() @lock.Path.ShouldEqual(semaphore.Path); await using var lockHandle = await @lock.TryAcquireAsync(); - Assert.IsNotNull(lockHandle); + Assert.That(lockHandle, Is.Not.Null); await using var readLockHandle = await readerWriterLock.TryAcquireReadLockAsync(); - Assert.IsNotNull(readLockHandle); + Assert.That(readLockHandle, Is.Not.Null); await using var semaphoreHandle = await semaphore.TryAcquireAsync(); - Assert.IsNotNull(semaphoreHandle); + Assert.That(semaphoreHandle, Is.Not.Null); await readLockHandle!.DisposeAsync(); await using var writeLockHandle = await readerWriterLock.TryAcquireWriteLockAsync(); - Assert.IsNotNull(writeLockHandle); + Assert.That(writeLockHandle, Is.Not.Null); } [Test, Category("CI")] diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index 31109db1..cd1080a1 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -71,17 +71,17 @@ public void TestEquality() { if (i == j) { - Assert.IsTrue(paths[i] == paths[j]); - Assert.IsFalse(paths[i] != paths[j]); - Assert.IsTrue(paths[i].Equals(paths[j])); - Assert.IsTrue(Equals(paths[i], paths[j])); + Assert.That(paths[i] == paths[j], Is.True); + Assert.That(paths[i] != paths[j], Is.False); + Assert.That(paths[i].Equals(paths[j]), Is.True); + Assert.That(Equals(paths[i], paths[j]), Is.True); } else { - Assert.IsFalse(paths[i] == paths[j]); - Assert.IsTrue(paths[i] != paths[j]); - Assert.IsFalse(paths[i].Equals(paths[j])); - Assert.IsFalse(Equals(paths[i], paths[j])); + Assert.That(paths[i] == paths[j], Is.False); + Assert.That(paths[i] != paths[j], Is.True); + Assert.That(paths[i].Equals(paths[j]), Is.False); + Assert.That(Equals(paths[i], paths[j]), Is.False); Assert.That(paths[j].GetHashCode(), Is.Not.EqualTo(paths[i].GetHashCode())); } } diff --git a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj index 2cda37e8..48b48a54 100644 --- a/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj +++ b/src/DistributedLockCodeGen/DistributedLockCodeGen.csproj @@ -11,12 +11,16 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/src/DistributedLockCodeGen/DocCommentGenerator.cs b/src/DistributedLockCodeGen/DocCommentGenerator.cs index f2b53a7f..252fe850 100644 --- a/src/DistributedLockCodeGen/DocCommentGenerator.cs +++ b/src/DistributedLockCodeGen/DocCommentGenerator.cs @@ -19,7 +19,7 @@ public void GenerateDocComments() .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.updatedCode) != CodeGenHelpers.NormalizeCodeWhitespace(t.code)) .ToList(); changes.ForEach(t => File.WriteAllText(t.file, t.updatedCode)); - Assert.IsEmpty(changes.Select(t => t.file)); + Assert.That(changes.Select(t => t.file), Is.Empty); } internal static string AddDocComments(string code) diff --git a/src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs b/src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs index 4d4dbfd1..f6543897 100644 --- a/src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs +++ b/src/DistributedLockCodeGen/GenerateIDistributedLockImplementations.cs @@ -86,7 +86,7 @@ public partial class {lockType} string IfSyncApis(string value) => supportsSyncApis ? value : string.Empty; } - Assert.IsEmpty(errors); + Assert.That(errors, Is.Empty); } [Test] @@ -185,7 +185,7 @@ public partial class {lockType} } } - Assert.IsEmpty(errors); + Assert.That(errors, Is.Empty); } private static void AppendExplicitInterfaceMethod(StringBuilder code, string @interface, string method, string returnType, string? @as = null) diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index f9d09116..ab657b14 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -79,7 +79,7 @@ public static class {providerExtensionsName} .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) .ToList(); changes.ForEach(t => File.WriteAllText(t.file, t.code)); - Assert.IsEmpty(changes.Select(t => t.file)); + Assert.That(changes.Select(t => t.file), Is.Empty); string GetExtensionMethodName(string interfaceMethodName) => Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$") diff --git a/src/DistributedLockCodeGen/packages.lock.json b/src/DistributedLockCodeGen/packages.lock.json index 3fd1f687..7107b5bb 100644 --- a/src/DistributedLockCodeGen/packages.lock.json +++ b/src/DistributedLockCodeGen/packages.lock.json @@ -21,6 +21,12 @@ "NETStandard.Library": "2.0.0" } }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, "NUnit3TestAdapter": { "type": "Direct", "requested": "[4.5.0, )", From 1537d4a3fb88bcb992bbf2c903a542947ec9f5f3 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 31 Mar 2024 12:58:55 -0400 Subject: [PATCH 267/399] 'dotnet build -c Release' to reduce churns --- src/DistributedLock.Core/packages.lock.json | 24 + src/DistributedLock.Tests/packages.lock.json | 573 +++++++++++++++++++ 2 files changed, 597 insertions(+) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 6d32472d..0584aab6 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.2, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 7ec709b7..a04de49f 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,579 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "dependencies": { + "System.Formats.Asn1": "7.0.0", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Npgsql": "[8.0.2, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From 02569384f521bf9905e8b9cdf8da7b0364f90f97 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 31 Mar 2024 13:28:48 -0400 Subject: [PATCH 268/399] Fix whitespaces --- .../Tests/ZooKeeper/ZooKeeperPathTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs index cd1080a1..518a09cd 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperPathTest.cs @@ -94,7 +94,7 @@ public void TestExposesMinimalApi() var publicMembers = typeof(ZooKeeperPath).GetMembers() .Where(m => m.DeclaringType == typeof(ZooKeeperPath)); Assert.That( - publicMembers.Select(m => m.Name) -, Is.EquivalentTo(new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" })); + publicMembers.Select(m => m.Name), + Is.EquivalentTo(new[] { "ToString", "Equals", "Equals", "GetHashCode", "op_Equality", "op_Inequality", ".ctor" })); } } From 6f08714a1b7ee9213abe57caf07f005db1714f30 Mon Sep 17 00:00:00 2001 From: Jihoon Park Date: Sun, 31 Mar 2024 15:24:35 -0400 Subject: [PATCH 269/399] Fix more whitespaces --- src/DistributedLock.Tests/Tests/ApiTest.cs | 19 ++++++++++--------- .../Tests/ZooKeeper/ZooKeeperApiTest.cs | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs index a38152b9..32708bec 100644 --- a/src/DistributedLock.Tests/Tests/ApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ApiTest.cs @@ -37,8 +37,8 @@ public void TestPublicApisAreSealed(AssemblyName assemblyName) { Assert.That( type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) - .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)) -, Is.Empty); + .Where(c => c.IsPublic || c.Attributes.HasFlag(MethodAttributes.Family)), + Is.Empty); } } } @@ -58,7 +58,8 @@ public void TestProviderApisAreAvailable(AssemblyName assemblyName) var providers = types.Where(t => !t.IsInterface && kvp.Key.IsAssignableFrom(t)).ToArray(); var provided = types.Where(t => !t.IsInterface && kvp.Value.IsAssignableFrom(t)).ToArray(); Assert.That( - providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType), Is.EquivalentTo(provided)); + providers.Select(t => t.GetMethods().Single(m => m.Name.StartsWith("Create") && kvp.Value.IsAssignableFrom(m.ReturnType)).ReturnType), + Is.EquivalentTo(provided)); foreach (var provider in providers) { @@ -79,8 +80,8 @@ public void TestPublicHandleTypesDoNotHaveVisibleConstructors(AssemblyName assem { Assert.That( publicHandleType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic) - .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly) -, Is.Empty); + .Where(c => c.IsPublic || c.IsFamily || c.IsFamilyOrAssembly), + Is.Empty); } } @@ -111,8 +112,8 @@ public void TestLibraryFilesDoNotWriteToConsole() .Where(f => new[] { ".Tests", "CodeGen", "DistributedLockTaker" }.All(s => f.IndexOf(s, StringComparison.OrdinalIgnoreCase) < 0)); Assert.That( libraryCsFiles.Where(f => File.ReadAllText(f).Contains("Console.")) - .Select(Path.GetFileName) -, Is.Empty); + .Select(Path.GetFileName), + Is.Empty); } [TestCaseSource(nameof(DistributedLockAssemblies))] @@ -124,8 +125,8 @@ public void TestInternalNamedMembersAreInternal(AssemblyName assemblyName) { Assert.That( publicType.GetMembers(BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance) - .Where(m => m.Name.Contains("Internal")) -, Is.Empty); + .Where(m => m.Name.Contains("Internal")), + Is.Empty); } } diff --git a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs index 398d73b9..fc542cd5 100644 --- a/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ZooKeeper/ZooKeeperApiTest.cs @@ -12,8 +12,8 @@ public void TestSynchronousAcquireAndDisposeMethodsAreImplementedExplicitly() { Assert.That( GetPublicTypes().SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance)) - .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))) -, Is.Empty); + .Where(m => m.Name == "Dispose" || (m.Name.Contains("Acquire") && !m.Name.EndsWith("Async"))), + Is.Empty); } [Test] From 83ebe96037ca843425fd7e308b8866ddad575ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20W=C4=99glarz?= Date: Tue, 9 Apr 2024 06:08:14 +0200 Subject: [PATCH 270/399] Update README.md - Updated API docs to DNDocs --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 5dc9e4d3..dd0d96b6 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,17 @@ await using (await myDistributedLock.AcquireAsync()) DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. -- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) +- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) : uses Microsoft SQL Server -- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) +- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) : uses Postgresql -- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.MySql.html): uses MySQL or MariaDB -- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html): uses Oracle -- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Redis.html): uses Redis -- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.Azure.html): uses Azure blobs -- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.ZooKeeper.html): uses Apache ZooKeeper -- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.FileSystem.html): uses lock files -- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) [![Static Badge](https://img.shields.io/badge/API%20Documentation-RobiniaDocs-43bc00?logo=readme&logoColor=white)](https://www.robiniadocs.com/d/distributedlock/api/Medallion.Threading.WaitHandles.html): uses operating system global `WaitHandle`s (Windows only) +- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MySql.html): uses MySQL or MariaDB +- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html): uses Oracle +- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Redis.html): uses Redis +- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Azure.html): uses Azure blobs +- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.ZooKeeper.html): uses Apache ZooKeeper +- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.FileSystem.html): uses lock files +- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.WaitHandles.html): uses operating system global `WaitHandle`s (Windows only) **Click on the name** of any of the above packages to see the documentation specific to that implementation, or read on for general documentation that applies to all implementations. From d0011c45adfbe6f1461357791aaf440870589d23 Mon Sep 17 00:00:00 2001 From: davidngjy Date: Sat, 29 Jun 2024 18:28:57 +1000 Subject: [PATCH 271/399] Add support for DbDataSource --- src/Directory.Packages.props | 4 +- src/DistributedLock.Core/packages.lock.json | 30 +- .../DistributedLock.Postgres.csproj | 13 +- .../PostgresConnectionOptionsBuilder.cs | 33 +- .../PostgresDatabaseConnection.cs | 12 +- .../PostgresDistributedLock.cs | 34 +- .../PostgresDistributedReaderWriterLock.cs | 16 +- ...tgresDistributedSynchronizationProvider.cs | 20 +- .../PublicAPI.Unshipped.txt | 2 +- .../PublicAPI/net8.0/PublicAPI.Shipped.txt | 1 + .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 4 + .../packages.lock.json | 77 ++- .../Postgres/PostgresDistributedLockTest.cs | 17 +- ...PostgresDistributedReaderWriterLockTest.cs | 8 +- ...sDistributedSynchronizationProviderTest.cs | 8 +- src/DistributedLock.Tests/packages.lock.json | 581 +----------------- src/DistributedLock/packages.lock.json | 24 +- src/DistributedLockTaker/packages.lock.json | 266 +------- 18 files changed, 253 insertions(+), 897 deletions(-) create mode 100644 src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt create mode 100644 src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index a7d2f366..ad18faae 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -12,7 +12,7 @@ - + @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 0584aab6..773178c5 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,17 +146,11 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 6e20a5a7..e266d3a4 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;net462 + netstandard2.0;netstandard2.1;net462;net8.0 Medallion.Threading.Postgres True 4 @@ -44,18 +44,23 @@ TRACE;DEBUG + + + + + - + - + - + diff --git a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs index a75fee09..4345d5be 100644 --- a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs +++ b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs @@ -15,10 +15,10 @@ internal PostgresConnectionOptionsBuilder() { } /// /// Some Postgres setups have automation in place which aggressively kills idle connections. - /// - /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. + /// + /// To prevent this, this option sets the cadence at which we run a no-op "keepalive" query on a connection that is holding a lock. /// Note that this still does not guarantee protection for the connection from all conditions where the governor might kill it. - /// + /// /// Defaults to , which disables keepalive. /// public PostgresConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCadence) @@ -29,12 +29,12 @@ public PostgresConnectionOptionsBuilder KeepaliveCadence(TimeSpan keepaliveCaden /// /// Whether the synchronization should use a transaction scope rather than a session scope. Defaults to false. - /// + /// /// Synchronizing based on a transaction is necessary to do distributed locking with some pgbouncer configurations - /// (see https://github.com/madelson/DistributedLock/issues/168#issuecomment-1823277173). It may also be marginally less - /// expensive than using a connection for a single lock because releasing requires only disposing the + /// (see https://github.com/madelson/DistributedLock/issues/168#issuecomment-1823277173). It may also be marginally less + /// expensive than using a connection for a single lock because releasing requires only disposing the /// underlying . - /// + /// /// The disadvantage of this strategy is that it is incompatible with and therefore /// gives up the advantages of that approach. /// @@ -46,16 +46,16 @@ public PostgresConnectionOptionsBuilder UseTransaction(bool useTransaction = tru /// /// This mode takes advantage of the fact that while "holding" a lock (or other synchronization primitive) - /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is + /// a connection is essentially idle. Thus, rather than creating a new connection for each held lock it is /// often possible to multiplex a shared connection so that that connection can hold multiple locks at the same time. - /// + /// /// Multiplexing is on by default. - /// + /// /// This is implemented in such a way that releasing a lock held on such a connection will never be blocked by an /// Acquire() call that is waiting to acquire a lock on that same connection. For this reason, the multiplexing - /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) + /// strategy is "optimistic": if the lock can't be acquired instantaneously on the shared connection, a new (shareable) /// connection will be allocated. - /// + /// /// This option can improve performance and avoid connection pool starvation in high-load scenarios. It is also /// particularly applicable to cases where /// semantics are used with a zero-length timeout. @@ -66,12 +66,13 @@ public PostgresConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = t return this; } - internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions(Action? optionsBuilder) + internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions( + Action? optionsBuilder, + PostgresConnectionOptionsBuilder? options = null) { - PostgresConnectionOptionsBuilder? options; if (optionsBuilder != null) { - options = new PostgresConnectionOptionsBuilder(); + options ??= new PostgresConnectionOptionsBuilder(); optionsBuilder(options); } else @@ -90,4 +91,4 @@ internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMul return (keepaliveCadence, useTransaction, useMultiplexing); } -} +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs b/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs index 474e6e2d..92d7d908 100644 --- a/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs +++ b/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs @@ -2,6 +2,9 @@ using Medallion.Threading.Internal.Data; using Npgsql; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Postgres; @@ -17,6 +20,13 @@ public PostgresDatabaseConnection(IDbTransaction transaction) { } +#if NET8_0_OR_GREATER + public PostgresDatabaseConnection(DbDataSource dbDataSource) + : base(dbDataSource.CreateConnection(), isExternallyOwned: false) + { + } +#endif + public PostgresDatabaseConnection(string connectionString) : base(new NpgsqlConnection(connectionString), isExternallyOwned: false) { @@ -64,4 +74,4 @@ public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken canc } } } -} +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index fae80b3c..a347d47f 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -1,6 +1,9 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Postgres; @@ -29,6 +32,17 @@ public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connec { } +#if NET8_0_OR_GREATER + /// + /// Constructs a lock with the given (effectively the lock name) and , + /// and + /// + public PostgresDistributedLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options = null) + : this(key, CreateInternalLock(key, dbDataSource, options)) + { + } +#endif + private PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) { this.Key = key; @@ -61,4 +75,22 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke if (connection == null) { throw new ArgumentNullException(nameof(connection)); } return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); } -} + +#if NET8_0_OR_GREATER + internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options) + { + if (dbDataSource == null) { throw new ArgumentNullException(nameof(dbDataSource)); } + + // Multiplexing is currently incompatible with DbDataSource, so default it to false + var builder = new PostgresConnectionOptionsBuilder(); + builder.UseMultiplexing(false); + + var (keepaliveCadence, useTransaction, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options, builder); + + return useMultiplexing + ? throw new NotSupportedException("Multiplexing is current incompatible with DbDataSource.") + : new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(dbDataSource), useTransaction: useTransaction, keepaliveCadence); + + } +#endif +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 88329223..1989cf5d 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -1,6 +1,9 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Postgres; @@ -29,6 +32,17 @@ public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConne { } +#if NET8_0_OR_GREATER + /// + /// Constructs a lock with the given (effectively the lock name) and , + /// and + /// + public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options = null) + : this(key, PostgresDistributedLock.CreateInternalLock(key, dbDataSource, options)) + { + } +#endif + private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDistributedLock internalLock) { this.Key = key; @@ -48,4 +62,4 @@ private PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbDist bool isWrite) => this._internalLock.TryAcquireAsync(timeout, isWrite ? PostgresAdvisoryLock.ExclusiveLock : PostgresAdvisoryLock.SharedLock, cancellationToken, contextHandle: null) .Wrap(h => new PostgresDistributedReaderWriterLockHandle(h)); -} +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index de2b710b..b871a20b 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -1,4 +1,7 @@ using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Postgres; @@ -33,12 +36,25 @@ public PostgresDistributedSynchronizationProvider(IDbConnection connection) this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); } +#if NET8_0_OR_GREATER + /// + /// Constructs a provider which connects to Postgres using the provided and . + /// + public PostgresDistributedSynchronizationProvider(DbDataSource dbDataSource, Action? options = null) + { + if (dbDataSource == null) { throw new ArgumentNullException(nameof(dbDataSource)); } + + this._lockFactory = key => new PostgresDistributedLock(key, dbDataSource, options); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, dbDataSource, options); + } +#endif + /// /// Creates a with the provided . /// public PostgresDistributedLock CreateLock(PostgresAdvisoryLockKey key) => this._lockFactory(key); - IDistributedLock IDistributedLockProvider.CreateLock(string name) => + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); /// @@ -48,4 +64,4 @@ IDistributedLock IDistributedLockProvider.CreateLock(string name) => IDistributedReaderWriterLock IDistributedReaderWriterLockProvider.CreateReaderWriterLock(string name) => this.CreateReaderWriterLock(new PostgresAdvisoryLockKey(name, allowHashing: true)); -} +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index 5f282702..7dc5c581 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -1 +1 @@ - \ No newline at end of file +#nullable enable diff --git a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt new file mode 100644 index 00000000..ab058de6 --- /dev/null +++ b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt @@ -0,0 +1 @@ +#nullable enable diff --git a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..156dfe60 --- /dev/null +++ b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -0,0 +1,4 @@ +#nullable enable +Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 4fd8add1..f7a06061 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -29,9 +29,9 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -215,9 +215,9 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -384,9 +384,9 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", @@ -508,6 +508,65 @@ "distributedlock.core": { "type": "Project" } + }, + "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Npgsql": { + "type": "Direct", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "distributedlock.core": { + "type": "Project" + } } } } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index ebba92a1..d9f6f8ec 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -2,6 +2,9 @@ using Npgsql; using NUnit.Framework; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Tests.Postgres; @@ -12,8 +15,20 @@ public void TestValidatesConstructorArguments() { Assert.Throws(() => new PostgresDistributedLock(new(0), default(string)!)); Assert.Throws(() => new PostgresDistributedLock(new(0), default(IDbConnection)!)); +#if NET8_0_OR_GREATER + Assert.Throws(() => new PostgresDistributedLock(new(0), default(DbDataSource)!)); +#endif } +#if NET8_0_OR_GREATER + [Test] + public void TestMultiplexingWithDbDataSourceThrowNotSupportedException() + { + using var dataSource = new NpgsqlDataSourceBuilder(TestingPostgresDb.DefaultConnectionString).Build(); + Assert.Throws(() => new PostgresDistributedLock(new(0), dataSource, opt => opt.UseMultiplexing())); + } +#endif + [Test] public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() { @@ -72,4 +87,4 @@ static Task GetTimeoutAsync(NpgsqlCommand command) return command.ExecuteScalarAsync()!; } } -} +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs index de544b94..52118ae1 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs @@ -1,6 +1,9 @@ using Medallion.Threading.Postgres; using NUnit.Framework; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Tests.Postgres; @@ -11,5 +14,8 @@ public void TestValidatesConstructorArguments() { Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(string)!)); Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(IDbConnection)!)); +#if NET8_0_OR_GREATER + Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(DbDataSource)!)); +#endif } -} +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index 27074811..decc2075 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -1,6 +1,9 @@ using Medallion.Threading.Postgres; using NUnit.Framework; using System.Data; +#if NET8_0_OR_GREATER +using System.Data.Common; +#endif namespace Medallion.Threading.Tests.Postgres; @@ -11,6 +14,9 @@ public void TestArgumentValidation() { Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(string)!)); Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(IDbConnection)!)); +#if NET8_0_OR_GREATER + Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(DbDataSource)!)); +#endif } [Test] @@ -32,4 +38,4 @@ public async Task BasicTest() Assert.That(handle, Is.Null); } } -} +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index a04de49f..d215a716 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,579 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", - "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", - "dependencies": { - "Microsoft.Identity.Client": "4.56.0", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", - "DistributedLock.FileSystem": "[1.0.2, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", - "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "StackExchange.Redis": "[2.7.27, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", - "dependencies": { - "Azure.Identity": "1.10.3", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -1118,7 +545,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -1186,9 +613,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index b2d434bb..fa4bf4de 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -453,7 +453,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -532,9 +532,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -1092,7 +1092,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -1179,9 +1179,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -1744,7 +1744,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -1820,9 +1820,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index bc719454..ff60a187 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -2,6 +2,15 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.7.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" + } + }, "Azure.Core": { "type": "Transitive", "resolved": "1.36.0", @@ -150,6 +159,11 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.NETFramework.ReferenceAssemblies.net472": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==" + }, "Oracle.ManagedDataAccess": { "type": "Transitive", "resolved": "21.13.0", @@ -412,7 +426,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -482,9 +496,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", @@ -515,84 +529,12 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - ".NETFramework,Version=v4.7.2/win7-x86": { - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", - "dependencies": { - "Azure.Identity": "1.10.3", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - } - }, "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "hKTrehpfVzOhAz0mreaTAZgbz0DrMEbWq4n3hAo8Ks6WdxdqQhNPvzOqn9VygKuWf1bmxPdraqzTaXriO/sn0A==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Azure.Core": { "type": "Transitive", @@ -998,7 +940,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.2, )" + "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { @@ -1066,9 +1008,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "MuJzLoWCaQhQAR3oh66YR0Ir6mxuezncGX3f8wxvAc21g0+9HICktJQlqMoODhxztZKXE5k9GxRxqUAN+vPb4g==", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } @@ -1095,164 +1037,6 @@ "resolved": "3.4.12.4", "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } - }, - "net8.0/win7-x86": { - "Microsoft.Data.SqlClient.SNI.runtime": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" - }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" - }, - "runtime.any.System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", - "dependencies": { - "System.Private.Uri": "4.3.0" - } - }, - "runtime.any.System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" - }, - "runtime.win7.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" - }, - "System.Diagnostics.EventLog": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" - }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, - "System.DirectoryServices": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", - "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0" - } - }, - "System.DirectoryServices.Protocols": { - "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" - } - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.win7.System.Private.Uri": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.any.System.Runtime": "4.3.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "8.0.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" - }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Text.Encoding": "4.3.0" - } - }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", - "dependencies": { - "System.Drawing.Common": "6.0.0" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", - "dependencies": { - "Azure.Identity": "1.10.3", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "Microsoft.SqlServer.Server": "1.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Runtime.Caching": "8.0.0" - } - }, - "System.Threading.AccessControl": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==" - } } } } \ No newline at end of file From c61ed1b0ec6880cedec7b64f82a2c5cf81be5210 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 29 Jun 2024 17:47:39 -0400 Subject: [PATCH 272/399] Fix build errors/warnings --- src/DistributedLock.Core/packages.lock.json | 6 +- .../PostgresAdvisoryLockKey.cs | 8 +- .../PublicAPI.Shipped.txt | 2 +- .../PublicAPI/net8.0/PublicAPI.Shipped.txt | 3 + .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 3 - .../packages.lock.json | 6 +- src/DistributedLockTaker/packages.lock.json | 250 ++++++++++++++++-- 7 files changed, 247 insertions(+), 31 deletions(-) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 773178c5..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -148,9 +148,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs index c8b5647b..04e9992d 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLockKey.cs @@ -94,12 +94,12 @@ internal long Key public bool Equals(PostgresAdvisoryLockKey that) => this.ToTuple().Equals(that.ToTuple()); /// - /// Implements + /// Implements /// - public override bool Equals(object obj) => obj is PostgresAdvisoryLockKey that && this.Equals(that); + public override bool Equals(object? obj) => obj is PostgresAdvisoryLockKey that && this.Equals(that); /// - /// Implements + /// Implements /// public override int GetHashCode() => this.ToTuple().GetHashCode(); @@ -116,7 +116,7 @@ internal long Key /// /// Returns a string representation of the key that can be round-tripped through - /// + /// /// public override string ToString() => this._keyEncoding switch { diff --git a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt index 72be84ec..6c905fde 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt @@ -42,7 +42,7 @@ Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.CreateLo Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.CreateReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key) -> Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock! Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(string! connectionString, System.Action? options = null) -> void Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.IDbConnection! connection) -> void -override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.Equals(object! obj) -> bool +override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.Equals(object? obj) -> bool override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.GetHashCode() -> int override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.ToString() -> string! static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator !=(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool diff --git a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt index ab058de6..2cd97d79 100644 --- a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Shipped.txt @@ -1 +1,4 @@ #nullable enable +Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt index 156dfe60..7dc5c581 100644 --- a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -1,4 +1 @@ #nullable enable -Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void -Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void -Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.Common.DbDataSource! dbDataSource, System.Action? options = null) -> void diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index f7a06061..5fe46487 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -518,9 +518,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index ff60a187..c5362ba6 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -2,15 +2,6 @@ "version": 2, "dependencies": { ".NETFramework,Version=v4.7.2": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" - } - }, "Azure.Core": { "type": "Transitive", "resolved": "1.36.0", @@ -159,11 +150,6 @@ "System.Text.Json": "4.7.2" } }, - "Microsoft.NETFramework.ReferenceAssemblies.net472": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==" - }, "Oracle.ManagedDataAccess": { "type": "Transitive", "resolved": "21.13.0", @@ -529,12 +515,84 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, + ".NETFramework,Version=v4.7.2/win7-x86": { + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + } + }, "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Azure.Core": { "type": "Transitive", @@ -1037,6 +1095,164 @@ "resolved": "3.4.12.4", "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } + }, + "net8.0/win7-x86": { + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "runtime.any.System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", + "dependencies": { + "System.Private.Uri": "4.3.0" + } + }, + "runtime.any.System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" + }, + "runtime.win7.System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + } + }, + "System.DirectoryServices": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "dependencies": { + "System.Security.AccessControl": "6.0.0", + "System.Security.Permissions": "6.0.0" + } + }, + "System.DirectoryServices.Protocols": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" + } + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7.System.Private.Uri": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.any.System.Runtime": "4.3.0" + } + }, + "System.Runtime.Caching": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", + "dependencies": { + "System.Configuration.ConfigurationManager": "8.0.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "runtime.any.System.Text.Encoding": "4.3.0" + } + }, + "System.Windows.Extensions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", + "dependencies": { + "System.Drawing.Common": "6.0.0" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "Microsoft.SqlServer.Server": "1.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Runtime.Caching": "8.0.0" + } + }, + "System.Threading.AccessControl": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "cIed5+HuYz+eV9yu9TH95zPkqmm1J9Qps9wxjB335sU8tsqc2kGdlTEH9FZzZeCS8a7mNSEsN8ZkyhQp1gfdEw==" + } } } } \ No newline at end of file From 4c7cd0ca5416af18290f649f35b4d91946a94c5d Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 29 Jun 2024 18:29:23 -0400 Subject: [PATCH 273/399] Minor tweaks for #153 --- src/DistributedLock.Core/packages.lock.json | 24 + .../PostgresConnectionOptionsBuilder.cs | 6 +- .../PostgresDatabaseConnection.cs | 4 +- .../PostgresDistributedLock.cs | 17 +- .../PostgresDistributedReaderWriterLock.cs | 4 +- ...tgresDistributedSynchronizationProvider.cs | 4 +- .../PublicAPI.Unshipped.txt | 1 - .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 1 - .../Postgres/PostgresDistributedLockTest.cs | 20 +- ...PostgresDistributedReaderWriterLockTest.cs | 4 +- ...sDistributedSynchronizationProviderTest.cs | 4 +- src/DistributedLock.Tests/packages.lock.json | 573 ++++++++++++++++++ 12 files changed, 635 insertions(+), 27 deletions(-) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs index 4345d5be..0f831a8a 100644 --- a/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs +++ b/src/DistributedLock.Postgres/PostgresConnectionOptionsBuilder.cs @@ -67,12 +67,12 @@ public PostgresConnectionOptionsBuilder UseMultiplexing(bool useMultiplexing = t } internal static (TimeoutValue keepaliveCadence, bool useTransaction, bool useMultiplexing) GetOptions( - Action? optionsBuilder, - PostgresConnectionOptionsBuilder? options = null) + Action? optionsBuilder) { + PostgresConnectionOptionsBuilder? options; if (optionsBuilder != null) { - options ??= new PostgresConnectionOptionsBuilder(); + options = new(); optionsBuilder(options); } else diff --git a/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs b/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs index 92d7d908..1ce3adaa 100644 --- a/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs +++ b/src/DistributedLock.Postgres/PostgresDatabaseConnection.cs @@ -2,7 +2,7 @@ using Medallion.Threading.Internal.Data; using Npgsql; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -20,7 +20,7 @@ public PostgresDatabaseConnection(IDbTransaction transaction) { } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER public PostgresDatabaseConnection(DbDataSource dbDataSource) : base(dbDataSource.CreateConnection(), isExternallyOwned: false) { diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index a347d47f..d61c4c7f 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -1,7 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -32,7 +32,7 @@ public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connec { } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , /// and @@ -76,21 +76,20 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options) { if (dbDataSource == null) { throw new ArgumentNullException(nameof(dbDataSource)); } // Multiplexing is currently incompatible with DbDataSource, so default it to false - var builder = new PostgresConnectionOptionsBuilder(); - builder.UseMultiplexing(false); + var originalOptions = options; + options = o => { o.UseMultiplexing(false); originalOptions?.Invoke(o); }; - var (keepaliveCadence, useTransaction, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options, builder); + var (keepaliveCadence, useTransaction, useMultiplexing) = PostgresConnectionOptionsBuilder.GetOptions(options); return useMultiplexing - ? throw new NotSupportedException("Multiplexing is current incompatible with DbDataSource.") - : new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(dbDataSource), useTransaction: useTransaction, keepaliveCadence); - + ? throw new NotSupportedException("Multiplexing is current incompatible with DbDataSource.") + : new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(dbDataSource), useTransaction: useTransaction, keepaliveCadence); } #endif } \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 1989cf5d..4a73134b 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -1,7 +1,7 @@ using Medallion.Threading.Internal; using Medallion.Threading.Internal.Data; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -32,7 +32,7 @@ public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConne { } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , /// and diff --git a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index b871a20b..f0e30d18 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -1,5 +1,5 @@ using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -36,7 +36,7 @@ public PostgresDistributedSynchronizationProvider(IDbConnection connection) this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER /// /// Constructs a provider which connects to Postgres using the provided and . /// diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index 7dc5c581..e69de29b 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -1 +0,0 @@ -#nullable enable diff --git a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt index 7dc5c581..e69de29b 100644 --- a/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -1 +0,0 @@ -#nullable enable diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index d9f6f8ec..c5abae7c 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -2,7 +2,7 @@ using Npgsql; using NUnit.Framework; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -15,18 +15,32 @@ public void TestValidatesConstructorArguments() { Assert.Throws(() => new PostgresDistributedLock(new(0), default(string)!)); Assert.Throws(() => new PostgresDistributedLock(new(0), default(IDbConnection)!)); -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER Assert.Throws(() => new PostgresDistributedLock(new(0), default(DbDataSource)!)); #endif } -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER [Test] public void TestMultiplexingWithDbDataSourceThrowNotSupportedException() { using var dataSource = new NpgsqlDataSourceBuilder(TestingPostgresDb.DefaultConnectionString).Build(); Assert.Throws(() => new PostgresDistributedLock(new(0), dataSource, opt => opt.UseMultiplexing())); } + + // DbDataSource just calls through to the IDbConnection flow so we don't need exhaustive testing, but we want to + // see it at least work once + [Test] + public async Task TestDbDataSourceConstructorWorks() + { + using var dataSource = new NpgsqlDataSourceBuilder(TestingPostgresDb.DefaultConnectionString).Build(); + PostgresDistributedLock @lock = new(new(5, 5), dataSource); + await using (await @lock.AcquireAsync()) + { + await using var handle = await @lock.TryAcquireAsync(); + Assert.IsNull(handle); + } + } #endif [Test] diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs index 52118ae1..822f7fed 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedReaderWriterLockTest.cs @@ -1,7 +1,7 @@ using Medallion.Threading.Postgres; using NUnit.Framework; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -14,7 +14,7 @@ public void TestValidatesConstructorArguments() { Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(string)!)); Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(IDbConnection)!)); -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER Assert.Throws(() => new PostgresDistributedReaderWriterLock(new(0), default(DbDataSource)!)); #endif } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs index decc2075..8b1deb65 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedSynchronizationProviderTest.cs @@ -1,7 +1,7 @@ using Medallion.Threading.Postgres; using NUnit.Framework; using System.Data; -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER using System.Data.Common; #endif @@ -14,7 +14,7 @@ public void TestArgumentValidation() { Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(string)!)); Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(IDbConnection)!)); -#if NET8_0_OR_GREATER +#if NET7_0_OR_GREATER Assert.Throws(() => new PostgresDistributedSynchronizationProvider(default(DbDataSource)!)); #endif } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index d215a716..4c1a9111 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,579 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.36.0", + "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.10.3", + "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "dependencies": { + "Azure.Core": "1.35.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.22.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.56.0", + "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "dependencies": { + "Microsoft.Identity.Client": "4.56.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "dependencies": { + "System.Formats.Asn1": "7.0.0", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Npgsql": "[8.0.3, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.0, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "dependencies": { + "Azure.Identity": "1.10.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.56.0", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From ed6f5f7a2536c27e89aeccbc7004d5a7f4141388 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:38:21 -0400 Subject: [PATCH 274/399] Address #216 which became more prominent with the Npgsql upgrade to 8.0.3 for some reason --- .../Internal/Data/DatabaseConnection.cs | 8 +- src/DistributedLock.Core/packages.lock.json | 24 - src/DistributedLock.Tests/packages.lock.json | 573 ------------------ 3 files changed, 7 insertions(+), 598 deletions(-) diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 0798d09d..30a9beee 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -46,7 +46,13 @@ protected DatabaseConnection(IDbTransaction transaction, bool isExternallyOwned) public DatabaseCommand CreateCommand() { - var command = this.InnerConnection.CreateCommand(); + IDbCommand command; + // Because of Npgsql's command recycling (https://github.com/npgsql/npgsql/blob/main/src/Npgsql/NpgsqlConnection.cs#L566), + // CreateCommand() is not actually thread-safe. Ideally this would use this.ConnectionMonitor.AcquireConnectionLockAsync + // like other operations, but that requires a change to the Core internal API so I'm leaving it for #217. For the current + // issue with Npgsql, merely synchronizing access to this method should be good enough, and ConnectionMonitor makes a + // fine lock object that isn't being used elsewhere (#216) + lock (this.ConnectionMonitor) { command = this.InnerConnection.CreateCommand(); } command.Transaction = this._transaction; return new DatabaseCommand(command, this); } diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 4c1a9111..d215a716 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,579 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", - "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", - "dependencies": { - "Microsoft.Identity.Client": "4.56.0", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", - "DistributedLock.FileSystem": "[1.0.2, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", - "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.3, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "StackExchange.Redis": "[2.7.27, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", - "dependencies": { - "Azure.Identity": "1.10.3", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From 03b149f9cac40cda3312d60e262164ce389f72cc Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:52:18 -0400 Subject: [PATCH 275/399] Improve error messages --- .../DistributedLockCoreTestCases.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 66920ba1..9dd08414 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -118,20 +118,20 @@ public void TestTimeouts() var waitTime = TimeSpan.FromSeconds(.5); var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); - syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire"); - Assert.That(syncAcquireTask.Exception?.InnerException, Is.InstanceOf(), "sync acquire"); + syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire " + this.GetType().Name); + Assert.That(syncAcquireTask.Exception?.InnerException, Is.InstanceOf(), "sync acquire " + this.GetType().Name); var asyncAcquireTask = @lock.AcquireAsync(timeout).AsTask(); - asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire"); - Assert.That(asyncAcquireTask.Exception!.InnerException, Is.InstanceOf(), "async acquire"); + asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire " + this.GetType().Name); + Assert.That(asyncAcquireTask.Exception!.InnerException, Is.InstanceOf(), "async acquire " + this.GetType().Name); var syncTryAcquireTask = Task.Run(() => @lock.TryAcquire(timeout)); - syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire"); - syncTryAcquireTask.Result.ShouldEqual(null, "sync tryAcquire"); + syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire " + this.GetType().Name); + syncTryAcquireTask.Result.ShouldEqual(null, "sync tryAcquire " + this.GetType().Name); var asyncTryAcquireTask = @lock.TryAcquireAsync(timeout).AsTask(); - asyncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "async tryAcquire"); - asyncTryAcquireTask.Result.ShouldEqual(null, "async tryAcquire"); + asyncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "async tryAcquire " + this.GetType().Name); + asyncTryAcquireTask.Result.ShouldEqual(null, "async tryAcquire " + this.GetType().Name); } } From 0fe19ad26048f5a6c8ef98e1b38db045aacade88 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 08:27:24 -0400 Subject: [PATCH 276/399] Docs updates --- docs/DistributedLock.Postgres.md | 2 +- src/DistributedLock.Postgres/PostgresDistributedLock.cs | 4 +++- .../PostgresDistributedReaderWriterLock.cs | 4 +++- .../PostgresDistributedSynchronizationProvider.cs | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md index da92deaa..d9ba1f7e 100644 --- a/docs/DistributedLock.Postgres.md +++ b/docs/DistributedLock.Postgres.md @@ -28,7 +28,7 @@ Under the hood, [Postgres advisory locks can be based on either one 64-bit integ - Passing an ASCII string with 0-9 characters, which will be mapped to a `long` based on a custom scheme. - Passing an arbitrary string with the `allowHashing` option set to `true` which will be hashed to a `long`. Note that hashing will only be used if other methods of interpreting the string fail. -In addition to specifying the `key`, Postgres-based locks allow you to specify either a `connectionString` or an `IDbConnection` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. **NOTE that since `IDbConnection` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** +In addition to specifying the `key`, Postgres-based locks allow you to specify either a `connectionString`, an `IDbConnection`, or a `DbDataSource` as a means of connecting to the database. In most cases, using a `connectionString` is preferred because it allows for the library to efficiently multiplex connections under the hood and, in the case of `IDbConnection`, eliminates the risk that the passed-in `IDbConnection` gets used in a way that disrupts the locking process. **NOTE that since `IDbConnection` objects are not thread-safe, lock objects constructed with them can only be used by one thread at a time.** ## Options diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index d61c4c7f..dda68386 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -35,7 +35,9 @@ public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connec #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , - /// and + /// and . + /// + /// Not compatible with connection multiplexing. /// public PostgresDistributedLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options = null) : this(key, CreateInternalLock(key, dbDataSource, options)) diff --git a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 4a73134b..8a713cc1 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -35,7 +35,9 @@ public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConne #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , - /// and + /// and . + /// + /// Not compatible with connection multiplexing. /// public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options = null) : this(key, PostgresDistributedLock.CreateInternalLock(key, dbDataSource, options)) diff --git a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index f0e30d18..bcb9f600 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -39,6 +39,8 @@ public PostgresDistributedSynchronizationProvider(IDbConnection connection) #if NET7_0_OR_GREATER /// /// Constructs a provider which connects to Postgres using the provided and . + /// + /// Not compatible with connection multiplexing. /// public PostgresDistributedSynchronizationProvider(DbDataSource dbDataSource, Action? options = null) { From 0cf7b13a4ac0a8199a8c2ea35724202e7516ca90 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 08:29:59 -0400 Subject: [PATCH 277/399] Bump Microsoft.Data.SqlClient to 5.2.1 For #210 --- src/Directory.Packages.props | 2 +- .../packages.lock.json | 141 ++++++++++------- ...onnectionOrTransactionStrategyTestCases.cs | 4 +- ...MultiplexingConnectionStrategyTestCases.cs | 2 +- src/DistributedLock.Tests/packages.lock.json | 63 ++++---- src/DistributedLock/packages.lock.json | 147 +++++++++++------- src/DistributedLockTaker/packages.lock.json | 147 +++++++++--------- 7 files changed, 283 insertions(+), 223 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ad18faae..4d00b52e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -14,7 +14,7 @@ - + diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index c97f9b91..b9bb0063 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -10,13 +10,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -46,10 +46,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.35.0", - "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Net.Http": "4.3.4", @@ -62,12 +63,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -86,18 +87,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -173,6 +175,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -373,13 +384,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -416,10 +427,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.35.0", - "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -430,12 +442,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -459,18 +471,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -569,6 +582,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -817,13 +839,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -850,10 +872,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.35.0", - "contentHash": "hENcx03Jyuqv05F4RBEPbxz29UrM3Nbhnr6Wl6NQpoU9BCIbL3XLentrxDCTrH54NLS11Exxi/o8MYgT/cnKFA==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -864,12 +887,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -901,18 +924,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -1011,6 +1035,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index 7a6d1e37..3a0e097b 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -17,7 +17,7 @@ public abstract class ExternalConnectionOrTransactionStrategyTestCases { }).Wait(TimeSpan.FromSeconds(15)).ShouldEqual(true, this.GetType().Name); + (await Task.WhenAll(tasks).ContinueWith(_ => { }).TryWaitAsync(TimeSpan.FromSeconds(15))).ShouldEqual(true, this.GetType().Name); // MariaDB fails both tasks due to deadlock instead of just picking a single victim Assert.That(tasks.Count(t => t.IsFaulted), Is.GreaterThanOrEqualTo(1)); diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index d226de6d..de38e641 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -140,7 +140,7 @@ public async Task TestBrokenConnectionDoesNotCorruptPool() await using var handle2 = await lock2.AcquireAsync(); Assert.DoesNotThrow(() => lock2.TryAcquire()?.Dispose()); - Assert.Catch(() => handle1.Dispose()); + Assert.Catch(handle1.Dispose); Assert.DoesNotThrowAsync(async () => await (await lock1.AcquireAsync()).DisposeAsync()); } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index d215a716..a631f38c 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -61,10 +61,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -75,12 +76,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -139,19 +140,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", - "System.IO.FileSystem.AccessControl": "5.0.0", + "Microsoft.Identity.Client": "4.60.3", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, @@ -309,6 +310,15 @@ "resolved": "4.4.0", "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "8.0.0", @@ -370,15 +380,6 @@ "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.IO.Hashing": { "type": "Transitive", "resolved": "6.0.0", @@ -461,8 +462,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + "resolved": "4.7.0", + "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" }, "System.Text.Encoding": { "type": "Transitive", @@ -559,7 +560,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -588,13 +589,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index fa4bf4de..808efa08 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -29,10 +29,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Net.Http": "4.3.4", @@ -45,12 +46,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -102,18 +103,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -197,6 +199,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", @@ -467,7 +478,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -504,13 +515,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -610,10 +621,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -624,12 +636,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -686,18 +698,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -804,6 +817,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", @@ -1106,7 +1128,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -1144,13 +1166,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -1241,10 +1263,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -1255,12 +1278,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -1313,18 +1336,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -1431,6 +1455,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", @@ -1758,7 +1791,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -1787,13 +1820,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index c5362ba6..644c6c7e 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -4,10 +4,11 @@ ".NETFramework,Version=v4.7.2": { "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -18,12 +19,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -78,18 +79,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -172,6 +174,15 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", @@ -426,7 +437,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -454,13 +465,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -571,13 +582,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -596,10 +607,11 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.36.0", - "contentHash": "vwqFZdHS4dzPlI7FFRkPx9ctA+aGGeRev3gnzG8lntWvKMmBhAmulABi1O9CEvS3/jzYt7yA+0pqVdxkpAd7dQ==", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Memory.Data": "1.0.2", "System.Numerics.Vectors": "4.5.0", @@ -610,12 +622,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.10.3", - "contentHash": "l1Xm2MWOF2Mzcwuarlw8kWQXLZk3UeB55aQXVyjj23aBfDwOZ3gu5GP2kJ6KlmZeZv2TCzw7x4L3V36iNr3gww==", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", "dependencies": { - "Azure.Core": "1.35.0", - "Microsoft.Identity.Client": "4.56.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.56.0", + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -661,19 +673,19 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "rr4zbidvHy9r4NvOAs5hdd964Ao2A0pAeFBJKR95u1CJAVzbd1p6tPTXUZ+5ld0cfThiVSGvz6UHwY6JjraTpA==", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.22.0" + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.56.0", - "contentHash": "H12YAzEGK55vZ+QpxUzozhW8ZZtgPDuWvgA0JbdIR9UhMUplj29JhIgE2imuH8W2Nw9D8JKygR1uxRFtpSNcrg==", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", "dependencies": { - "Microsoft.Identity.Client": "4.56.0", - "System.IO.FileSystem.AccessControl": "5.0.0", + "Microsoft.Identity.Client": "4.60.3", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, @@ -767,6 +779,15 @@ "System.IO.Pipelines": "5.0.1" } }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "8.0.0", @@ -828,15 +849,6 @@ "Microsoft.IdentityModel.Tokens": "6.35.0" } }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.IO.Hashing": { "type": "Transitive", "resolved": "6.0.0", @@ -912,11 +924,6 @@ "System.Windows.Extensions": "6.0.0" } }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -1012,7 +1019,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.0, )" + "Microsoft.Data.SqlClient": "[5.2.1, )" } }, "distributedlock.waithandles": { @@ -1041,13 +1048,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -1160,15 +1167,6 @@ "Microsoft.Win32.SystemEvents": "6.0.0" } }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Private.Uri": { "type": "Transitive", "resolved": "4.3.0", @@ -1207,11 +1205,6 @@ "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -1233,13 +1226,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.0, )", - "resolved": "5.2.0", - "contentHash": "3alfyqRN3ELRtdvU1dGtLBRNQqprr3TJ0WrUJfMISPwg1nPUN2P3Lelah68IKWuV27Ceb7ig95hWNHFTSXfxMg==", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", "dependencies": { - "Azure.Identity": "1.10.3", + "Azure.Identity": "1.11.3", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.56.0", + "Microsoft.Identity.Client": "4.60.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", From f872b719cc8cd8668aec8f7c3654b7e1b67e2f07 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 08:38:52 -0400 Subject: [PATCH 278/399] Version bumps and minor code modernizations --- .../Internal/AsyncLock.cs | 9 +- .../Internal/Data/ConnectionMonitor.cs | 14 +- .../Internal/ManagedFinalizerQueue.cs | 14 +- src/DistributedLock.Core/packages.lock.json | 24 + .../DistributedLock.Postgres.csproj | 2 +- .../DistributedLock.SqlServer.csproj | 2 +- src/DistributedLock.SqlServer/SqlSemaphore.cs | 21 +- ...MultiplexingConnectionStrategyTestCases.cs | 2 +- src/DistributedLock.Tests/packages.lock.json | 588 +++++++++++++++++- src/DistributedLock/DistributedLock.csproj | 2 +- 10 files changed, 629 insertions(+), 49 deletions(-) diff --git a/src/DistributedLock.Core/Internal/AsyncLock.cs b/src/DistributedLock.Core/Internal/AsyncLock.cs index 8fceef0b..6c31c3f6 100644 --- a/src/DistributedLock.Core/Internal/AsyncLock.cs +++ b/src/DistributedLock.Core/Internal/AsyncLock.cs @@ -31,14 +31,9 @@ public async ValueTask AcquireAsync(CancellationToken cancellationT return acquired ? new Handle(this._semaphore) : null; } - private sealed class Handle : IDisposable + private sealed class Handle(SemaphoreSlim semaphore) : IDisposable { - private SemaphoreSlim? _semaphore; - - public Handle(SemaphoreSlim semaphore) - { - this._semaphore = semaphore; - } + private SemaphoreSlim? _semaphore = semaphore; public void Dispose() => Interlocked.Exchange(ref this._semaphore, null)?.Release(); } diff --git a/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs b/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs index 6e87b680..41d796f5 100644 --- a/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs +++ b/src/DistributedLock.Core/Internal/Data/ConnectionMonitor.cs @@ -138,7 +138,7 @@ public IDatabaseConnectionMonitoringHandle GetMonitoringHandle() var connectionLostTokenSource = new CancellationTokenSource(); var handle = new MonitoringHandle(this, connectionLostTokenSource.Token); - (this._monitoringHandleRegistrations ??= new Dictionary()) + (this._monitoringHandleRegistrations ??= []) .Add(handle, connectionLostTokenSource); if (!this.StartMonitorWorkerIfNeededNoLock() @@ -403,16 +403,10 @@ private async Task DoKeepaliveAsync(TimeoutValue keepaliveCadence, Cancell return true; } - private sealed class MonitoringHandle : IDatabaseConnectionMonitoringHandle + private sealed class MonitoringHandle(ConnectionMonitor keepaliveHelper, CancellationToken cancellationToken) : IDatabaseConnectionMonitoringHandle { - private ConnectionMonitor? _monitor; - private readonly CancellationToken _connectionLostToken; - - public MonitoringHandle(ConnectionMonitor keepaliveHelper, CancellationToken cancellationToken) - { - this._monitor = keepaliveHelper; - this._connectionLostToken = cancellationToken; - } + private ConnectionMonitor? _monitor = keepaliveHelper; + private readonly CancellationToken _connectionLostToken = cancellationToken; public CancellationToken ConnectionLostToken => Volatile.Read(ref this._monitor) != null ? this._connectionLostToken : throw new ObjectDisposedException("handle"); diff --git a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs index 55de6170..85251a19 100644 --- a/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs +++ b/src/DistributedLock.Core/Internal/ManagedFinalizerQueue.cs @@ -142,7 +142,7 @@ private Task FinalizeAsync(bool waitForItemFinalization) var itemFinalizerTask = this.TryRemove(kvp.Key, disposeKey: true); if (waitForItemFinalization) { - (itemFinalizerTasks ??= new List()).Add(itemFinalizerTask); + (itemFinalizerTasks ??= []).Add(itemFinalizerTask); } } } @@ -171,16 +171,10 @@ private Task TryRemove(IAsyncDisposable key, bool disposeKey) return Task.CompletedTask; } - private sealed class Registration : IDisposable + private sealed class Registration(ManagedFinalizerQueue queue, IAsyncDisposable key) : IDisposable { - private readonly ManagedFinalizerQueue _queue; - private IAsyncDisposable? _key; - - public Registration(ManagedFinalizerQueue queue, IAsyncDisposable key) - { - this._queue = queue; - this._key = key; - } + private readonly ManagedFinalizerQueue _queue = queue; + private IAsyncDisposable? _key = key; public void Dispose() { diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index e266d3a4..b3552a3b 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.1.0 + 1.2.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index ae83832d..0e6efb8f 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -11,7 +11,7 @@ - 1.0.4 + 1.0.5 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/src/DistributedLock.SqlServer/SqlSemaphore.cs b/src/DistributedLock.SqlServer/SqlSemaphore.cs index 14f8d089..0fd5f70a 100644 --- a/src/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/src/DistributedLock.SqlServer/SqlSemaphore.cs @@ -6,14 +6,9 @@ namespace Medallion.Threading.SqlServer; -internal sealed class SqlSemaphore : IDbSynchronizationStrategy +internal sealed class SqlSemaphore(int maxCount) : IDbSynchronizationStrategy { - public SqlSemaphore(int maxCount) - { - this.MaxCount = maxCount; - } - - public int MaxCount { get; } + public int MaxCount { get; } = maxCount; #region ---- Execution ---- public async ValueTask TryAcquireAsync(DatabaseConnection connection, string resourceName, TimeoutValue timeout, CancellationToken cancellationToken) @@ -87,16 +82,10 @@ public async ValueTask ReleaseAsync(DatabaseConnection connection, string resour bool IDbSynchronizationStrategy.IsUpgradeable => false; - public sealed class Cookie + public sealed class Cookie(string ticket, string markerTable) { - public Cookie(string ticket, string markerTable) - { - this.Ticket = ticket ?? throw new ArgumentNullException(nameof(ticket)); - this.MarkerTable = markerTable ?? throw new ArgumentNullException(nameof(markerTable)); - } - - public string Ticket { get; } - public string MarkerTable { get; } + public string Ticket { get; } = ticket ?? throw new ArgumentNullException(nameof(ticket)); + public string MarkerTable { get; } = markerTable ?? throw new ArgumentNullException(nameof(markerTable)); } #endregion diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs index de38e641..6f9f8d26 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/MultiplexingConnectionStrategyTestCases.cs @@ -49,7 +49,7 @@ private WeakReference TestCleanupHelper(IDistributedLock lock1, IDistributedLock { var handle = lock1.Acquire(); - Assert.That(lock2.TryAcquireAsync().Result, Is.Null); + Assert.That(lock2.TryAcquireAsync().AsTask().Result, Is.Null); return new WeakReference(handle); } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index a631f38c..318e9e0b 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,590 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.11.3", + "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "dependencies": { + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.60.3", + "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.60.3", + "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "dependencies": { + "Microsoft.Identity.Client": "4.60.3", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "dependencies": { + "System.Formats.Asn1": "7.0.0", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.2.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Npgsql": "[8.0.3, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "Microsoft.Data.SqlClient": "[5.2.1, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.6, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.1, )", + "resolved": "5.2.1", + "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "dependencies": { + "Azure.Identity": "1.11.3", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.60.3", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -505,9 +1089,9 @@ "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.SqlServer": "[1.0.5, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 495f84a5..b0b39f26 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.4.0 + 2.5.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 703f9aa7adf7442ae4dd2bf65c73aedd4550aa3f Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 08:46:38 -0400 Subject: [PATCH 279/399] Update release notes for 2.5 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index dd0d96b6..92490f5a 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,11 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.5 + - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks @davidngjy for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) + - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks @Meir017/@davidngjy for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) + - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Postgres 1.2.0) + - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! From 0dd6fc347dc5190c8014409875232647a9c459ee Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 09:18:49 -0400 Subject: [PATCH 280/399] Test fixups --- .../DistributedLockCoreTestCases.cs | 12 ++++++------ .../Infrastructure/TestHelper.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index 9dd08414..e48bf314 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -105,32 +105,32 @@ public void TestDisposeHandleIsIdempotent() [Test] [NonParallelizable, Retry(tryCount: 3)] // timing-sensitive - public void TestTimeouts() + public async Task TestTimeouts() { // use a randomized name in case we end up retrying var lockName = Guid.NewGuid().ToString(); var @lock = this._lockProvider.CreateLock(lockName); // acquire with a different lock instance to avoid reentrancy mattering - using (this._lockProvider.CreateLock(lockName).Acquire()) + await using (await this._lockProvider.CreateLock(lockName).AcquireAsync()) { var timeout = TimeSpan.FromSeconds(.2); var waitTime = TimeSpan.FromSeconds(.5); var syncAcquireTask = Task.Run(() => @lock.Acquire(timeout)); - syncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "sync acquire " + this.GetType().Name); + (await syncAcquireTask.ContinueWith(_ => { }).TryWaitAsync(waitTime)).ShouldEqual(true, "sync acquire " + this.GetType().Name); Assert.That(syncAcquireTask.Exception?.InnerException, Is.InstanceOf(), "sync acquire " + this.GetType().Name); var asyncAcquireTask = @lock.AcquireAsync(timeout).AsTask(); - asyncAcquireTask.ContinueWith(_ => { }).Wait(waitTime).ShouldEqual(true, "async acquire " + this.GetType().Name); + (await asyncAcquireTask.ContinueWith(_ => { }).TryWaitAsync(waitTime)).ShouldEqual(true, "async acquire " + this.GetType().Name); Assert.That(asyncAcquireTask.Exception!.InnerException, Is.InstanceOf(), "async acquire " + this.GetType().Name); var syncTryAcquireTask = Task.Run(() => @lock.TryAcquire(timeout)); - syncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "sync tryAcquire " + this.GetType().Name); + (await syncTryAcquireTask.TryWaitAsync(waitTime)).ShouldEqual(true, "sync tryAcquire " + this.GetType().Name); syncTryAcquireTask.Result.ShouldEqual(null, "sync tryAcquire " + this.GetType().Name); var asyncTryAcquireTask = @lock.TryAcquireAsync(timeout).AsTask(); - asyncTryAcquireTask.Wait(waitTime).ShouldEqual(true, "async tryAcquire " + this.GetType().Name); + (await asyncTryAcquireTask.TryWaitAsync(waitTime)).ShouldEqual(true, "async tryAcquire " + this.GetType().Name); asyncTryAcquireTask.Result.ShouldEqual(null, "async tryAcquire " + this.GetType().Name); } } diff --git a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs index 4a03f688..22cb16cd 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -13,7 +13,7 @@ internal static class TestHelper public static T ShouldEqual(this T @this, T that, string? message = null) { - Assert.That(that, Is.EqualTo(@this), message: message); + Assert.That(@this, Is.EqualTo(that), message: message); return @this; } From 91262f7e758429d31a27d0a3942725f66df70ce6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 09:52:06 -0400 Subject: [PATCH 281/399] Bump core version --- README.md | 2 +- src/DistributedLock.Core/DistributedLock.Core.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92490f5a..a0958ef9 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks @davidngjy for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks @Meir017/@davidngjy for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Postgres 1.2.0) + - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index 3f559bda..396e3e9e 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -11,7 +11,7 @@ - 1.0.6 + 1.0.7 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages From 1d39d4d0634f79dddccbbf664295a62ef870c38c Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 10:23:31 -0400 Subject: [PATCH 282/399] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a0958ef9..c9f6a83b 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,8 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.5 - - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks @davidngjy for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks @Meir017/@davidngjy for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) + - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [@davidngjy](https://github.com/@davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) + - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/@Meir017)/[@davidngjy](https://github.com/@davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - 2.4 From f7288ff18f0b176574af4dc72d0a157cb58a7586 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 10:24:34 -0400 Subject: [PATCH 283/399] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9f6a83b..fa3c78bd 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,8 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.5 - - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [@davidngjy](https://github.com/@davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/@Meir017)/[@davidngjy](https://github.com/@davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) + - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/@davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) + - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - 2.4 From ce4a071dc2e87cf4295a9be4d1e20bbfe4a467e9 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 30 Jun 2024 10:26:13 -0400 Subject: [PATCH 284/399] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa3c78bd..a26eb6d4 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.5 - - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/@davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) + - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) From 4414996d53bf1a04cc534825ff5fb1884cee37da Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Wed, 10 Jul 2024 15:02:02 +0300 Subject: [PATCH 285/399] Add initial support locking with external transaction for Postgres --- .../PostgresAdvisoryLock.cs | 41 +++++++++++-------- .../PostgresDistributedLock.cs | 17 ++++++++ .../PostgresDistributedReaderWriterLock.cs | 11 +++++ ...tgresDistributedSynchronizationProvider.cs | 14 +++++++ .../PublicAPI.Unshipped.txt | 3 ++ 5 files changed, 70 insertions(+), 16 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 2a8f9617..8684aa5b 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -46,11 +46,12 @@ private PostgresAdvisoryLock(bool isShared) // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end // of the current transaction instead of just the current batch if we're in a transaction. To make sure - // we don't leak those settings, in the case of a transaction we first set up a save point which we can + // we don't leak those settings, in the case of a transaction, we first set up a save point which we can // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently // roll back a save point without knowing that it has been set up, we start the save point in its own - // query before we try-catch - var needsSavePoint = await HasTransactionAsync(connection).ConfigureAwait(false); + // query before we try-catch. + var needsSavePoint = await ShouldDefineSavePoint(connection).ConfigureAwait(false); + if (needsSavePoint) { using var setSavePointCommand = connection.CreateCommand(); @@ -124,9 +125,7 @@ private PostgresAdvisoryLock(bool isShared) async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync(bool acquired) { if (needsSavePoint - // For transaction scoped locks, we can't roll back the save point on success because that will roll - // back our hold on the lock. It's ok to "leak" the savepoint in that case because it's an internally-owned - // transaction/connection and the savepoint will be cleaned up with the disposal of the transaction. + // For transaction scoped locks, we can't roll back the save point on success because that will roll back our hold on the lock. && !(acquired && UseTransactionScopedLock(connection))) { // attempt to clear the timeout variables we set @@ -182,13 +181,17 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post return command; } - private static async ValueTask HasTransactionAsync(DatabaseConnection connection) + private static async ValueTask ShouldDefineSavePoint(DatabaseConnection connection) { - if (connection.HasTransaction) { return true; } - if (!connection.IsExernallyOwned) { return false; } + // If the connection is internally-owned, we only define a save point if a transaction has been opened. + if (!connection.IsExernallyOwned) { return connection.HasTransaction; } + + // If the connection is externally-owned with an established transaction, we don't want to pollute it with a save point + // which we won't be able to release in case the lock will be acquired. + if (connection.HasTransaction) { return false; } - // If the connection is externally owned, then it might be part of a transaction that we can't - // see. In that case, the only real way to detect it is to begin a new one + // The externally-owned connection might still be part of a transaction that we can't see. + // In that case, the only real way to detect it is to begin a new one. try { await connection.BeginTransactionAsync().ConfigureAwait(false); @@ -199,6 +202,7 @@ private static async ValueTask HasTransactionAsync(DatabaseConnection conn } await connection.DisposeTransactionAsync().ConfigureAwait(false); + return false; } @@ -207,7 +211,13 @@ public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, bool isTry) { - Invariant.Require(!UseTransactionScopedLock(connection)); + // For transaction scoped advisory locks, the lock can only be released by ending the transaction. + // If the transaction is internally-owned, then the lock will be released when the transaction is disposed as part of the internal connection management. + // If the transaction is externally-owned, then the lock will have to be released explicitly by the transaction initiator. + if (UseTransactionScopedLock(connection)) + { + return; + } using var command = connection.CreateCommand(); command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); @@ -235,10 +245,9 @@ private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command } private static bool UseTransactionScopedLock(DatabaseConnection connection) => - // This implementation (similar to what we do for SQL Server) is based on the fact that we only create transactions on - // internally-owned connections when doing transaction-scoped locking, and we only support transaction-scoped locking on - // internally-owned connections (since there's no explicit release). - !connection.IsExernallyOwned && connection.HasTransaction; + // Transaction-scoped locking is supported on both externally-owned and internally-owned connections, + // as long as the connection has a transaction. + connection.HasTransaction; private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) { diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index dda68386..2163aca2 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -32,6 +32,17 @@ public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connec { } + /// + /// Constructs a lock with the given (effectively the lock name) and . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be committed or rolled back. + /// + public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) + : this(key, CreateInternalLock(key, transaction)) + { + } + #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , @@ -78,6 +89,12 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); } + internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(transaction)); + } + #if NET7_0_OR_GREATER internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options) { diff --git a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 8a713cc1..73777841 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -32,6 +32,17 @@ public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConne { } + /// + /// Constructs a lock with the given (effectively the lock name) and . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be committed or rolled back. + /// + public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) + : this(key, PostgresDistributedLock.CreateInternalLock(key, transaction)) + { + } + #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , diff --git a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index bcb9f600..fa151084 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -36,6 +36,20 @@ public PostgresDistributedSynchronizationProvider(IDbConnection connection) this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); } + /// + /// Constructs a provider which connects to Postgres using the provided . + /// + /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and + /// will not be committed or rolled back. + /// + public PostgresDistributedSynchronizationProvider(IDbTransaction transaction) + { + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + this._lockFactory = key => new PostgresDistributedLock(key, transaction); + this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, transaction); + } + #if NET7_0_OR_GREATER /// /// Constructs a provider which connects to Postgres using the provided and . diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index e69de29b..79508f8f 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -0,0 +1,3 @@ +Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction) -> void +Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction) -> void +Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.IDbTransaction! transaction) -> void \ No newline at end of file From ad1c932579c3ba50fbf84435505c4aa322c6ebe0 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Sun, 18 Aug 2024 10:32:26 +0300 Subject: [PATCH 286/399] Add support for static utility methods --- .../Internal/DistributedLockHelpers.cs | 27 ++++++++- src/DistributedLock.Core/Internal/Helpers.cs | 2 +- .../PostgresDistributedLock.Extensions.cs | 56 +++++++++++++++++++ .../PostgresDistributedLock.cs | 17 ------ .../PostgresDistributedReaderWriterLock.cs | 11 ---- ...tgresDistributedSynchronizationProvider.cs | 14 ----- .../PublicAPI.Unshipped.txt | 8 ++- 7 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs diff --git a/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 7427b731..3b997933 100644 --- a/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -1,4 +1,5 @@ -using System.Security.Cryptography; +using Medallion.Threading.Internal.Data; +using System.Security.Cryptography; using System.Text; namespace Medallion.Threading.Internal; @@ -133,6 +134,30 @@ public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handl SyncViaAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); #endregion + #region ---- IDbSynchronizationStrategy implementations ---- + public static ValueTask TryAcquireAsync(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class => + strategy.TryAcquireAsync(connection, resourceName, timeout, cancellationToken); + + public static ValueTask AcquireAsync(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class => + strategy.TryAcquireAsync(connection, resourceName, timeout, cancellationToken).ThrowTimeoutIfNull(); + + public static THandle Acquire(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan? timeout, CancellationToken cancellationToken) + where THandle : class => + SyncViaAsync.Run( + state => AcquireAsync(state.strategy, state.connection, state.resourceName, state.timeout, state.cancellationToken), + (strategy, connection, resourceName, timeout, cancellationToken) + ); + + public static THandle? TryAcquire(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan timeout, CancellationToken cancellationToken) + where THandle : class => + SyncViaAsync.Run( + state => TryAcquireAsync(strategy, connection, resourceName, timeout, cancellationToken), + (strategy, connection, resourceName, timeout, cancellationToken) + ); + #endregion + private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index d77cd1d0..7868c08d 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -28,7 +28,7 @@ public readonly struct TaskConversion public readonly struct TaskConversion { } - internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); + public static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); public static ValueTask AsValueTask(this Task task) => new(task); public static ValueTask AsValueTask(this Task task) => new(task); diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs new file mode 100644 index 00000000..deee7272 --- /dev/null +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs @@ -0,0 +1,56 @@ +using Medallion.Threading.Internal; +using System.Data; + +namespace Medallion.Threading.Postgres; + +public partial class PostgresDistributedLock +{ + public static bool TryAcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) + { + if (key == null) { throw new ArgumentNullException(nameof(key)); } + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + var connection = new PostgresDatabaseConnection(transaction); + + var handle = DistributedLockHelpers.TryAcquire(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); + + return handle != null; + } + + public static void AcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) + { + if (key == null) { throw new ArgumentNullException(nameof(key)); } + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + var connection = new PostgresDatabaseConnection(transaction); + + DistributedLockHelpers.Acquire(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); + } + + public static ValueTask TryAcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) + { + if (key == null) { throw new ArgumentNullException(nameof(key)); } + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + var connection = new PostgresDatabaseConnection(transaction); + + return TryAcquireAsync(); + + async ValueTask TryAcquireAsync() + { + var handle = await DistributedLockHelpers.TryAcquireAsync(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); + + return handle != null; + } + } + + public static ValueTask AcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) + { + if (key == null) { throw new ArgumentNullException(nameof(key)); } + if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } + + var connection = new PostgresDatabaseConnection(transaction); + + return DistributedLockHelpers.AcquireAsync(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken).ConvertToVoid(); + } +} diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index 2163aca2..dda68386 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -32,17 +32,6 @@ public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbConnection connec { } - /// - /// Constructs a lock with the given (effectively the lock name) and . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be committed or rolled back. - /// - public PostgresDistributedLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) - : this(key, CreateInternalLock(key, transaction)) - { - } - #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , @@ -89,12 +78,6 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(connection)); } - internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - return new DedicatedConnectionOrTransactionDbDistributedLock(key.ToString(), () => new PostgresDatabaseConnection(transaction)); - } - #if NET7_0_OR_GREATER internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey key, DbDataSource dbDataSource, Action? options) { diff --git a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs index 73777841..8a713cc1 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedReaderWriterLock.cs @@ -32,17 +32,6 @@ public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbConne { } - /// - /// Constructs a lock with the given (effectively the lock name) and . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be committed or rolled back. - /// - public PostgresDistributedReaderWriterLock(PostgresAdvisoryLockKey key, IDbTransaction transaction) - : this(key, PostgresDistributedLock.CreateInternalLock(key, transaction)) - { - } - #if NET7_0_OR_GREATER /// /// Constructs a lock with the given (effectively the lock name) and , diff --git a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs index fa151084..bcb9f600 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedSynchronizationProvider.cs @@ -36,20 +36,6 @@ public PostgresDistributedSynchronizationProvider(IDbConnection connection) this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, connection); } - /// - /// Constructs a provider which connects to Postgres using the provided . - /// - /// The provided will be used to connect to the database and will provide lock scope. It is assumed to be externally managed and - /// will not be committed or rolled back. - /// - public PostgresDistributedSynchronizationProvider(IDbTransaction transaction) - { - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - - this._lockFactory = key => new PostgresDistributedLock(key, transaction); - this._readerWriterLockFactory = key => new PostgresDistributedReaderWriterLock(key, transaction); - } - #if NET7_0_OR_GREATER /// /// Constructs a provider which connects to Postgres using the provided and . diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index 79508f8f..00b28778 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -1,3 +1,5 @@ -Medallion.Threading.Postgres.PostgresDistributedLock.PostgresDistributedLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction) -> void -Medallion.Threading.Postgres.PostgresDistributedReaderWriterLock.PostgresDistributedReaderWriterLock(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction) -> void -Medallion.Threading.Postgres.PostgresDistributedSynchronizationProvider.PostgresDistributedSynchronizationProvider(System.Data.IDbTransaction! transaction) -> void \ No newline at end of file +#nullable enable +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file From 2a70861ae9fe33334ec09ce5cb835c71637262da Mon Sep 17 00:00:00 2001 From: Richard K Date: Mon, 9 Sep 2024 12:16:48 +0200 Subject: [PATCH 287/399] Azure: Handle blob lease acquire errors from response instead of exception --- .../AzureBlobLeaseDistributedLock.cs | 18 ++++++++++-------- .../BlobLeaseClientWrapper.cs | 18 ++++++++++++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 32a67f8e..18b3cc07 100644 --- a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -12,7 +12,7 @@ namespace Medallion.Threading.Azure; public sealed partial class AzureBlobLeaseDistributedLock : IInternalDistributedLock { /// - /// Metadata marker used to indicate that a blob was created for distributed locking and therefore + /// Metadata marker used to indicate that a blob was created for distributed locking and therefore /// should be destroyed upon release /// private static readonly string CreatedMetadataKey = $"__DistributedLock"; @@ -53,7 +53,7 @@ internal static string GetSafeName(string name, BlobContainerClient blobContaine return DistributedLockHelpers.ToSafeName(name, maxLength, s => ConvertToValidName(s)); - // check based on + // check based on // https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-the-well-known-account-name-and-key bool IsStorageEmulator() => blobContainerClient.Uri.IsAbsoluteUri && blobContainerClient.Uri.AbsoluteUri.StartsWith("http://127.0.0.1:10000/devstoreaccount1", StringComparison.Ordinal); @@ -105,13 +105,15 @@ static string ConvertToValidName(string name) ); private async ValueTask TryAcquireAsync( - BlobLeaseClientWrapper leaseClient, + BlobLeaseClientWrapper leaseClient, CancellationToken cancellationToken, bool isRetryAfterCreate) { - try { await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); } - catch (RequestFailedException acquireException) + var response = await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); + if (response.IsError) { + var acquireException = new RequestFailedException(response); + if (acquireException.ErrorCode == AzureErrors.LeaseAlreadyPresent) { return null; } if (acquireException.ErrorCode == AzureErrors.BlobNotFound) @@ -144,7 +146,7 @@ static string ConvertToValidName(string name) } } - throw; + throw acquireException; } var shouldDeleteBlob = isRetryAfterCreate @@ -160,7 +162,7 @@ internal sealed class InternalHandle : IDistributedSynchronizationHandle, LeaseM private readonly bool _ownsBlob; private readonly AzureBlobLeaseDistributedLock _lock; private readonly LeaseMonitor _leaseMonitor; - + public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBlobLeaseDistributedLock @lock) { this._leaseClient = leaseClient; @@ -193,7 +195,7 @@ public async ValueTask DisposeAsync() { await this._lock._blobClient.DeleteIfExistsAsync(leaseId: this._leaseClient.LeaseId).ConfigureAwait(false); } - else + else { await this._leaseClient.ReleaseAsync().ConfigureAwait(false); } diff --git a/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs index 11b13ec9..8bffc41f 100644 --- a/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs +++ b/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs @@ -1,4 +1,5 @@ -using Azure.Storage.Blobs.Specialized; +using Azure; +using Azure.Storage.Blobs.Specialized; using Medallion.Threading.Internal; namespace Medallion.Threading.Azure; @@ -17,14 +18,19 @@ public BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) public string LeaseId => this._blobLeaseClient.LeaseId; - public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) + public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) { + var requestContext = new RequestContext + { + CancellationToken = cancellationToken, + ErrorOptions = ErrorOptions.NoThrow + }; + if (SyncViaAsync.IsSynchronous) { - this._blobLeaseClient.Acquire(duration.TimeSpan, cancellationToken: cancellationToken); - return default; + return new ValueTask(this._blobLeaseClient.Acquire(duration.TimeSpan, conditions: null, requestContext)); } - return new ValueTask(this._blobLeaseClient.AcquireAsync(duration.TimeSpan, cancellationToken: cancellationToken)); + return new ValueTask(this._blobLeaseClient.AcquireAsync(duration.TimeSpan, conditions: null, requestContext)); } public ValueTask RenewAsync(CancellationToken cancellationToken) @@ -46,4 +52,4 @@ public ValueTask ReleaseAsync() } return new ValueTask(this._blobLeaseClient.ReleaseAsync()); } -} +} \ No newline at end of file From 44609869c41b407542c228253ea322572d3ff48d Mon Sep 17 00:00:00 2001 From: Martin Demberger Date: Tue, 29 Oct 2024 16:37:40 +0100 Subject: [PATCH 288/399] Added case for rare race conditions on azure lease --- .../AzureBlobLeaseDistributedLock.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 32a67f8e..0e11f44a 100644 --- a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -105,11 +105,11 @@ static string ConvertToValidName(string name) ); private async ValueTask TryAcquireAsync( - BlobLeaseClientWrapper leaseClient, + BlobLeaseClientWrapper leaseClient, CancellationToken cancellationToken, bool isRetryAfterCreate) { - try { await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); } + try { await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); } catch (RequestFailedException acquireException) { if (acquireException.ErrorCode == AzureErrors.LeaseAlreadyPresent) { return null; } @@ -135,6 +135,11 @@ static string ConvertToValidName(string name) { // if the retry fails and we created, attempt deletion to clean things up try { await this._blobClient.DeleteIfExistsAsync().ConfigureAwait(false); } + catch (RequestFailedException deletionException) when (deletionException.ErrorCode == AzureErrors.LeaseIdMissing) + { + // handle the race condition where we try to delete and someone else acquired it + // only the original Exception from TryAcquireAsync should be thrown + } catch (Exception deletionException) { throw new AggregateException(retryException, deletionException); @@ -160,7 +165,7 @@ internal sealed class InternalHandle : IDistributedSynchronizationHandle, LeaseM private readonly bool _ownsBlob; private readonly AzureBlobLeaseDistributedLock _lock; private readonly LeaseMonitor _leaseMonitor; - + public InternalHandle(BlobLeaseClientWrapper leaseClient, bool ownsBlob, AzureBlobLeaseDistributedLock @lock) { this._leaseClient = leaseClient; @@ -193,7 +198,7 @@ public async ValueTask DisposeAsync() { await this._lock._blobClient.DeleteIfExistsAsync(leaseId: this._leaseClient.LeaseId).ConfigureAwait(false); } - else + else { await this._leaseClient.ReleaseAsync().ConfigureAwait(false); } From 06f465e8ed0f6a1731f8adfbd6ed25ef96aff435 Mon Sep 17 00:00:00 2001 From: Steve Ryan Date: Fri, 22 Nov 2024 16:47:59 +1100 Subject: [PATCH 289/399] Bump Microsoft.Data.SqlClient to 5.2.2 --- src/Directory.Packages.props | 4 +- src/DistributedLock.Core/packages.lock.json | 30 +- .../packages.lock.json | 6 +- .../packages.lock.json | 84 +-- src/DistributedLock.Tests/packages.lock.json | 632 +----------------- src/DistributedLock/packages.lock.json | 142 ++-- src/DistributedLockTaker/packages.lock.json | 142 ++-- 7 files changed, 213 insertions(+), 827 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4d00b52e..fcff4e33 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -14,7 +14,7 @@ - + @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..cba53cca 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,17 +146,11 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.11, )", + "resolved": "8.0.11", + "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 5fe46487..ea966c3f 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -518,9 +518,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.11, )", + "resolved": "8.0.11", + "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index b9bb0063..3ba9674b 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -10,13 +10,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -63,12 +63,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -87,8 +87,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -96,10 +96,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -384,13 +384,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -442,12 +442,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -471,8 +471,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -480,10 +480,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -839,13 +839,13 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -887,12 +887,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -924,8 +924,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -933,10 +933,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 318e9e0b..9de0510b 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,590 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", - "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", - "dependencies": { - "Microsoft.Identity.Client": "4.60.3", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", - "DistributedLock.FileSystem": "[1.0.2, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.2.0, )", - "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.5, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Npgsql": "[8.0.3, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "StackExchange.Redis": "[2.7.27, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", - "dependencies": { - "Azure.Identity": "1.11.3", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", - "System.Threading.Channels": "8.0.0" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -660,12 +76,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -724,8 +140,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -733,10 +149,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, @@ -1100,7 +516,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -1109,55 +525,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1173,13 +589,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 808efa08..53b35e9f 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -46,12 +46,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -103,8 +103,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -112,10 +112,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -430,7 +430,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -443,54 +443,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Oracle.ManagedDataAccess": "[21.13.0, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -515,13 +515,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -636,12 +636,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -698,8 +698,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -707,10 +707,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -1088,7 +1088,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -1100,48 +1100,48 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1166,13 +1166,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -1278,12 +1278,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -1336,8 +1336,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -1345,10 +1345,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -1747,7 +1747,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -1756,55 +1756,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1820,13 +1820,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 644c6c7e..04012c1f 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -19,12 +19,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -79,8 +79,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -88,10 +88,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } @@ -378,9 +378,9 @@ "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.SqlServer": "[1.0.5, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -389,7 +389,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -402,54 +402,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Oracle.ManagedDataAccess": "[21.13.0, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -465,13 +465,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -526,7 +526,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - ".NETFramework,Version=v4.7.2/win7-x86": { + ".NETFramework,Version=v4.7.2/win-x86": { "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -582,13 +582,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "System.Buffers": "4.5.1", @@ -601,9 +601,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.11, )", + "resolved": "8.0.11", + "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" }, "Azure.Core": { "type": "Transitive", @@ -622,12 +622,12 @@ }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.3", - "contentHash": "4EsGMAr+oog5UqHs46qwA7S/lJiwpXjPBY3t9tQBmJ8nsgmT/LLnrc32eiTlfOdfKxUz4fxBD2YjSnVZacu97w==", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", "dependencies": { "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.60.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", "System.Memory": "4.5.4", "System.Security.Cryptography.ProtectedData": "4.7.0", "System.Text.Json": "4.7.2", @@ -673,8 +673,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "jve1RzmSpBhGlqMzPva6VfRbLMLZZc1Q8WRVZf8+iEruQkBgDTJPq8OeTehcY4GGYG1j6UB1xVofVE+n4BLDdw==", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -682,10 +682,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.60.3", - "contentHash": "X1Cz14/RbmlLshusE5u2zfG+5ul6ttgou19BZe5Mdw1qm6fgOI9/imBB2TIsx2UD7nkgd2+MCSzhbukZf7udeg==", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", "dependencies": { - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, @@ -964,9 +964,9 @@ "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.3, )", - "DistributedLock.Postgres": "[1.1.0, )", + "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.4, )", + "DistributedLock.SqlServer": "[1.0.5, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -975,7 +975,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.core": { @@ -984,55 +984,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )" + "DistributedLock.Core": "[1.0.7, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Oracle.ManagedDataAccess.Core": "[3.21.130, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", - "Microsoft.Data.SqlClient": "[5.2.1, )" + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.6, )", + "DistributedLock.Core": "[1.0.7, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1048,13 +1048,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", @@ -1103,7 +1103,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - "net8.0/win7-x86": { + "net8.0/win-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "5.2.0", @@ -1127,11 +1127,6 @@ "resolved": "4.3.0", "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" }, - "runtime.win7.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" - }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -1173,8 +1168,7 @@ "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.win7.System.Private.Uri": "4.3.0" + "Microsoft.NETCore.Targets": "1.1.0" } }, "System.Runtime": { @@ -1226,13 +1220,13 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.1, )", - "resolved": "5.2.1", - "contentHash": "ojg2XWmih4ubPPtrhRqqXk0SM6wC2ZSTkNNEAlYBhMo4IsRHjLazFc0abzcZCNfw1JyWcqY7vGutWTv8ZaFD9g==", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", "dependencies": { - "Azure.Identity": "1.11.3", + "Azure.Identity": "1.11.4", "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.60.3", + "Microsoft.Identity.Client": "4.61.3", "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", "Microsoft.SqlServer.Server": "1.0.0", From 9165a8f890cc26e64c039f86992b5836c9e8ba58 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 3 Dec 2024 21:11:55 -0500 Subject: [PATCH 290/399] packages lock --- src/DistributedLock.Core/packages.lock.json | 30 +- .../packages.lock.json | 6 +- src/DistributedLock.Tests/packages.lock.json | 584 ++++++++++++++++++ src/DistributedLockTaker/packages.lock.json | 18 +- 4 files changed, 626 insertions(+), 12 deletions(-) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index cba53cca..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,11 +164,17 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.11, )", - "resolved": "8.0.11", - "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index ea966c3f..5fe46487 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -518,9 +518,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.11, )", - "resolved": "8.0.11", - "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 9de0510b..36b56400 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,590 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "dependencies": { + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "dependencies": { + "Microsoft.Identity.Client": "4.61.3", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Oracle.ManagedDataAccess": { + "type": "Transitive", + "resolved": "21.13.0", + "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "dependencies": { + "System.Formats.Asn1": "7.0.0", + "System.Text.Json": "6.0.1" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Postgres": "[1.2.0, )", + "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.7, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "Oracle.ManagedDataAccess": "[21.13.0, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "Npgsql": "[8.0.3, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.7, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", + "dependencies": { + "Azure.Identity": "1.11.4", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 04012c1f..07cef573 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -526,7 +526,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - ".NETFramework,Version=v4.7.2/win-x86": { + ".NETFramework,Version=v4.7.2/win7-x86": { "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -601,9 +601,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.11, )", - "resolved": "8.0.11", - "contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ==" + "requested": "[8.0.4, )", + "resolved": "8.0.4", + "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" }, "Azure.Core": { "type": "Transitive", @@ -1103,7 +1103,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - "net8.0/win-x86": { + "net8.0/win7-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "5.2.0", @@ -1127,6 +1127,11 @@ "resolved": "4.3.0", "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" }, + "runtime.win7.System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" + }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -1168,7 +1173,8 @@ "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7.System.Private.Uri": "4.3.0" } }, "System.Runtime": { From 19df97745cf9ece4598c922cb6e0fc976b1ae4ef Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:35:13 -0500 Subject: [PATCH 291/399] Version bump --- .../AzureBlobLeaseDistributedLock.cs | 10 +++---- .../BlobLeaseClientWrapper.cs | 29 +++++++------------ .../DistributedLock.Azure.csproj | 2 +- .../DistributedLock.SqlServer.csproj | 2 +- src/DistributedLock/DistributedLock.csproj | 2 +- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs index 0671ee48..914d5c0c 100644 --- a/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs +++ b/src/DistributedLock.Azure/AzureBlobLeaseDistributedLock.cs @@ -51,7 +51,7 @@ internal static string GetSafeName(string name, BlobContainerClient blobContaine { var maxLength = IsStorageEmulator() ? 256 : 1024; - return DistributedLockHelpers.ToSafeName(name, maxLength, s => ConvertToValidName(s)); + return DistributedLockHelpers.ToSafeName(name, maxLength, ConvertToValidName); // check based on // https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator#connect-to-the-emulator-account-using-the-well-known-account-name-and-key @@ -109,7 +109,7 @@ static string ConvertToValidName(string name) CancellationToken cancellationToken, bool isRetryAfterCreate) { - var response = await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); + using var response = await leaseClient.AcquireAsync(this._options.duration, cancellationToken).ConfigureAwait(false); if (response.IsError) { var acquireException = new RequestFailedException(response); @@ -128,7 +128,7 @@ static string ConvertToValidName(string name) { // handle the race condition where we try to create and someone else creates it first return createException.ErrorCode == AzureErrors.LeaseIdMissing - ? default(AzureBlobLeaseDistributedLockHandle?) + ? default : throw new AggregateException($"Blob {this._blobClient.Name} does not exist and could not be created. See inner exceptions for details", acquireException, createException); } @@ -139,8 +139,8 @@ static string ConvertToValidName(string name) try { await this._blobClient.DeleteIfExistsAsync().ConfigureAwait(false); } catch (RequestFailedException deletionException) when (deletionException.ErrorCode == AzureErrors.LeaseIdMissing) { - // handle the race condition where we try to delete and someone else acquired it - // only the original Exception from TryAcquireAsync should be thrown + // Handle the race condition where we try to delete and someone else acquired it: + // in that case only the original Exception from TryAcquireAsync should be thrown. } catch (Exception deletionException) { diff --git a/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs b/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs index 8bffc41f..e0ea120d 100644 --- a/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs +++ b/src/DistributedLock.Azure/BlobLeaseClientWrapper.cs @@ -7,49 +7,40 @@ namespace Medallion.Threading.Azure; /// /// Adds support to /// -internal sealed class BlobLeaseClientWrapper +internal sealed class BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) { - private readonly BlobLeaseClient _blobLeaseClient; - - public BlobLeaseClientWrapper(BlobLeaseClient blobLeaseClient) - { - this._blobLeaseClient = blobLeaseClient; - } - - public string LeaseId => this._blobLeaseClient.LeaseId; + public string LeaseId => blobLeaseClient.LeaseId; public ValueTask AcquireAsync(TimeoutValue duration, CancellationToken cancellationToken) { - var requestContext = new RequestContext + RequestContext requestContext = new() { CancellationToken = cancellationToken, ErrorOptions = ErrorOptions.NoThrow }; - if (SyncViaAsync.IsSynchronous) - { - return new ValueTask(this._blobLeaseClient.Acquire(duration.TimeSpan, conditions: null, requestContext)); - } - return new ValueTask(this._blobLeaseClient.AcquireAsync(duration.TimeSpan, conditions: null, requestContext)); + return SyncViaAsync.IsSynchronous + ? new ValueTask(blobLeaseClient.Acquire(duration.TimeSpan, conditions: null, requestContext)) + : new ValueTask(blobLeaseClient.AcquireAsync(duration.TimeSpan, conditions: null, requestContext)); } public ValueTask RenewAsync(CancellationToken cancellationToken) { if (SyncViaAsync.IsSynchronous) { - this._blobLeaseClient.Renew(cancellationToken: cancellationToken); + blobLeaseClient.Renew(cancellationToken: cancellationToken); return default; } - return new ValueTask(this._blobLeaseClient.RenewAsync(cancellationToken: cancellationToken)); + return new ValueTask(blobLeaseClient.RenewAsync(cancellationToken: cancellationToken)); } public ValueTask ReleaseAsync() { if (SyncViaAsync.IsSynchronous) { - this._blobLeaseClient.Release(); + blobLeaseClient.Release(); return default; } - return new ValueTask(this._blobLeaseClient.ReleaseAsync()); + return new ValueTask(blobLeaseClient.ReleaseAsync()); } } \ No newline at end of file diff --git a/src/DistributedLock.Azure/DistributedLock.Azure.csproj b/src/DistributedLock.Azure/DistributedLock.Azure.csproj index cf1c356f..e4adae2b 100644 --- a/src/DistributedLock.Azure/DistributedLock.Azure.csproj +++ b/src/DistributedLock.Azure/DistributedLock.Azure.csproj @@ -11,7 +11,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson Provides a distributed locking implementation based on Azure blob leases diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 0e6efb8f..2b53749a 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -11,7 +11,7 @@ - 1.0.5 + 1.0.6 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index b0b39f26..dff5730a 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.5.0 + 2.5.1 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From a7df48f62d3329ae1cbc38d454f6c5e135a12704 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:46:48 -0500 Subject: [PATCH 292/399] README updates --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a26eb6d4..81a2d8ac 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,10 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.5.1 + - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for contributing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) + - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for contributing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) + - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) From 970ff3ed4d2df075b7bdd68e5734239404af8ca6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:48:15 -0500 Subject: [PATCH 293/399] README update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 81a2d8ac..320e0003 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,8 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.5.1 - - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for contributing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) - - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for contributing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) + - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) + - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) From 3b54d0d8551dc44d55dc3917508dec4d050df49f Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 6 Dec 2024 21:43:05 -0500 Subject: [PATCH 294/399] Bump Oracle client libs to latest + avoid system.private.uri vulnerability --- README.md | 3 +- src/Directory.Packages.props | 5 +- .../DistributedLock.Core.csproj | 2 +- .../Internal/Data/DatabaseConnection.cs | 7 +- src/DistributedLock.Core/packages.lock.json | 24 - .../DistributedLock.Oracle.csproj | 6 +- .../OracleDatabaseConnection.cs | 2 + src/DistributedLock.Oracle/packages.lock.json | 148 ++-- .../Infrastructure/Oracle/TestingOracleDb.cs | 7 + src/DistributedLock.Tests/packages.lock.json | 162 ++-- src/DistributedLock/DistributedLock.csproj | 4 +- src/DistributedLock/packages.lock.json | 728 +++++++++++++++--- src/DistributedLockTaker/packages.lock.json | 235 +++--- 13 files changed, 888 insertions(+), 445 deletions(-) diff --git a/README.md b/README.md index 320e0003..1edd4d94 100644 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) + - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4). - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) @@ -153,7 +154,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! + - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index fcff4e33..26a14653 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -10,8 +10,8 @@ - - + + @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index 396e3e9e..c7c207fb 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -11,7 +11,7 @@ - 1.0.7 + 1.0.8 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs index 30a9beee..adb3a1c1 100644 --- a/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs +++ b/src/DistributedLock.Core/Internal/Data/DatabaseConnection.cs @@ -82,7 +82,12 @@ public async ValueTask OpenAsync(CancellationToken cancellationToken) if ((cancellationToken.CanBeCanceled || !SyncViaAsync.IsSynchronous) && this.InnerConnection is DbConnection dbConnection) { - await dbConnection.OpenAsync(cancellationToken).ConfigureAwait(false); + try { await dbConnection.OpenAsync(cancellationToken).ConfigureAwait(false); } + // Oracle can throw OracleException instead of OCE here + catch (Exception ex) when (cancellationToken.IsCancellationRequested && this.IsCommandCancellationException(ex)) + { + throw new OperationCanceledException("Connection open canceled", ex, cancellationToken); + } } else { diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index 32e0600d..ee509ea1 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net462 + netstandard2.1;net472 Medallion.Threading.Oracle True 4 @@ -11,7 +11,7 @@ - 1.0.3 + 1.0.4 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Oracle Database @@ -46,7 +46,7 @@ - + diff --git a/src/DistributedLock.Oracle/OracleDatabaseConnection.cs b/src/DistributedLock.Oracle/OracleDatabaseConnection.cs index bf2a26d9..df6aa519 100644 --- a/src/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/src/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -72,6 +72,8 @@ public static OracleConnection CreateConnection(string connectionString) { var firstSeparatorIndex = connectionString.IndexOf(';'); var applicationName = connectionString.Substring(startIndex: ApplicationNameIndicatorPrefix.Length, length: firstSeparatorIndex - ApplicationNameIndicatorPrefix.Length); + // After upgrading the Oracle client to 23.6.1, the connection pool sometimes seems to grow beyond what is strictly required. + // This causes issues if we're tracking connections by name. Therefore, we disable pooling on named connections var connection = new OracleConnection(connectionString.Substring(startIndex: firstSeparatorIndex + 1)); connection.ConnectionOpen += _ => connection.ClientInfo = applicationName; return connection; diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index 3d6d09dc..b511da3b 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -1,22 +1,13 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.6.2": { + ".NETFramework,Version=v4.7.2": { "Microsoft.CodeAnalysis.PublicApiAnalyzers": { "type": "Direct", "requested": "[3.3.4, )", "resolved": "3.3.4", "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net462": "1.0.3" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -29,23 +20,28 @@ }, "Oracle.ManagedDataAccess": { "type": "Direct", - "requested": "[21.13.0, )", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.Build.Tasks.Git": { + "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } }, - "Microsoft.NETFramework.ReferenceAssemblies.net462": { + "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -57,10 +53,19 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -89,25 +94,24 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" } @@ -120,27 +124,17 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, "distributedlock.core": { "type": "Project", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.ValueTuple": "[4.5.0, )" } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.ValueTuple": { - "type": "CentralTransitive", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, ".NETStandard,Version=v2.1": { @@ -162,14 +156,16 @@ }, "Oracle.ManagedDataAccess.Core": { "type": "Direct", - "requested": "[3.21.130, )", - "resolved": "3.21.130", - "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "Oc8AX7xme05xrp4/aCxKBH4+bpWgMCFafXI7LbLO/7OBMJLZRXhMtejDgIb8aYvIVyV7vSdAy3LkCYcJorxn1A==", "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Diagnostics.PerformanceCounter": "6.0.1", - "System.DirectoryServices": "6.0.1", "System.DirectoryServices.Protocols": "6.0.2", - "System.Text.Json": "6.0.1" + "System.Formats.Asn1": "6.0.1", + "System.Security.Cryptography.Pkcs": "6.0.4", + "System.Text.Json": "6.0.10" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -192,21 +188,19 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Diagnostics.PerformanceCounter": { + "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, - "System.DirectoryServices": { + "System.Diagnostics.PerformanceCounter": { "type": "Transitive", "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", - "dependencies": { - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" }, "System.DirectoryServices.Protocols": { "type": "Transitive", @@ -216,15 +210,13 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.IO.FileSystem.AccessControl": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "resolved": "6.0.1", + "contentHash": "glgtKqWJpH9GDw0m9I5xFiF6WDIQqi/eZXU6MkMRPzAWEERGGAJh+qztkrlWSDbokQ1jalj5NcBNIvVoSDpSSA==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" + "System.Memory": "4.5.4" } }, "System.Memory": { @@ -247,20 +239,18 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Security.AccessControl": { + "System.Security.Cryptography.Cng": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } + "resolved": "5.0.0", + "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.Security.Permissions": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "resolved": "6.0.4", + "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==", "dependencies": { - "System.Security.AccessControl": "6.0.0" + "System.Formats.Asn1": "6.0.0", + "System.Security.Cryptography.Cng": "5.0.0" } }, "System.Security.Principal.Windows": { @@ -280,8 +270,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==", + "resolved": "6.0.10", + "contentHash": "NSB0kDipxn2ychp88NXWfFRFlmi1bst/xynOutbnpEfRCT9JZkZ7KOmF/I/hNKo2dILiMGnqblm+j1sggdLB9g==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.Buffers": "4.5.1", diff --git a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs index 0b5c7735..3ff1714d 100644 --- a/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs +++ b/src/DistributedLock.Tests/Infrastructure/Oracle/TestingOracleDb.cs @@ -31,6 +31,13 @@ public override int CountActiveSessions(string applicationName) { Invariant.Require(applicationName.Length <= this.MaxApplicationNameLength); + // Oracle's client seems to allow the connection pool to grow beyond what is strictly required; + // Clear the pool to get an accurate count. See https://github.com/oracle/dotnet-db-samples/issues/425 + using (var clearConnection = this.CreateConnection()) + { + this.ClearPool(clearConnection); + } + using var connection = new OracleConnection(DefaultConnectionString); connection.Open(); using var command = connection.CreateCommand(); diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 36b56400..de793fc4 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -211,15 +211,6 @@ "System.Text.Json": "4.7.2" } }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -270,8 +261,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -397,8 +388,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -433,13 +424,13 @@ "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -448,7 +439,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -461,54 +452,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -565,6 +556,18 @@ "System.Threading.Channels": "8.0.0" } }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "StackExchange.Redis": { "type": "CentralTransitive", "requested": "[2.7.27, )", @@ -794,8 +797,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "3.1.0", + "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -833,11 +836,6 @@ "System.Security.Principal.Windows": "4.7.0" } }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.0", @@ -853,12 +851,13 @@ }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", - "resolved": "3.21.130", - "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", + "resolved": "23.6.1", + "contentHash": "Oc8AX7xme05xrp4/aCxKBH4+bpWgMCFafXI7LbLO/7OBMJLZRXhMtejDgIb8aYvIVyV7vSdAy3LkCYcJorxn1A==", "dependencies": { - "System.Diagnostics.PerformanceCounter": "6.0.1", - "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.2" + "System.Diagnostics.PerformanceCounter": "8.0.0", + "System.DirectoryServices.Protocols": "8.0.0", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Pkcs": "8.0.0" } }, "Pipelines.Sockets.Unofficial": { @@ -927,33 +926,21 @@ }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, - "System.DirectoryServices": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "resolved": "8.0.0", + "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==", "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" + "resolved": "8.0.0", + "contentHash": "puwJxURHDrYLGTQdsHyeMS72ClTqYa4lDYz6LHSbkZEk5hq8H8JfsO4MyYhB5BMMxg93jsQzLUwrnCumj11UIg==" }, - "System.Drawing.Common": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", @@ -1022,28 +1009,31 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" + "resolved": "4.7.0", + "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0", + "System.Security.Principal.Windows": "4.7.0" + } }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Windows.Extensions": "6.0.0" + "System.Formats.Asn1": "8.0.0" } }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" + }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "4.7.0", @@ -1074,24 +1064,16 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", - "dependencies": { - "System.Drawing.Common": "6.0.0" - } - }, "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -1100,7 +1082,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -1109,55 +1091,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess.Core": "[3.21.130, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index dff5730a..5833e0a7 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net462 + netstandard2.0;netstandard2.1;net462;net472 Medallion.Threading True 4 @@ -53,7 +53,7 @@ - + diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 53b35e9f..972cbaec 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -234,10 +234,567 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "Npgsql": "[8.0.3, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "StackExchange.Redis": "[2.7.27, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "CentralTransitive", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", + "dependencies": { + "Azure.Identity": "1.11.4", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.3, )", + "resolved": "8.0.3", + "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.0", + "System.Threading.Channels": "8.0.0" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.27, )", + "resolved": "2.7.27", + "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.ValueTuple": { + "type": "CentralTransitive", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, + ".NETFramework,Version=v4.7.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "dependencies": { + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "dependencies": { + "Microsoft.Identity.Client": "4.61.3", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -305,14 +862,6 @@ "System.Text.Json": "4.6.0" } }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -336,38 +885,11 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" - }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.7.0", "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, "System.Security.Permissions": { "type": "Transitive", "resolved": "6.0.0", @@ -398,8 +920,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -426,11 +948,16 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, "distributedlock.azure": { "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -443,54 +970,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -504,15 +1031,6 @@ "System.Text.Json": "4.7.2" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", @@ -558,12 +1076,14 @@ }, "Oracle.ManagedDataAccess": { "type": "CentralTransitive", - "requested": "[21.13.0, )", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" } }, "StackExchange.Redis": { @@ -576,16 +1096,9 @@ "Microsoft.Extensions.Logging.Abstractions": "6.0.0", "Pipelines.Sockets.Unofficial": "2.2.8", "System.IO.Compression": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "System.Threading.Channels": "5.0.0" } }, - "System.ValueTuple": { - "type": "CentralTransitive", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, "ZooKeeperNetEx": { "type": "CentralTransitive", "requested": "[3.4.12.4, )", @@ -1088,7 +1601,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -1100,48 +1613,48 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1496,23 +2009,21 @@ "resolved": "6.0.1", "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==" }, - "System.DirectoryServices": { + "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "resolved": "6.0.2", + "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==", "dependencies": { - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0", "System.Security.Principal.Windows": "5.0.0" } }, - "System.DirectoryServices.Protocols": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==", + "resolved": "6.0.1", + "contentHash": "glgtKqWJpH9GDw0m9I5xFiF6WDIQqi/eZXU6MkMRPzAWEERGGAJh+qztkrlWSDbokQ1jalj5NcBNIvVoSDpSSA==", "dependencies": { - "System.Security.Principal.Windows": "5.0.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" } }, "System.IdentityModel.Tokens.Jwt": { @@ -1657,6 +2168,15 @@ "resolved": "5.0.0", "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "6.0.4", + "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==", + "dependencies": { + "System.Formats.Asn1": "6.0.0", + "System.Security.Cryptography.Cng": "5.0.0" + } + }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "6.0.0", @@ -1747,7 +2267,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -1756,55 +2276,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess.Core": "[3.21.130, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1867,14 +2387,16 @@ }, "Oracle.ManagedDataAccess.Core": { "type": "CentralTransitive", - "requested": "[3.21.130, )", - "resolved": "3.21.130", - "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "Oc8AX7xme05xrp4/aCxKBH4+bpWgMCFafXI7LbLO/7OBMJLZRXhMtejDgIb8aYvIVyV7vSdAy3LkCYcJorxn1A==", "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Diagnostics.PerformanceCounter": "6.0.1", - "System.DirectoryServices": "6.0.1", "System.DirectoryServices.Protocols": "6.0.2", - "System.Text.Json": "6.0.1" + "System.Formats.Asn1": "6.0.1", + "System.Security.Cryptography.Pkcs": "6.0.4", + "System.Text.Json": "6.0.10" } }, "StackExchange.Redis": { diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 07cef573..469f349f 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -152,15 +152,6 @@ "System.Text.Json": "4.7.2" } }, - "Oracle.ManagedDataAccess": { - "type": "Transitive", - "resolved": "21.13.0", - "contentHash": "3OaqQzmx5aRrjBfPu44BaGy9Jz+NiO8Q7x+jPrSL91nSc/M4JYv6j/aX1dwdq4rlSHAw6Ct9rUsd0z7xjvq0Gw==", - "dependencies": { - "System.Formats.Asn1": "7.0.0", - "System.Text.Json": "6.0.1" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -211,8 +202,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -338,8 +329,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -374,13 +365,13 @@ "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -389,7 +380,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -402,54 +393,54 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess": "[21.13.0, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -506,6 +497,18 @@ "System.Threading.Channels": "8.0.0" } }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "StackExchange.Redis": { "type": "CentralTransitive", "requested": "[2.7.27, )", @@ -756,19 +759,15 @@ "resolved": "1.0.0", "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" - }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", - "resolved": "3.21.130", - "contentHash": "bXNwPyAaDivO84HEYiegK7r/LleSEfA0nc70bE88wkqd1E0Q1+r/SUbJ51xOK2vk6iHbTSMuhnC79BU8svPBjQ==", + "resolved": "23.6.1", + "contentHash": "Oc8AX7xme05xrp4/aCxKBH4+bpWgMCFafXI7LbLO/7OBMJLZRXhMtejDgIb8aYvIVyV7vSdAy3LkCYcJorxn1A==", "dependencies": { - "System.Diagnostics.PerformanceCounter": "6.0.1", - "System.DirectoryServices": "6.0.1", - "System.DirectoryServices.Protocols": "6.0.2" + "System.Diagnostics.PerformanceCounter": "8.0.0", + "System.DirectoryServices.Protocols": "8.0.0", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Pkcs": "8.0.0" } }, "Pipelines.Sockets.Unofficial": { @@ -812,33 +811,21 @@ }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, - "System.DirectoryServices": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "resolved": "8.0.0", + "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==", "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" + "resolved": "8.0.0", + "contentHash": "puwJxURHDrYLGTQdsHyeMS72ClTqYa4lDYz6LHSbkZEk5hq8H8JfsO4MyYhB5BMMxg93jsQzLUwrnCumj11UIg==" }, - "System.Drawing.Common": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", @@ -900,30 +887,24 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" - }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Windows.Extensions": "6.0.0" + "System.Formats.Asn1": "8.0.0" } }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -949,24 +930,16 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", - "dependencies": { - "System.Drawing.Common": "6.0.0" - } - }, "distributedlock": { "type": "Project", "dependencies": { - "DistributedLock.Azure": "[1.0.1, )", + "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.2, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.3, )", + "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.2.0, )", "DistributedLock.Redis": "[1.0.3, )", - "DistributedLock.SqlServer": "[1.0.5, )", + "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -975,7 +948,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.core": { @@ -984,55 +957,55 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )" + "DistributedLock.Core": "[1.0.8, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", - "Oracle.ManagedDataAccess.Core": "[3.21.130, )" + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Npgsql": "[8.0.3, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "StackExchange.Redis": "[2.7.27, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.7, )", + "DistributedLock.Core": "[1.0.8, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1109,10 +1082,15 @@ "resolved": "5.2.0", "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, - "Microsoft.Win32.SystemEvents": { + "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.3", + "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" }, "runtime.any.System.Runtime": { "type": "Transitive", @@ -1139,43 +1117,16 @@ }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dDl7Gx3bmSrM2k2ZIm+ucEJnLloZRyvfQF1DvfvATcGF3jtaUBiPvChma+6ZcZzxWMirN3kCywkW7PILphXyMQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, - "System.DirectoryServices": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "935IbO7h5FDGYxeO3cbx/CuvBBuk/VI8sENlfmXlh1pupNOB3LAGzdYdPY8CawGJFP7KNrHK5eUlsFoz3F6cuA==", + "resolved": "8.0.0", + "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==", "dependencies": { - "System.Security.AccessControl": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.DirectoryServices.Protocols": { "type": "Transitive", - "resolved": "6.0.2", - "contentHash": "vDDPWwHn3/DNZ+kPkdXHoada+tKPEC9bVqDOr4hK6HBSP7hGCUTA0Zw6WU5qpGaqa5M1/V+axHMIv+DNEbIf6g==" - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.win7.System.Private.Uri": "4.3.0" - } + "resolved": "8.0.0", + "contentHash": "puwJxURHDrYLGTQdsHyeMS72ClTqYa4lDYz6LHSbkZEk5hq8H8JfsO4MyYhB5BMMxg93jsQzLUwrnCumj11UIg==" }, "System.Runtime": { "type": "Transitive", @@ -1195,16 +1146,19 @@ "System.Configuration.ConfigurationManager": "8.0.0" } }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==" - }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", + "dependencies": { + "System.Formats.Asn1": "8.0.0" + } + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -1216,14 +1170,6 @@ "runtime.any.System.Text.Encoding": "4.3.0" } }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "IXoJOXIqc39AIe+CIR7koBtRGMiCt/LPM3lI+PELtDIy9XdyeSrwXFdWV9dzJ2Awl0paLWUaknLxFQ5HpHZUog==", - "dependencies": { - "System.Drawing.Common": "6.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", @@ -1240,6 +1186,17 @@ "System.Runtime.Caching": "8.0.0" } }, + "System.Private.Uri": { + "type": "CentralTransitive", + "requested": "[4.3.2, )", + "resolved": "4.3.2", + "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "Microsoft.NETCore.Targets": "1.1.3", + "runtime.win7.System.Private.Uri": "4.3.0" + } + }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", From 201ef42edf0b2d004b38df8f1ea5d18491af6652 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 6 Dec 2024 21:54:46 -0500 Subject: [PATCH 295/399] Bump Npgsql to latest patch --- README.md | 3 +- src/Directory.Packages.props | 2 +- src/DistributedLock.Core/packages.lock.json | 24 +++++++++ .../DistributedLock.Postgres.csproj | 2 +- .../packages.lock.json | 42 +++++++-------- .../Tests/Core/Data/DatabaseConnectionTest.cs | 2 +- src/DistributedLock.Tests/packages.lock.json | 18 +++---- src/DistributedLock/packages.lock.json | 52 +++++++++---------- src/DistributedLockTaker/packages.lock.json | 18 +++---- 9 files changed, 94 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 1edd4d94..dbec43cc 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,8 @@ Setup steps for working with the repository locally are documented [here](docs/D - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) - - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4). + - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4) + - Bump Npgsql to latest patch to avoid bringing in vulnerable packages (DistributedLock.Postgres 1.2.1) - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 26a14653..0023a608 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -12,7 +12,7 @@ - + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index b3552a3b..74461129 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.2.0 + 1.2.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 5fe46487..797320b6 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -29,16 +29,16 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -136,8 +136,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -215,16 +215,16 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -322,8 +322,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -384,15 +384,15 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -481,8 +481,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -534,9 +534,9 @@ }, "Npgsql": { "type": "Direct", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } diff --git a/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs b/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs index ec2cf92d..d07f29aa 100644 --- a/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/Data/DatabaseConnectionTest.cs @@ -12,7 +12,7 @@ public class DatabaseConnectionTest [Test] public async Task TestConnectionMonitorStaysSubscribedAfterClose() { - var db = new TestingSqlServerDb { ApplicationName = nameof(TestConnectionMonitorStaysSubscribedAfterClose) }; + var db = new TestingSqlServerDb { ApplicationName = TestHelper.UniqueName }; await using var connection = new SqlDatabaseConnection(db.ConnectionString); diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index de793fc4..a0d85a11 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -473,7 +473,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -543,16 +543,16 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -1112,7 +1112,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -1180,9 +1180,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 972cbaec..d43eb309 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -388,8 +388,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -447,7 +447,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -526,16 +526,16 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -991,7 +991,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -1061,16 +1061,16 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -1560,8 +1560,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -1627,7 +1627,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -1714,16 +1714,16 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -2229,8 +2229,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -2297,7 +2297,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -2373,15 +2373,15 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 469f349f..2f58c624 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -414,7 +414,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -484,16 +484,16 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Bcl.HashCode": "1.1.1", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "System.Collections.Immutable": "8.0.0", "System.Diagnostics.DiagnosticSource": "8.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.0", + "System.Text.Json": "8.0.5", "System.Threading.Channels": "8.0.0" } }, @@ -978,7 +978,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.3, )" + "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { @@ -1046,9 +1046,9 @@ }, "Npgsql": { "type": "CentralTransitive", - "requested": "[8.0.3, )", - "resolved": "8.0.3", - "contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0" } From b7f4dab060117510126a1e21954f1ae8a39ff208 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:51:58 -0500 Subject: [PATCH 296/399] Try bumping retry count in FileDistributedLock --- README.md | 3 ++- .../DistributedLock.FileSystem.csproj | 2 +- src/DistributedLock.FileSystem/FileDistributedLock.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dbec43cc..39c4e369 100644 --- a/README.md +++ b/README.md @@ -152,13 +152,14 @@ Setup steps for working with the repository locally are documented [here](docs/D - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) + - Improve directory creation concurrency handling for `FileDistributedLock` (DistributedLock.FileSystem 1.0.3) - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](), DistributedLock.FileSystem 1.0.2) + - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](https://github.com/madelson/DistributedLock/issues/195), DistributedLock.FileSystem 1.0.2) - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) - New API documentation on [dndocs](https://dndocs.com/). Thanks [@NeuroXiq](https://github.com/NeuroXiq)! - New documentation for contributors to get the project running locally (see [Contributing](#contributing)) diff --git a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj index 5a89109c..8189b435 100644 --- a/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj +++ b/src/DistributedLock.FileSystem/DistributedLock.FileSystem.csproj @@ -11,7 +11,7 @@ - 1.0.2 + 1.0.3 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on file locks diff --git a/src/DistributedLock.FileSystem/FileDistributedLock.cs b/src/DistributedLock.FileSystem/FileDistributedLock.cs index 2001570a..5ac4c2de 100644 --- a/src/DistributedLock.FileSystem/FileDistributedLock.cs +++ b/src/DistributedLock.FileSystem/FileDistributedLock.cs @@ -12,7 +12,7 @@ public sealed partial class FileDistributedLock : IInternalDistributedLock - private const int MaxUnauthorizedAccessExceptionRetries = 800; + private const int MaxUnauthorizedAccessExceptionRetries = 1600; // These are not configurable currently because in the future we may want to change the implementation of FileDistributedLock // to leverage native methods which may allow for actual blocking. The values here reflect the idea that we expect file locks From 737df17c2c342f446866b0279f0e6eac644729f4 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:05:52 -0500 Subject: [PATCH 297/399] Fix readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39c4e369..8d82a3e6 100644 --- a/README.md +++ b/README.md @@ -147,12 +147,12 @@ Setup steps for working with the repository locally are documented [here](docs/D - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4) - Bump Npgsql to latest patch to avoid bringing in vulnerable packages (DistributedLock.Postgres 1.2.1) + - Improve directory creation concurrency handling for `FileDistributedLock` (DistributedLock.FileSystem 1.0.3) - 2.5 - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - - Improve directory creation concurrency handling for `FileDistributedLock` (DistributedLock.FileSystem 1.0.3) - 2.4 - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! From 056fa155991ae4c993c0be231c64ffdc5ccdb870 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Wed, 18 Dec 2024 16:14:17 +0200 Subject: [PATCH 298/399] Fixes after CR + unit tests --- .../Internal/DistributedLockHelpers.cs | 27 +--- src/DistributedLock.Core/Internal/Helpers.cs | 2 +- .../PostgresAdvisoryLock.cs | 8 +- .../PostgresDistributedLock.Extensions.cs | 141 ++++++++++++++---- .../PublicAPI.Unshipped.txt | 8 +- .../PostgresDistributedLockExtensionsTest.cs | 48 ++++++ 6 files changed, 166 insertions(+), 68 deletions(-) create mode 100644 src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs diff --git a/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs b/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs index 3b997933..7427b731 100644 --- a/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs +++ b/src/DistributedLock.Core/Internal/DistributedLockHelpers.cs @@ -1,5 +1,4 @@ -using Medallion.Threading.Internal.Data; -using System.Security.Cryptography; +using System.Security.Cryptography; using System.Text; namespace Medallion.Threading.Internal; @@ -134,30 +133,6 @@ public static bool TryUpgradeToWriteLock(IDistributedLockUpgradeableHandle handl SyncViaAsync.Run(t => t.handle.TryUpgradeToWriteLockAsync(t.timeout, t.cancellationToken), (handle, timeout, cancellationToken)); #endregion - #region ---- IDbSynchronizationStrategy implementations ---- - public static ValueTask TryAcquireAsync(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class => - strategy.TryAcquireAsync(connection, resourceName, timeout, cancellationToken); - - public static ValueTask AcquireAsync(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class => - strategy.TryAcquireAsync(connection, resourceName, timeout, cancellationToken).ThrowTimeoutIfNull(); - - public static THandle Acquire(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan? timeout, CancellationToken cancellationToken) - where THandle : class => - SyncViaAsync.Run( - state => AcquireAsync(state.strategy, state.connection, state.resourceName, state.timeout, state.cancellationToken), - (strategy, connection, resourceName, timeout, cancellationToken) - ); - - public static THandle? TryAcquire(IDbSynchronizationStrategy strategy, DatabaseConnection connection, string resourceName, TimeSpan timeout, CancellationToken cancellationToken) - where THandle : class => - SyncViaAsync.Run( - state => TryAcquireAsync(strategy, connection, resourceName, timeout, cancellationToken), - (strategy, connection, resourceName, timeout, cancellationToken) - ); - #endregion - private static Exception LockTimeout(string? @object = null) => new TimeoutException($"Timeout exceeded when trying to acquire the {@object ?? "lock"}"); public static async ValueTask ThrowTimeoutIfNull(this ValueTask task, string? @object = null) where T : class => diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index 7868c08d..d77cd1d0 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -28,7 +28,7 @@ public readonly struct TaskConversion public readonly struct TaskConversion { } - public static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); + internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); public static ValueTask AsValueTask(this Task task) => new(task); public static ValueTask AsValueTask(this Task task) => new(task); diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 8684aa5b..068f9f58 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -211,13 +211,7 @@ public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName private async ValueTask ReleaseAsync(DatabaseConnection connection, PostgresAdvisoryLockKey key, bool isTry) { - // For transaction scoped advisory locks, the lock can only be released by ending the transaction. - // If the transaction is internally-owned, then the lock will be released when the transaction is disposed as part of the internal connection management. - // If the transaction is externally-owned, then the lock will have to be released explicitly by the transaction initiator. - if (UseTransactionScopedLock(connection)) - { - return; - } + Invariant.Require(!UseTransactionScopedLock(connection)); using var command = connection.CreateCommand(); command.SetCommandText($"SELECT pg_catalog.pg_advisory_unlock{(this._isShared ? "_shared" : string.Empty)}({AddKeyParametersAndGetKeyArguments(command, key)})"); diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs index deee7272..4580a836 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs @@ -5,52 +5,133 @@ namespace Medallion.Threading.Postgres; public partial class PostgresDistributedLock { - public static bool TryAcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) + /// + /// Attempts to acquire a transaction-scoped advisory lock synchronously with an externally owned transaction. Usage: + /// + /// var transaction = /* create a DB transaction */ + /// + /// var isLockAcquired = myLock.TryAcquireWithTransaction(..., transaction, ...) + /// + /// if (isLockAcquired != null) + /// { + /// /* we have the lock! */ + /// + /// // Commit or Rollback the transaction, which in turn will release the lock + /// } + /// + /// + /// NOTE: The owner of the transaction is the responsible party for it - the owner must commit or rollback the transaction in order to release the acquired lock. + /// + /// The postgres advisory lock key which will be used to acquire the lock. + /// The externally owned transaction which will be used to acquire the lock. The owner of the transaction must commit or rollback it for the lock to be released. + /// How long to wait before giving up on the acquisition attempt. Defaults to 0. + /// Specifies a token by which the wait can be canceled + /// Whether the lock has been acquired + public static bool TryAcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + SyncViaAsync.Run(state => TryAcquireWithTransactionAsyncInternal(state.key, state.transaction, state.timeout, state.cancellationToken), (key, transaction, timeout, cancellationToken)); + + /// + /// Acquires a transaction-scoped advisory lock synchronously, failing with if the attempt times out. Usage: + /// + /// var transaction = /* create a DB transaction */ + /// + /// myLock.AcquireWithTransaction(..., transaction, ...) + /// + /// /* we have the lock! */ + /// + /// // Commit or Rollback the transaction, which in turn will release the lock + /// + /// + /// NOTE: The owner of the transaction is the responsible party for it - the owner must commit or rollback the transaction in order to release the acquired lock. + /// + /// The postgres advisory lock key which will be used to acquire the lock. + /// The externally owned transaction which will be used to acquire the lock. The owner of the transaction must commit or rollback it for the lock to be released. + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + public static void AcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + SyncViaAsync.Run(state => AcquireWithTransactionAsyncInternal(state.key, state.transaction, state.timeout, state.cancellationToken), (key, transaction, timeout, cancellationToken)); + + /// + /// Attempts to acquire a transaction-scoped advisory lock asynchronously with an externally owned transaction. Usage: + /// + /// var transaction = /* create a DB transaction */ + /// + /// var isLockAcquired = await myLock.TryAcquireWithTransactionAsync(..., transaction, ...) + /// + /// if (isLockAcquired != null) + /// { + /// /* we have the lock! */ + /// + /// // Commit or Rollback the transaction, which in turn will release the lock + /// } + /// + /// + /// NOTE: The owner of the transaction is the responsible party for it - the owner must commit or rollback the transaction in order to release the acquired lock. + /// + /// The postgres advisory lock key which will be used to acquire the lock. + /// The externally owned transaction which will be used to acquire the lock. The owner of the transaction must commit or rollback it for the lock to be released. + /// How long to wait before giving up on the acquisition attempt. Defaults to 0. + /// Specifies a token by which the wait can be canceled + /// Whether the lock has been acquired + public static ValueTask TryAcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + TryAcquireWithTransactionAsyncInternal(key, transaction, timeout, cancellationToken); + + /// + /// Acquires a transaction-scoped advisory lock asynchronously, failing with if the attempt times out. Usage: + /// + /// var transaction = /* create a DB transaction */ + /// + /// await myLock.AcquireWithTransaction(..., transaction, ...) + /// + /// /* we have the lock! */ + /// + /// // Commit or Rollback the transaction, which in turn will release the lock + /// + /// + /// NOTE: The owner of the transaction is the responsible party for it - the owner must commit or rollback the transaction in order to release the acquired lock. + /// + /// The postgres advisory lock key which will be used to acquire the lock. + /// The externally owned transaction which will be used to acquire the lock. The owner of the transaction must commit or rollback it for the lock to be released. + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + public static ValueTask AcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + AcquireWithTransactionAsyncInternal(key, transaction, timeout, cancellationToken); + + internal static ValueTask TryAcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) { if (key == null) { throw new ArgumentNullException(nameof(key)); } if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - var connection = new PostgresDatabaseConnection(transaction); - - var handle = DistributedLockHelpers.TryAcquire(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); - - return handle != null; - } - - public static void AcquireWithTransaction(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) - { - if (key == null) { throw new ArgumentNullException(nameof(key)); } - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - - var connection = new PostgresDatabaseConnection(transaction); - - DistributedLockHelpers.Acquire(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); - } - - public static ValueTask TryAcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) - { - if (key == null) { throw new ArgumentNullException(nameof(key)); } - if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - - var connection = new PostgresDatabaseConnection(transaction); - return TryAcquireAsync(); async ValueTask TryAcquireAsync() { - var handle = await DistributedLockHelpers.TryAcquireAsync(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken); + var connection = new PostgresDatabaseConnection(transaction); + + await using (connection.ConfigureAwait(false)) + { + var handle = await PostgresAdvisoryLock.ExclusiveLock.TryAcquireAsync(connection, key.ToString(), timeout, cancellationToken).ConfigureAwait(false); - return handle != null; + return handle != null; + } } } - public static ValueTask AcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) + internal static ValueTask AcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) { if (key == null) { throw new ArgumentNullException(nameof(key)); } if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } - var connection = new PostgresDatabaseConnection(transaction); + return AcquireAsync(); - return DistributedLockHelpers.AcquireAsync(PostgresAdvisoryLock.ExclusiveLock, connection, key.ToString(), timeout, cancellationToken).ConvertToVoid(); + async ValueTask AcquireAsync() + { + var connection = new PostgresDatabaseConnection(transaction); + + await using (connection.ConfigureAwait(false)) + { + await PostgresAdvisoryLock.ExclusiveLock.TryAcquireAsync(connection, key.ToString(), timeout, cancellationToken).ThrowTimeoutIfNull().ConfigureAwait(false); + } + } } } diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index 00b28778..e80fc01b 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -1,5 +1,5 @@ #nullable enable -static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool -static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void -static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey! key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs new file mode 100644 index 00000000..ae8de36e --- /dev/null +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs @@ -0,0 +1,48 @@ +using Medallion.Threading.Postgres; +using Npgsql; +using NUnit.Framework; + +namespace Medallion.Threading.Tests.Postgres; + +internal class PostgresDistributedLockExtensionsTest +{ + [Test] + public void TestValidatesConstructorArguments() + { + Assert.Throws(() => PostgresDistributedLock.TryAcquireWithTransaction(default, null!)); + Assert.ThrowsAsync(async () => await PostgresDistributedLock.TryAcquireWithTransactionAsync(default, null!).ConfigureAwait(false)); + Assert.Throws(() => PostgresDistributedLock.AcquireWithTransaction(default, null!)); + Assert.ThrowsAsync(async () => await PostgresDistributedLock.AcquireWithTransactionAsync(default, null!).ConfigureAwait(false)); + } + + [Test] + public async Task TestWorksWithExternalTransaction() + { + bool isLockAcquired; + + var key = new PostgresAdvisoryLockKey(0); + + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); + + using (var transaction = connection.BeginTransaction()) + { + PostgresDistributedLock.AcquireWithTransaction(key, transaction); + + isLockAcquired = PostgresDistributedLock.TryAcquireWithTransaction(key, transaction); + Assert.That(isLockAcquired, Is.False); + + transaction.Rollback(); + } + + using (var transaction = connection.BeginTransaction()) + { + isLockAcquired = await PostgresDistributedLock.TryAcquireWithTransactionAsync(key, transaction).ConfigureAwait(false); + Assert.That(isLockAcquired, Is.True); + + Assert.ThrowsAsync(async () => await PostgresDistributedLock.AcquireWithTransactionAsync(key, transaction, TimeSpan.FromMilliseconds(10)).ConfigureAwait(false)); + + transaction.Commit(); + } + } +} From a56a7c71ae7b71cbb0d634c6226a0b0ac49d7648 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Tue, 31 Dec 2024 07:36:13 +0200 Subject: [PATCH 299/399] Changes after CR --- .../PostgresDistributedLock.Extensions.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs index 4580a836..895b2619 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs @@ -97,7 +97,7 @@ public static ValueTask TryAcquireWithTransactionAsync(PostgresAdvisoryLoc public static ValueTask AcquireWithTransactionAsync(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => AcquireWithTransactionAsyncInternal(key, transaction, timeout, cancellationToken); - internal static ValueTask TryAcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout = default, CancellationToken cancellationToken = default) + internal static ValueTask TryAcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan timeout, CancellationToken cancellationToken) { if (key == null) { throw new ArgumentNullException(nameof(key)); } if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } @@ -110,14 +110,14 @@ async ValueTask TryAcquireAsync() await using (connection.ConfigureAwait(false)) { - var handle = await PostgresAdvisoryLock.ExclusiveLock.TryAcquireAsync(connection, key.ToString(), timeout, cancellationToken).ConfigureAwait(false); + var lockAcquiredCookie = await PostgresAdvisoryLock.ExclusiveLock.TryAcquireAsync(connection, key.ToString(), timeout, cancellationToken).ConfigureAwait(false); - return handle != null; + return lockAcquiredCookie != null; } } } - internal static ValueTask AcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout = null, CancellationToken cancellationToken = default) + internal static ValueTask AcquireWithTransactionAsyncInternal(PostgresAdvisoryLockKey key, IDbTransaction transaction, TimeSpan? timeout, CancellationToken cancellationToken) { if (key == null) { throw new ArgumentNullException(nameof(key)); } if (transaction == null) { throw new ArgumentNullException(nameof(transaction)); } From 24a862b0b920f65b510d6449bba6db694add1bf8 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 4 Jan 2025 14:56:20 -0500 Subject: [PATCH 300/399] Use TestHelper.UniqueName in TestCancellationDoesNotLeadToLostSignal Prevents possibility of overlap between net472 and net8.0 runs --- .../Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs index ff28e9ea..48829571 100644 --- a/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/WaitHandles/WaitHandleDistributedSemaphoreTest.cs @@ -83,7 +83,7 @@ public void TestGetSafeLockNameCompat() [Test] public async Task TestCancellationDoesNotLeadToLostSignal([Values] bool async) { - var semaphore = new WaitHandleDistributedSemaphore(nameof(this.TestCancellationDoesNotLeadToLostSignal), 2); + var semaphore = new WaitHandleDistributedSemaphore(TestHelper.UniqueName, 2); await using var _ = await semaphore.AcquireAsync(TimeSpan.FromSeconds(1)); Random random = new(); From cfb4f9a0e2a20d97837329d3be9949b0a2278c47 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Tue, 7 Jan 2025 09:26:39 +0200 Subject: [PATCH 301/399] Improve comments --- .../PostgresAdvisoryLock.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 068f9f58..b6486165 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -186,12 +186,14 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co // If the connection is internally-owned, we only define a save point if a transaction has been opened. if (!connection.IsExernallyOwned) { return connection.HasTransaction; } - // If the connection is externally-owned with an established transaction, we don't want to pollute it with a save point - // which we won't be able to release in case the lock will be acquired. + // If the connection is externally-owned with an established transaction, + // it means that the connection came through the transactional locking APIs (see PostgresDistributedLock.Extensions class), + // and we can't define a save point since it can't be released in case the lock will be acquired (the lock will be released too in this scneario). if (connection.HasTransaction) { return false; } // The externally-owned connection might still be part of a transaction that we can't see. - // In that case, the only real way to detect it is to begin a new one. + // This can only be the case if the externally-owned connection didn't came through the transactional locking APIs (see PostgresDistributedLock.Extensions class). + // In that case, the only real way to detect the transaction is to begin a new one. try { await connection.BeginTransactionAsync().ConfigureAwait(false); @@ -203,6 +205,7 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co await connection.DisposeTransactionAsync().ConfigureAwait(false); + // If we reached this point, it means the externally-owned connection has no transaction, therefore we can't define a save point. return false; } @@ -239,8 +242,8 @@ private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command } private static bool UseTransactionScopedLock(DatabaseConnection connection) => - // Transaction-scoped locking is supported on both externally-owned and internally-owned connections, - // as long as the connection has a transaction. + // Transaction-scoped locking is supported on internally-owned connections and externally-owned connections which explicitly have a transaction + // (meaning that the external connection came through the transactional locking APIs, see PostgresDistributedLock.Extensions class). connection.HasTransaction; private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) From 3010de2ec58c36711a5cfe039da2531013aa0624 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Mon, 20 Jan 2025 11:39:49 +0200 Subject: [PATCH 302/399] Add support for capturing and restoring timeout settings for Postgres lock --- .../PostgresAdvisoryLock.cs | 105 +++++++++++++++++- .../PostgresDistributedLockExtensionsTest.cs | 67 +++++++++++ .../Postgres/PostgresDistributedLockTest.cs | 36 ++++-- 3 files changed, 194 insertions(+), 14 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index b6486165..ac41389e 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -44,11 +44,19 @@ private PostgresAdvisoryLock(bool isShared) return null; } + // Only in the case where we will try to acquire a transaction-scoped lock, we will define a save point, but we won't be able to roll it back + // in case of a successful lock acquisition becuase the lock will be released. Therefore, in such cases, we capture the timeout settings values before + // we set a save point, and then we try to restore the values after the attempt to acquire the lock. + // NOTE: the save point functionality can't be removed in favor of capturing and restoring the values for all cases. + // When an error occurs while attempting to acquire the lock, the transaction is aborted and we can't run any other query, unless either + // the transaction or the save point are rolled back. + var capturedTimeoutSettings = await CaptureTimeoutSettingsIfNeededAsync(connection, cancellationToken).ConfigureAwait(false); + // Our acquire command will use SET LOCAL to set up statement timeouts. This lasts until the end // of the current transaction instead of just the current batch if we're in a transaction. To make sure // we don't leak those settings, in the case of a transaction, we first set up a save point which we can - // later roll back (taking the settings changes with it but NOT the lock). Because we can't confidently - // roll back a save point without knowing that it has been set up, we start the save point in its own + // later roll back (only in cases where we don't acquire a transaction scoped lock - taking the settings changes with it but NOT the lock). + // Because we can't confidently roll back a save point without knowing that it has been set up, we start the save point in its own // query before we try-catch. var needsSavePoint = await ShouldDefineSavePoint(connection).ConfigureAwait(false); @@ -70,6 +78,8 @@ private PostgresAdvisoryLock(bool isShared) { await RollBackTransactionTimeoutVariablesIfNeededAsync(acquired: false).ConfigureAwait(false); + await RestoreTimeoutSettingsIfNeededAsync(capturedTimeoutSettings, connection).ConfigureAwait(false); + if (ex is PostgresException postgresException) { switch (postgresException.SqlState) @@ -115,6 +125,8 @@ private PostgresAdvisoryLock(bool isShared) await RollBackTransactionTimeoutVariablesIfNeededAsync(acquired: acquired == true).ConfigureAwait(false); + await RestoreTimeoutSettingsIfNeededAsync(capturedTimeoutSettings, connection).ConfigureAwait(false); + return acquired switch { false => null, @@ -124,7 +136,7 @@ private PostgresAdvisoryLock(bool isShared) async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync(bool acquired) { - if (needsSavePoint + if (needsSavePoint // For transaction scoped locks, we can't roll back the save point on success because that will roll back our hold on the lock. && !(acquired && UseTransactionScopedLock(connection))) { @@ -181,15 +193,38 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post return command; } + private static async ValueTask CaptureTimeoutSettingsIfNeededAsync(DatabaseConnection connection, CancellationToken cancellationToken) + { + var shouldCaptureTimeoutSettings = UseTransactionScopedLock(connection); + + // Return null in case we won't try to acquire a transaction-scoped lock. + if (!shouldCaptureTimeoutSettings) { return null; } + + var statementTimeout = await GetCurrentSetting("statement_timeout", connection, cancellationToken).ConfigureAwait(false); + var lockTimeout = await GetCurrentSetting("lock_timeout", connection, cancellationToken).ConfigureAwait(false); + + var capturedTimeoutSettings = new CapturedTimeoutSettings(statementTimeout, lockTimeout); + + return capturedTimeoutSettings; + } + + private static async ValueTask GetCurrentSetting(string settingName, DatabaseConnection connection, CancellationToken cancellationToken) + { + using var getCurrentSettingCommand = connection.CreateCommand(); + + getCurrentSettingCommand.SetCommandText($"SELECT current_setting('{settingName}', 'true') AS {settingName};"); + + return (string?) await getCurrentSettingCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + } + private static async ValueTask ShouldDefineSavePoint(DatabaseConnection connection) { // If the connection is internally-owned, we only define a save point if a transaction has been opened. if (!connection.IsExernallyOwned) { return connection.HasTransaction; } // If the connection is externally-owned with an established transaction, - // it means that the connection came through the transactional locking APIs (see PostgresDistributedLock.Extensions class), - // and we can't define a save point since it can't be released in case the lock will be acquired (the lock will be released too in this scneario). - if (connection.HasTransaction) { return false; } + // it means that the connection came through the transactional locking APIs (see PostgresDistributedLock.Extensions class). + if (connection.HasTransaction) { return true; } // The externally-owned connection might still be part of a transaction that we can't see. // This can only be the case if the externally-owned connection didn't came through the transactional locking APIs (see PostgresDistributedLock.Extensions class). @@ -200,6 +235,7 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co } catch (InvalidOperationException) { + // If we reached this point, it means the externally-owned connection has a transaction, therefore we need to define a save point. return true; } @@ -209,6 +245,31 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co return false; } + private static async ValueTask RestoreTimeoutSettingsIfNeededAsync(CapturedTimeoutSettings? settings, DatabaseConnection connection) + { + // Settings is expected to be null in case we didn't try to acquire a transaction-scoped lock. + // If all the timeouts are null, than it means none of them were found in the DB. Theoretically it should never happen. + if (settings is null || (settings.Value.StatementTimeout == null && settings.Value.LockTimeout == null)) { return; } + + using var restoreTimeoutSettingsCommand = connection.CreateCommand(); + + var commandText = new StringBuilder(); + + if (settings.Value.StatementTimeout != null) + { + commandText.AppendLine($"SET LOCAL statement_timeout = {settings.Value.StatementTimeout};"); + } + + if (settings.Value.LockTimeout != null) + { + commandText.AppendLine($"SET LOCAL lock_timeout = {settings.Value.LockTimeout};"); + } + + restoreTimeoutSettingsCommand.SetCommandText(commandText.ToString()); + + await restoreTimeoutSettingsCommand.ExecuteNonQueryAsync(CancellationToken.None).ConfigureAwait(false); + } + public ValueTask ReleaseAsync(DatabaseConnection connection, string resourceName, object lockCookie) => this.ReleaseAsync(connection, new PostgresAdvisoryLockKey(resourceName), isTry: false); @@ -274,4 +335,36 @@ private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseC return $"(l.classid = @{classIdParameter} AND l.objid = @{objIdParameter} AND l.objsubid = {objSubId})"; } + + private readonly struct CapturedTimeoutSettings + { + public CapturedTimeoutSettings(string? statementTimeout, string? lockTimeout) + { + this.StatementTimeout = ParsePostgresTimeout(statementTimeout); + this.LockTimeout = ParsePostgresTimeout(lockTimeout); + } + + public int? StatementTimeout { get; } + + public int? LockTimeout { get; } + + private static int? ParsePostgresTimeout(string? timeout) + { + if (timeout == null) { return null; } // This will be the case if the timeout wasn't found in the DB. Theoretically it should never happen. + if (timeout == "0") { return 0; } // This will be the case if the timeout is disabled. + + // In any other case we need to extract the timeout from the string, since Postgres returns timeouts with their unit attached, e.g. "5000ms". + var timeoutOnlyDigits = string.Empty; + + for (var i = 0; i < timeout.Length; ++i) + { + if (char.IsDigit(timeout[i])) + { + timeoutOnlyDigits += timeout[i]; + } + } + + return int.Parse(timeoutOnlyDigits); + } + } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs index ae8de36e..91e5ea3d 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs @@ -45,4 +45,71 @@ public async Task TestWorksWithExternalTransaction() transaction.Commit(); } } + + [Test] + public async Task TestTimeoutSettingsRestoredWithExternalTransaction() + { + bool isLockAcquired; + + var key = new PostgresAdvisoryLockKey(0); + + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); + + using (var transaction = connection.BeginTransaction()) + { + using var transactionCommand = connection.CreateCommand(); + transactionCommand.Transaction = transaction; + + transactionCommand.CommandText = "SET LOCAL statement_timeout = 1010;SET LOCAL lock_timeout = 510;"; + await transactionCommand.ExecuteNonQueryAsync(); + + isLockAcquired = await PostgresDistributedLock.TryAcquireWithTransactionAsync(key, transaction).ConfigureAwait(false); + Assert.That(isLockAcquired, Is.True); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("510ms"); + + isLockAcquired = PostgresDistributedLock.TryAcquireWithTransaction(key, transaction, TimeSpan.FromMilliseconds(10)); + Assert.That(isLockAcquired, Is.False); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("510ms"); + + transaction.Rollback(); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("0"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("0"); + } + + using (var transaction = connection.BeginTransaction()) + { + using var transactionCommand = connection.CreateCommand(); + transactionCommand.Transaction = transaction; + + transactionCommand.CommandText = "SET LOCAL statement_timeout = 1010;SET LOCAL lock_timeout = 510;"; + await transactionCommand.ExecuteNonQueryAsync(); + + await PostgresDistributedLock.AcquireWithTransactionAsync(key, transaction).ConfigureAwait(false); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("510ms"); + + Assert.Throws(() => PostgresDistributedLock.AcquireWithTransaction(key, transaction, TimeSpan.FromMilliseconds(10))); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("510ms"); + + transaction.Commit(); + + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("0"); + (await GetTimeoutAsync("lock_timeout", transactionCommand)).ShouldEqual("0"); + } + } + + private static Task GetTimeoutAsync(string timeoutName, NpgsqlCommand command) + { + command.CommandText = $"SHOW {timeoutName}"; + return command.ExecuteScalarAsync()!; + } } diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index c5abae7c..6be0e764 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -59,6 +59,24 @@ public async Task TestInt64AndInt32PairKeyNamespacesAreDifferent() Assert.That(handle2, Is.Not.Null); } + [Test] + public async Task TestWorksWithInternalTransaction() + { + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); + + using var command = connection.CreateCommand(); + + var transactionLock = new PostgresDistributedLock(new PostgresAdvisoryLockKey("InternTrans", true), TestingPostgresDb.DefaultConnectionString, o => o.UseTransaction()); + + using (var transactionLockHandle = await transactionLock.TryAcquireAsync(TimeSpan.FromSeconds(.3))) + { + (await GetTimeoutAsync("lock_timeout", command)).ShouldEqual("0"); + } + + (await GetTimeoutAsync("lock_timeout", command)).ShouldEqual("0"); + } + [Test] public async Task TestWorksWithAmbientTransaction() { @@ -79,26 +97,28 @@ public async Task TestWorksWithAmbientTransaction() using (var timedOutHandle = await connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(.2))) { + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + Assert.That(timedOutHandle, Is.Null); } - (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(.3)); var task = connectionLock.AcquireAsync(cancellationToken: cancellationTokenSource.Token).AsTask(); task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)).ShouldEqual(true); task.Status.ShouldEqual(TaskStatus.Canceled); - (await GetTimeoutAsync(transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); } using var connectionCommand = connection.CreateCommand(); - (await GetTimeoutAsync(connectionCommand)).ShouldEqual("0"); + (await GetTimeoutAsync("statement_timeout", connectionCommand)).ShouldEqual("0"); + } - static Task GetTimeoutAsync(NpgsqlCommand command) - { - command.CommandText = "SHOW statement_timeout"; - return command.ExecuteScalarAsync()!; - } + private static Task GetTimeoutAsync(string timeoutName, NpgsqlCommand command) + { + command.CommandText = $"SHOW {timeoutName}"; + return command.ExecuteScalarAsync()!; } } \ No newline at end of file From dfb2cd206c3bc0fcfc58f1d48b449565bb546d7d Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Wed, 22 Jan 2025 09:59:37 +0200 Subject: [PATCH 303/399] Changes after CR --- .../PostgresAdvisoryLock.cs | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index ac41389e..44a6404d 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -203,7 +203,7 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post var statementTimeout = await GetCurrentSetting("statement_timeout", connection, cancellationToken).ConfigureAwait(false); var lockTimeout = await GetCurrentSetting("lock_timeout", connection, cancellationToken).ConfigureAwait(false); - var capturedTimeoutSettings = new CapturedTimeoutSettings(statementTimeout, lockTimeout); + var capturedTimeoutSettings = new CapturedTimeoutSettings(statementTimeout!, lockTimeout!); return capturedTimeoutSettings; } @@ -248,22 +248,14 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co private static async ValueTask RestoreTimeoutSettingsIfNeededAsync(CapturedTimeoutSettings? settings, DatabaseConnection connection) { // Settings is expected to be null in case we didn't try to acquire a transaction-scoped lock. - // If all the timeouts are null, than it means none of them were found in the DB. Theoretically it should never happen. - if (settings is null || (settings.Value.StatementTimeout == null && settings.Value.LockTimeout == null)) { return; } + if (settings is null) { return; } using var restoreTimeoutSettingsCommand = connection.CreateCommand(); var commandText = new StringBuilder(); - if (settings.Value.StatementTimeout != null) - { - commandText.AppendLine($"SET LOCAL statement_timeout = {settings.Value.StatementTimeout};"); - } - - if (settings.Value.LockTimeout != null) - { - commandText.AppendLine($"SET LOCAL lock_timeout = {settings.Value.LockTimeout};"); - } + commandText.AppendLine($"SET LOCAL statement_timeout = {settings.Value.StatementTimeout};"); + commandText.AppendLine($"SET LOCAL lock_timeout = {settings.Value.LockTimeout};"); restoreTimeoutSettingsCommand.SetCommandText(commandText.ToString()); @@ -338,19 +330,18 @@ private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseC private readonly struct CapturedTimeoutSettings { - public CapturedTimeoutSettings(string? statementTimeout, string? lockTimeout) + public CapturedTimeoutSettings(string statementTimeout, string lockTimeout) { this.StatementTimeout = ParsePostgresTimeout(statementTimeout); this.LockTimeout = ParsePostgresTimeout(lockTimeout); } - public int? StatementTimeout { get; } + public int StatementTimeout { get; } - public int? LockTimeout { get; } + public int LockTimeout { get; } - private static int? ParsePostgresTimeout(string? timeout) + private static int ParsePostgresTimeout(string timeout) { - if (timeout == null) { return null; } // This will be the case if the timeout wasn't found in the DB. Theoretically it should never happen. if (timeout == "0") { return 0; } // This will be the case if the timeout is disabled. // In any other case we need to extract the timeout from the string, since Postgres returns timeouts with their unit attached, e.g. "5000ms". From afdc2d660945ee5454799b06b574df975096c321 Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Sun, 26 Jan 2025 16:02:02 +0200 Subject: [PATCH 304/399] New test --- .../PostgresDistributedLockExtensionsTest.cs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs index 91e5ea3d..94e7c889 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs @@ -107,6 +107,31 @@ public async Task TestTimeoutSettingsRestoredWithExternalTransaction() } } + + [Test] + public async Task TestWorksForMultipleLocksUnderTheSameConnectionWithExternalTransaction() + { + var key1 = new PostgresAdvisoryLockKey(1); + var key2 = new PostgresAdvisoryLockKey(2); + + using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); + await connection.OpenAsync(); + + using (var transaction = connection.BeginTransaction()) + { + var isFirstLockAcquired = await PostgresDistributedLock.TryAcquireWithTransactionAsync(key1, transaction).ConfigureAwait(false); + Assert.That(isFirstLockAcquired, Is.True); + + var isSecondLockAcquired = await PostgresDistributedLock.TryAcquireWithTransactionAsync(key2, transaction).ConfigureAwait(false); + Assert.That(isSecondLockAcquired, Is.True); + + isSecondLockAcquired = await PostgresDistributedLock.TryAcquireWithTransactionAsync(key2, transaction).ConfigureAwait(false); + Assert.That(isSecondLockAcquired, Is.False); + + transaction.Rollback(); + } + } + private static Task GetTimeoutAsync(string timeoutName, NpgsqlCommand command) { command.CommandText = $"SHOW {timeoutName}"; From c06f3ef87275158db8cb7efec08166b4bd414225 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:36:23 -0500 Subject: [PATCH 305/399] comment --- src/DistributedLock.Postgres/PostgresDistributedLock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.cs index dda68386..640ed16c 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.cs @@ -83,7 +83,7 @@ internal static IDbDistributedLock CreateInternalLock(PostgresAdvisoryLockKey ke { if (dbDataSource == null) { throw new ArgumentNullException(nameof(dbDataSource)); } - // Multiplexing is currently incompatible with DbDataSource, so default it to false + // Multiplexing is currently incompatible with DbDataSource (see #238), so default it to false var originalOptions = options; options = o => { o.UseMultiplexing(false); originalOptions?.Invoke(o); }; From fe04d5e8a273077be8382c7f5a91964d07d935fc Mon Sep 17 00:00:00 2001 From: Tzachi Aviran Date: Mon, 27 Jan 2025 09:30:51 +0200 Subject: [PATCH 306/399] Fixes after CR --- src/DistributedLock.Postgres/PostgresAdvisoryLock.cs | 9 ++++++--- .../Postgres/PostgresDistributedLockExtensionsTest.cs | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 44a6404d..d00ff7fa 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -138,6 +138,9 @@ async ValueTask RollBackTransactionTimeoutVariablesIfNeededAsync(bool acquired) { if (needsSavePoint // For transaction scoped locks, we can't roll back the save point on success because that will roll back our hold on the lock. + // It's ok to "leak" the savepoint because if it's an internally-owned transaction then the savepoint will be cleaned up with the disposal of the transaction. + // If it's an externally-owned transaction then we must "leak" it or we will lose the lock. Also, we can't avoid using a save point in this case + // because otherwise if an exception had occurred the extrenally-owned transaction will be aborted and become completely unusable. && !(acquired && UseTransactionScopedLock(connection))) { // attempt to clear the timeout variables we set @@ -195,9 +198,9 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post private static async ValueTask CaptureTimeoutSettingsIfNeededAsync(DatabaseConnection connection, CancellationToken cancellationToken) { - var shouldCaptureTimeoutSettings = UseTransactionScopedLock(connection); + var shouldCaptureTimeoutSettings = connection.IsExernallyOwned && UseTransactionScopedLock(connection); - // Return null in case we won't try to acquire a transaction-scoped lock. + // Return null in case we won't try to acquire an externally-owned transaction-scoped lock. if (!shouldCaptureTimeoutSettings) { return null; } var statementTimeout = await GetCurrentSetting("statement_timeout", connection, cancellationToken).ConfigureAwait(false); @@ -247,7 +250,7 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co private static async ValueTask RestoreTimeoutSettingsIfNeededAsync(CapturedTimeoutSettings? settings, DatabaseConnection connection) { - // Settings is expected to be null in case we didn't try to acquire a transaction-scoped lock. + // Settings is expected to be null in case we didn't try to acquire an externally-owned transaction-scoped lock. if (settings is null) { return; } using var restoreTimeoutSettingsCommand = connection.CreateCommand(); diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs index 94e7c889..a612b401 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockExtensionsTest.cs @@ -109,6 +109,8 @@ public async Task TestTimeoutSettingsRestoredWithExternalTransaction() [Test] + // Each lock acquisition creates the same named savepoint; this seems like it would create a conflict + // but it actually works fine in Postgres (see https://www.postgresql.org/docs/current/sql-savepoint.html) public async Task TestWorksForMultipleLocksUnderTheSameConnectionWithExternalTransaction() { var key1 = new PostgresAdvisoryLockKey(1); From 306be8b2524f953263acd0876abeabb9581bcf8a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:41:49 -0500 Subject: [PATCH 307/399] Minor cleanup --- .../PostgresAdvisoryLock.cs | 41 ++++++------------- ...> PostgresDistributedLock.Transactions.cs} | 0 2 files changed, 12 insertions(+), 29 deletions(-) rename src/DistributedLock.Postgres/{PostgresDistributedLock.Extensions.cs => PostgresDistributedLock.Transactions.cs} (100%) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index d00ff7fa..8652d8e7 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -3,6 +3,8 @@ using Npgsql; using System.Data; using System.Text; +using System.Text.RegularExpressions; +using System.Threading; namespace Medallion.Threading.Postgres; @@ -226,11 +228,11 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co if (!connection.IsExernallyOwned) { return connection.HasTransaction; } // If the connection is externally-owned with an established transaction, - // it means that the connection came through the transactional locking APIs (see PostgresDistributedLock.Extensions class). + // it means that the connection came through the transactional locking APIs (see PostgresDistributedLock.Transactions.cs). if (connection.HasTransaction) { return true; } // The externally-owned connection might still be part of a transaction that we can't see. - // This can only be the case if the externally-owned connection didn't came through the transactional locking APIs (see PostgresDistributedLock.Extensions class). + // This can only be the case if the externally-owned connection didn't came through the transactional locking APIs (see PostgresDistributedLock.Transactions.cs). // In that case, the only real way to detect the transaction is to begin a new one. try { @@ -299,7 +301,7 @@ private static string AddKeyParametersAndGetKeyArguments(DatabaseCommand command private static bool UseTransactionScopedLock(DatabaseConnection connection) => // Transaction-scoped locking is supported on internally-owned connections and externally-owned connections which explicitly have a transaction - // (meaning that the external connection came through the transactional locking APIs, see PostgresDistributedLock.Extensions class). + // (meaning that the external connection came through the transactional locking APIs, see PostgresDistributedLock.Transactions.cs). connection.HasTransaction; private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseCommand command, PostgresAdvisoryLockKey key) @@ -331,34 +333,15 @@ private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseC return $"(l.classid = @{classIdParameter} AND l.objid = @{objIdParameter} AND l.objsubid = {objSubId})"; } - private readonly struct CapturedTimeoutSettings + private readonly struct CapturedTimeoutSettings(string statementTimeout, string lockTimeout) { - public CapturedTimeoutSettings(string statementTimeout, string lockTimeout) - { - this.StatementTimeout = ParsePostgresTimeout(statementTimeout); - this.LockTimeout = ParsePostgresTimeout(lockTimeout); - } - - public int StatementTimeout { get; } - - public int LockTimeout { get; } - - private static int ParsePostgresTimeout(string timeout) - { - if (timeout == "0") { return 0; } // This will be the case if the timeout is disabled. + public int StatementTimeout { get; } = ParsePostgresTimeout(statementTimeout); - // In any other case we need to extract the timeout from the string, since Postgres returns timeouts with their unit attached, e.g. "5000ms". - var timeoutOnlyDigits = string.Empty; + public int LockTimeout { get; } = ParsePostgresTimeout(lockTimeout); - for (var i = 0; i < timeout.Length; ++i) - { - if (char.IsDigit(timeout[i])) - { - timeoutOnlyDigits += timeout[i]; - } - } - - return int.Parse(timeoutOnlyDigits); - } + private static int ParsePostgresTimeout(string timeout) => + Regex.Match(timeout, @"^\d+(?=(?:ms)?$)") is { Success: true, Value: var value } + ? int.Parse(value) + : throw new FormatException($"Unexpected timeout setting value '{timeout}'"); } } diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs similarity index 100% rename from src/DistributedLock.Postgres/PostgresDistributedLock.Extensions.cs rename to src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs From 4d9acd9d084c70f6edfe794fab7378d3520576cf Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:04:44 -0500 Subject: [PATCH 308/399] Version bumps and readme update --- README.md | 2 ++ docs/DistributedLock.Postgres.md | 11 +++++++++++ .../DistributedLock.Postgres.csproj | 2 +- .../PostgresAdvisoryLock.cs | 19 +++++++++---------- .../PostgresDistributedLock.Transactions.cs | 1 - .../PublicAPI.Shipped.txt | 6 +++++- .../PublicAPI.Unshipped.txt | 5 ----- src/DistributedLock/DistributedLock.csproj | 2 +- 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 8d82a3e6..03d275f4 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,8 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.6 + - Add support for acquiring transaction-scoped Postgres locks using externally-owned transactions. Thanks [@Tzachi009](https://github.com/Tzachi009) for implementing! ([#213](https://github.com/madelson/DistributedLock/issues/213), DistributedLock.Postgres 1.3) - 2.5.1 - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) diff --git a/docs/DistributedLock.Postgres.md b/docs/DistributedLock.Postgres.md index d9ba1f7e..6ff94031 100644 --- a/docs/DistributedLock.Postgres.md +++ b/docs/DistributedLock.Postgres.md @@ -18,6 +18,17 @@ await using (await @lock.AcquireAsync()) - The `PostgresDistributedReaderWriterLock` class implements the `IDistributedReaderWriterLock` interface. - The `PostgresDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` and `IDistributedReaderWriterLockProvider` interfaces. +As of version 1.3, an additional set of static APIs on `PostgresDistributedLock` allows you to leverage transaction-scoped locking with an existing `IDbTransaction` instance. Since Postgres offers no way to explicitly release transaction-scoped locks and the caller controls the transaction, these locks are acquire-only and do not need a using block. For example: +```C# +using (var transaction = connection.BeginTransaction()) +{ + ... + // acquires the lock; it will be held until the transaction ends + await PostgresDistributedLock.AcquireWithTransactionAsync(key, transaction); + ... +} +``` + ## Implementation notes Under the hood, [Postgres advisory locks can be based on either one 64-bit integer value or a pair of 32-bit integer values](https://www.postgresql.org/docs/12/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS). Because of this, rather than taking in a name the lock constructors take a `PostgresAdvisoryLockKey` object which can be constructed in several ways: diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 74461129..07f3307a 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.2.1 + 1.3.0 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 8652d8e7..6601b8b3 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -211,15 +211,15 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post var capturedTimeoutSettings = new CapturedTimeoutSettings(statementTimeout!, lockTimeout!); return capturedTimeoutSettings; - } - private static async ValueTask GetCurrentSetting(string settingName, DatabaseConnection connection, CancellationToken cancellationToken) - { - using var getCurrentSettingCommand = connection.CreateCommand(); + async ValueTask GetCurrentSetting(string settingName, DatabaseConnection connection, CancellationToken cancellationToken) + { + using var getCurrentSettingCommand = connection.CreateCommand(); - getCurrentSettingCommand.SetCommandText($"SELECT current_setting('{settingName}', 'true') AS {settingName};"); + getCurrentSettingCommand.SetCommandText($"SELECT current_setting('{settingName}', 'true') AS {settingName};"); - return (string?) await getCurrentSettingCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + return (string?)await getCurrentSettingCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); + } } private static async ValueTask ShouldDefineSavePoint(DatabaseConnection connection) @@ -240,13 +240,13 @@ private static async ValueTask ShouldDefineSavePoint(DatabaseConnection co } catch (InvalidOperationException) { - // If we reached this point, it means the externally-owned connection has a transaction, therefore we need to define a save point. + // Externally-owned connection with a transaction => we need to define a save point. return true; } await connection.DisposeTransactionAsync().ConfigureAwait(false); - // If we reached this point, it means the externally-owned connection has no transaction, therefore we can't define a save point. + // Externally-owned connection with no transaction => no save point return false; } @@ -257,8 +257,7 @@ private static async ValueTask RestoreTimeoutSettingsIfNeededAsync(CapturedTimeo using var restoreTimeoutSettingsCommand = connection.CreateCommand(); - var commandText = new StringBuilder(); - + StringBuilder commandText = new(); commandText.AppendLine($"SET LOCAL statement_timeout = {settings.Value.StatementTimeout};"); commandText.AppendLine($"SET LOCAL lock_timeout = {settings.Value.LockTimeout};"); diff --git a/src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs b/src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs index 895b2619..4580f23a 100644 --- a/src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs +++ b/src/DistributedLock.Postgres/PostgresDistributedLock.Transactions.cs @@ -127,7 +127,6 @@ internal static ValueTask AcquireWithTransactionAsyncInternal(PostgresAdvisoryLo async ValueTask AcquireAsync() { var connection = new PostgresDatabaseConnection(transaction); - await using (connection.ConfigureAwait(false)) { await PostgresAdvisoryLock.ExclusiveLock.TryAcquireAsync(connection, key.ToString(), timeout, cancellationToken).ThrowTimeoutIfNull().ConfigureAwait(false); diff --git a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt index 6c905fde..705df616 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Shipped.txt @@ -46,4 +46,8 @@ override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.Equals(object? obj override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.GetHashCode() -> int override Medallion.Threading.Postgres.PostgresAdvisoryLockKey.ToString() -> string! static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator !=(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool -static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator ==(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool \ No newline at end of file +static Medallion.Threading.Postgres.PostgresAdvisoryLockKey.operator ==(Medallion.Threading.Postgres.PostgresAdvisoryLockKey a, Medallion.Threading.Postgres.PostgresAdvisoryLockKey b) -> bool +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void +static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool +static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt index e80fc01b..e69de29b 100644 --- a/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Postgres/PublicAPI.Unshipped.txt @@ -1,5 +0,0 @@ -#nullable enable -static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> void -static Medallion.Threading.Postgres.PostgresDistributedLock.AcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransaction(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool -static Medallion.Threading.Postgres.PostgresDistributedLock.TryAcquireWithTransactionAsync(Medallion.Threading.Postgres.PostgresAdvisoryLockKey key, System.Data.IDbTransaction! transaction, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 5833e0a7..22c5b77f 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.5.1 + 2.6.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 856cd153fecb9ace69f910178b97e5053ce41d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20St=C4=99pie=C5=84?= <62397363+mariusz96@users.noreply.github.com> Date: Thu, 5 Jun 2025 11:16:49 +0200 Subject: [PATCH 309/399] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 03d275f4..ba644323 100644 --- a/README.md +++ b/README.md @@ -78,12 +78,12 @@ using (var handle = myDistributedLock.TryAcquire()) `async` versions of both of these methods are also supported. These are preferred when you are writing async code since they will not consume a thread while waiting for the lock. If you are using C#8 or higher, you can also dispose of handles asynchronously: -### Timeouts - ```C# await using (await myDistributedLock.AcquireAsync()) { ... } ``` +### Timeouts + Additionally, all of these methods support an optional `timeout` parameter. `timeout` determines how long `Acquire` will wait before failing with a `TimeoutException` and how long `TryAcquire` will wait before returning null. The default `timeout` for `Acquire` is `Timeout.InfiniteTimeSpan` while for `TryAcquire` the default `timeout` is `TimeSpan.Zero`. ### Cancellation From 84339be9a0f7d6b0ed2ee7f7091024d86c940dd9 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 7 Jul 2025 12:49:34 +0330 Subject: [PATCH 310/399] Add CompositeDistributedSynchronizationHandle for managing multiple distributed synchronization handles --- ...mpositeDistributedSynchronizationHandle.cs | 489 ++++++++++++++++++ 1 file changed, 489 insertions(+) create mode 100644 src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs new file mode 100644 index 00000000..723d2e16 --- /dev/null +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -0,0 +1,489 @@ +using Medallion.Threading.Internal; + +namespace Medallion.Threading; + +internal sealed class CompositeDistributedSynchronizationHandle : IDistributedSynchronizationHandle +{ + private readonly IDistributedSynchronizationHandle[] _handles; + private readonly CancellationTokenSource? _linkedLostCts; + private bool _disposed; + + public CompositeDistributedSynchronizationHandle(IReadOnlyList handles) + { + ValidateHandles(handles); + this._handles = handles.ToArray(); + this._linkedLostCts = this.CreateLinkedCancellationTokenSource(); + } + + public CancellationToken HandleLostToken => this._linkedLostCts?.Token ?? CancellationToken.None; + + public void Dispose() + { + if (this._disposed) + { + return; + } + + this._disposed = true; + var errors = this.DisposeHandles(h => h.Dispose()); + this._linkedLostCts?.Dispose(); + ThrowAggregateExceptionIfNeeded(errors, "disposing"); + } + + public async ValueTask DisposeAsync() + { + if (this._disposed) + { + return; + } + + this._disposed = true; + var errors = await this.DisposeHandlesAsync(h => h.DisposeAsync()).ConfigureAwait(false); + this._linkedLostCts?.Dispose(); + ThrowAggregateExceptionIfNeeded(errors, "asynchronously disposing"); + } + + public static async ValueTask TryAcquireAllAsync( + TProvider provider, + Func> acquireFunc, + IReadOnlyList names, + TimeSpan timeout = default, + CancellationToken cancellationToken = default) + { + ValidateAcquireParameters(provider, acquireFunc, names); + + var timeoutTracker = new TimeoutTracker(timeout); + var handles = new List(names.Count); + + try + { + foreach (var name in names) + { + var handle = await acquireFunc(provider, name, timeoutTracker.Remaining, cancellationToken) + .ConfigureAwait(false); + + if (handle is null) + { + return null; + } + + handles.Add(handle); + + if (timeoutTracker.IsExpired) + { + return null; + } + } + + var result = new CompositeDistributedSynchronizationHandle(handles); + handles.Clear(); + return result; + } + finally + { + await DisposeHandlesAsync(handles).ConfigureAwait(false); + } + } + + + public static async ValueTask AcquireAllAsync( + TProvider provider, + Func> acquireFunc, + IReadOnlyList names, + TimeSpan? timeout = null, + CancellationToken cancellationToken = default) + { + var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; + var handle = await TryAcquireAllAsync( + provider, + WrapAcquireFunc(acquireFunc), + names, + effectiveTimeout, + cancellationToken) + .ConfigureAwait(false); + + if (handle is null) + { + throw new TimeoutException($"Timed out after {effectiveTimeout} while acquiring all locks."); + } + + return handle; + } + + public static IDistributedSynchronizationHandle? TryAcquireAll( + TProvider provider, + Func acquireFunc, + IReadOnlyList names, + TimeSpan timeout = default, + CancellationToken cancellationToken = default) => + SyncViaAsync.Run( + state => TryAcquireAllAsync( + state.provider, + WrapSyncAcquireFunc(state.acquireFunc), + state.names, + state.timeout, + state.cancellationToken), + (provider, acquireFunc, names, timeout, cancellationToken) + ); + + public static IDistributedSynchronizationHandle AcquireAll( + TProvider provider, + Func acquireFunc, + IReadOnlyList names, + TimeSpan? timeout = null, + CancellationToken cancellationToken = default) => + SyncViaAsync.Run( + state => AcquireAllAsync( + state.provider, + WrapSyncAcquireFuncForRequired(state.acquireFunc), + state.names, + state.timeout, + state.cancellationToken), + (provider, acquireFunc, names, timeout, cancellationToken) + ); + + public static async ValueTask TryAcquireAllAsync( + TProvider provider, + Func> + acquireFunc, + IReadOnlyList names, + int maxCount, + TimeSpan timeout = default, + CancellationToken cancellationToken = default) + { + ValidateAcquireParameters(provider, acquireFunc, names); + + var timeoutTracker = new TimeoutTracker(timeout); + var handles = new List(names.Count); + + try + { + foreach (var name in names) + { + var handle = await acquireFunc(provider, name, maxCount, timeoutTracker.Remaining, cancellationToken) + .ConfigureAwait(false); + + if (handle is null) + { + return null; + } + + handles.Add(handle); + + if (timeoutTracker.IsExpired) + { + return null; + } + } + + var result = new CompositeDistributedSynchronizationHandle(handles); + handles.Clear(); + return result; + } + finally + { + await DisposeHandlesAsync(handles).ConfigureAwait(false); + } + } + + + public static async ValueTask AcquireAllAsync( + TProvider provider, + Func> + acquireFunc, + IReadOnlyList names, + int maxCount, + TimeSpan? timeout = null, + CancellationToken cancellationToken = default) + { + var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; + var handle = await TryAcquireAllAsync( + provider, + WrapAcquireFunc(acquireFunc), + names, + maxCount, + effectiveTimeout, + cancellationToken) + .ConfigureAwait(false); + + if (handle is null) + { + throw new TimeoutException($"Timed out after {effectiveTimeout} while acquiring all locks."); + } + + return handle; + } + + public static IDistributedSynchronizationHandle? TryAcquireAll( + TProvider provider, + Func acquireFunc, + IReadOnlyList names, + int maxCount, + TimeSpan timeout = default, + CancellationToken cancellationToken = default) => + SyncViaAsync.Run( + state => TryAcquireAllAsync( + state.provider, + WrapSyncAcquireFunc(state.acquireFunc), + state.names, + state.maxCount, + state.timeout, + state.cancellationToken), + (provider, acquireFunc, names, maxCount, timeout, cancellationToken) + ); + + public static IDistributedSynchronizationHandle AcquireAll( + TProvider provider, + Func acquireFunc, + IReadOnlyList names, + int maxCount, + TimeSpan? timeout = null, + CancellationToken cancellationToken = default) => + SyncViaAsync.Run( + state => AcquireAllAsync( + state.provider, + WrapSyncAcquireFuncForRequired(state.acquireFunc), + state.names, + state.maxCount, + state.timeout, + state.cancellationToken), + (provider, acquireFunc, names, maxCount, timeout, cancellationToken) + ); + + private static void ValidateHandles(IReadOnlyList handles) + { + if (handles is null) + { + throw new ArgumentNullException(nameof(handles)); + } + + if (handles.Count == 0) + { + throw new ArgumentException("At least one handle is required", nameof(handles)); + } + + for (var i = 0; i < handles.Count; ++i) + { + if (handles[i] is null) + { + throw new ArgumentException( + $"Handles must not contain null elements; found null at index {i}", + nameof(handles) + ); + } + } + } + + private CancellationTokenSource? CreateLinkedCancellationTokenSource() + { + var cancellableTokens = this._handles + .Select(h => h.HandleLostToken) + .Where(t => t.CanBeCanceled) + .ToArray(); + + return cancellableTokens.Length > 0 + ? CancellationTokenSource.CreateLinkedTokenSource(cancellableTokens) + : null; + } + + private List? DisposeHandles(Action disposeAction) + { + List? errors = null; + + foreach (var handle in this._handles) + { + try + { + disposeAction(handle); + } + catch (Exception ex) + { + (errors ??= []).Add(ex); + } + } + + return errors; + } + + private async ValueTask?> DisposeHandlesAsync( + Func disposeAction) + { + List? errors = null; + + foreach (var handle in this._handles) + { + try + { + await disposeAction(handle).ConfigureAwait(false); + } + catch (Exception ex) + { + (errors ??= []).Add(ex); + } + } + + return errors; + } + + private static void ThrowAggregateExceptionIfNeeded(List? errors, string operation) + { + if (errors is not null && errors.Count > 0) + { + throw new AggregateException( + $"One or more errors occurred while {operation} a composite distributed handle.", errors); + } + } + + private static void ValidateAcquireParameters( + TProvider provider, + Func> acquireFunc, + IReadOnlyList names) + { + if (provider is null) + { + throw new ArgumentNullException(nameof(provider)); + } + + if (acquireFunc is null) + { + throw new ArgumentNullException(nameof(acquireFunc)); + } + + if (names is null) + { + throw new ArgumentNullException(nameof(names)); + } + + if (names.Count == 0) + { + throw new ArgumentException("At least one lock name is required.", nameof(names)); + } + + for (var i = 0; i < names.Count; ++i) + { + if (names[i] is null) + { + throw new ArgumentException( + $"Names must not contain null elements; found null at index {i}", + nameof(names) + ); + } + } + } + + private static void ValidateAcquireParameters( + TProvider provider, + Func> + acquireFunc, + IReadOnlyList names) + { + if (provider is null) + { + throw new ArgumentNullException(nameof(provider)); + } + + if (acquireFunc is null) + { + throw new ArgumentNullException(nameof(acquireFunc)); + } + + if (names is null) + { + throw new ArgumentNullException(nameof(names)); + } + + if (names.Count == 0) + { + throw new ArgumentException("At least one lock name is required.", nameof(names)); + } + + for (var i = 0; i < names.Count; ++i) + { + if (names[i] is null) + { + throw new ArgumentException( + $"Names must not contain null elements; found null at index {i}", + nameof(names) + ); + } + } + } + + private static async ValueTask DisposeHandlesAsync(List handles) + { + foreach (var handle in handles) + { + try + { + await handle.DisposeAsync().ConfigureAwait(false); + } + catch + { + // Suppress exceptions during cleanup + } + } + } + + private static Func> + WrapAcquireFunc( + Func> + acquireFunc) => + async (p, n, t, c) => await acquireFunc(p, n, t, c).ConfigureAwait(false); + + private static Func> + WrapSyncAcquireFunc( + Func acquireFunc) => + (p, n, t, c) => new ValueTask(acquireFunc(p, n, t, c)); + + private static Func> + WrapSyncAcquireFuncForRequired( + Func acquireFunc) => + (p, n, t, c) => + { + var handle = acquireFunc(p, n, t, c); + return handle is not null + ? new ValueTask(handle) + : throw new TimeoutException($"Failed to acquire lock for '{n}'"); + }; + + + private static Func> + WrapAcquireFunc( + Func> + acquireFunc) => + async (p, n, mc, t, c) => await acquireFunc(p, n, mc, t, c).ConfigureAwait(false); + + private static Func> + WrapSyncAcquireFunc( + Func + acquireFunc) => + (p, n, mc, t, c) => new ValueTask(acquireFunc(p, n, mc, t, c)); + + private static Func> + WrapSyncAcquireFuncForRequired( + Func + acquireFunc) => + (p, n, mc, t, c) => + { + var handle = acquireFunc(p, n, mc, t, c); + return handle is not null + ? new ValueTask(handle) + : throw new TimeoutException($"Failed to acquire lock for '{n}'"); + }; + + private sealed class TimeoutTracker(TimeSpan timeout) + { + private readonly System.Diagnostics.Stopwatch? _stopwatch = timeout == Timeout.InfiniteTimeSpan + ? null + : System.Diagnostics.Stopwatch.StartNew(); + + public TimeSpan Remaining => this._stopwatch is null + ? Timeout.InfiniteTimeSpan + : timeout - this._stopwatch.Elapsed; + + public bool IsExpired => this._stopwatch is not null && this._stopwatch.Elapsed >= timeout; + } +} \ No newline at end of file From 184ad1ae4133673186d0965ee924f3be5317a84d Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 7 Jul 2025 12:50:08 +0330 Subject: [PATCH 311/399] Change GenerateProviders to generate composite lock methods --- .../DistributedLockProviderExtensions.cs | 48 ++++++ ...butedReaderWriterLockProviderExtensions.cs | 88 ++++++++++ .../DistributedSemaphoreProviderExtensions.cs | 48 ++++++ ...eableReaderWriterLockProviderExtensions.cs | 10 ++ .../GenerateProviders.cs | 162 ++++++++++++++---- 5 files changed, 318 insertions(+), 38 deletions(-) diff --git a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs index ea4ad6f5..bc98c6bb 100644 --- a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -7,6 +7,8 @@ namespace Medallion.Threading; /// public static class DistributedLockProviderExtensions { + # region Single Lock Methods + /// /// Equivalent to calling and then /// . @@ -34,4 +36,50 @@ public static IDistributedSynchronizationHandle AcquireLock(this IDistributedLoc /// public static ValueTask AcquireLockAsync(this IDistributedLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); + + # endregion + + # region Composite Lock Methods + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle? TryAcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAll( + provider, + static (p, n, t, c) => p.TryAcquireLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle AcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAll( + provider, + static (p, n, t, c) => p.AcquireLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask TryAcquireAllLocksAsync(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + provider, + static (p, n, t, c) => p.TryAcquireLockAsync(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask AcquireAllLocksAsync(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAllAsync( + provider, + static (p, n, t, c) => p.AcquireLockAsync(n, t, c), + names, timeout, cancellationToken); + + # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index 5ac66fac..da5f407c 100644 --- a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -7,6 +7,8 @@ namespace Medallion.Threading; /// public static class DistributedReaderWriterLockProviderExtensions { + # region Single Lock Methods + /// /// Equivalent to calling and then /// . @@ -62,4 +64,90 @@ public static IDistributedSynchronizationHandle AcquireWriteLock(this IDistribut /// public static ValueTask AcquireWriteLockAsync(this IDistributedReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); + + # endregion + + # region Composite Lock Methods + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle? TryAcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAll( + provider, + static (p, n, t, c) => p.TryAcquireReadLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle AcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAll( + provider, + static (p, n, t, c) => p.AcquireReadLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask TryAcquireAllReadLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + provider, + static (p, n, t, c) => p.TryAcquireReadLockAsync(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask AcquireAllReadLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAllAsync( + provider, + static (p, n, t, c) => p.AcquireReadLockAsync(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle? TryAcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAll( + provider, + static (p, n, t, c) => p.TryAcquireWriteLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle AcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAll( + provider, + static (p, n, t, c) => p.AcquireWriteLock(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask TryAcquireAllWriteLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + provider, + static (p, n, t, c) => p.TryAcquireWriteLockAsync(n, t, c), + names, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask AcquireAllWriteLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAllAsync( + provider, + static (p, n, t, c) => p.AcquireWriteLockAsync(n, t, c), + names, timeout, cancellationToken); + + # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index b808b004..3ed29ebe 100644 --- a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -7,6 +7,8 @@ namespace Medallion.Threading; /// public static class DistributedSemaphoreProviderExtensions { + # region Single Lock Methods + /// /// Equivalent to calling and then /// . @@ -34,4 +36,50 @@ public static IDistributedSynchronizationHandle AcquireSemaphore(this IDistribut /// public static ValueTask AcquireSemaphoreAsync(this IDistributedSemaphoreProvider provider, string name, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); + + # endregion + + # region Composite Lock Methods + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle? TryAcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAll( + provider, + static (p, n, mc, t, c) => p.TryAcquireSemaphore(n, mc, t, c), + names, maxCount, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static IDistributedSynchronizationHandle AcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAll( + provider, + static (p, n, mc, t, c) => p.AcquireSemaphore(n, mc, t, c), + names, maxCount, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask TryAcquireAllSemaphoresAsync(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + provider, + static (p, n, mc, t, c) => p.TryAcquireSemaphoreAsync(n, mc, t, c), + names, maxCount, timeout, cancellationToken); + + /// + /// Equivalent to calling for each name in and then + /// on each created instance, combining the results into a composite handle. + /// + public static ValueTask AcquireAllSemaphoresAsync(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + CompositeDistributedSynchronizationHandle.AcquireAllAsync( + provider, + static (p, n, mc, t, c) => p.AcquireSemaphoreAsync(n, mc, t, c), + names, maxCount, timeout, cancellationToken); + + # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 4b8c51f9..2bc1c429 100644 --- a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -7,6 +7,8 @@ namespace Medallion.Threading; /// public static class DistributedUpgradeableReaderWriterLockProviderExtensions { + # region Single Lock Methods + /// /// Equivalent to calling and then /// . @@ -34,4 +36,12 @@ public static IDistributedLockUpgradeableHandle AcquireUpgradeableReadLock(this /// public static ValueTask AcquireUpgradeableReadLockAsync(this IDistributedUpgradeableReaderWriterLockProvider provider, string name, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLockAsync(timeout, cancellationToken); + + # endregion + + # region Composite Lock Methods + +// Composite methods are not supported for IDistributedUpgradeableReaderWriterLock + + # endregion } \ No newline at end of file diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index ab657b14..80c80747 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -10,64 +10,112 @@ namespace DistributedLockCodeGen; [Category("CI")] public class GenerateProviders { - public static readonly IReadOnlyList Interfaces = new[] - { + public static readonly IReadOnlyList Interfaces = + [ "IDistributedLock", "IDistributedReaderWriterLock", "IDistributedUpgradeableReaderWriterLock", "IDistributedSemaphore" - }; + ]; + + private static readonly IReadOnlyList ExcludedInterfacesForCompositeMethods = + [ + "IDistributedUpgradeableReaderWriterLock" + ]; [TestCaseSource(nameof(Interfaces))] public void GenerateProviderInterfaceAndExtensions(string interfaceName) { - var interfaceFile = Directory.GetFiles(CodeGenHelpers.SolutionDirectory, interfaceName + ".cs", SearchOption.AllDirectories) + var interfaceFile = Directory + .GetFiles(CodeGenHelpers.SolutionDirectory, interfaceName + ".cs", SearchOption.AllDirectories) .Single(); var providerInterfaceName = interfaceName + "Provider"; var createMethodName = $"Create{interfaceName.Replace("IDistributed", string.Empty)}"; - var providerInterfaceCode = $@"// AUTO-GENERATED -namespace Medallion.Threading; - -/// -/// Acts as a factory for instances of a certain type. This interface may be -/// easier to use than in dependency injection scenarios. -/// -public interface {providerInterfaceName}{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)} -{{ - /// - /// Constructs an instance with the given . - /// - {interfaceName} {createMethodName}(string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}); -}}"; + var providerInterfaceCode = $$""" + // AUTO-GENERATED + namespace Medallion.Threading; + + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)}} + { + /// + /// Constructs an instance with the given . + /// + {{interfaceName}} {{createMethodName}}(string name{{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}}); + } + """; var interfaceMethods = Regex.Matches( File.ReadAllText(interfaceFile), @"(?\S+) (?\S+)\((?((?\S*) (?\w+)[^,)]*(\, )?)*)\);", RegexOptions.ExplicitCapture ); - var extensionMethodBodies = interfaceMethods.Cast() + + var extensionSingleMethodBodies = interfaceMethods .Select(m => -$@" /// - /// Equivalent to calling and then - /// ().Select(c => c.Value))})"" />. - /// - public static {m.Groups["returnType"].Value} {GetExtensionMethodName(m.Groups["name"].Value)}(this {providerInterfaceName} provider, string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => - (provider ?? throw new ArgumentNullException(nameof(provider))).{createMethodName}(name{(interfaceName.Contains("Semaphore") ? ", maxCount" : string.Empty)}).{m.Groups["name"].Value}({string.Join(", ", m.Groups["parameterName"].Captures.Cast().Select(c => c.Value))});" + $""" + /// + /// Equivalent to calling and then + /// c.Value))})" />. + /// + public static {m.Groups["returnType"].Value} {GetExtensionMethodName(m.Groups["name"].Value)}(this {providerInterfaceName} provider, string name{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => + (provider ?? throw new ArgumentNullException(nameof(provider))).{createMethodName}(name{(interfaceName.Contains("Semaphore") ? ", maxCount" : string.Empty)}).{m.Groups["name"].Value}({string.Join(", ", m.Groups["parameterName"].Captures.Select(c => c.Value))}); + """ ); + var extensionCompositeMethodBodies = ExcludedInterfacesForCompositeMethods.Contains(interfaceName) + ? + [ + $"// Composite methods are not supported for {interfaceName}" + ] + : interfaceMethods + .Select(m => + { + var (extensionMethodName, innerCallName) = GetAllExtensionMethodName(m.Groups["name"].Value); + var isSemaphore = interfaceName.Contains("Semaphore"); + + return $""" + /// + /// Equivalent to calling for each name in and then + /// c.Value))})" /> on each created instance, combining the results into a composite handle. + /// + public static {m.Groups["returnType"].Value} {extensionMethodName}(this {providerInterfaceName} provider, IReadOnlyList names{(isSemaphore ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => + CompositeDistributedSynchronizationHandle.{innerCallName}( + provider, + static (p, n{(isSemaphore ? ", mc" : string.Empty)}, t, c) => p.{GetExtensionMethodName(m.Groups["name"].Value)}(n{(isSemaphore ? ", mc" : string.Empty)}, t, c), + names,{(isSemaphore ? " maxCount," : string.Empty)} timeout, cancellationToken); + """; + } + ); + var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; - var providerExtensionsCode = $@"// AUTO-GENERATED + var providerExtensionsCode = $$""" + // AUTO-GENERATED + + namespace Medallion.Threading; + + /// + /// Productivity helper methods for + /// + public static class {{providerExtensionsName}} + { + # region Single Lock Methods + + {{string.Join(Environment.NewLine + Environment.NewLine, extensionSingleMethodBodies)}} + + # endregion + + # region Composite Lock Methods -namespace Medallion.Threading; + {{string.Join(Environment.NewLine + Environment.NewLine, extensionCompositeMethodBodies)}} -/// -/// Productivity helper methods for -/// -public static class {providerExtensionsName} -{{ -{string.Join(Environment.NewLine + Environment.NewLine, extensionMethodBodies)} -}}"; + # endregion + } + """; var changes = new[] { @@ -76,7 +124,8 @@ public static class {providerExtensionsName} } .Select(t => (file: Path.Combine(Path.GetDirectoryName(interfaceFile)!, t.name + ".cs"), t.code)) .Select(t => (t.file, t.code, originalCode: File.Exists(t.file) ? File.ReadAllText(t.file) : string.Empty)) - .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) + .Where(t => CodeGenHelpers.NormalizeCodeWhitespace(t.code) != + CodeGenHelpers.NormalizeCodeWhitespace(t.originalCode)) .ToList(); changes.ForEach(t => File.WriteAllText(t.file, t.code)); Assert.That(changes.Select(t => t.file), Is.Empty); @@ -85,8 +134,45 @@ string GetExtensionMethodName(string interfaceMethodName) => Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$") // make it more specific to differentiate when one concrete provider implements multiple provider interfaces ? interfaceMethodName.Replace("Async", string.Empty) - + interfaceName.Replace("IDistributed", string.Empty) - + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) + + interfaceName.Replace("IDistributed", string.Empty) + + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) : interfaceMethodName; + + (string extensionMethodName, string innerCallName) GetAllExtensionMethodName(string interfaceMethodName) + { + var isExactAcquire = Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$"); + var isAsync = interfaceMethodName.EndsWith("Async", StringComparison.Ordinal); + var isTryVariant = interfaceMethodName.StartsWith("Try", StringComparison.Ordinal); + + string extensionMethodName; + + if (!isExactAcquire) + { + // e.g. TryAcquireReadLock -> TryAcquireAllReadLocks + // TryAcquireSemaphore -> TryAcquireAllSemaphores + // TryAcquireUpgradeableReadLockAsync -> TryAcquireUpgradeableAllReadLockAsync + extensionMethodName = interfaceMethodName + .Replace("Acquire", "AcquireAll") // Acquire -> AcquireAll + .Replace("Async", string.Empty) // strip Async (add back later) + + "s" // pluralise + + (isAsync ? "Async" : string.Empty); // restore Async if needed + } + else + { + // e.g. TryAcquire -> TryAcquireAllLocks + // AcquireAsync -> AcquireAllLocksAsync + extensionMethodName = interfaceMethodName.Replace("Async", string.Empty) + + "All" + + interfaceName.Replace("IDistributed", string.Empty) + "s" + + (isAsync ? "Async" : string.Empty); + } + + // - “Try…” methods -> TryAcquireAll[Async] + // - plain Acquire… -> AcquireAll[Async] + var innerCallName = (isTryVariant ? "TryAcquireAll" : "AcquireAll") + + (isAsync ? "Async" : string.Empty); + + return (extensionMethodName, innerCallName); + } } -} +} \ No newline at end of file From e9a7a30ecc0ea0e08897e19b78de407b7d154ffa Mon Sep 17 00:00:00 2001 From: Teesofttech Date: Sat, 2 Aug 2025 20:51:40 +0100 Subject: [PATCH 312/399] Added Redis semaphore: current count --- .../Primitives/RedisSemaphorePrimitive.cs | 19 +++++++++++ .../RedisDistributedSemaphore.cs | 14 ++++++++ .../Redis/RedisDistributedSemaphoreTest.cs | 32 +++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index bae81947..06a25c94 100644 --- a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -78,4 +78,23 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); + + /// + /// Get Current Count + /// + /// + /// + internal async ValueTask GetCurrentCountAsync(IDatabaseAsync database) + { + // Lua script to count the members (holders) + const string script = @" return redis.call('zcard', KEYS[1]) "; + + // Execute against the semaphore key + var result = (int) (long) await database.ScriptEvaluateAsync( + script, + keys: new RedisKey[] { this._key } + ).ConfigureAwait(false); + + return result; + } } diff --git a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs index 44bee55a..03946d93 100644 --- a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -39,6 +39,20 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, /// public string Name => this.Key.ToString(); + public int GetCurrentCount() + { + // Sync-over-async wrapper + return GetCurrentCountAsync().GetAwaiter().GetResult(); + } + + public async ValueTask GetCurrentCountAsync() + { + var database = _databases[0]; + var primitive = new RedisSemaphorePrimitive(this.Key, this.MaxCount, this._options.RedLockTimeouts); + var acquiredCount = await primitive.GetCurrentCountAsync(database).ConfigureAwait(false); + return this.MaxCount - acquiredCount; + } + /// /// Implements /// diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index d6154385..3b127b6c 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -26,4 +26,36 @@ public void TestValidatesConstructorParameters() Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); } + + [Test] + [Category("CI")] + public async Task TestGetCurrentCountAsync() + { + // Arrange + const int maxCount = 5; + const int acquiredCount = 2; + var expectedAvailable = maxCount - acquiredCount; + + var databaseMock = new Mock(MockBehavior.Strict); + + // Mock ScriptEvaluateAsync to return acquiredCount + databaseMock + .Setup(db => db.ScriptEvaluateAsync( + It.IsAny(), + It.IsAny(), + It.IsAny(), + It.IsAny())) + .ReturnsAsync((RedisResult)(object)(long)acquiredCount); + + var semaphore = new RedisDistributedSemaphore("test-key", maxCount, databaseMock.Object); + + // Act + var availableCount = await semaphore.GetCurrentCountAsync(); + + // Assert + availableCount.ShouldEqual(expectedAvailable); + + databaseMock.VerifyAll(); + } + } From dddc925c8ffd3668cba74d17fe69c7a2ee1f1372 Mon Sep 17 00:00:00 2001 From: TEESOFTTECH Date: Sat, 2 Aug 2025 21:22:14 +0100 Subject: [PATCH 313/399] Fixed failing test --- .../Primitives/RedisSemaphorePrimitive.cs | 19 ++++--- .../PublicAPI.Unshipped.txt | 2 +- .../RedisDistributedSemaphore.cs | 1 - .../Redis/RedisDistributedSemaphoreTest.cs | 50 ++++++++++++++----- 4 files changed, 51 insertions(+), 21 deletions(-) diff --git a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 06a25c94..2bcf0124 100644 --- a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -78,7 +78,7 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); - + /// /// Get Current Count /// @@ -86,15 +86,22 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => /// internal async ValueTask GetCurrentCountAsync(IDatabaseAsync database) { - // Lua script to count the members (holders) - const string script = @" return redis.call('zcard', KEYS[1]) "; + const string script = @"return redis.call('zcard', KEYS[1])"; - // Execute against the semaphore key - var result = (int) (long) await database.ScriptEvaluateAsync( + // Execute Lua script + var result = await database.ScriptEvaluateAsync( script, keys: new RedisKey[] { this._key } ).ConfigureAwait(false); - return result; + // Safely handle result + if (result.IsNull) + { + // Key does not exist => count = 0 + return 0; + } + + return (int)(long)result; // Redis returns integer reply } + } diff --git a/src/DistributedLock.Redis/PublicAPI.Unshipped.txt b/src/DistributedLock.Redis/PublicAPI.Unshipped.txt index 5f282702..e7d09d1b 100644 --- a/src/DistributedLock.Redis/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Redis/PublicAPI.Unshipped.txt @@ -1 +1 @@ - \ No newline at end of file +Medallion.Threading.Redis.RedisDistributedSemaphore.GetCurrentCountAsync() -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs index 03946d93..4487115a 100644 --- a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -41,7 +41,6 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, public int GetCurrentCount() { - // Sync-over-async wrapper return GetCurrentCountAsync().GetAwaiter().GetResult(); } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index 3b127b6c..a84ebe4a 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -26,36 +26,60 @@ public void TestValidatesConstructorParameters() Assert.Throws(() => new RedisDistributedSemaphore("key", -1, database)); Assert.Throws(() => new RedisDistributedSemaphore("key", 2, default(IDatabase)!)); } - + [Test] [Category("CI")] public async Task TestGetCurrentCountAsync() { - // Arrange const int maxCount = 5; const int acquiredCount = 2; var expectedAvailable = maxCount - acquiredCount; + var scriptSubstring = "zcard"; var databaseMock = new Mock(MockBehavior.Strict); - // Mock ScriptEvaluateAsync to return acquiredCount + var fakeResult = RedisResult.Create((RedisValue)(long)acquiredCount); + var fakeTask = Task.FromResult(fakeResult); + databaseMock .Setup(db => db.ScriptEvaluateAsync( - It.IsAny(), - It.IsAny(), - It.IsAny(), - It.IsAny())) - .ReturnsAsync((RedisResult)(object)(long)acquiredCount); + It.Is(s => s.Contains(scriptSubstring)), + It.Is(keys => keys.Length == 1 && keys[0] == "test-key"), + null, + CommandFlags.None)) + .Returns(fakeTask); var semaphore = new RedisDistributedSemaphore("test-key", maxCount, databaseMock.Object); + var available = await semaphore.GetCurrentCountAsync(); - // Act - var availableCount = await semaphore.GetCurrentCountAsync(); - - // Assert - availableCount.ShouldEqual(expectedAvailable); + expectedAvailable.ShouldEqual(available); databaseMock.VerifyAll(); } + [Test] + [Category("CI")] + public void TestGetCurrentCountSync() + { + const int maxCount = 5; + const int acquiredCount = 3; + var expectedAvailable = maxCount - acquiredCount; + var fakeResult = RedisResult.Create((RedisValue)(long)acquiredCount); + var fakeTask = Task.FromResult(fakeResult); + + var databaseMock = new Mock(MockBehavior.Strict); + databaseMock + .Setup(db => db.ScriptEvaluateAsync( + It.IsAny(), + It.IsAny(), + null, + CommandFlags.None)) + .Returns(fakeTask); + + var semaphore = new RedisDistributedSemaphore("test-key", maxCount, databaseMock.Object); + var available = semaphore.GetCurrentCount(); + + expectedAvailable.ShouldEqual(available); + databaseMock.VerifyAll(); + } } From d166ecf6861159d702c8ab9f634ef96e1402a3a3 Mon Sep 17 00:00:00 2001 From: teesofttech Date: Mon, 4 Aug 2025 22:55:41 +0100 Subject: [PATCH 314/399] Addressed PR Comments --- .../Primitives/RedisSemaphorePrimitive.cs | 35 +++++------ .../RedisDistributedSemaphore.cs | 27 +++++--- .../Tests/Redis/RedisDistributedLockTest.cs | 63 +++++++++++++++++++ .../Redis/RedisDistributedSemaphoreTest.cs | 47 +++++++------- 4 files changed, 117 insertions(+), 55 deletions(-) diff --git a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 2bcf0124..11114c35 100644 --- a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -79,29 +79,24 @@ public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); - /// - /// Get Current Count - /// - /// - /// - internal async ValueTask GetCurrentCountAsync(IDatabaseAsync database) + public async ValueTask GetAcquiredCountAsync(IDatabase database) { - const string script = @"return redis.call('zcard', KEYS[1])"; - - // Execute Lua script - var result = await database.ScriptEvaluateAsync( - script, - keys: new RedisKey[] { this._key } - ).ConfigureAwait(false); - - // Safely handle result - if (result.IsNull) + long held; + if (SyncViaAsync.IsSynchronous) { - // Key does not exist => count = 0 - return 0; + held = database.SortedSetLength( + this._key, + flags: CommandFlags.DemandMaster + ); + } + else + { + held = await database.SortedSetLengthAsync( + this._key, + flags: CommandFlags.DemandMaster + ).ConfigureAwait(false); } - return (int)(long)result; // Redis returns integer reply + return held; } - } diff --git a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs index 4487115a..570fcd50 100644 --- a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -39,19 +39,28 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, /// public string Name => this.Key.ToString(); - public int GetCurrentCount() - { - return GetCurrentCountAsync().GetAwaiter().GetResult(); - } - + /// + /// Gets the current available count. + /// + /// + /// Use in async contexts to avoid blocking. + /// + public int GetCurrentCount() => (int)SyncViaAsync.Run(s => s.GetCurrentCountAsync(), state: this); + + /// + /// Asynchronously gets the current available count. + /// + /// The number of available slots. public async ValueTask GetCurrentCountAsync() { - var database = _databases[0]; + var database = this._databases[0]; var primitive = new RedisSemaphorePrimitive(this.Key, this.MaxCount, this._options.RedLockTimeouts); - var acquiredCount = await primitive.GetCurrentCountAsync(database).ConfigureAwait(false); - return this.MaxCount - acquiredCount; + var acquiredCount = await primitive.GetAcquiredCountAsync(database).ConfigureAwait(false); + + var available = this.MaxCount - acquiredCount; + return (int)Math.Max(0, available); } - + /// /// Implements /// diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index 6ea2d757..8e630fbf 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -56,4 +56,67 @@ public async Task TestCanAcquireLockWhenCurrentCultureIsTurkishTurkey() CultureInfo.CurrentCulture = originalCultureInfo; } } + + [Test] + public async Task TestGetCurrentCountReflectsAcquisitionsAndReleases() + { + var _db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + + const int maxCount = 3; + var key = TestHelper.UniqueName + ":sem"; + var semaphore = new RedisDistributedSemaphore(key, maxCount, _db); + + + maxCount.ShouldEqual(semaphore.GetCurrentCount()); + maxCount.ShouldEqual(await semaphore.GetCurrentCountAsync()); + + // Acquire one + var handle1 = await semaphore.AcquireAsync(); + + Assert.IsNotNull(handle1); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); + + // Acquire second + var handle2 = await semaphore.AcquireAsync(); + Assert.IsNotNull(handle2); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 2)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 2)); + + // Release first + await handle1.DisposeAsync(); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); + + // Release second + await handle2.DisposeAsync(); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount)); + } + + [Test] + public async Task TestGetCurrentCountNeverNegativeWhenOverReleased() + { + var _db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + + const int maxCount = 2; + var key = TestHelper.UniqueName + ":sem2"; + var semaphore = new RedisDistributedSemaphore(key, maxCount, _db); + + // Acquire more than maxCount (simulate drift) + var h1 = await semaphore.AcquireAsync(); + var h2 = await semaphore.AcquireAsync(); + // manually add a phantom entry to exceed maxCount + await _db.SortedSetAddAsync(key, "phantom", 0); + + // Now phantom + two real => acquiredCount == 3 > maxCount + // GetCurrentCount should floor at 0 + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(0)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(0)); + + // Cleanup + await h1.DisposeAsync(); + await h2.DisposeAsync(); + await _db.KeyDeleteAsync(key); + } } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index a84ebe4a..d4ccdb8c 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -32,27 +32,23 @@ public void TestValidatesConstructorParameters() public async Task TestGetCurrentCountAsync() { const int maxCount = 5; - const int acquiredCount = 2; - var expectedAvailable = maxCount - acquiredCount; - var scriptSubstring = "zcard"; + const int heldCount = 2; + var expectedAvailable = maxCount - heldCount; var databaseMock = new Mock(MockBehavior.Strict); - - var fakeResult = RedisResult.Create((RedisValue)(long)acquiredCount); - var fakeTask = Task.FromResult(fakeResult); - databaseMock - .Setup(db => db.ScriptEvaluateAsync( - It.Is(s => s.Contains(scriptSubstring)), - It.Is(keys => keys.Length == 1 && keys[0] == "test-key"), - null, - CommandFlags.None)) - .Returns(fakeTask); + .Setup(db => db.SortedSetLengthAsync( + It.Is(k => k == "test-key"), + It.IsAny(), + It.IsAny(), + It.IsAny(), + CommandFlags.DemandMaster)) + .ReturnsAsync(heldCount); - var semaphore = new RedisDistributedSemaphore("test-key", maxCount, databaseMock.Object); + var semaphore = new RedisDistributedSemaphore("test-key", 5, databaseMock.Object); var available = await semaphore.GetCurrentCountAsync(); - expectedAvailable.ShouldEqual(available); + available.ShouldEqual(expectedAvailable); databaseMock.VerifyAll(); } @@ -61,20 +57,19 @@ public async Task TestGetCurrentCountAsync() [Category("CI")] public void TestGetCurrentCountSync() { - const int maxCount = 5; - const int acquiredCount = 3; - var expectedAvailable = maxCount - acquiredCount; - var fakeResult = RedisResult.Create((RedisValue)(long)acquiredCount); - var fakeTask = Task.FromResult(fakeResult); + const int maxCount = 4; + const int heldCount = 3; + var expectedAvailable = maxCount - heldCount; var databaseMock = new Mock(MockBehavior.Strict); databaseMock - .Setup(db => db.ScriptEvaluateAsync( - It.IsAny(), - It.IsAny(), - null, - CommandFlags.None)) - .Returns(fakeTask); + .Setup(db => db.SortedSetLength( + It.Is(k => k == "test-key"), + It.IsAny(), + It.IsAny(), + It.IsAny(), + CommandFlags.DemandMaster)) + .Returns(heldCount); var semaphore = new RedisDistributedSemaphore("test-key", maxCount, databaseMock.Object); var available = semaphore.GetCurrentCount(); From 4a968f78c031733560dce5a93977e859f39dcce8 Mon Sep 17 00:00:00 2001 From: teesofttech Date: Tue, 5 Aug 2025 00:24:35 +0100 Subject: [PATCH 315/399] Addressed PR Comments --- src/DistributedLock.Redis/PublicAPI.Shipped.txt | 3 ++- src/DistributedLock.Redis/PublicAPI.Unshipped.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Redis/PublicAPI.Shipped.txt b/src/DistributedLock.Redis/PublicAPI.Shipped.txt index f99981dd..4166748a 100644 --- a/src/DistributedLock.Redis/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Redis/PublicAPI.Shipped.txt @@ -33,6 +33,7 @@ Medallion.Threading.Redis.RedisDistributedSemaphore.Acquire(System.TimeSpan? tim Medallion.Threading.Redis.RedisDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask Medallion.Threading.Redis.RedisDistributedSemaphore.MaxCount.get -> int Medallion.Threading.Redis.RedisDistributedSemaphore.Name.get -> string! +Medallion.Threading.Redis.RedisDistributedSemaphore.GetCurrentCountAsync() -> System.Threading.Tasks.ValueTask Medallion.Threading.Redis.RedisDistributedSemaphore.RedisDistributedSemaphore(StackExchange.Redis.RedisKey key, int maxCount, StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void Medallion.Threading.Redis.RedisDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedSemaphoreHandle? Medallion.Threading.Redis.RedisDistributedSemaphore.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask @@ -50,4 +51,4 @@ Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateLock(Sta Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateReaderWriterLock(string! name) -> Medallion.Threading.Redis.RedisDistributedReaderWriterLock! Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.CreateSemaphore(StackExchange.Redis.RedisKey key, int maxCount) -> Medallion.Threading.Redis.RedisDistributedSemaphore! Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.RedisDistributedSynchronizationProvider(StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void -Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.RedisDistributedSynchronizationProvider(System.Collections.Generic.IEnumerable! databases, System.Action? options = null) -> void \ No newline at end of file +Medallion.Threading.Redis.RedisDistributedSynchronizationProvider.RedisDistributedSynchronizationProvider(System.Collections.Generic.IEnumerable! databases, System.Action? options = null) -> void diff --git a/src/DistributedLock.Redis/PublicAPI.Unshipped.txt b/src/DistributedLock.Redis/PublicAPI.Unshipped.txt index e7d09d1b..5f282702 100644 --- a/src/DistributedLock.Redis/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Redis/PublicAPI.Unshipped.txt @@ -1 +1 @@ -Medallion.Threading.Redis.RedisDistributedSemaphore.GetCurrentCountAsync() -> System.Threading.Tasks.ValueTask \ No newline at end of file + \ No newline at end of file From 826bcf20e9eeea7a6f8258603aa1da0a654db44f Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 10 Aug 2025 10:25:14 -0400 Subject: [PATCH 316/399] Build fix --- .../PublicAPI.Shipped.txt | 1 + .../RedisDistributedSemaphore.cs | 2 +- .../Tests/Redis/RedisDistributedLockTest.cs | 63 ------------------- .../Redis/RedisDistributedSemaphoreTest.cs | 63 +++++++++++++++++++ 4 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/DistributedLock.Redis/PublicAPI.Shipped.txt b/src/DistributedLock.Redis/PublicAPI.Shipped.txt index 4166748a..111506ee 100644 --- a/src/DistributedLock.Redis/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Redis/PublicAPI.Shipped.txt @@ -33,6 +33,7 @@ Medallion.Threading.Redis.RedisDistributedSemaphore.Acquire(System.TimeSpan? tim Medallion.Threading.Redis.RedisDistributedSemaphore.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask Medallion.Threading.Redis.RedisDistributedSemaphore.MaxCount.get -> int Medallion.Threading.Redis.RedisDistributedSemaphore.Name.get -> string! +Medallion.Threading.Redis.RedisDistributedSemaphore.GetCurrentCount() -> int Medallion.Threading.Redis.RedisDistributedSemaphore.GetCurrentCountAsync() -> System.Threading.Tasks.ValueTask Medallion.Threading.Redis.RedisDistributedSemaphore.RedisDistributedSemaphore(StackExchange.Redis.RedisKey key, int maxCount, StackExchange.Redis.IDatabase! database, System.Action? options = null) -> void Medallion.Threading.Redis.RedisDistributedSemaphore.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.Redis.RedisDistributedSemaphoreHandle? diff --git a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs index 570fcd50..91d1e9c1 100644 --- a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -45,7 +45,7 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, /// /// Use in async contexts to avoid blocking. /// - public int GetCurrentCount() => (int)SyncViaAsync.Run(s => s.GetCurrentCountAsync(), state: this); + public int GetCurrentCount() => SyncViaAsync.Run(s => s.GetCurrentCountAsync(), state: this); /// /// Asynchronously gets the current available count. diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs index 8e630fbf..6ea2d757 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedLockTest.cs @@ -56,67 +56,4 @@ public async Task TestCanAcquireLockWhenCurrentCultureIsTurkishTurkey() CultureInfo.CurrentCulture = originalCultureInfo; } } - - [Test] - public async Task TestGetCurrentCountReflectsAcquisitionsAndReleases() - { - var _db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); - - const int maxCount = 3; - var key = TestHelper.UniqueName + ":sem"; - var semaphore = new RedisDistributedSemaphore(key, maxCount, _db); - - - maxCount.ShouldEqual(semaphore.GetCurrentCount()); - maxCount.ShouldEqual(await semaphore.GetCurrentCountAsync()); - - // Acquire one - var handle1 = await semaphore.AcquireAsync(); - - Assert.IsNotNull(handle1); - Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); - Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); - - // Acquire second - var handle2 = await semaphore.AcquireAsync(); - Assert.IsNotNull(handle2); - Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 2)); - Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 2)); - - // Release first - await handle1.DisposeAsync(); - Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); - Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); - - // Release second - await handle2.DisposeAsync(); - Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount)); - Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount)); - } - - [Test] - public async Task TestGetCurrentCountNeverNegativeWhenOverReleased() - { - var _db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); - - const int maxCount = 2; - var key = TestHelper.UniqueName + ":sem2"; - var semaphore = new RedisDistributedSemaphore(key, maxCount, _db); - - // Acquire more than maxCount (simulate drift) - var h1 = await semaphore.AcquireAsync(); - var h2 = await semaphore.AcquireAsync(); - // manually add a phantom entry to exceed maxCount - await _db.SortedSetAddAsync(key, "phantom", 0); - - // Now phantom + two real => acquiredCount == 3 > maxCount - // GetCurrentCount should floor at 0 - Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(0)); - Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(0)); - - // Cleanup - await h1.DisposeAsync(); - await h2.DisposeAsync(); - await _db.KeyDeleteAsync(key); - } } diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index d4ccdb8c..a4e048c8 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -77,4 +77,67 @@ public void TestGetCurrentCountSync() expectedAvailable.ShouldEqual(available); databaseMock.VerifyAll(); } + + + [Test] + public async Task TestGetCurrentCountReflectsAcquisitionsAndReleases() + { + var db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + + const int maxCount = 3; + var key = TestHelper.UniqueName + ":sem"; + var semaphore = new RedisDistributedSemaphore(key, maxCount, db); + + maxCount.ShouldEqual(semaphore.GetCurrentCount()); + maxCount.ShouldEqual(await semaphore.GetCurrentCountAsync()); + + // Acquire one + var handle1 = await semaphore.AcquireAsync(); + + Assert.IsNotNull(handle1); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); + + // Acquire second + var handle2 = await semaphore.AcquireAsync(); + Assert.IsNotNull(handle2); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 2)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 2)); + + // Release first + await handle1.DisposeAsync(); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount - 1)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount - 1)); + + // Release second + await handle2.DisposeAsync(); + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(maxCount)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(maxCount)); + } + + [Test] + public async Task TestGetCurrentCountNeverNegativeWhenOverReleased() + { + var db = RedisServer.GetDefaultServer(0).Multiplexer.GetDatabase(); + + const int maxCount = 2; + var key = TestHelper.UniqueName + ":sem2"; + var semaphore = new RedisDistributedSemaphore(key, maxCount, db); + + // Acquire more than maxCount (simulate drift) + var h1 = await semaphore.AcquireAsync(); + var h2 = await semaphore.AcquireAsync(); + // manually add a phantom entry to exceed maxCount + await db.SortedSetAddAsync(key, "phantom", 0); + + // Now phantom + two real => acquiredCount == 3 > maxCount + // GetCurrentCount should floor at 0 + Assert.That(semaphore.GetCurrentCount(), Is.EqualTo(0)); + Assert.That(await semaphore.GetCurrentCountAsync(), Is.EqualTo(0)); + + // Cleanup + await h1.DisposeAsync(); + await h2.DisposeAsync(); + await db.KeyDeleteAsync(key); + } } From a35a799bac95ca3779847d220bf4385be8aaf3b1 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 10 Aug 2025 10:27:48 -0400 Subject: [PATCH 317/399] Bump versions --- src/DistributedLock.Redis/DistributedLock.Redis.csproj | 2 +- src/DistributedLock/DistributedLock.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 334d7bd1..130226bd 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -11,7 +11,7 @@ - 1.0.3 + 1.1.0 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 22c5b77f..cdb3a088 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.6.0 + 2.7.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From af771d55d3744a409cbd6afc38a0449e8273cbfe Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 10 Aug 2025 10:29:02 -0400 Subject: [PATCH 318/399] Comment tweak --- src/DistributedLock.Redis/RedisDistributedSemaphore.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs index 91d1e9c1..5596dbb4 100644 --- a/src/DistributedLock.Redis/RedisDistributedSemaphore.cs +++ b/src/DistributedLock.Redis/RedisDistributedSemaphore.cs @@ -40,17 +40,13 @@ public RedisDistributedSemaphore(RedisKey key, int maxCount, IDatabase database, public string Name => this.Key.ToString(); /// - /// Gets the current available count. + /// Gets the current available count. Comparable to /// - /// - /// Use in async contexts to avoid blocking. - /// public int GetCurrentCount() => SyncViaAsync.Run(s => s.GetCurrentCountAsync(), state: this); /// - /// Asynchronously gets the current available count. + /// Asynchronously gets the current available count. Comparable to /// - /// The number of available slots. public async ValueTask GetCurrentCountAsync() { var database = this._databases[0]; From e59f78775d2bf3a1b4adceb5169606126dcb3832 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 10 Aug 2025 10:42:17 -0400 Subject: [PATCH 319/399] Bump stackexchange redis to latest patch --- README.md | 2 ++ src/Directory.Packages.props | 2 +- src/DistributedLock.Redis/packages.lock.json | 18 +++++------ .../RedisSynchronizationCoreTestCases.cs | 4 ++- src/DistributedLock.Tests/packages.lock.json | 28 ++++++++-------- src/DistributedLock/packages.lock.json | 32 +++++++++---------- src/DistributedLockTaker/packages.lock.json | 28 ++++++++-------- 7 files changed, 59 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 03d275f4..f946c298 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,8 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.7 + - Add support for fetching a Redis-based semaphore's current available count. Thanks [@teesoftech](https://github.com/teesofttech) for implementing! ([#234](https://github.com/madelson/DistributedLock/issues/234), DistributedLock.Redis 1.1) - 2.6 - Add support for acquiring transaction-scoped Postgres locks using externally-owned transactions. Thanks [@Tzachi009](https://github.com/Tzachi009) for implementing! ([#213](https://github.com/madelson/DistributedLock/issues/213), DistributedLock.Postgres 1.3) - 2.5.1 diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0023a608..f0fe5922 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -13,7 +13,7 @@ - + diff --git a/src/DistributedLock.Redis/packages.lock.json b/src/DistributedLock.Redis/packages.lock.json index 85f211fd..17d886f4 100644 --- a/src/DistributedLock.Redis/packages.lock.json +++ b/src/DistributedLock.Redis/packages.lock.json @@ -35,9 +35,9 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -197,9 +197,9 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -325,9 +325,9 @@ }, "StackExchange.Redis": { "type": "Direct", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", diff --git a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs index 1cc53335..945ea9c4 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Redis/RedisSynchronizationCoreTestCases.cs @@ -30,7 +30,9 @@ public void TestMajorityFaultingDatabasesCauseAcquireToThrow() var @lock = this._provider.CreateLock("multi"); // we only get the one exception - Assert.ThrowsAsync(() => @lock.TryAcquireAsync().AsTask()); + Assert.That( + Assert.CatchAsync(() => @lock.TryAcquireAsync().AsTask()), + Is.InstanceOf().Or.InstanceOf()); // single sync acquire flow is different this._provider.Strategy.DatabaseProvider.Databases = new[] { databases[2].Object }; diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index a0d85a11..89913e0e 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -425,11 +425,11 @@ "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.2.0, )", - "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.0, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -480,7 +480,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -570,9 +570,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -1068,11 +1068,11 @@ "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.2.0, )", - "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.0, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -1119,7 +1119,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -1189,9 +1189,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "6.0.0", "Pipelines.Sockets.Unofficial": "2.2.8" diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index d43eb309..44b4b439 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -454,7 +454,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -541,9 +541,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -998,7 +998,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -1088,9 +1088,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -1634,7 +1634,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -1729,9 +1729,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -2304,7 +2304,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -2401,9 +2401,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 2f58c624..1584b3e4 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -366,11 +366,11 @@ "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.2.0, )", - "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.0, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -421,7 +421,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -511,9 +511,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.Logging.Abstractions": "6.0.0", @@ -934,11 +934,11 @@ "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.2.0, )", - "DistributedLock.Redis": "[1.0.3, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.0, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -985,7 +985,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.27, )" + "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { @@ -1055,9 +1055,9 @@ }, "StackExchange.Redis": { "type": "CentralTransitive", - "requested": "[2.7.27, )", - "resolved": "2.7.27", - "contentHash": "Uqc2OQHglqj9/FfGQ6RkKFkZfHySfZlfmbCl+hc+u2I/IqunfelQ7QJi7ZhvAJxUtu80pildVX6NPLdDaUffOw==", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "6.0.0", "Pipelines.Sockets.Unofficial": "2.2.8" From bf67ed38a9da3df987b0d1245bc8774f80de81cb Mon Sep 17 00:00:00 2001 From: Joes Date: Tue, 21 Oct 2025 17:34:39 +0800 Subject: [PATCH 320/399] feat: Added support for MongoDB distributed locks Added the DistributedLock.MongoDB project, providing a MongoDB-based distributed lock implementation that supports both synchronous and asynchronous lock operations. Added core classes `MongoDistributedLock`, `MongoDistributedLockHandle`, `MongoDistributedSynchronizationOptionsBuilder`, and `MongoDistributedSynchronizationProvider` to implement lock acquisition, release, automatic renewal, and configuration functions. Updated project configuration, added dependency on `MongoDB.Driver`, and supported multiple target frameworks (.NET 8, .NET Standard 2.1, .NET Framework 4.7.2). Added usage instructions and code examples in `README.md`. Added comprehensive test coverage, including basic functionality, competition scenarios, lock loss handling, and support for custom collection names, ensuring the reliability of the functionality. Updated dependency versions and optimized internal access configuration for the test project. --- src/Directory.Packages.props | 1 + src/DistributedLock.Core/packages.lock.json | 30 +- .../AssemblyAttributes.cs | 5 + .../DistributedLock.MongoDB.csproj | 62 ++ .../MongoDistributedLock.IDistributedLock.cs | 98 +++ .../MongoDistributedLock.cs | 116 +++ .../MongoDistributedLockHandle.cs | 136 ++++ ...istributedSynchronizationOptionsBuilder.cs | 124 ++++ ...MongoDistributedSynchronizationProvider.cs | 44 ++ .../MongoLockDocument.cs | 39 + .../PublicAPI.Shipped.txt | 22 + .../PublicAPI.Unshipped.txt | 1 + src/DistributedLock.MongoDB/README.md | 106 +++ .../packages.lock.json | 518 ++++++++++++++ .../packages.lock.json | 6 +- .../DistributedLock.Tests.csproj | 1 + .../MongoDB/TestingMongoDbProviders.cs | 45 ++ .../TestingMongoDbSynchronizationStrategy.cs | 11 + .../Shared/MongoDbCredentials.cs | 31 + .../Tests/MongoDB/MongoDistributedLockTest.cs | 118 +++ ...ibutedSynchronizationOptionsBuilderTest.cs | 64 ++ ...oDistributedSynchronizationProviderTest.cs | 71 ++ src/DistributedLock.Tests/packages.lock.json | 674 ++---------------- src/DistributedLock.sln | 10 +- src/DistributedLock/DistributedLock.csproj | 2 +- src/DistributedLock/packages.lock.json | 76 ++ src/DistributedLockTaker/packages.lock.json | 18 +- 27 files changed, 1783 insertions(+), 646 deletions(-) create mode 100644 src/DistributedLock.MongoDB/AssemblyAttributes.cs create mode 100644 src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj create mode 100644 src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs create mode 100644 src/DistributedLock.MongoDB/MongoDistributedLock.cs create mode 100644 src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs create mode 100644 src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs create mode 100644 src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs create mode 100644 src/DistributedLock.MongoDB/MongoLockDocument.cs create mode 100644 src/DistributedLock.MongoDB/PublicAPI.Shipped.txt create mode 100644 src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt create mode 100644 src/DistributedLock.MongoDB/README.md create mode 100644 src/DistributedLock.MongoDB/packages.lock.json create mode 100644 src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs create mode 100644 src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs create mode 100644 src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs create mode 100644 src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs create mode 100644 src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs create mode 100644 src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index f0fe5922..2894c36a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -7,6 +7,7 @@ + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..0e0884af 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,17 +146,11 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.21, )", + "resolved": "8.0.21", + "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.MongoDB/AssemblyAttributes.cs b/src/DistributedLock.MongoDB/AssemblyAttributes.cs new file mode 100644 index 00000000..f3102190 --- /dev/null +++ b/src/DistributedLock.MongoDB/AssemblyAttributes.cs @@ -0,0 +1,5 @@ +using System.Runtime.CompilerServices; + +[assembly: + InternalsVisibleTo( + "DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj new file mode 100644 index 00000000..828c3eaa --- /dev/null +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -0,0 +1,62 @@ + + + + netstandard2.1;net8.0;net472; + Medallion.Threading.MongoDB + True + 4 + Latest + enable + enable + + + + 1.3.0 + 1.0.0.0 + Michael Adelson + Provides a distributed lock implementation based on MongoDB + Copyright © 2020 Michael Adelson + MIT + distributed lock async mongodb + https://github.com/madelson/DistributedLock + https://github.com/madelson/DistributedLock + 1.0.0.0 + See https://github.com/madelson/DistributedLock#release-notes + true + ..\DistributedLock.snk + + + + True + True + True + + + embedded + + true + true + + + + False + 1591 + TRACE;DEBUG + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs new file mode 100644 index 00000000..89936ac7 --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs @@ -0,0 +1,98 @@ +using Medallion.Threading.Internal; + +namespace Medallion.Threading.MongoDB; + +public partial class MongoDistributedLock +{ + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) + { + return TryAcquire(timeout, cancellationToken); + } + + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) + { + return Acquire(timeout, cancellationToken); + } + + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) + { + return TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + } + + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) + { + return AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + } + + /// + /// Attempts to acquire the lock synchronously. Usage: + /// + /// using (var handle = myLock.TryAcquire(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public MongoDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) + { + return DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); + } + + /// + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// + /// using (myLock.Acquire(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) + { + return DistributedLockHelpers.Acquire(this, timeout, cancellationToken); + } + + /// + /// Attempts to acquire the lock asynchronously. Usage: + /// + /// await using (var handle = await myLock.TryAcquireAsync(...)) + /// { + /// if (handle != null) { /* we have the lock! */ } + /// } + /// // dispose releases the lock if we took it + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to 0 + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) + { + return this.As>().InternalTryAcquireAsync(timeout, cancellationToken); + } + + /// + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// + /// await using (await myLock.AcquireAsync(...)) + /// { + /// /* we have the lock! */ + /// } + /// // dispose releases the lock + /// + /// + /// How long to wait before giving up on the acquisition attempt. Defaults to + /// Specifies a token by which the wait can be canceled + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) + { + return DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); + } +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs new file mode 100644 index 00000000..1fb4ec8d --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -0,0 +1,116 @@ +using Medallion.Threading.Internal; +using MongoDB.Driver; + +namespace Medallion.Threading.MongoDB; + +/// +/// Implements a using MongoDB. +/// +public sealed partial class MongoDistributedLock : IInternalDistributedLock +{ + private readonly string _collectionName; + private readonly IMongoDatabase _database; + private readonly MongoDistributedLockOptions _options; + + /// + /// The MongoDB key used to implement the lock + /// + public string Key { get; } + + /// + /// Implements + /// + public string Name => Key; + + /// + /// Constructs a lock named using the provided and . + /// The locks will be stored in a collection named "DistributedLocks" by default. + /// + public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) + : this(key, database, "DistributedLocks", options) { } + + /// + /// Constructs a lock named using the provided , , and + /// . + /// + public MongoDistributedLock(string key, IMongoDatabase database, string collectionName, Action? options = null) + { + if (string.IsNullOrEmpty(key)) { throw new ArgumentNullException(nameof(key)); } + _database = database ?? throw new ArgumentNullException(nameof(database)); + _collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); + Key = key; + _options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); + } + + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + return BusyWaitHelper.WaitAsync(this, + (@this, ct) => @this.TryAcquireAsync(ct), + timeout, + _options.MinBusyWaitSleepTime, + _options.MaxBusyWaitSleepTime, + cancellationToken); + } + + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) + { + var collection = _database.GetCollection(_collectionName); + + // Ensure index exists for efficient queries + await EnsureIndexAsync(collection, cancellationToken).ConfigureAwait(false); + var lockId = Guid.NewGuid().ToString(); + var now = DateTime.UtcNow; + var expiresAt = now.Add(_options.Expiry.TimeSpan); + + // Filter: lock with this key doesn't exist OR has expired + var filter = Builders.Filter.Or(Builders.Filter.Eq(d => d.Id, Key) & Builders.Filter.Lt(d => d.ExpiresAt, now), + Builders.Filter.Eq(d => d.Id, Key) & Builders.Filter.Exists(d => d.ExpiresAt, false)); + var update = Builders.Update + .Set(d => d.Id, Key) + .Set(d => d.LockId, lockId) + .Set(d => d.ExpiresAt, expiresAt) + .Set(d => d.AcquiredAt, now); + var options = new FindOneAndUpdateOptions { IsUpsert = true, ReturnDocument = ReturnDocument.After }; + try + { + var result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + + // Verify we actually got the lock + if (result != null && result.LockId == lockId) + { + return new(_database, + _collectionName, + Key, + lockId, + _options.Expiry, + _options.ExtensionCadence); + } + } + catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) + { + // Lock is already held by someone else + return null; + } + catch (MongoCommandException) + { + // Lock is already held + return null; + } + return null; + } + + private static async Task EnsureIndexAsync(IMongoCollection collection, CancellationToken cancellationToken) + { + try + { + var indexKeys = Builders.IndexKeys.Ascending(d => d.ExpiresAt); + var indexOptions = new CreateIndexOptions { Background = true }; + var indexModel = new CreateIndexModel(indexKeys, indexOptions); + await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: cancellationToken).ConfigureAwait(false); + } + catch + { + // Index might already exist, ignore errors + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs new file mode 100644 index 00000000..352c698c --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -0,0 +1,136 @@ +using Medallion.Threading.Internal; +using MongoDB.Driver; + +namespace Medallion.Threading.MongoDB; + +/// +/// Implements for +/// +public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHandle +{ + private readonly string _collectionName; + private readonly CancellationTokenSource _cts; + private readonly IMongoDatabase _database; + private readonly Task _extensionTask; + private readonly string _key; + private readonly string _lockId; + private int _disposed; + + /// + /// Implements + /// + public CancellationToken HandleLostToken => _cts.Token; + + internal MongoDistributedLockHandle( + IMongoDatabase database, + string collectionName, + string key, + string lockId, + TimeoutValue expiry, + TimeoutValue extensionCadence) + { + _database = database; + _collectionName = collectionName; + _key = key; + _lockId = lockId; + _cts = new(); + + // Start background task to extend the lock + _extensionTask = ExtendLockAsync(expiry, extensionCadence, _cts.Token); + } + + /// + /// Releases the lock + /// + public void Dispose() + { + if (Interlocked.Exchange(ref _disposed, 1) is not 0) + { + return; + } + _cts.Cancel(); + try + { + _extensionTask.Wait(HandleLostToken); + } + catch + { + // Ignore exceptions during cleanup + } + finally + { + _cts.Dispose(); + ReleaseLockAsync(CancellationToken.None).AsTask().Wait(HandleLostToken); + } + } + + /// + /// Releases the lock asynchronously + /// + public async ValueTask DisposeAsync() + { + if (Interlocked.Exchange(ref _disposed, 1) is 0) + { + _cts.Cancel(); + try + { + await _extensionTask.ConfigureAwait(false); + } + catch + { + // Ignore exceptions during cleanup + } + finally + { + _cts.Dispose(); + await ReleaseLockAsync(CancellationToken.None).ConfigureAwait(false); + } + } + } + + private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCadence, CancellationToken cancellationToken) + { + try + { + while (!cancellationToken.IsCancellationRequested) + { + await Task.Delay(extensionCadence.TimeSpan, cancellationToken).ConfigureAwait(false); + var collection = _database.GetCollection(_collectionName); + var filter = Builders.Filter.Eq(d => d.Id, _key) & Builders.Filter.Eq(d => d.LockId, _lockId); + var update = Builders.Update.Set(d => d.ExpiresAt, DateTime.UtcNow.Add(expiry.TimeSpan)); + var result = await collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + + // If we failed to extend, the lock was lost + if (result.MatchedCount is not 0) + { + continue; + } + _cts.Cancel(); + break; + } + } + catch (OperationCanceledException) + { + // Expected when disposing + } + catch + { + // Lock extension failed, signal that the lock is lost + _cts.Cancel(); + } + } + + private async ValueTask ReleaseLockAsync(CancellationToken cancellationToken) + { + try + { + var collection = _database.GetCollection(_collectionName); + var filter = Builders.Filter.Eq(d => d.Id, _key) & Builders.Filter.Eq(d => d.LockId, _lockId); + await collection.DeleteOneAsync(filter, cancellationToken).ConfigureAwait(false); + } + catch + { + // Ignore errors during release + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs new file mode 100644 index 00000000..eae699e1 --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -0,0 +1,124 @@ +using Medallion.Threading.Internal; + +namespace Medallion.Threading.MongoDB; + +/// +/// Options for configuring a MongoDB-based distributed synchronization algorithm +/// +public sealed class MongoDistributedSynchronizationOptionsBuilder +{ + internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); + + /// + /// We don't want to allow expiry to go too low, since then the lock doesn't even work + /// + internal static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); + + private TimeoutValue? _expiry, _extensionCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; + + internal MongoDistributedSynchronizationOptionsBuilder() { } + + /// + /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, + /// this value generally will have little effect on program behavior. However, making the expiry longer means that + /// auto-extension requests can occur less frequently, saving resources. On the other hand, when a lock is abandoned + /// without explicit release (e. g. if the holding process crashes), the expiry determines how long other processes + /// would need to wait in order to acquire it. + /// Defaults to 30s. + /// + public MongoDistributedSynchronizationOptionsBuilder Expiry(TimeSpan expiry) + { + var expiryTimeoutValue = new TimeoutValue(expiry, nameof(expiry)); + if (expiryTimeoutValue.IsInfinite || expiryTimeoutValue.CompareTo(MinimumExpiry) < 0) + { + throw new ArgumentOutOfRangeException(nameof(expiry), expiry, $"Must be >= {MinimumExpiry.TimeSpan} and < ∞"); + } + _expiry = expiryTimeoutValue; + return this; + } + + /// + /// Determines how frequently the lock will be extended while held. More frequent extension means more unnecessary requests + /// but also a lower chance of losing the lock due to the process hanging or otherwise failing to get its extension request in + /// before the lock expiry elapses. + /// Defaults to 1/3 of the expiry time. + /// + public MongoDistributedSynchronizationOptionsBuilder ExtensionCadence(TimeSpan extensionCadence) + { + _extensionCadence = new TimeoutValue(extensionCadence, nameof(extensionCadence)); + return this; + } + + /// + /// Waiting to acquire a lock requires a busy wait that alternates acquire attempts and sleeps. + /// This determines how much time is spent sleeping between attempts. Lower values will raise the + /// volume of acquire requests under contention but will also raise the responsiveness (how long + /// it takes a waiter to notice that a contended the lock has become available). + /// Specifying a range of values allows the implementation to select an actual value in the range + /// at random for each sleep. This helps avoid the case where two clients become "synchronized" + /// in such a way that results in one client monopolizing the lock. + /// The default is [10ms, 800ms] + /// + public MongoDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) + { + var minTimeoutValue = new TimeoutValue(min, nameof(min)); + var maxTimeoutValue = new TimeoutValue(max, nameof(max)); + if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } + if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) + { + throw new ArgumentOutOfRangeException(nameof(max), max, "must be non-infinite and greater than " + nameof(min)); + } + _minBusyWaitSleepTime = minTimeoutValue; + _maxBusyWaitSleepTime = maxTimeoutValue; + return this; + } + + internal static MongoDistributedLockOptions GetOptions(Action? optionsBuilder) + { + MongoDistributedSynchronizationOptionsBuilder? options; + if (optionsBuilder != null) + { + options = new(); + optionsBuilder(options); + } + else + { + options = null; + } + var expiry = options?._expiry ?? DefaultExpiry; + TimeoutValue extensionCadence; + if (options?._extensionCadence is { } specifiedExtensionCadence) + { + if (specifiedExtensionCadence.CompareTo(expiry) >= 0) + { + throw new ArgumentOutOfRangeException(nameof(extensionCadence), + specifiedExtensionCadence.TimeSpan, + $"{nameof(extensionCadence)} must be less than {nameof(expiry)} ({expiry.TimeSpan})"); + } + extensionCadence = specifiedExtensionCadence; + } + else + { + extensionCadence = TimeSpan.FromMilliseconds(expiry.InMilliseconds / 3.0); + } + return new(expiry, + extensionCadence, + options?._minBusyWaitSleepTime ?? TimeSpan.FromMilliseconds(10), + options?._maxBusyWaitSleepTime ?? TimeSpan.FromSeconds(0.8)); + } +} + +internal readonly struct MongoDistributedLockOptions( + TimeoutValue expiry, + TimeoutValue extensionCadence, + TimeoutValue minBusyWaitSleepTime, + TimeoutValue maxBusyWaitSleepTime) +{ + public TimeoutValue Expiry { get; } = expiry; + + public TimeoutValue ExtensionCadence { get; } = extensionCadence; + + public TimeoutValue MinBusyWaitSleepTime { get; } = minBusyWaitSleepTime; + + public TimeoutValue MaxBusyWaitSleepTime { get; } = maxBusyWaitSleepTime; +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs new file mode 100644 index 00000000..c3a46ace --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs @@ -0,0 +1,44 @@ +using MongoDB.Driver; + +namespace Medallion.Threading.MongoDB; + +/// +/// Implements for . +/// +public sealed class MongoDistributedSynchronizationProvider : IDistributedLockProvider +{ + private readonly string _collectionName; + private readonly IMongoDatabase _database; + private readonly Action? _options; + + /// + /// Constructs a that connects to the provided + /// and uses the provided . Locks will be stored in a collection named "DistributedLocks" by default. + /// + public MongoDistributedSynchronizationProvider(IMongoDatabase database, Action? options = null) + : this(database, "DistributedLocks", options) { } + + /// + /// Constructs a that connects to the provided , + /// stores locks in the specified , and uses the provided . + /// + public MongoDistributedSynchronizationProvider(IMongoDatabase database, string collectionName, Action? options = null) + { + _database = database ?? throw new ArgumentNullException(nameof(database)); + _collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); + _options = options; + } + + /// + /// Creates a using the given . + /// + public MongoDistributedLock CreateLock(string name) + { + return new(name, _database, _collectionName, _options); + } + + IDistributedLock IDistributedLockProvider.CreateLock(string name) + { + return CreateLock(name); + } +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoLockDocument.cs b/src/DistributedLock.MongoDB/MongoLockDocument.cs new file mode 100644 index 00000000..d6359a29 --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoLockDocument.cs @@ -0,0 +1,39 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace Medallion.Threading.MongoDB; + +/// +/// Represents a lock document stored in MongoDB +/// +// ReSharper disable once ClassNeverInstantiated.Global +internal sealed class MongoLockDocument +{ + /// + /// When the lock was acquired (UTC) + /// + [BsonElement("acquiredAt")] + [BsonRepresentation(BsonType.DateTime)] + public DateTime AcquiredAt { get; set; } + + /// + /// When the lock expires (UTC) + /// + [BsonElement("expiresAt")] + [BsonRepresentation(BsonType.DateTime)] + public DateTime ExpiresAt { get; set; } + + /// + /// The lock name/key (MongoDB document ID) + /// + [BsonId] + [BsonRepresentation(BsonType.String)] + public string Id { get; set; } = string.Empty; + + /// + /// Unique identifier for this lock acquisition + /// + [BsonElement("lockId")] + [BsonRepresentation(BsonType.String)] + public string LockId { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/PublicAPI.Shipped.txt b/src/DistributedLock.MongoDB/PublicAPI.Shipped.txt new file mode 100644 index 00000000..5e440dc2 --- /dev/null +++ b/src/DistributedLock.MongoDB/PublicAPI.Shipped.txt @@ -0,0 +1,22 @@ +#nullable enable +Medallion.Threading.MongoDB.MongoDistributedLock +Medallion.Threading.MongoDB.MongoDistributedLock.Acquire(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.MongoDB.MongoDistributedLockHandle! +Medallion.Threading.MongoDB.MongoDistributedLock.AcquireAsync(System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.MongoDB.MongoDistributedLock.Key.get -> string! +Medallion.Threading.MongoDB.MongoDistributedLock.Name.get -> string! +Medallion.Threading.MongoDB.MongoDistributedLock.MongoDistributedLock(string! key, MongoDB.Driver.IMongoDatabase! database, System.Action? options = null) -> void +Medallion.Threading.MongoDB.MongoDistributedLock.MongoDistributedLock(string! key, MongoDB.Driver.IMongoDatabase! database, string! collectionName, System.Action? options = null) -> void +Medallion.Threading.MongoDB.MongoDistributedLock.TryAcquire(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.MongoDB.MongoDistributedLockHandle? +Medallion.Threading.MongoDB.MongoDistributedLock.TryAcquireAsync(System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +Medallion.Threading.MongoDB.MongoDistributedLockHandle +Medallion.Threading.MongoDB.MongoDistributedLockHandle.Dispose() -> void +Medallion.Threading.MongoDB.MongoDistributedLockHandle.DisposeAsync() -> System.Threading.Tasks.ValueTask +Medallion.Threading.MongoDB.MongoDistributedLockHandle.HandleLostToken.get -> System.Threading.CancellationToken +Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder +Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder.BusyWaitSleepTime(System.TimeSpan min, System.TimeSpan max) -> Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder! +Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder.Expiry(System.TimeSpan expiry) -> Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder! +Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder.ExtensionCadence(System.TimeSpan extensionCadence) -> Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder! +Medallion.Threading.MongoDB.MongoDistributedSynchronizationProvider +Medallion.Threading.MongoDB.MongoDistributedSynchronizationProvider.CreateLock(string! name) -> Medallion.Threading.MongoDB.MongoDistributedLock! +Medallion.Threading.MongoDB.MongoDistributedSynchronizationProvider.MongoDistributedSynchronizationProvider(MongoDB.Driver.IMongoDatabase! database, System.Action? options = null) -> void +Medallion.Threading.MongoDB.MongoDistributedSynchronizationProvider.MongoDistributedSynchronizationProvider(MongoDB.Driver.IMongoDatabase! database, string! collectionName, System.Action? options = null) -> void diff --git a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt new file mode 100644 index 00000000..1883be4e --- /dev/null +++ b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +Medallion.Threading.MongoDB.MongoDistributedLock \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md new file mode 100644 index 00000000..2cac9f0d --- /dev/null +++ b/src/DistributedLock.MongoDB/README.md @@ -0,0 +1,106 @@ +# DistributedLock.MongoDB + +This library provides distributed lock implementation using MongoDB as the backing store. + +## Installation + +```bash +dotnet add package DistributedLock.MongoDB +``` + +## Usage + +### Basic Lock Usage + +```csharp +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + +// Create MongoDB client and database +var client = new MongoClient("mongodb://localhost:27017"); +var database = client.GetDatabase("myDatabase"); + +// Create a lock +var @lock = new MongoDistributedLock("myLockName", database); + +// Acquire the lock +await using (var handle = await @lock.AcquireAsync()) +{ + // Critical section protected by the lock + Console.WriteLine("Lock acquired!"); +} +// Lock is automatically released when disposed +``` + +### Using the Provider + +```csharp +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + +var client = new MongoClient("mongodb://localhost:27017"); +var database = client.GetDatabase("myDatabase"); + +// Create a provider +var provider = new MongoDistributedSynchronizationProvider(database); + +// Use the provider to create locks +var lock1 = provider.CreateLock("lock1"); +var lock2 = provider.CreateLock("lock2"); + +await using (var handle = await lock1.AcquireAsync()) +{ + // Do work... +} +``` + +### Configuration Options + +You can customize the lock behavior using the options builder: + +```csharp +var @lock = new MongoDistributedLock( + "myLockName", + database, + options => options + .Expiry(TimeSpan.FromSeconds(30)) // Lock expiry time + .ExtensionCadence(TimeSpan.FromSeconds(10)) // How often to extend the lock + .BusyWaitSleepTime( // Sleep time between acquire attempts + min: TimeSpan.FromMilliseconds(10), + max: TimeSpan.FromMilliseconds(800)) +); +``` + +### Custom Collection Name + +By default, locks are stored in a collection named "DistributedLocks". You can specify a custom collection name: + +```csharp +var @lock = new MongoDistributedLock("myLockName", database, "MyCustomLocks"); +``` + +## How It Works + +The MongoDB distributed lock uses MongoDB's document upsert and update operations to implement distributed locking: + +1. **Acquisition**: Attempts to insert or update a document with the lock key and a unique lock ID +2. **Extension**: Automatically extends the lock expiry while held to prevent timeout +3. **Release**: Deletes the lock document when disposed +4. **Expiry**: Locks automatically expire if not extended, allowing recovery from crashed processes + +## Features + +- ✅ Async/await support +- ✅ Automatic lock extension while held +- ✅ Configurable expiry and extension cadence +- ✅ Lock abandonment protection via expiry +- ✅ `CancellationToken` support +- ✅ Handle lost token notification +- ✅ Multi-target support: .NET 8, .NET Standard 2.1, .NET Framework 4.7.2 + +## Notes + +- The lock collection will have an index on the `expiresAt` field for efficient queries +- Lock extension happens automatically in the background +- If lock extension fails, the `HandleLostToken` will be signaled +- Stale locks (from crashed processes) will automatically expire based on the expiry setting diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json new file mode 100644 index 00000000..11abd24a --- /dev/null +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -0,0 +1,518 @@ +{ + "version": 2, + "dependencies": { + ".NETFramework,Version=v4.7.2": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "MongoDB.Driver": { + "type": "Direct", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + } + }, + ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "MongoDB.Driver": { + "type": "Direct", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "distributedlock.core": { + "type": "Project" + } + }, + "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.21, )", + "resolved": "8.0.21", + "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "MongoDB.Driver": { + "type": "Direct", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + } + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" + }, + "distributedlock.core": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 797320b6..041eb72b 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -518,9 +518,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.21, )", + "resolved": "8.0.21", + "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index be82219e..07020675 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -31,6 +31,7 @@ + \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs new file mode 100644 index 00000000..d873e300 --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs @@ -0,0 +1,45 @@ +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + +namespace Medallion.Threading.Tests.MongoDB; + +public sealed class TestingMongoDistributedLockProvider : TestingLockProvider +{ + private readonly string _collectionName = "DistributedLocks_" + Guid.NewGuid().ToString("N"); + private readonly IMongoDatabase _database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + + public override IDistributedLock CreateLockWithExactName(string name) + { + var @lock = new MongoDistributedLock(name, _database, _collectionName); + Strategy.KillHandleAction = () => + { + var collection = _database.GetCollection(_collectionName); + collection.DeleteOne(Builders.Filter.Eq(d => d.Id, name)); + }; + return @lock; + } + + public override string GetSafeName(string name) + { + return new MongoDistributedLock(name, _database, _collectionName).Name; + } + + public override string GetCrossProcessLockType() + { + return nameof(MongoDistributedLock); + } + + public override void Dispose() + { + // Clean up test collection + try + { + _database.DropCollection(_collectionName); + } + catch + { + // Ignore cleanup errors + } + base.Dispose(); + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs new file mode 100644 index 00000000..4324c1d5 --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs @@ -0,0 +1,11 @@ +namespace Medallion.Threading.Tests.MongoDB; + +public sealed class TestingMongoDbSynchronizationStrategy : TestingSynchronizationStrategy +{ + public Action? KillHandleAction { get; set; } + + public override void PrepareForHandleAbandonment() + { + KillHandleAction?.Invoke(); + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs new file mode 100644 index 00000000..8c8ce172 --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs @@ -0,0 +1,31 @@ +using MongoDB.Driver; +using System.IO; + +namespace Medallion.Threading.Tests.MongoDB; + +internal static class MongoDbCredentials +{ + private static string? _connectionString; + + public static string GetConnectionString(string baseDirectory) + { + if (_connectionString != null) { return _connectionString; } + var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mongodb.txt")); + if (File.Exists(file)) + { + _connectionString = File.ReadAllText(file).Trim(); + } + else + { + // Default local MongoDB connection + _connectionString = "mongodb://localhost:27017"; + } + return _connectionString; + } + + public static IMongoDatabase GetDefaultDatabase(string baseDirectory) + { + var client = new MongoClient(GetConnectionString(baseDirectory)); + return client.GetDatabase("DistributedLockTests"); + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs new file mode 100644 index 00000000..a8f8ef1e --- /dev/null +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -0,0 +1,118 @@ +using Medallion.Threading.MongoDB; +using MongoDB.Driver; +using Moq; +using NUnit.Framework; + +namespace Medallion.Threading.Tests.MongoDB; + +public class MongoDistributedLockTest +{ + [Test] + public async Task TestBasicLockFunctionality() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + var @lock = new MongoDistributedLock(lockName, database); + await using (var handle = await @lock.AcquireAsync()) + { + Assert.That(handle, Is.Not.Null); + // Use async TryAcquireAsync instead of synchronous IsHeld() + var handle2 = await @lock.TryAcquireAsync(TimeSpan.Zero); + Assert.That(handle2, Is.Null, "Lock should be held"); + if (handle2 != null) + { + await handle2.DisposeAsync(); + } + } + // Verify lock is released + await using (var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(1))) + { + Assert.That(handle, Is.Not.Null, "Lock should be released"); + } + } + + [Test] + public async Task TestCustomCollectionName() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + const string CustomCollectionName = "CustomLocks"; + var @lock = new MongoDistributedLock(lockName, database, CustomCollectionName); + await using (var handle = await @lock.AcquireAsync()) + { + Assert.That(handle, Is.Not.Null); + } + + // Verify the collection was created + var collectionExists = (await database.ListCollectionNamesAsync()).ToList().Contains(CustomCollectionName); + Assert.That(collectionExists, Is.True); + + // Cleanup + await database.DropCollectionAsync(CustomCollectionName); + } + + [Test] + public async Task TestHandleLostToken() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + // Configure a short extension cadence so the test doesn't have to wait too long + var @lock = new MongoDistributedLock(lockName, database, options: o => o.ExtensionCadence(TimeSpan.FromMilliseconds(500))); + await using var handle = await @lock.AcquireAsync(); + Assert.That(handle, Is.Not.Null); + Assert.Multiple(() => + { + Assert.That(handle.HandleLostToken.CanBeCanceled, Is.True); + Assert.That(handle.HandleLostToken.IsCancellationRequested, Is.False); + }); + + // Manually delete the lock document to simulate lock loss + var collection = database.GetCollection("DistributedLocks"); + await collection.DeleteOneAsync(Builders.Filter.Eq(d => d.Id, lockName)); + + // Wait a bit for the extension task to detect the loss + await Task.Delay(TimeSpan.FromSeconds(2)); + Assert.That(handle.HandleLostToken.IsCancellationRequested, Is.True, "HandleLostToken should be signaled when lock is lost"); + } + + [Test] + public async Task TestLockContentionAsync() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + var lock1 = new MongoDistributedLock(lockName, database); + var lock2 = new MongoDistributedLock(lockName, database); + await using (var handle1 = await lock1.AcquireAsync()) + { + Assert.That(handle1, Is.Not.Null); + var handle2 = await lock2.TryAcquireAsync(TimeSpan.FromMilliseconds(100)); + Assert.That(handle2, Is.Null, "Should not acquire lock while held by another instance"); + } + + // After release, lock2 should be able to acquire + await using (var handle2 = await lock2.AcquireAsync(TimeSpan.FromSeconds(5))) + { + Assert.That(handle2, Is.Not.Null); + } + } + + [Test] + public void TestName() + { + const string Name = "\0🐉汉字\b\r\n\\"; + var database = new Mock(MockBehavior.Strict).Object; + var @lock = new MongoDistributedLock(Name, database); + @lock.Name.ShouldEqual(Name); + @lock.Key.ShouldEqual(Name); + } + + [Test] + public void TestValidatesConstructorParameters() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new MongoDistributedLock(null!, database)); + Assert.Throws(() => new MongoDistributedLock(string.Empty, database)); + Assert.Throws(() => new MongoDistributedLock("key", null!)); + Assert.Throws(() => new MongoDistributedLock("key", database, (string)null!)); + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs new file mode 100644 index 00000000..c6d4a430 --- /dev/null +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs @@ -0,0 +1,64 @@ +using Medallion.Threading.MongoDB; +using NUnit.Framework; + +namespace Medallion.Threading.Tests.MongoDB; + +[Category("CI")] +public class MongoDistributedSynchronizationOptionsBuilderTest +{ + [Test] + public void TestBusyWaitSleepTimeValidation() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + Assert.Throws(() => + new MongoDistributedLock("test", database, options => options + .BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromMilliseconds(500)))); + Assert.Throws(() => + new MongoDistributedLock("test", database, options => options + .BusyWaitSleepTime(Timeout.InfiniteTimeSpan, TimeSpan.FromSeconds(1)))); + Assert.DoesNotThrow(() => + new MongoDistributedLock("test", database, options => options + .BusyWaitSleepTime(TimeSpan.FromMilliseconds(10), TimeSpan.FromSeconds(1)))); + } + + [Test] + public void TestExpiryValidation() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + Assert.Throws(() => + new MongoDistributedLock("test", database, options => options.Expiry(TimeSpan.FromMilliseconds(50)))); + Assert.Throws(() => + new MongoDistributedLock("test", database, options => options.Expiry(Timeout.InfiniteTimeSpan))); + Assert.DoesNotThrow(() => + new MongoDistributedLock("test", database, options => options.Expiry(TimeSpan.FromSeconds(1)))); + } + + [Test] + public void TestExtensionCadenceValidation() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + Assert.Throws(() => + new MongoDistributedLock("test", database, options => options + .Expiry(TimeSpan.FromSeconds(5)) + .ExtensionCadence(TimeSpan.FromSeconds(10)))); + Assert.DoesNotThrow(() => + new MongoDistributedLock("test", database, options => options + .Expiry(TimeSpan.FromSeconds(10)) + .ExtensionCadence(TimeSpan.FromSeconds(3)))); + } + + [Test] + public async Task TestOptionsAreApplied() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + var @lock = new MongoDistributedLock(lockName, database, options => options + .Expiry(TimeSpan.FromSeconds(60)) + .ExtensionCadence(TimeSpan.FromSeconds(20)) + .BusyWaitSleepTime(TimeSpan.FromMilliseconds(5), TimeSpan.FromMilliseconds(100))); + await using (var handle = await @lock.AcquireAsync()) + { + Assert.That(handle, Is.Not.Null); + } + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs new file mode 100644 index 00000000..54879238 --- /dev/null +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs @@ -0,0 +1,71 @@ +using Medallion.Threading.MongoDB; +using MongoDB.Driver; +using NUnit.Framework; + +namespace Medallion.Threading.Tests.MongoDB; + +[Category("CI")] +public class MongoDistributedSynchronizationProviderTest +{ + [Test] + public void TestArgumentValidation() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + Assert.Throws(() => new MongoDistributedSynchronizationProvider(null!)); + Assert.Throws(() => new MongoDistributedSynchronizationProvider(database, (string)null!)); + Assert.DoesNotThrow(() => new MongoDistributedSynchronizationProvider(database)); + Assert.DoesNotThrow(() => new MongoDistributedSynchronizationProvider(database, "CustomCollection")); + } + + [Test] + public void TestIDistributedLockProviderInterface() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + IDistributedLockProvider provider = new MongoDistributedSynchronizationProvider(database); + var @lock = provider.CreateLock("interfaceTest"); + Assert.That(@lock, Is.Not.Null); + Assert.That(@lock, Is.InstanceOf()); + Assert.That(@lock.Name, Is.EqualTo("interfaceTest")); + } + + [Test] + public async Task TestProviderCreateLock() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var provider = new MongoDistributedSynchronizationProvider(database); + var lock1 = provider.CreateLock("testLock1"); + var lock2 = provider.CreateLock("testLock2"); + Assert.That(lock1, Is.Not.Null); + Assert.That(lock2, Is.Not.Null); + Assert.That(lock1.Name, Is.EqualTo("testLock1")); + Assert.That(lock2.Name, Is.EqualTo("testLock2")); + + // Test that locks work + await using (var handle1 = await lock1.AcquireAsync()) + await using (var handle2 = await lock2.AcquireAsync()) + { + Assert.That(handle1, Is.Not.Null); + Assert.That(handle2, Is.Not.Null); + } + } + + [Test] + public async Task TestProviderWithCustomCollection() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + const string CustomCollection = "TestProviderLocks"; + var provider = new MongoDistributedSynchronizationProvider(database, CustomCollection); + var @lock = provider.CreateLock("testLock"); + await using (var handle = await @lock.AcquireAsync()) + { + Assert.That(handle, Is.Not.Null); + } + + // Verify the custom collection was used + var collectionExists = (await database.ListCollectionNamesAsync()).ToList().Contains(CustomCollection); + Assert.That(collectionExists, Is.True); + + // Cleanup + await database.DropCollectionAsync(CustomCollection); + } +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 89913e0e..6cc0a2f3 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,593 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", - "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", - "dependencies": { - "Microsoft.Identity.Client": "4.61.3", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", - "DistributedLock.SqlServer": "[1.0.6, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Oracle.ManagedDataAccess": "[23.6.1, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.6, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.33, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.5", - "System.Threading.Channels": "8.0.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "CentralTransitive", - "requested": "[23.6.1, )", - "resolved": "23.6.1", - "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Formats.Asn1": "8.0.1", - "System.Text.Json": "8.0.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.33, )", - "resolved": "2.7.33", - "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -692,6 +105,14 @@ "System.Diagnostics.EventLog": "6.0.0" } }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "1.1.1", @@ -797,8 +218,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -829,11 +250,20 @@ }, "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Security.Principal.Windows": "4.7.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "NETStandard.Library": { @@ -893,6 +323,21 @@ "resolved": "4.4.0", "contentHash": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==" }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, "System.ClientModel": { "type": "Transitive", "resolved": "1.0.0", @@ -963,8 +408,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Memory.Data": { "type": "Transitive", @@ -1009,11 +454,11 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0", - "System.Security.Principal.Windows": "4.7.0" + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" } }, "System.Security.Cryptography.Cng": { @@ -1036,8 +481,8 @@ }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Text.Encoding": { "type": "Transitive", @@ -1064,6 +509,11 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" + }, "distributedlock": { "type": "Project", "dependencies": { @@ -1094,6 +544,13 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MongoDB.Driver": "[3.5.0, )" + } + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -1169,6 +626,21 @@ "System.Runtime.Caching": "8.0.0" } }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + } + }, "MySqlConnector": { "type": "CentralTransitive", "requested": "[2.3.5, )", diff --git a/src/DistributedLock.sln b/src/DistributedLock.sln index 61d17d38..30c8dd91 100644 --- a/src/DistributedLock.sln +++ b/src/DistributedLock.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34616.47 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11116.177 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock", "DistributedLock\DistributedLock.csproj", "{C1F56B68-C2EE-48E5-A99B-B40D397AE34F}" EndProject @@ -47,6 +47,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution package.readme.md = package.readme.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.MongoDB", "DistributedLock.MongoDB\DistributedLock.MongoDB.csproj", "{92074E6D-99D1-46B1-A0AE-442EA1FEA397}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -109,6 +111,10 @@ Global {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Release|Any CPU.ActiveCfg = Release|Any CPU {1CAB9A1D-0C02-459C-A90E-47819832BD58}.Release|Any CPU.Build.0 = Release|Any CPU + {92074E6D-99D1-46B1-A0AE-442EA1FEA397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92074E6D-99D1-46B1-A0AE-442EA1FEA397}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92074E6D-99D1-46B1-A0AE-442EA1FEA397}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92074E6D-99D1-46B1-A0AE-442EA1FEA397}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index cdb3a088..48c5da8d 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -57,7 +57,7 @@ - + \ No newline at end of file diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 44b4b439..5407bb0c 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -436,6 +436,13 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MySqlConnector": "[3.5.0, )" + } + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -973,6 +980,9 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project" + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -1616,6 +1626,9 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project" + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -1812,6 +1825,14 @@ "System.IO.Hashing": "6.0.0" } }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "8.0.0", @@ -1955,6 +1976,15 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -1963,6 +1993,22 @@ "System.IO.Pipelines": "5.0.1" } }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.7.1" + } + }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -2263,6 +2309,14 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -2279,6 +2333,13 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MongoDB.Driver": "[3.5.0, )" + } + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -2361,6 +2422,21 @@ "System.Text.Encodings.Web": "6.0.0" } }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + } + }, "MySqlConnector": { "type": "CentralTransitive", "requested": "[2.3.5, )", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 1584b3e4..8476aab4 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -529,7 +529,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - ".NETFramework,Version=v4.7.2/win7-x86": { + ".NETFramework,Version=v4.7.2/win-x86": { "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -604,9 +604,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.21, )", + "resolved": "8.0.21", + "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" }, "Azure.Core": { "type": "Transitive", @@ -1076,7 +1076,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - "net8.0/win7-x86": { + "net8.0/win-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "5.2.0", @@ -1105,11 +1105,6 @@ "resolved": "4.3.0", "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" }, - "runtime.win7.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" - }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -1193,8 +1188,7 @@ "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3", - "runtime.win7.System.Private.Uri": "4.3.0" + "Microsoft.NETCore.Targets": "1.1.3" } }, "System.Threading.AccessControl": { From 80ff241f8dc081a8702d481e1c360158aa6c3e66 Mon Sep 17 00:00:00 2001 From: Joes Date: Tue, 21 Oct 2025 18:02:53 +0800 Subject: [PATCH 321/399] =?UTF-8?q?=E6=8F=90=E9=AB=98=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E6=80=A7=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E5=8F=AF?= =?UTF-8?q?=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将字段和构造函数的访问修饰符从 internal 修改为 private，以增强封装性。修复注释中的拼写错误并优化格式，提升代码的可读性和维护性。 --- .../MongoDistributedSynchronizationOptionsBuilder.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs index eae699e1..b021030d 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -7,22 +7,22 @@ namespace Medallion.Threading.MongoDB; /// public sealed class MongoDistributedSynchronizationOptionsBuilder { - internal static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); + private static readonly TimeoutValue DefaultExpiry = TimeSpan.FromSeconds(30); /// /// We don't want to allow expiry to go too low, since then the lock doesn't even work /// - internal static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); + private static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); private TimeoutValue? _expiry, _extensionCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; - internal MongoDistributedSynchronizationOptionsBuilder() { } + private MongoDistributedSynchronizationOptionsBuilder() { } /// /// Specifies how long the lock will last, absent auto-extension. Because auto-extension exists, /// this value generally will have little effect on program behavior. However, making the expiry longer means that /// auto-extension requests can occur less frequently, saving resources. On the other hand, when a lock is abandoned - /// without explicit release (e. g. if the holding process crashes), the expiry determines how long other processes + /// without explicit release (e.g. if the holding process crashes), the expiry determines how long other processes /// would need to wait in order to acquire it. /// Defaults to 30s. /// From e06c413145391bd2db6c08c917ad6fc2085ec887 Mon Sep 17 00:00:00 2001 From: Joes Date: Tue, 21 Oct 2025 18:12:21 +0800 Subject: [PATCH 322/399] =?UTF-8?q?fix:=20=E4=B8=BA=20DistributedLock.Mong?= =?UTF-8?q?oDB=20=E6=B7=BB=E5=8A=A0=20InternalsVisibleTo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `AssemblyAttributes.cs` 文件中，新增了对 `DistributedLock.MongoDB` 的 `InternalsVisibleTo` 特性声明。 此更改允许 `DistributedLock.MongoDB` 程序集访问当前程序集的内部成员。 其他现有的 `InternalsVisibleTo` 特性未受影响。 --- src/DistributedLock.Core/AssemblyAttributes.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DistributedLock.Core/AssemblyAttributes.cs b/src/DistributedLock.Core/AssemblyAttributes.cs index d2e9bff3..888ed9ef 100644 --- a/src/DistributedLock.Core/AssemblyAttributes.cs +++ b/src/DistributedLock.Core/AssemblyAttributes.cs @@ -15,4 +15,5 @@ [assembly: InternalsVisibleTo("DistributedLock.ZooKeeper, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.MySql, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] [assembly: InternalsVisibleTo("DistributedLock.Oracle, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.MongoDB, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] #endif From 003ce7b9f262c8c5583b931d60f9c5208f33f83b Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 22 Oct 2025 09:18:07 +0800 Subject: [PATCH 323/399] fix: ci error --- src/DistributedLock.Tests/packages.lock.json | 1 + src/DistributedLock/DistributedLock.csproj | 1 + src/DistributedLock/packages.lock.json | 144 ++++++++- src/DistributedLockTaker/packages.lock.json | 305 ++++++++++++++++++- 4 files changed, 431 insertions(+), 20 deletions(-) diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 6cc0a2f3..8fcb7525 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -519,6 +519,7 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.3.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 48c5da8d..2cbbc0e1 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -54,6 +54,7 @@ + diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 5407bb0c..8d115faf 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -436,13 +436,6 @@ "DistributedLock.Core": "[1.0.8, )" } }, - "distributedlock.mongodb": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "MySqlConnector": "[3.5.0, )" - } - }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -628,6 +621,15 @@ "System.IO.Hashing": "6.0.0" } }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "8.0.0", @@ -750,6 +752,24 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -758,6 +778,25 @@ "System.IO.Pipelines": "5.0.1" } }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -817,6 +856,11 @@ "Microsoft.IdentityModel.Tokens": "6.35.0" } }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", @@ -869,11 +913,24 @@ "System.Text.Json": "4.6.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", @@ -892,11 +949,41 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.7.0", "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, "System.Security.Permissions": { "type": "Transitive", "resolved": "6.0.0", @@ -915,6 +1002,14 @@ "resolved": "4.3.0", "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -960,6 +1055,15 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, "distributedlock.azure": { "type": "Project", "dependencies": { @@ -981,7 +1085,11 @@ } }, "distributedlock.mongodb": { - "type": "Project" + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MongoDB.Driver": "[3.5.0, )" + } }, "distributedlock.mysql": { "type": "Project", @@ -1058,6 +1166,23 @@ "System.Text.Encodings.Web": "6.0.0" } }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, "MySqlConnector": { "type": "CentralTransitive", "requested": "[2.3.5, )", @@ -1626,9 +1751,6 @@ "DistributedLock.Core": "[1.0.8, )" } }, - "distributedlock.mongodb": { - "type": "Project" - }, "distributedlock.mysql": { "type": "Project", "dependencies": { diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 8476aab4..0feb1eeb 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -40,6 +40,15 @@ "System.IO.Hashing": "6.0.0" } }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "8.0.0", @@ -152,6 +161,24 @@ "System.Text.Json": "4.7.2" } }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -160,6 +187,25 @@ "System.IO.Pipelines": "5.0.1" } }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -219,6 +265,11 @@ "Microsoft.IdentityModel.Tokens": "6.35.0" } }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", @@ -271,11 +322,24 @@ "System.Text.Json": "4.6.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", @@ -294,11 +358,41 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.7.0", "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, "System.Security.Permissions": { "type": "Transitive", "resolved": "6.0.0", @@ -317,6 +411,14 @@ "resolved": "4.3.0", "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -362,11 +464,21 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, "distributedlock": { "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.3.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", @@ -396,6 +508,13 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MongoDB.Driver": "[3.5.0, )" + } + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -471,6 +590,23 @@ "System.Text.Encodings.Web": "6.0.0" } }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, "MySqlConnector": { "type": "CentralTransitive", "requested": "[2.3.5, )", @@ -530,6 +666,15 @@ } }, ".NETFramework,Version=v4.7.2/win-x86": { + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", "resolved": "6.0.1", @@ -552,6 +697,14 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", "resolved": "4.3.0", @@ -565,11 +718,36 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.7.0", "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, "System.Security.Permissions": { "type": "Transitive", "resolved": "6.0.0", @@ -583,6 +761,14 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", @@ -646,6 +832,14 @@ "System.IO.Hashing": "6.0.0" } }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "1.1.1", @@ -746,8 +940,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -759,6 +953,24 @@ "resolved": "1.0.0", "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.0", + "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, "Oracle.ManagedDataAccess.Core": { "type": "Transitive", "resolved": "23.6.1", @@ -778,6 +990,21 @@ "System.IO.Pipelines": "5.0.1" } }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, "System.ClientModel": { "type": "Transitive", "resolved": "1.0.0", @@ -848,8 +1075,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Memory.Data": { "type": "Transitive", @@ -887,6 +1114,15 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", @@ -905,6 +1141,11 @@ "resolved": "8.0.0", "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -930,11 +1171,17 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" + }, "distributedlock": { "type": "Project", "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.3.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", @@ -960,6 +1207,13 @@ "DistributedLock.Core": "[1.0.8, )" } }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MongoDB.Driver": "[3.5.0, )" + } + }, "distributedlock.mysql": { "type": "Project", "dependencies": { @@ -1035,6 +1289,21 @@ "System.Runtime.Caching": "8.0.0" } }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.0, )", + "resolved": "3.5.0", + "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.0", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + } + }, "MySqlConnector": { "type": "CentralTransitive", "requested": "[2.3.5, )", @@ -1082,16 +1351,20 @@ "resolved": "5.2.0", "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" - }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.3", "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "runtime.any.System.Runtime": { "type": "Transitive", "resolved": "4.3.0", @@ -1141,6 +1414,15 @@ "System.Configuration.ConfigurationManager": "8.0.0" } }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "System.Security.Cryptography.Cng": { "type": "Transitive", "resolved": "4.5.0", @@ -1154,6 +1436,11 @@ "System.Formats.Asn1": "8.0.0" } }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", From e26e3b7013b2737e5df932a927ad91b9300b3c17 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 22 Oct 2025 09:19:31 +0800 Subject: [PATCH 324/399] add authors --- src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 828c3eaa..7259e5a4 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -13,7 +13,7 @@ 1.3.0 1.0.0.0 - Michael Adelson + Michael Adelson, joesdu Provides a distributed lock implementation based on MongoDB Copyright © 2020 Michael Adelson MIT From b2cf5aa8425ad781951a122ad9719d82e4e49013 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 22 Oct 2025 09:23:52 +0800 Subject: [PATCH 325/399] =?UTF-8?q?fix:=20error=20RS0025,=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=8F=AF=E7=A9=BA=E5=BC=95=E7=94=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `PublicAPI.Unshipped.txt` 文件中，删除了 `Medallion.Threading.MongoDB.MongoDistributedLock+#nullable enable` 行。这意味着不再启用该文件中的可空引用类型功能，可能会影响到代码的可空性检查和相关的编译器警告。 --- src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt index 1883be4e..815c9200 100644 --- a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt @@ -1 +1 @@ -Medallion.Threading.MongoDB.MongoDistributedLock \ No newline at end of file +#nullable enable \ No newline at end of file From b0fe2d0b5561e955b6cdb1e70e4410db6b744e61 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 22 Oct 2025 09:38:15 +0800 Subject: [PATCH 326/399] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Distribute?= =?UTF-8?q?dLock.MongoDB=20=E5=AE=8C=E6=95=B4=E6=96=87=E6=A1=A3=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20README=20=E6=8E=92=E7=89=88=E4=B8=8E?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 149 ++++++++++++++++---------------- docs/DistributedLock.MongoDB.md | 82 ++++++++++++++++++ 2 files changed, 158 insertions(+), 73 deletions(-) create mode 100644 docs/DistributedLock.MongoDB.md diff --git a/README.md b/README.md index 403f776b..b7e1de00 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ DistributedLock is a .NET library that provides robust and easy-to-use distributed mutexes, reader-writer locks, and semaphores based on a variety of underlying technologies. With DistributedLock, synchronizing access to a region of code across multiple applications/machines is as simple as: + ```C# await using (await myDistributedLock.AcquireAsync()) { @@ -12,12 +13,13 @@ await using (await myDistributedLock.AcquireAsync()) ## Implementations -DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. +DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. _Note that each package is versioned independently according to SemVer_. - **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) -: uses Microsoft SQL Server + : uses Microsoft SQL Server - **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) -: uses Postgresql + : uses Postgresql +- **[DistributedLock.MongoDB](docs/DistributedLock.MongoDB.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MongoDB.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MongoDB/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MongoDB.html): uses MongoDB - **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MySql.html): uses MySQL or MariaDB - **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html): uses Oracle - **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Redis.html): uses Redis @@ -108,7 +110,7 @@ public class SomeService { this._synchronizationProvider = synchronizationProvider; } - + public void InitializeUserAccount(int id) { // use the provider to construct a lock @@ -117,7 +119,7 @@ public class SomeService { // do stuff } - + // ALTERNATIVELY, for common use-cases extension methods allow this to be done with a single call using (this._synchronizationProvider.AcquireLock($"UserAccount{id}")) { @@ -141,94 +143,95 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes + - 2.7 - - Add support for fetching a Redis-based semaphore's current available count. Thanks [@teesoftech](https://github.com/teesofttech) for implementing! ([#234](https://github.com/madelson/DistributedLock/issues/234), DistributedLock.Redis 1.1) + - Add support for fetching a Redis-based semaphore's current available count. Thanks [@teesoftech](https://github.com/teesofttech) for implementing! ([#234](https://github.com/madelson/DistributedLock/issues/234), DistributedLock.Redis 1.1) - 2.6 - - Add support for acquiring transaction-scoped Postgres locks using externally-owned transactions. Thanks [@Tzachi009](https://github.com/Tzachi009) for implementing! ([#213](https://github.com/madelson/DistributedLock/issues/213), DistributedLock.Postgres 1.3) + - Add support for acquiring transaction-scoped Postgres locks using externally-owned transactions. Thanks [@Tzachi009](https://github.com/Tzachi009) for implementing! ([#213](https://github.com/madelson/DistributedLock/issues/213), DistributedLock.Postgres 1.3) - 2.5.1 - - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) - - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) - - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) - - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4) - - Bump Npgsql to latest patch to avoid bringing in vulnerable packages (DistributedLock.Postgres 1.2.1) - - Improve directory creation concurrency handling for `FileDistributedLock` (DistributedLock.FileSystem 1.0.3) + - Increase efficiency of Azure blob locks when the blob does not exist. Thanks [@richardkooiman](https://github.com/richardkooiman) for implementing! ([#227](https://github.com/madelson/DistributedLock/pull/227), DistributedLock.Azure 1.0.2) + - Improve error handling in race condition scenarios for Azure blobs. Thanks [@MartinDembergerR9](https://github.com/MartinDembergerR9) for implementing! ([#228](https://github.com/madelson/DistributedLock/pull/228), DistributedLock.Azure 1.0.2) + - Bump Microsoft.Data.SqlClient to 5.2.2 to avoid vulnerability. Thanks [@steve85](https://github.com/steve85) for implementing! ([#229](https://github.com/madelson/DistributedLock/pull/229), DistributedLock.SqlServer 1.0.6) + - Bump Oracle.ManagedDataAccess to latest to avoid bringing in vulnerable packages (DistributedLock.Core 1.0.8, DistributedLock.Oracle 1.0.4) + - Bump Npgsql to latest patch to avoid bringing in vulnerable packages (DistributedLock.Postgres 1.2.1) + - Improve directory creation concurrency handling for `FileDistributedLock` (DistributedLock.FileSystem 1.0.3) - 2.5 - - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) - - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) - - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) - - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) + - Add support for creating Postgres locks off `DbDataSource` which is helpful for apps using `NpgsqlMultiHostDataSource`. Thanks [davidngjy](https://github.com/davidngjy) for implementing! ([#153](https://github.com/madelson/DistributedLock/issues/153), DistributedLock.Postgres 1.2.0) + - Upgrade Npgsql to 8.0.3 to avoid vulnerability. Thanks [@Meir017](https://github.com/Meir017)/[@davidngjy](https://github.com/davidngjy) for implementing! ([#218](https://github.com/madelson/DistributedLock/issues/218), DistributedLock.Postgres 1.2.0) + - Fix Postgres race condition with connection keepalive enabled ([#216](https://github.com/madelson/DistributedLock/issues/216), DistributedLock.Core 1.0.7) + - Upgrade Microsoft.Data.SqlClient to 5.2.1 to avoid vulnerability ([#210](https://github.com/madelson/DistributedLock/issues/210), DistributedLock.SqlServer 1.0.5) - 2.4 - - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) - - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! - - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) - - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! - - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](https://github.com/madelson/DistributedLock/issues/195), DistributedLock.FileSystem 1.0.2) - - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) - - New API documentation on [dndocs](https://dndocs.com/). Thanks [@NeuroXiq](https://github.com/NeuroXiq)! - - New documentation for contributors to get the project running locally (see [Contributing](#contributing)) + - Add support for transaction-scoped locking in Postgres using `pg_advisory_xact_lock` which is helpful when using PgBouncer ([#168](https://github.com/madelson/DistributedLock/issues/168), DistributedLock.Postgres 1.1.0) + - Improve support for newer versions of StackExchange.Redis, especially when using the default backlog policy ([#162](https://github.com/madelson/DistributedLock/issues/162), DistributedLock.Redis 1.0.3). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! + - Drop `net461` support (`net462` remains supported). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for implementing! + - Reduce occurrence of `UnobservedTaskException`s thrown by the library ([#192](https://github.com/madelson/DistributedLock/issues/192), DistributedLock.Core 1.0.6) + - Update dependencies to modern versions without known issues/vulnerabilities ([#111](https://github.com/madelson/DistributedLock/issues/111)/[#177](https://github.com/madelson/DistributedLock/issues/177)/[#184](https://github.com/madelson/DistributedLock/issues/184)/[#185](https://github.com/madelson/DistributedLock/issues/185), all packages). Thanks [@Bartleby2718](https://github.com/Bartleby2718) for helping with this! + - Improve directory creation concurrency handling for `FileDistributedLock` on Linux/.NET 8 ([#195](https://github.com/madelson/DistributedLock/issues/195), DistributedLock.FileSystem 1.0.2) + - Allow using transaction-scoped locks in SQL Server without explicitly disabling multiplexing ([#189](https://github.com/madelson/DistributedLock/issues/189), DistributedLock.SqlServer 1.0.4) + - New API documentation on [dndocs](https://dndocs.com/). Thanks [@NeuroXiq](https://github.com/NeuroXiq)! + - New documentation for contributors to get the project running locally (see [Contributing](#contributing)) - 2.3.4 - - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! + - Support Npgsql 8.0's [ExecuteScalar breaking change](https://github.com/npgsql/npgsql/issues/5143) ([#174](https://github.com/madelson/DistributedLock/issues/174), DistributedLock.Postgres 1.0.5). Thanks [@Kaffeetasse](https://github.com/Kaffeetasse) for diagnosing and fixing! - 2.3.3 - - Update Microsoft.Data.SqlClient due to vulnerabilities ([#149](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) - - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) + - Update Microsoft.Data.SqlClient due to vulnerabilities ([#149](https://github.com/madelson/DistributedLock/issues/149), DistributedLock.SqlServer 1.0.3) + - Update versions of Oracle.ManagedDataAccess and Oracle.ManagedDataAccess.Core due to vulnerabilities (DistributedLock.Oracle 1.0.2) - 2.3.2 - - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! + - Work around underlying Postgres race condition when waiting on advisory locks with a short non-zero timeout ([#147](https://github.com/madelson/DistributedLock/issues/147), DistributedLock.Postgres 1.0.4). Thanks [@Tzachi009](https://github.com/Tzachi009) for reporting and isolating the issue! - 2.3.1 - - Fixed concurrency issue with `HandleLostToken` for relational database locks ([#133](https://github.com/madelson/DistributedLock/issues/133), DistributedLock.Core 1.0.5, DistributedLock.MySql 1.0.1, DistributedLock.Oracle 1.0.1, DistributedLock.Postgres 1.0.3, DistributedLock.SqlServer 1.0.2). Thanks [@OskarKlintrot](https://github.com/OskarKlintrot) for testing! - - Fixed misleading error message why trying to disable auto-extension in Redis ([#130](https://github.com/madelson/DistributedLock/issues/130), DistributedLock.Redis 1.0.2) - - Fixed concurrency issue with canceling async waits on `WaitHandle`s ([#120](https://github.com/madelson/DistributedLock/issues/120), DistributedLock.WaitHandles 1.0.1) + - Fixed concurrency issue with `HandleLostToken` for relational database locks ([#133](https://github.com/madelson/DistributedLock/issues/133), DistributedLock.Core 1.0.5, DistributedLock.MySql 1.0.1, DistributedLock.Oracle 1.0.1, DistributedLock.Postgres 1.0.3, DistributedLock.SqlServer 1.0.2). Thanks [@OskarKlintrot](https://github.com/OskarKlintrot) for testing! + - Fixed misleading error message why trying to disable auto-extension in Redis ([#130](https://github.com/madelson/DistributedLock/issues/130), DistributedLock.Redis 1.0.2) + - Fixed concurrency issue with canceling async waits on `WaitHandle`s ([#120](https://github.com/madelson/DistributedLock/issues/120), DistributedLock.WaitHandles 1.0.1) - 2.3.0 - - Added Oracle-based implementation ([#45](https://github.com/madelson/DistributedLock/issues/45), DistributedLock.Oracle 1.0.0). Thanks [@odin568](https://github.com/odin568) for testing! - - Made file-based locking more robust to transient `UnauthorizedAccessException`s ([#106](https://github.com/madelson/DistributedLock/issues/106) & [#109](https://github.com/madelson/DistributedLock/issues/109), DistributedLock.FileSystem 1.0.1) - - Work around cancellation bug in Npgsql command preparation ([#112](https://github.com/madelson/DistributedLock/issues/112), DistributedLock.Postgres 1.0.2) + - Added Oracle-based implementation ([#45](https://github.com/madelson/DistributedLock/issues/45), DistributedLock.Oracle 1.0.0). Thanks [@odin568](https://github.com/odin568) for testing! + - Made file-based locking more robust to transient `UnauthorizedAccessException`s ([#106](https://github.com/madelson/DistributedLock/issues/106) & [#109](https://github.com/madelson/DistributedLock/issues/109), DistributedLock.FileSystem 1.0.1) + - Work around cancellation bug in Npgsql command preparation ([#112](https://github.com/madelson/DistributedLock/issues/112), DistributedLock.Postgres 1.0.2) - 2.2.0 - - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0). Thanks [@theplacefordev](https://github.com/theplacefordev) for testing! + - Added MySQL/MariaDB-based implementation ([#95](https://github.com/madelson/DistributedLock/issues/95), DistributedLock.MySql 1.0.0). Thanks [@theplacefordev](https://github.com/theplacefordev) for testing! - 2.1.0 - - Added ZooKeeper-based implementation ([#41](https://github.com/madelson/DistributedLock/issues/41), DistributedLock.ZooKeeper 1.0.0) + - Added ZooKeeper-based implementation ([#41](https://github.com/madelson/DistributedLock/issues/41), DistributedLock.ZooKeeper 1.0.0) - 2.0.2 - - Fixed bug where `HandleLostToken` would hang when accessed on a SqlServer or Postgres lock handle that used keepalive ([#85](https://github.com/madelson/DistributedLock/issues/85), DistributedLock.Core 1.0.1) - - Fixed bug where broken database connections could result in future lock attempts failing when using SqlServer or Postgres locks with multiplexing ([#83](https://github.com/madelson/DistributedLock/issues/83), DistributedLock.Core 1.0.1) - - Updated Npgsql dependency to 5.x to take advantage of various bugfixes ([#61](https://github.com/madelson/DistributedLock/issues/61), DistributedLock.Postgres 1.0.1) + - Fixed bug where `HandleLostToken` would hang when accessed on a SqlServer or Postgres lock handle that used keepalive ([#85](https://github.com/madelson/DistributedLock/issues/85), DistributedLock.Core 1.0.1) + - Fixed bug where broken database connections could result in future lock attempts failing when using SqlServer or Postgres locks with multiplexing ([#83](https://github.com/madelson/DistributedLock/issues/83), DistributedLock.Core 1.0.1) + - Updated Npgsql dependency to 5.x to take advantage of various bugfixes ([#61](https://github.com/madelson/DistributedLock/issues/61), DistributedLock.Postgres 1.0.1) - 2.0.1 - - Fixed Redis lock behavior when using a database with `WithKeyPrefix` ([#66](https://github.com/madelson/DistributedLock/issues/66), DistributedLock.Redis 1.0.1). Thanks [@skomis-mm](https://github.com/skomis-mm) for contributing! + - Fixed Redis lock behavior when using a database with `WithKeyPrefix` ([#66](https://github.com/madelson/DistributedLock/issues/66), DistributedLock.Redis 1.0.1). Thanks [@skomis-mm](https://github.com/skomis-mm) for contributing! - 2.0.0 (see also [Migrating from 1.x to 2.x](docs/Migrating%20from%201.x%20to%202.x.md#migrating-from-1x-to-2x)) - - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) - - Added Postgresql-based locking ([#56](https://github.com/madelson/DistributedLock/issues/56), DistributedLock.Postgres 1.0.0) - - Added Redis-based locking ([#24](https://github.com/madelson/DistributedLock/issues/24), DistributedLock.Redis 1.0.0) - - Added Azure blob-based locking ([#42](https://github.com/madelson/DistributedLock/issues/42), DistributedLock.Azure 1.0.0) - - Added file-based locking ([#28](https://github.com/madelson/DistributedLock/issues/28), DistributedLock.FileSystem 1.0.0) - - Added provider classes for improved IOC integration ([#13](https://github.com/madelson/DistributedLock/issues/13)) - - Added strong naming to assemblies. Thanks [@pedropaulovc](https://github.com/pedropaulovc) for contributing! ([#47](https://github.com/madelson/DistributedLock/issues/47), BREAKING CHANGE) - - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` [#20](https://github.com/madelson/DistributedLock/issues/20), BREAKING CHANGE) - - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives ([#10](https://github.com/madelson/DistributedLock/issues/10)) - - Added `HandleLostToken` API for tracking if a lock's underlying connection dies ([#6](https://github.com/madelson/DistributedLock/issues/6), BREAKING CHANGE) - - Added SourceLink support ([#57](https://github.com/madelson/DistributedLock/issues/57)) - - Removed `GetSafeName` API in favor of safe naming by default (BREAKING CHANGE) - - Renamed "SystemDistributedLock" to "EventWaitHandleDistributedLock" (DistributedLock.WaitHandles 1.0.0) - - Stopped supporting net45 (BREAKING CHANGE) - - Removed `DbConnection` and `DbTransaction` constructors form `SqlDistributedLock`, leaving the constructors that take `IDbConnection`/`IDbTransaction` ([#35](https://github.com/madelson/DistributedLock/issues/35), BREAKING CHANGE) - - Changed methods returning `Task` to instead return `ValueTask`, making it so that `using (@lock.AcquireAsync()) { ... } without an `await` no longer compiles (#34, BREAKING CHANGE) - - Changed `UpgradeableLockHandle.UpgradeToWriteLock` to return `void` ([#33](https://github.com/madelson/DistributedLock/issues/33), BREAKING CHANGE) - - Switched to Microsoft.Data.SqlClient by default for all target frameworks (BREAKING CHANGE) - - Changed all locking implementations to be non-reentrant (BREAKING CHANGE) + - Revamped package structure so that DistributedLock is now an umbrella package and each implementation technology has its own package (BREAKING CHANGE) + - Added Postgresql-based locking ([#56](https://github.com/madelson/DistributedLock/issues/56), DistributedLock.Postgres 1.0.0) + - Added Redis-based locking ([#24](https://github.com/madelson/DistributedLock/issues/24), DistributedLock.Redis 1.0.0) + - Added Azure blob-based locking ([#42](https://github.com/madelson/DistributedLock/issues/42), DistributedLock.Azure 1.0.0) + - Added file-based locking ([#28](https://github.com/madelson/DistributedLock/issues/28), DistributedLock.FileSystem 1.0.0) + - Added provider classes for improved IOC integration ([#13](https://github.com/madelson/DistributedLock/issues/13)) + - Added strong naming to assemblies. Thanks [@pedropaulovc](https://github.com/pedropaulovc) for contributing! ([#47](https://github.com/madelson/DistributedLock/issues/47), BREAKING CHANGE) + - Made lock handles implement `IAsyncDisposable` in addition to `IDisposable` [#20](https://github.com/madelson/DistributedLock/issues/20), BREAKING CHANGE) + - Exposed implementation-agnostic interfaces (e. g. `IDistributedLock`) for all synchronization primitives ([#10](https://github.com/madelson/DistributedLock/issues/10)) + - Added `HandleLostToken` API for tracking if a lock's underlying connection dies ([#6](https://github.com/madelson/DistributedLock/issues/6), BREAKING CHANGE) + - Added SourceLink support ([#57](https://github.com/madelson/DistributedLock/issues/57)) + - Removed `GetSafeName` API in favor of safe naming by default (BREAKING CHANGE) + - Renamed "SystemDistributedLock" to "EventWaitHandleDistributedLock" (DistributedLock.WaitHandles 1.0.0) + - Stopped supporting net45 (BREAKING CHANGE) + - Removed `DbConnection` and `DbTransaction` constructors form `SqlDistributedLock`, leaving the constructors that take `IDbConnection`/`IDbTransaction` ([#35](https://github.com/madelson/DistributedLock/issues/35), BREAKING CHANGE) + - Changed methods returning `Task` to instead return `ValueTask`, making it so that `using (@lock.AcquireAsync()) { ... } without an `await` no longer compiles (#34, BREAKING CHANGE) + - Changed `UpgradeableLockHandle.UpgradeToWriteLock` to return `void` ([#33](https://github.com/madelson/DistributedLock/issues/33), BREAKING CHANGE) + - Switched to Microsoft.Data.SqlClient by default for all target frameworks (BREAKING CHANGE) + - Changed all locking implementations to be non-reentrant (BREAKING CHANGE) - 1.5.0 - - Added cross-platform support via Microsoft.Data.SqlClient ([#25](https://github.com/madelson/DistributedLock/issues/25)). This feature is available for .NET Standard >= 2.0. Thanks to [@alesebi91](https://github.com/alesebi91) for helping with the implementation and testing! - - Added C#8 nullable annotations ([#31](https://github.com/madelson/DistributedLock/issues/31)) - - Fixed minor bug in connection multiplexing which could lead to more lock contention ([#32](https://github.com/madelson/DistributedLock/issues/32)) + - Added cross-platform support via Microsoft.Data.SqlClient ([#25](https://github.com/madelson/DistributedLock/issues/25)). This feature is available for .NET Standard >= 2.0. Thanks to [@alesebi91](https://github.com/alesebi91) for helping with the implementation and testing! + - Added C#8 nullable annotations ([#31](https://github.com/madelson/DistributedLock/issues/31)) + - Fixed minor bug in connection multiplexing which could lead to more lock contention ([#32](https://github.com/madelson/DistributedLock/issues/32)) - 1.4.0 - - Added a SQL-based distributed semaphore ([#7](https://github.com/madelson/DistributedLock/issues/7)) - - Fix bug where SqlDistributedLockConnectionStrategy.Azure would leak connections, relying on GC to reclaim them ([#14](https://github.com/madelson/DistributedLock/issues/14)). Thanks [zavalita1](https://github.com/zavalita1) for investigating this issue! - - Throw a specific exception type (`DeadlockException`) rather than the generic `InvalidOperationException` when a deadlock is detected ([#11](https://github.com/madelson/DistributedLock/issues/11)) + - Added a SQL-based distributed semaphore ([#7](https://github.com/madelson/DistributedLock/issues/7)) + - Fix bug where SqlDistributedLockConnectionStrategy.Azure would leak connections, relying on GC to reclaim them ([#14](https://github.com/madelson/DistributedLock/issues/14)). Thanks [zavalita1](https://github.com/zavalita1) for investigating this issue! + - Throw a specific exception type (`DeadlockException`) rather than the generic `InvalidOperationException` when a deadlock is detected ([#11](https://github.com/madelson/DistributedLock/issues/11)) - 1.3.1 Minor fix to avoid "leaking" isolation level changes in transaction-based locks ([#8](https://github.com/madelson/DistributedLock/issues/8)). Also switched to the VS2017 project file format - 1.3.0 Added an Azure connection strategy to keep lock connections from becoming idle and being reclaimed by Azure's connection governor ([#5](https://github.com/madelson/DistributedLock/issues/5)) - 1.2.0 - - Added a SQL-based distributed reader-writer lock - - .NET Core support via .NET Standard - - Changed the default locking scope for SQL distributed lock to be a connection rather than a transaction, avoiding cases where long-running transactions can block backups - - Allowed for customization of the SQL distributed lock connection strategy when connecting via a connection string - - Added a new connection strategy which allows for multiplexing multiple held locks onto one connection - - Added IDbConnection/IDbTransaction constructors ([#3](https://github.com/madelson/DistributedLock/issues/3)) + - Added a SQL-based distributed reader-writer lock + - .NET Core support via .NET Standard + - Changed the default locking scope for SQL distributed lock to be a connection rather than a transaction, avoiding cases where long-running transactions can block backups + - Allowed for customization of the SQL distributed lock connection strategy when connecting via a connection string + - Added a new connection strategy which allows for multiplexing multiple held locks onto one connection + - Added IDbConnection/IDbTransaction constructors ([#3](https://github.com/madelson/DistributedLock/issues/3)) - 1.1.0 Added support for SQL distributed locks scoped to existing connections/transactions - 1.0.1 Minor fix when using infinite timeouts - 1.0.0 Initial release diff --git a/docs/DistributedLock.MongoDB.md b/docs/DistributedLock.MongoDB.md new file mode 100644 index 00000000..231bd594 --- /dev/null +++ b/docs/DistributedLock.MongoDB.md @@ -0,0 +1,82 @@ +# DistributedLock.MongoDB + +[Download the NuGet package](https://www.nuget.org/packages/DistributedLock.MongoDB) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MongoDB.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MongoDB/) + +The DistributedLock.MongoDB package offers distributed locks based on [MongoDB](https://www.mongodb.com/). For example: + +```C# +var client = new MongoClient("mongodb://localhost:27017"); +var database = client.GetDatabase("myDatabase"); +var @lock = new MongoDistributedLock("MyLockName", database); +await using (await @lock.AcquireAsync()) +{ + // I have the lock +} +``` + +## APIs + +- The `MongoDistributedLock` class implements the `IDistributedLock` interface. +- The `MongoDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` interface. + +## Implementation notes + +MongoDB-based locks use MongoDB's document upsert and update operations to implement distributed locking. The implementation works as follows: + +1. **Acquisition**: Attempts to insert or update a document with the lock key and a unique lock ID. +2. **Extension**: Automatically extends the lock expiry while held to prevent timeout. +3. **Release**: Deletes the lock document when disposed. +4. **Expiry**: Locks automatically expire if not extended, allowing recovery from crashed processes. + +MongoDB locks can be constructed with an `IMongoDatabase` and an optional collection name. If no collection name is specified, locks will be stored in a collection named `"DistributedLocks"`. The collection will automatically have an index created on the `expiresAt` field for efficient queries. + +When using the provider pattern, you can create multiple locks with different names from the same provider: + +```C# +var client = new MongoClient(connectionString); +var database = client.GetDatabase("myDatabase"); +var provider = new MongoDistributedSynchronizationProvider(database); + +var lock1 = provider.CreateLock("lock1"); +var lock2 = provider.CreateLock("lock2"); + +await using (await lock1.AcquireAsync()) +{ + // Do work with lock1 +} +``` + +**NOTE**: Lock extension happens automatically in the background while the lock is held. If lock extension fails (for example, due to network issues), the `HandleLostToken` will be signaled to notify you that the lock may have been lost. + +## Options + +In addition to specifying the name and database, several tuning options are available: + +- `Expiry` determines how long the lock will be initially claimed for. Because of automatic extension, locks can be held for longer than this value. Defaults to 30 seconds. +- `ExtensionCadence` determines how frequently the hold on the lock will be renewed to the full `Expiry`. Defaults to 1/3 of `Expiry` (approximately 10 seconds when using the default expiry). +- `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lock that is currently held by someone else. A random time in the range will be chosen for each sleep. If you expect contention, lowering these values may increase responsiveness (how quickly a lock detects that it can now be taken) but will increase the number of calls made to MongoDB. Raising the values will have the reverse effects. Defaults to a range of 10ms to 800ms. + +Example of using options: + +```C# +var @lock = new MongoDistributedLock( + "MyLockName", + database, + options => options + .Expiry(TimeSpan.FromSeconds(30)) + .ExtensionCadence(TimeSpan.FromSeconds(10)) + .BusyWaitSleepTime( + min: TimeSpan.FromMilliseconds(10), + max: TimeSpan.FromMilliseconds(800)) +); +``` + +You can also specify a custom collection name: + +```C# +var @lock = new MongoDistributedLock("MyLockName", database, "MyCustomLocks"); +``` + +## Stale lock cleanup + +Stale locks from crashed processes will automatically expire based on the `Expiry` setting. MongoDB's built-in TTL index support ensures that expired lock documents are cleaned up automatically by the database. This means that if a process crashes while holding a lock, the lock will become available again after the expiry time has elapsed. From 9b4ddf4392bd7787470bad97308ef934e63920b6 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 22 Oct 2025 09:50:05 +0800 Subject: [PATCH 327/399] fix: ci --- .../Tests/MongoDB/MongoDistributedLockTest.cs | 2 ++ .../MongoDistributedSynchronizationOptionsBuilderTest.cs | 1 - .../MongoDB/MongoDistributedSynchronizationProviderTest.cs | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index a8f8ef1e..9c753478 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -97,6 +97,7 @@ public async Task TestLockContentionAsync() } [Test] + [Category("CI")] public void TestName() { const string Name = "\0🐉汉字\b\r\n\\"; @@ -107,6 +108,7 @@ public void TestName() } [Test] + [Category("CI")] public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs index c6d4a430..1e2ae9c0 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs @@ -3,7 +3,6 @@ namespace Medallion.Threading.Tests.MongoDB; -[Category("CI")] public class MongoDistributedSynchronizationOptionsBuilderTest { [Test] diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs index 54879238..1aa97e1e 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs @@ -4,7 +4,6 @@ namespace Medallion.Threading.Tests.MongoDB; -[Category("CI")] public class MongoDistributedSynchronizationProviderTest { [Test] From e26097973c930b8f1e5ee7691c6fe4a8cbd50020 Mon Sep 17 00:00:00 2001 From: Joes Date: Thu, 23 Oct 2025 09:43:13 +0800 Subject: [PATCH 328/399] =?UTF-8?q?tests:=20=E5=9C=A8=20CombinatorialTests?= =?UTF-8?q?.cs=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20MongoDB=20=E7=BB=84?= =?UTF-8?q?=E5=90=88=E6=B5=8B=E8=AF=95=E7=B1=BB=20Core=5FMongo=5FMongoDbSy?= =?UTF-8?q?nchronizationStrategyTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DistributedLock.Tests/Tests/CombinatorialTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/DistributedLock.Tests/Tests/CombinatorialTests.cs b/src/DistributedLock.Tests/Tests/CombinatorialTests.cs index cfa4c9ab..90dd2ca3 100644 --- a/src/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/src/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -11,6 +11,11 @@ namespace Medallion.Threading.Tests.FileSystem [Category("CI")] public class Core_File_FileSynchronizationStrategyTest : DistributedLockCoreTestCases { } } +namespace Medallion.Threading.Tests.MongoDB +{ + public class Core_Mongo_MongoDbSynchronizationStrategyTest : DistributedLockCoreTestCases { } +} + namespace Medallion.Threading.Tests.MySql { public class ConnectionStringStrategy_MySql_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDb_ConnectionMultiplexingSynchronizationStrategy_MariaDbDb_MariaDbDbTest : ConnectionStringStrategyTestCases, TestingMariaDbDb>, TestingConnectionMultiplexingSynchronizationStrategy, TestingMariaDbDb> { } From 3a28ef0428579e4dc080ae8b281ac9adddc329af Mon Sep 17 00:00:00 2001 From: Joes Date: Thu, 23 Oct 2025 10:50:30 +0800 Subject: [PATCH 329/399] fix: ci error? MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `MongoDistributedLock.IDistributedLock.cs` 文件中，`MongoDistributedLock` 类实现了 `IDistributedLock` 接口的 `TryAcquire` 方法，新增了自动生成的方法以支持分布式锁的获取。此外，更新了文档注释，修正了异步获取锁的代码示例格式。 --- .../MongoDistributedLock.IDistributedLock.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs index 89936ac7..b2fd5714 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs @@ -4,6 +4,8 @@ namespace Medallion.Threading.MongoDB; public partial class MongoDistributedLock { + // AUTO-GENERATED + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) { return TryAcquire(timeout, cancellationToken); @@ -84,7 +86,7 @@ public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, Cancellation /// await using (await myLock.AcquireAsync(...)) /// { /// /* we have the lock! */ - /// } + /// } /// // dispose releases the lock /// /// From cd141257708fc80244263996f0ef27b83f2ce396 Mon Sep 17 00:00:00 2001 From: Joes Date: Thu, 23 Oct 2025 10:54:40 +0800 Subject: [PATCH 330/399] style: fix code format --- .../MongoDistributedLock.IDistributedLock.cs | 71 +++++++------------ 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs index b2fd5714..33ffa43a 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.IDistributedLock.cs @@ -6,28 +6,17 @@ public partial class MongoDistributedLock { // AUTO-GENERATED - IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) - { - return TryAcquire(timeout, cancellationToken); - } - - IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) - { - return Acquire(timeout, cancellationToken); - } - - ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) - { - return TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - } - - ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) - { - return AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); - } + IDistributedSynchronizationHandle? IDistributedLock.TryAcquire(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquire(timeout, cancellationToken); + IDistributedSynchronizationHandle IDistributedLock.Acquire(TimeSpan? timeout, CancellationToken cancellationToken) => + this.Acquire(timeout, cancellationToken); + ValueTask IDistributedLock.TryAcquireAsync(TimeSpan timeout, CancellationToken cancellationToken) => + this.TryAcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); + ValueTask IDistributedLock.AcquireAsync(TimeSpan? timeout, CancellationToken cancellationToken) => + this.AcquireAsync(timeout, cancellationToken).Convert(To.ValueTask); /// - /// Attempts to acquire the lock synchronously. Usage: + /// Attempts to acquire the lock synchronously. Usage: /// /// using (var handle = myLock.TryAcquire(...)) /// { @@ -38,14 +27,12 @@ ValueTask IDistributedLock.AcquireAsync(TimeS /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public MongoDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) - { - return DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); - } + /// A which can be used to release the lock or null on failure + public MongoDistributedLockHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + DistributedLockHelpers.TryAcquire(this, timeout, cancellationToken); /// - /// Acquires the lock synchronously, failing with if the attempt times out. Usage: + /// Acquires the lock synchronously, failing with if the attempt times out. Usage: /// /// using (myLock.Acquire(...)) /// { @@ -54,16 +41,14 @@ ValueTask IDistributedLock.AcquireAsync(TimeS /// // dispose releases the lock /// /// - /// How long to wait before giving up on the acquisition attempt. Defaults to + /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) - { - return DistributedLockHelpers.Acquire(this, timeout, cancellationToken); - } + /// A which can be used to release the lock + public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.Acquire(this, timeout, cancellationToken); /// - /// Attempts to acquire the lock asynchronously. Usage: + /// Attempts to acquire the lock asynchronously. Usage: /// /// await using (var handle = await myLock.TryAcquireAsync(...)) /// { @@ -74,14 +59,12 @@ public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, Cancellation /// /// How long to wait before giving up on the acquisition attempt. Defaults to 0 /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock or null on failure - public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) - { - return this.As>().InternalTryAcquireAsync(timeout, cancellationToken); - } + /// A which can be used to release the lock or null on failure + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this.As>().InternalTryAcquireAsync(timeout, cancellationToken); /// - /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: + /// Acquires the lock asynchronously, failing with if the attempt times out. Usage: /// /// await using (await myLock.AcquireAsync(...)) /// { @@ -90,11 +73,9 @@ public MongoDistributedLockHandle Acquire(TimeSpan? timeout = null, Cancellation /// // dispose releases the lock /// /// - /// How long to wait before giving up on the acquisition attempt. Defaults to + /// How long to wait before giving up on the acquisition attempt. Defaults to /// Specifies a token by which the wait can be canceled - /// A which can be used to release the lock - public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) - { - return DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); - } + /// A which can be used to release the lock + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + DistributedLockHelpers.AcquireAsync(this, timeout, cancellationToken); } \ No newline at end of file From 08c6404f2becce66c72c908de9fbefb8a1dd7797 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 26 Oct 2025 09:57:06 -0400 Subject: [PATCH 331/399] Ensure that all lua scripts partition parameters between KEYS and ARGV Fix #254 --- .../Primitives/RedisMutexPrimitive.cs | 39 +++-- .../RedisReaderWriterLockPrimitives.cs | 151 +++++++++--------- .../Primitives/RedisScript.cs | 108 +++++++++++-- .../Primitives/RedisSemaphorePrimitive.cs | 62 +++---- src/DistributedLock.Redis/Shims.cs | 18 +++ .../Redis/RedisDistributedSemaphoreTest.cs | 1 - 6 files changed, 248 insertions(+), 131 deletions(-) create mode 100644 src/DistributedLock.Redis/Shims.cs diff --git a/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs index b65d1b77..1ef46d61 100644 --- a/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisMutexPrimitive.cs @@ -6,6 +6,27 @@ namespace Medallion.Threading.Redis.Primitives; internal class RedisMutexPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { + private static readonly RedisScript TryExtendScript, ReleaseScript; + + static RedisMutexPrimitive() + { + Func key = p => p._key; + Func lockId = p => p._lockId; + Func expiryMillis = p => p._timeouts.Expiry.InMilliseconds; + + TryExtendScript = new($@" + if redis.call('get', {key}) == {lockId} then + return redis.call('pexpire', {key}, {expiryMillis}) + end + return 0"); + + ReleaseScript = new($@" + if redis.call('get', {key}) == {lockId} then + return redis.call('del', {key}) + end + return 0"); + } + private readonly RedisKey _key; private readonly RedisValue _lockId; private readonly RedLockTimeouts _timeouts; @@ -19,14 +40,6 @@ public RedisMutexPrimitive(RedisKey key, RedisValue lockId, RedLockTimeouts time public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - private static readonly RedisScript ReleaseScript = new(@" - if redis.call('get', @key) == @lockId then - return redis.call('del', @key) - end - return 0", - p => new { key = p._key, lockId = p._lockId } - ); - public void Release(IDatabase database, bool fireAndForget) => ReleaseScript.Execute(database, this, fireAndForget); public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseScript.ExecuteAsync(database, this, fireAndForget); @@ -35,15 +48,7 @@ public bool TryAcquire(IDatabase database) => public Task TryAcquireAsync(IDatabaseAsync database) => database.StringSetAsync(this._key, this._lockId, this._timeouts.Expiry.TimeSpan, When.NotExists, CommandFlags.DemandMaster); - private static readonly RedisScript ExtendScript = new(@" - if redis.call('get', @key) == @lockId then - return redis.call('pexpire', @key, @expiryMillis) - end - return 0", - p => new { key = p._key, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); - - public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); + public Task TryExtendAsync(IDatabaseAsync database) => TryExtendScript.ExecuteAsync(database, this).AsBooleanTask(); public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); } diff --git a/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs b/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs index d2398767..375e30ff 100644 --- a/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs +++ b/src/DistributedLock.Redis/Primitives/RedisReaderWriterLockPrimitives.cs @@ -6,6 +6,52 @@ namespace Medallion.Threading.Redis.Primitives; internal class RedisReadLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { + private static readonly RedisScript TryAcquireReadScript, TryExtendReadScript, ReleaseReadScript; + + static RedisReadLockPrimitive() + { + Func readerKey = p => p._readerKey, + writerKey = p => p._writerKey; + Func lockId = p => p._lockId; + Func expiryMillis = p => p._timeouts.Expiry.InMilliseconds; + + // TRY ACQUIRE READ + // + // First, check the writer lock value: if it exists then we fail. + // + // Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL + // of the reader set to be at least our expiry. Return success. + TryAcquireReadScript = new($@" + if redis.call('exists', {writerKey}) == 1 then + return 0 + end + redis.call('sadd', {readerKey}, {lockId}) + local readerTtl = redis.call('pttl', {readerKey}) + if readerTtl < tonumber({expiryMillis}) then + redis.call('pexpire', {readerKey}, {expiryMillis}) + end + return 1"); + + // TRY EXTEND READ + // + // First, check if the reader set exists and our ID is still a member. If not, we fail. + // + // Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) + TryExtendReadScript = new($@" + if redis.call('sismember', {readerKey}, {lockId}) == 0 then + return 0 + end + if redis.call('pttl', {readerKey}) < tonumber({expiryMillis}) then + redis.call('pexpire', {readerKey}, {expiryMillis}) + end + return 1"); + + // RELEASE READ + // + // Just remove our ID from the reader set (noop if it wasn't there or the set DNE) + ReleaseReadScript = new($@"redis.call('srem', {readerKey}, {lockId})"); + } + private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); private readonly RedisKey _readerKey, _writerKey; private readonly RedLockTimeouts _timeouts; @@ -19,60 +65,11 @@ public RedisReadLockPrimitive(RedisKey readerKey, RedisKey writerKey, RedLockTim public TimeoutValue AcquireTimeout => this._timeouts.AcquireTimeout; - /// - /// RELEASE READ - /// - /// Just remove our ID from the reader set (noop if it wasn't there or the set DNE) - /// - private static readonly RedisScript ReleaseReadScript = new( - @"redis.call('srem', @readerKey, @lockId)", - p => new { readerKey = p._readerKey, lockId = p._lockId } - ); - public void Release(IDatabase database, bool fireAndForget) => ReleaseReadScript.Execute(database, this, fireAndForget); public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => ReleaseReadScript.ExecuteAsync(database, this, fireAndForget); - /// - /// TRY EXTEND READ - /// - /// First, check if the reader set exists and our ID is still a member. If not, we fail. - /// - /// Then, extend the reader set TTL to be at least our expiry (at least because other readers might be operating with a longer expiry) - /// - private static readonly RedisScript TryExtendReadScript = new(@" - if redis.call('sismember', @readerKey, @lockId) == 0 then - return 0 - end - if redis.call('pttl', @readerKey) < tonumber(@expiryMillis) then - redis.call('pexpire', @readerKey, @expiryMillis) - end - return 1", - p => new { readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); - public Task TryExtendAsync(IDatabaseAsync database) => TryExtendReadScript.ExecuteAsync(database, this).AsBooleanTask(); - /// - /// TRY ACQUIRE READ - /// - /// First, check the writer lock value: if it exists then we fail. - /// - /// Then, add our ID to the reader set, creating it if it does not exist. Then, extend the TTL - /// of the reader set to be at least our expiry. Return success. - /// - private static readonly RedisScript TryAcquireReadScript = new($@" - if redis.call('exists', @writerKey) == 1 then - return 0 - end - redis.call('sadd', @readerKey, @lockId) - local readerTtl = redis.call('pttl', @readerKey) - if readerTtl < tonumber(@expiryMillis) then - redis.call('pexpire', @readerKey, @expiryMillis) - end - return 1", - p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); - public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireReadScript.ExecuteAsync(database, this).AsBooleanTask(); public bool TryAcquire(IDatabase database) => (bool)TryAcquireReadScript.Execute(database, this); @@ -91,6 +88,37 @@ public RedisWriterWaitingPrimitive(RedisKey writerKey, RedisValue baseLockId, Re internal class RedisWriteLockPrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { + private static readonly RedisScript TryAcquireWriteScript; + + static RedisWriteLockPrimitive() + { + Func readerKey = p => p._readerKey, + writerKey = p => p._writerKey; + Func lockId = p => p._lockId; + Func expiryMillis = p => p._timeouts.Expiry.InMilliseconds; + + // TRY ACQUIRE WRITE + // + // First, check if writerValue exists. If so, fail unless it's our waiting ID. + // + // Then, check if there are no readers. If so, then set writerValue to our ID and return success. If not, then if the lock + // has our waiting ID re-up the expiry (avoids the need to extend the writer waiting lock). + // + // Finally, return failure. + TryAcquireWriteScript = new($@" + local writerValue = redis.call('get', {writerKey}) + if writerValue == false or writerValue == {lockId} .. '{RedisWriterWaitingPrimitive.LockIdSuffix:r}' then + if redis.call('scard', {readerKey}) == 0 then + redis.call('set', {writerKey}, {lockId}, 'px', {expiryMillis}) + return 1 + end + if writerValue ~= false then + redis.call('pexpire', {writerKey}, {expiryMillis}) + end + end + return 0"); + } + private readonly RedisKey _readerKey, _writerKey; private readonly RedisValue _lockId; private readonly RedLockTimeouts _timeouts; @@ -114,31 +142,6 @@ public RedisWriteLockPrimitive( public void Release(IDatabase database, bool fireAndForget) => this._mutexPrimitive.Release(database, fireAndForget); public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => this._mutexPrimitive.ReleaseAsync(database, fireAndForget); - /// - /// TRY ACQUIRE WRITE - /// - /// First, check if writerValue exists. If so, fail unless it's our waiting ID. - /// - /// Then, check if there are no readers. If so, then set writerValue to our ID and return success. If not, then if the lock - /// has our waiting ID re-up the expiry (avoids the need to extend the writer waiting lock). - /// - /// Finally, return failure. - /// - private static readonly RedisScript TryAcquireWriteScript = new($@" - local writerValue = redis.call('get', @writerKey) - if writerValue == false or writerValue == @lockId .. '{RedisWriterWaitingPrimitive.LockIdSuffix}' then - if redis.call('scard', @readerKey) == 0 then - redis.call('set', @writerKey, @lockId, 'px', @expiryMillis) - return 1 - end - if writerValue ~= false then - redis.call('pexpire', @writerKey, @expiryMillis) - end - end - return 0", - p => new { writerKey = p._writerKey, readerKey = p._readerKey, lockId = p._lockId, expiryMillis = p._timeouts.Expiry.InMilliseconds } - ); - public bool TryAcquire(IDatabase database) => (bool)TryAcquireWriteScript.Execute(database, this); public Task TryAcquireAsync(IDatabaseAsync database) => TryAcquireWriteScript.ExecuteAsync(database, this).AsBooleanTask(); diff --git a/src/DistributedLock.Redis/Primitives/RedisScript.cs b/src/DistributedLock.Redis/Primitives/RedisScript.cs index efbcfbb9..983166f6 100644 --- a/src/DistributedLock.Redis/Primitives/RedisScript.cs +++ b/src/DistributedLock.Redis/Primitives/RedisScript.cs @@ -1,21 +1,107 @@ -using Medallion.Threading.Redis.RedLock; +using Medallion.Threading.Internal; +using Medallion.Threading.Redis.RedLock; using StackExchange.Redis; +using System.Runtime.CompilerServices; +using System.Text; using System.Text.RegularExpressions; namespace Medallion.Threading.Redis.Primitives; -internal class RedisScript(string script, Func parameters) +/// +/// We use this class over Redis's because that class's parameters all get mapped to ARGV[..] and we want +/// to appropriately map key parameters to KEYS[..] for compatibility with some cloud scenarios. See #254 +/// +internal readonly struct RedisScript { - private readonly LuaScript _script = LuaScript.Prepare(RemoveExtraneousWhitespace(script)); + private readonly string _script; + private readonly Func _getKeys; + private readonly Func _getValues; - public RedisResult Execute(IDatabase database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluate(this._script, parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public RedisScript(RedisScriptInterpolatedString scriptTemplate) + { + (this._script, this._getKeys, this._getValues) = scriptTemplate.ToScript(); + } - public Task ExecuteAsync(IDatabaseAsync database, TArgument argument, bool fireAndForget = false) => - // database.ScriptEvaluate must be called instead of script.Evaluate in order to respect the database's key prefix - database.ScriptEvaluateAsync(this._script, parameters(argument), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + public RedisResult Execute(IDatabase database, TArg arg, bool fireAndForget = false) => + database.ScriptEvaluate(this._script, this._getKeys(arg), this._getValues(arg), flags: RedLockHelper.GetCommandFlags(fireAndForget)); - // send the smallest possible script to the server - private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); + public Task ExecuteAsync(IDatabaseAsync database, TArg arg, bool fireAndForget = false) => + database.ScriptEvaluateAsync(this._script, this._getKeys(arg), this._getValues(arg), flags: RedLockHelper.GetCommandFlags(fireAndForget)); + + public static RedisScriptInterpolatedString Fragment(RedisScriptInterpolatedString fragment) => fragment; + + [InterpolatedStringHandler] + internal readonly ref struct RedisScriptInterpolatedString(int literalLength, int formattedCount) + { + // 2 because for N holes we can have at most N + 1 literals (ignoring fragments) + private readonly List<(string Text, Delegate? Getter)> _parts = new(capacity: (2 * formattedCount) + 1); + + public void AppendLiteral(string text) => this._parts.Add((text, null)); + + public void AppendFormatted(Func key, [CallerArgumentExpression(nameof(key))] string keyString = "") => + this._parts.Add((keyString, key)); + + public void AppendFormatted(Func value, [CallerArgumentExpression(nameof(value))] string valueString = "") => + this._parts.Add((valueString, value)); + + public void AppendFormatted(Func value, [CallerArgumentExpression(nameof(value))] string valueString = "") => + this.AppendFormatted(a => (RedisValue)value(a), valueString); + + public void AppendFormatted(RedisScriptInterpolatedString fragment) => + this._parts.AddRange(fragment._parts); + + public void AppendFormatted(string text, string format) + { + Invariant.Require(format == "r"); + this.AppendLiteral(text); + } + + public (string, Func, Func) ToScript() + { + // 8 for KEYS[..] or ARGV[..] + StringBuilder builder = new(capacity: literalLength + (8 * formattedCount)); + Dictionary, int)> keys = new(capacity: formattedCount); + Dictionary, int)> values = new(capacity: formattedCount); + + foreach (var (text, getter) in this._parts) + { + if (getter is null) + { + builder.Append(text); + } + else if (getter is Func key) + { + builder.Append("KEYS[").Append(GetOneBasedIndex(keys, key, text)).Append(']'); + } + else + { + builder.Append("ARGV[").Append(GetOneBasedIndex(values, (Func)getter, text)).Append(']'); + } + } + + return ( + RemoveExtraneousWhitespace(builder.ToString()), + CreateGetter(keys), + CreateGetter(values) + ); + } + + private static int GetOneBasedIndex(Dictionary dictionary, T key, string keyString) + { + if (dictionary.TryGetValue(keyString, out var value)) { return value.Index + 1; } + + dictionary.Add(keyString, (key, dictionary.Count)); + return dictionary.Count; // implicitly index + 1 + } + + private static Func CreateGetter(Dictionary Value, int Index)> dictionary) => arg => + { + var result = new T[dictionary.Count]; + foreach (var pair in dictionary) { result[pair.Value.Index] = pair.Value.Value(arg); } + return result; + }; + + // send the smallest possible script to the server + private static string RemoveExtraneousWhitespace(string script) => Regex.Replace(script.Trim(), @"\s+", " "); + } } diff --git a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs index 11114c35..74d5540a 100644 --- a/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs +++ b/src/DistributedLock.Redis/Primitives/RedisSemaphorePrimitive.cs @@ -12,17 +12,43 @@ namespace Medallion.Threading.Redis.Primitives; /// internal class RedisSemaphorePrimitive : IRedLockAcquirableSynchronizationPrimitive, IRedLockExtensibleSynchronizationPrimitive { - // replicate_commands is necessary to call before calling non-deterministic functions - private const string GetNowMillisScriptFragment = @" + private static readonly RedisScript AcquireScript, ExtendScript; + + static RedisSemaphorePrimitive() + { + Func key = p => p._key; + Func lockId = p => p._lockId; + Func expiryMillis = p => p._timeouts.Expiry.InMilliseconds, + setExpiryMillis = p => p.SetExpiry.InMilliseconds, + maxCount = p => p._maxCount; + + // replicate_commands is necessary to call before calling non-deterministic functions + var getNowMillisScriptFragment = RedisScript.Fragment($@" redis.replicate_commands() local nowResult = redis.call('time') - local nowMillis = (tonumber(nowResult[1]) * 1000.0) + (tonumber(nowResult[2]) / 1000.0)"; + local nowMillis = (tonumber(nowResult[1]) * 1000.0) + (tonumber(nowResult[2]) / 1000.0)"); + var renewSetScriptFragment = RedisScript.Fragment($@" + local keyTtl = redis.call('pttl', {key}) + if keyTtl < tonumber({setExpiryMillis}) then + redis.call('pexpire', {key}, {setExpiryMillis}) + end"); + + AcquireScript = new($@" + {getNowMillisScriptFragment} + redis.call('zremrangebyscore', {key}, '-inf', nowMillis) + if redis.call('zcard', {key}) < tonumber({maxCount}) then + redis.call('zadd', {key}, nowMillis + tonumber({expiryMillis}), {lockId}) + {renewSetScriptFragment} + return 1 + end + return 0"); - private const string RenewSetScriptFragment = @" - local keyTtl = redis.call('pttl', @key) - if keyTtl < tonumber(@setExpiryMillis) then - redis.call('pexpire', @key, @setExpiryMillis) - end"; + ExtendScript = new($@" + {getNowMillisScriptFragment} + local result = redis.call('zadd', {key}, 'XX', 'CH', nowMillis + tonumber({expiryMillis}), {lockId}) + {renewSetScriptFragment} + return result"); + } private readonly RedisValue _lockId = RedLockHelper.CreateLockId(); private readonly RedisKey _key; @@ -51,30 +77,10 @@ public void Release(IDatabase database, bool fireAndForget) => public Task ReleaseAsync(IDatabaseAsync database, bool fireAndForget) => database.SortedSetRemoveAsync(this._key, this._lockId, RedLockHelper.GetCommandFlags(fireAndForget)); - private static readonly RedisScript AcquireScript = new($@" - {GetNowMillisScriptFragment} - redis.call('zremrangebyscore', @key, '-inf', nowMillis) - if redis.call('zcard', @key) < tonumber(@maxCount) then - redis.call('zadd', @key, nowMillis + tonumber(@expiryMillis), @lockId) - {RenewSetScriptFragment} - return 1 - end - return 0", - p => new { key = p._key, maxCount = p._maxCount, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } - ); - public bool TryAcquire(IDatabase database) => (bool)AcquireScript.Execute(database, this); public Task TryAcquireAsync(IDatabaseAsync database) => AcquireScript.ExecuteAsync(database, this).AsBooleanTask(); - private static readonly RedisScript ExtendScript = new($@" - {GetNowMillisScriptFragment} - local result = redis.call('zadd', @key, 'XX', 'CH', nowMillis + tonumber(@expiryMillis), @lockId) - {RenewSetScriptFragment} - return result", - p => new { key = p._key, expiryMillis = p._timeouts.Expiry.InMilliseconds, lockId = p._lockId, setExpiryMillis = p.SetExpiry.InMilliseconds } - ); - public Task TryExtendAsync(IDatabaseAsync database) => ExtendScript.ExecuteAsync(database, this).AsBooleanTask(); public bool IsConnected(IDatabase database) => database.IsConnected(this._key, CommandFlags.DemandMaster); diff --git a/src/DistributedLock.Redis/Shims.cs b/src/DistributedLock.Redis/Shims.cs new file mode 100644 index 00000000..8b93dd54 --- /dev/null +++ b/src/DistributedLock.Redis/Shims.cs @@ -0,0 +1,18 @@ +#if !NET6_OR_GREATER +namespace System.Runtime.CompilerServices +{ + [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)] + internal sealed class InterpolatedStringHandlerAttribute : Attribute { } +} +#endif + +#if !NETCOREAPP3_0_OR_GREATER +namespace System.Runtime.CompilerServices +{ + [AttributeUsage(AttributeTargets.Parameter, Inherited = false, AllowMultiple = false)] + internal sealed class CallerArgumentExpressionAttribute(string parameterName) : Attribute + { + public string ParameterName { get; } = parameterName; + } +} +#endif \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs index a4e048c8..c34e2ca6 100644 --- a/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs +++ b/src/DistributedLock.Tests/Tests/Redis/RedisDistributedSemaphoreTest.cs @@ -78,7 +78,6 @@ public void TestGetCurrentCountSync() databaseMock.VerifyAll(); } - [Test] public async Task TestGetCurrentCountReflectsAcquisitionsAndReleases() { From 2036f9e456658a632a14b3920c1697d0aaf59daf Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 26 Oct 2025 16:02:40 -0400 Subject: [PATCH 332/399] Version bump --- README.md | 2 ++ src/DistributedLock.Redis/DistributedLock.Redis.csproj | 2 +- src/DistributedLock/DistributedLock.csproj | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 403f776b..1576a2a2 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,8 @@ Contributions are welcome! If you are interested in contributing towards a new o Setup steps for working with the repository locally are documented [here](docs/Developing%20DistributedLock.md). ## Release notes +- 2.7.1 + - Improve compatibility with Redis clusters that require keys in Lua scripts to be passed via the KEYS array. Thanks [@pengweiqhca](https://github.com/pengweiqhca) for reporting a identifying the fix! ([#254](https://github.com/madelson/DistributedLock/issues/254), DistributedLock.Redis 1.1.1) - 2.7 - Add support for fetching a Redis-based semaphore's current available count. Thanks [@teesoftech](https://github.com/teesofttech) for implementing! ([#234](https://github.com/madelson/DistributedLock/issues/234), DistributedLock.Redis 1.1) - 2.6 diff --git a/src/DistributedLock.Redis/DistributedLock.Redis.csproj b/src/DistributedLock.Redis/DistributedLock.Redis.csproj index 130226bd..660f8705 100644 --- a/src/DistributedLock.Redis/DistributedLock.Redis.csproj +++ b/src/DistributedLock.Redis/DistributedLock.Redis.csproj @@ -11,7 +11,7 @@ - 1.1.0 + 1.1.1 1.0.0.0 Michael Adelson Provides distributed locking primitives based on Redis diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index cdb3a088..0d23135b 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.7.0 + 2.7.1 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From db7554b3752450573e92cd998eca656a722bc9d0 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 14:46:40 +0330 Subject: [PATCH 333/399] Refactor composite lock acquisition --- ...mpositeDistributedSynchronizationHandle.cs | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 723d2e16..35a30855 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -54,6 +54,7 @@ public async ValueTask DisposeAsync() var timeoutTracker = new TimeoutTracker(timeout); var handles = new List(names.Count); + IDistributedSynchronizationHandle? result = null; try { @@ -64,25 +65,28 @@ public async ValueTask DisposeAsync() if (handle is null) { - return null; + break; } handles.Add(handle); if (timeoutTracker.IsExpired) { - return null; + break; } } - var result = new CompositeDistributedSynchronizationHandle(handles); - handles.Clear(); - return result; + result = new CompositeDistributedSynchronizationHandle(handles); } finally { - await DisposeHandlesAsync(handles).ConfigureAwait(false); + if (result is null) + { + await DisposeHandlesAsync(handles).ConfigureAwait(false); + } } + + return result; } @@ -155,6 +159,7 @@ public static IDistributedSynchronizationHandle AcquireAll( var timeoutTracker = new TimeoutTracker(timeout); var handles = new List(names.Count); + IDistributedSynchronizationHandle? result = null; try { @@ -165,25 +170,28 @@ public static IDistributedSynchronizationHandle AcquireAll( if (handle is null) { - return null; + break; } handles.Add(handle); if (timeoutTracker.IsExpired) { - return null; + break; } } - var result = new CompositeDistributedSynchronizationHandle(handles); - handles.Clear(); - return result; + result = new CompositeDistributedSynchronizationHandle(handles); } finally { - await DisposeHandlesAsync(handles).ConfigureAwait(false); + if (result is null) + { + await DisposeHandlesAsync(handles).ConfigureAwait(false); + } } + + return result; } From 1eea667934d1dce687b41961af1be2e04c3289db Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 14:50:10 +0330 Subject: [PATCH 334/399] Remove default parameter values --- ...mpositeDistributedSynchronizationHandle.cs | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 35a30855..4cf561cb 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -47,8 +47,8 @@ public async ValueTask DisposeAsync() TProvider provider, Func> acquireFunc, IReadOnlyList names, - TimeSpan timeout = default, - CancellationToken cancellationToken = default) + TimeSpan timeout, + CancellationToken cancellationToken) { ValidateAcquireParameters(provider, acquireFunc, names); @@ -89,13 +89,12 @@ public async ValueTask DisposeAsync() return result; } - public static async ValueTask AcquireAllAsync( TProvider provider, Func> acquireFunc, IReadOnlyList names, - TimeSpan? timeout = null, - CancellationToken cancellationToken = default) + TimeSpan? timeout, + CancellationToken cancellationToken) { var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; var handle = await TryAcquireAllAsync( @@ -118,8 +117,8 @@ public static async ValueTask AcquireAllAsync TProvider provider, Func acquireFunc, IReadOnlyList names, - TimeSpan timeout = default, - CancellationToken cancellationToken = default) => + TimeSpan timeout, + CancellationToken cancellationToken) => SyncViaAsync.Run( state => TryAcquireAllAsync( state.provider, @@ -134,8 +133,8 @@ public static IDistributedSynchronizationHandle AcquireAll( TProvider provider, Func acquireFunc, IReadOnlyList names, - TimeSpan? timeout = null, - CancellationToken cancellationToken = default) => + TimeSpan? timeout, + CancellationToken cancellationToken) => SyncViaAsync.Run( state => AcquireAllAsync( state.provider, @@ -152,8 +151,8 @@ public static IDistributedSynchronizationHandle AcquireAll( acquireFunc, IReadOnlyList names, int maxCount, - TimeSpan timeout = default, - CancellationToken cancellationToken = default) + TimeSpan timeout, + CancellationToken cancellationToken) { ValidateAcquireParameters(provider, acquireFunc, names); @@ -201,8 +200,8 @@ public static async ValueTask AcquireAllAsync acquireFunc, IReadOnlyList names, int maxCount, - TimeSpan? timeout = null, - CancellationToken cancellationToken = default) + TimeSpan? timeout, + CancellationToken cancellationToken) { var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; var handle = await TryAcquireAllAsync( @@ -227,8 +226,8 @@ public static async ValueTask AcquireAllAsync Func acquireFunc, IReadOnlyList names, int maxCount, - TimeSpan timeout = default, - CancellationToken cancellationToken = default) => + TimeSpan timeout, + CancellationToken cancellationToken) => SyncViaAsync.Run( state => TryAcquireAllAsync( state.provider, @@ -245,8 +244,8 @@ public static IDistributedSynchronizationHandle AcquireAll( Func acquireFunc, IReadOnlyList names, int maxCount, - TimeSpan? timeout = null, - CancellationToken cancellationToken = default) => + TimeSpan? timeout, + CancellationToken cancellationToken) => SyncViaAsync.Run( state => AcquireAllAsync( state.provider, From ac6d8a9a5e859cf97a0e1961e99ef24c0bb89b18 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 14:53:54 +0330 Subject: [PATCH 335/399] Refactor TimeoutTracker to use TimeoutValue and make it struct --- .../CompositeDistributedSynchronizationHandle.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 4cf561cb..749f865c 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -52,7 +52,7 @@ public async ValueTask DisposeAsync() { ValidateAcquireParameters(provider, acquireFunc, names); - var timeoutTracker = new TimeoutTracker(timeout); + var timeoutTracker = new TimeoutTracker(new TimeoutValue(timeout)); var handles = new List(names.Count); IDistributedSynchronizationHandle? result = null; @@ -156,7 +156,7 @@ public static IDistributedSynchronizationHandle AcquireAll( { ValidateAcquireParameters(provider, acquireFunc, names); - var timeoutTracker = new TimeoutTracker(timeout); + var timeoutTracker = new TimeoutTracker(new TimeoutValue(timeout)); var handles = new List(names.Count); IDistributedSynchronizationHandle? result = null; @@ -481,16 +481,16 @@ private static Func this._stopwatch is null ? Timeout.InfiniteTimeSpan - : timeout - this._stopwatch.Elapsed; + : timeout.TimeSpan - this._stopwatch.Elapsed; - public bool IsExpired => this._stopwatch is not null && this._stopwatch.Elapsed >= timeout; + public bool IsExpired => this._stopwatch is not null && this._stopwatch.Elapsed >= timeout.TimeSpan; } } \ No newline at end of file From 33967ffd1cee4bd0c0a0bb44995f80f9689fc4c8 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 15:01:03 +0330 Subject: [PATCH 336/399] Fix TimeoutTracker.Remaining to return zero instead of negative TimeSpan --- .../CompositeDistributedSynchronizationHandle.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 749f865c..6ce502b4 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -487,9 +487,12 @@ private readonly struct TimeoutTracker(TimeoutValue timeout) ? null : System.Diagnostics.Stopwatch.StartNew(); - public TimeSpan Remaining => this._stopwatch is null - ? Timeout.InfiniteTimeSpan - : timeout.TimeSpan - this._stopwatch.Elapsed; + public TimeSpan Remaining => + this._stopwatch is { Elapsed: var elapsed } + ? elapsed >= timeout.TimeSpan + ? TimeSpan.Zero + : timeout.TimeSpan - elapsed + : Timeout.InfiniteTimeSpan; public bool IsExpired => this._stopwatch is not null && this._stopwatch.Elapsed >= timeout.TimeSpan; } From e1424b60195fff25d44ec944cad20dd433d10926 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 15:50:00 +0330 Subject: [PATCH 337/399] Check `handles.Count` before assigning the result --- .../CompositeDistributedSynchronizationHandle.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 6ce502b4..7abc1a9f 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -76,7 +76,10 @@ public async ValueTask DisposeAsync() } } - result = new CompositeDistributedSynchronizationHandle(handles); + if (handles.Count == names.Count) + { + result = new CompositeDistributedSynchronizationHandle(handles); + } } finally { @@ -180,7 +183,10 @@ public static IDistributedSynchronizationHandle AcquireAll( } } - result = new CompositeDistributedSynchronizationHandle(handles); + if (handles.Count == names.Count) + { + result = new CompositeDistributedSynchronizationHandle(handles); + } } finally { From c99758e376707d6040938196666554cf39a55a91 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 15:50:15 +0330 Subject: [PATCH 338/399] Add composite lock tests --- .../DistributedLockProviderExtensionsTest.cs | 284 +++++++++++++++++- 1 file changed, 283 insertions(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index 074e82d5..9ca1a407 100644 --- a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -49,7 +49,7 @@ public void TestCallThrough([Values] bool isTry, [Values] bool isAsync) } void Test( - Expression> providerFunction, + Expression> providerFunction, Expression> lockFunction) { providerFunction.Compile()(mockProvider.Object); @@ -58,4 +58,286 @@ void Test( mockLock.Verify(lockFunction, Times.Once()); } } + + [Test, Combinatorial] + public void TestCompositeArgumentValidation([Values] bool isAsync) + { + var mockProvider = new Mock(); + var validNames = new List { "lock1", "lock2" }; + + if (isAsync) + { + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.TryAcquireAllLocksAsync(null!, validNames).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.TryAcquireAllLocksAsync(mockProvider.Object, null!).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.TryAcquireAllLocksAsync(mockProvider.Object, new List()).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.TryAcquireAllLocksAsync(mockProvider.Object, new List { "lock1", null! }).AsTask()); + + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.AcquireAllLocksAsync(null!, validNames).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.AcquireAllLocksAsync(mockProvider.Object, null!).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.AcquireAllLocksAsync(mockProvider.Object, new List()).AsTask()); + Assert.ThrowsAsync(() => DistributedLockProviderExtensions.AcquireAllLocksAsync(mockProvider.Object, new List { "lock1", null! }).AsTask()); + } + else + { + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireAllLocks(null!, validNames)); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireAllLocks(mockProvider.Object, null!)); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireAllLocks(mockProvider.Object, new List())); + Assert.Throws(() => DistributedLockProviderExtensions.TryAcquireAllLocks(mockProvider.Object, new List { "lock1", null! })); + + Assert.Throws(() => DistributedLockProviderExtensions.AcquireAllLocks(null!, validNames)); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireAllLocks(mockProvider.Object, null!)); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireAllLocks(mockProvider.Object, new List())); + Assert.Throws(() => DistributedLockProviderExtensions.AcquireAllLocks(mockProvider.Object, new List { "lock1", null! })); + } + } + + [Test, Combinatorial] + public async Task TestCompositePartialAcquisitionFailure([Values] bool isAsync) + { + var mockProvider = new Mock(); + var mockLockA = new Mock(); + var mockLockB = new Mock(); + var mockHandleA = new Mock(); + + mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); + mockProvider.Setup(p => p.CreateLock("B")).Returns(mockLockB.Object); + + if (isAsync) + { + mockLockA.Setup(l => l.TryAcquireAsync(TimeSpan.Zero, default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync((IDistributedSynchronizationHandle?)null); + } + else + { + mockLockA.Setup(l => l.TryAcquire(TimeSpan.Zero, default)) + .Returns(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns((IDistributedSynchronizationHandle?)null); + } + + var names = new List { "A", "B" }; + IDistributedSynchronizationHandle? result; + + if (isAsync) + { + result = await mockProvider.Object.TryAcquireAllLocksAsync(names, TimeSpan.Zero, default); + } + else + { + result = mockProvider.Object.TryAcquireAllLocks(names, TimeSpan.Zero, default); + } + + Assert.That(result, Is.Null); + + mockHandleA.Verify(h => h.DisposeAsync(), Times.Once); + } + + [Test, Combinatorial] + public async Task TestCompositeSuccessfulAcquisition([Values] bool isTry, [Values] bool isAsync) + { + var mockProvider = new Mock(); + var mockLockA = new Mock(); + var mockLockB = new Mock(); + var mockHandleA = new Mock(); + var mockHandleB = new Mock(); + + mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); + mockProvider.Setup(p => p.CreateLock("B")).Returns(mockLockB.Object); + + if (isAsync) + { + if (isTry) + { + mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleB.Object); + } + else + { + mockLockA.Setup(l => l.AcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.AcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleB.Object); + } + } + else + { + if (isTry) + { + mockLockA.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns(mockHandleB.Object); + } + else + { + mockLockA.Setup(l => l.Acquire(It.IsAny(), default)) + .Returns(mockHandleA.Object); + mockLockB.Setup(l => l.Acquire(It.IsAny(), default)) + .Returns(mockHandleB.Object); + } + } + + var names = new List { "A", "B" }; + IDistributedSynchronizationHandle? result; + + if (isAsync) + { + if (isTry) + { + result = await mockProvider.Object.TryAcquireAllLocksAsync(names, TimeSpan.FromSeconds(10), default); + } + else + { + result = await mockProvider.Object.AcquireAllLocksAsync(names, TimeSpan.FromSeconds(10), default); + } + } + else + { + if (isTry) + { + result = mockProvider.Object.TryAcquireAllLocks(names, TimeSpan.FromSeconds(10), default); + } + else + { + result = mockProvider.Object.AcquireAllLocks(names, TimeSpan.FromSeconds(10), default); + } + } + + Assert.That(result, Is.Not.Null); + + mockProvider.Verify(p => p.CreateLock("A"), Times.Once); + mockProvider.Verify(p => p.CreateLock("B"), Times.Once); + + if (isAsync) + { + await result!.DisposeAsync(); + mockHandleA.Verify(h => h.DisposeAsync(), Times.Once); + mockHandleB.Verify(h => h.DisposeAsync(), Times.Once); + } + else + { + result!.Dispose(); + mockHandleA.Verify(h => h.Dispose(), Times.Once); + mockHandleB.Verify(h => h.Dispose(), Times.Once); + } + } + + [Test, Combinatorial] + public void TestCompositeAcquireThrowsOnTimeout([Values] bool isAsync) + { + var mockProvider = new Mock(); + var mockLockA = new Mock(); + + mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); + + if (isAsync) + { + mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync((IDistributedSynchronizationHandle?)null); + } + else + { + mockLockA.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns((IDistributedSynchronizationHandle?)null); + } + + var names = new List { "A" }; + + if (isAsync) + { + Assert.ThrowsAsync(() => mockProvider.Object.AcquireAllLocksAsync(names, TimeSpan.Zero, default).AsTask()); + } + else + { + Assert.Throws(() => mockProvider.Object.AcquireAllLocks(names, TimeSpan.Zero, default)); + } + } + + [Test] + public async Task TestCompositeRemainingTimeDistribution() + { + var mockProvider = new Mock(); + var mockLockA = new Mock(); + var mockLockB = new Mock(); + var mockHandleA = new Mock(); + var mockHandleB = new Mock(); + + mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); + mockProvider.Setup(p => p.CreateLock("B")).Returns(mockLockB.Object); + + var capturedTimeouts = new List(); + + mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync((TimeSpan timeout, CancellationToken _) => + { + capturedTimeouts.Add(timeout); + Task.Delay(TimeSpan.FromMilliseconds(100)).Wait(); + return mockHandleA.Object; + }); + + mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync((TimeSpan timeout, CancellationToken _) => + { + capturedTimeouts.Add(timeout); + return mockHandleB.Object; + }); + + var names = new List { "A", "B" }; + var totalTimeout = TimeSpan.FromSeconds(5); + + var result = await mockProvider.Object.TryAcquireAllLocksAsync(names, totalTimeout, default); + + Assert.That(result, Is.Not.Null); + Assert.That(capturedTimeouts.Count, Is.EqualTo(2)); + + Assert.That(capturedTimeouts[0].TotalMilliseconds, Is.EqualTo(totalTimeout.TotalMilliseconds).Within(1.0)); + + Assert.That(capturedTimeouts[1], Is.LessThan(totalTimeout)); + Assert.That(capturedTimeouts[1], Is.GreaterThanOrEqualTo(TimeSpan.Zero)); + + await result!.DisposeAsync(); + } + + [Test] + public async Task TestCompositeHandleLostToken() + { + var mockProvider = new Mock(); + var mockLockA = new Mock(); + var mockLockB = new Mock(); + + var ctsA = new CancellationTokenSource(); + var ctsB = new CancellationTokenSource(); + + var mockHandleA = new Mock(); + var mockHandleB = new Mock(); + + mockHandleA.Setup(h => h.HandleLostToken).Returns(ctsA.Token); + mockHandleB.Setup(h => h.HandleLostToken).Returns(ctsB.Token); + + mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); + mockProvider.Setup(p => p.CreateLock("B")).Returns(mockLockB.Object); + + mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleB.Object); + + var names = new List { "A", "B" }; + var result = await mockProvider.Object.TryAcquireAllLocksAsync(names, TimeSpan.FromSeconds(10), default); + + Assert.That(result, Is.Not.Null); + Assert.That(result!.HandleLostToken.CanBeCanceled, Is.True); + + ctsA.Cancel(); + + Assert.That(result.HandleLostToken.IsCancellationRequested, Is.True); + + await result.DisposeAsync(); + ctsA.Dispose(); + ctsB.Dispose(); + } } From 8f316e3e3edcb782258dfe42f5b06fce60d11231 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 16:14:11 +0330 Subject: [PATCH 339/399] Add new Public APIs to --- .../PublicAPI.Unshipped.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/DistributedLock.Core/PublicAPI.Unshipped.txt b/src/DistributedLock.Core/PublicAPI.Unshipped.txt index 5f282702..4b44c194 100644 --- a/src/DistributedLock.Core/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Core/PublicAPI.Unshipped.txt @@ -1 +1,17 @@ - \ No newline at end of file +#nullable enable +static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask From 246b325e5a13e3c4d58947a10690dd6e96542ff7 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 16:26:47 +0330 Subject: [PATCH 340/399] Comment why composite methods are not supported for `ExcludedInterfacesForCompositeMethods` --- ...stributedUpgradeableReaderWriterLockProviderExtensions.cs | 3 ++- src/DistributedLockCodeGen/GenerateProviders.cs | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 2bc1c429..22884c62 100644 --- a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -41,7 +41,8 @@ public static ValueTask AcquireUpgradeableRea # region Composite Lock Methods -// Composite methods are not supported for IDistributedUpgradeableReaderWriterLock + // Composite methods are not supported for IDistributedUpgradeableReaderWriterLock + // because a composite acquire operation must be able to roll back and upgrade does not support that. # endregion } \ No newline at end of file diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index 80c80747..3cbd5ff4 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -70,7 +70,10 @@ public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgra var extensionCompositeMethodBodies = ExcludedInterfacesForCompositeMethods.Contains(interfaceName) ? [ - $"// Composite methods are not supported for {interfaceName}" + $""" + // Composite methods are not supported for {interfaceName} + // because a composite acquire operation must be able to roll back and upgrade does not support that. + """ ] : interfaceMethods .Select(m => From 848f215477647eec0f22515b116c0b199b3999d5 Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 23:28:43 +0330 Subject: [PATCH 341/399] Define reason for each interface in --- src/DistributedLockCodeGen/GenerateProviders.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index 3cbd5ff4..d00aa8c8 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -18,10 +18,10 @@ public class GenerateProviders "IDistributedSemaphore" ]; - private static readonly IReadOnlyList ExcludedInterfacesForCompositeMethods = - [ - "IDistributedUpgradeableReaderWriterLock" - ]; + private static readonly IReadOnlyDictionary ExcludedInterfacesForCompositeMethods = new Dictionary + { + ["IDistributedUpgradeableReaderWriterLock"] = "a composite acquire operation must be able to roll back and upgrade does not support that." + }; [TestCaseSource(nameof(Interfaces))] public void GenerateProviderInterfaceAndExtensions(string interfaceName) @@ -67,12 +67,12 @@ public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgra """ ); - var extensionCompositeMethodBodies = ExcludedInterfacesForCompositeMethods.Contains(interfaceName) + var extensionCompositeMethodBodies = ExcludedInterfacesForCompositeMethods.TryGetValue(interfaceName, out var exclusionReason) ? [ $""" // Composite methods are not supported for {interfaceName} - // because a composite acquire operation must be able to roll back and upgrade does not support that. + // because {exclusionReason} """ ] : interfaceMethods From 7afa7af141e6d9199774f5e693157476bc15f24e Mon Sep 17 00:00:00 2001 From: Moein Nemati Date: Mon, 1 Dec 2025 23:32:45 +0330 Subject: [PATCH 342/399] Remove extra space --- src/DistributedLock.Core/DistributedLockProviderExtensions.cs | 2 +- .../DistributedReaderWriterLockProviderExtensions.cs | 2 +- .../DistributedSemaphoreProviderExtensions.cs | 2 +- .../DistributedUpgradeableReaderWriterLockProviderExtensions.cs | 2 +- src/DistributedLockCodeGen/GenerateProviders.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs index bc98c6bb..42dd78f1 100644 --- a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -38,7 +38,7 @@ public static ValueTask AcquireLockAsync(this (provider ?? throw new ArgumentNullException(nameof(provider))).CreateLock(name).AcquireAsync(timeout, cancellationToken); # endregion - + # region Composite Lock Methods /// diff --git a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index da5f407c..5e2dadd2 100644 --- a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -66,7 +66,7 @@ public static ValueTask AcquireWriteLockAsync (provider ?? throw new ArgumentNullException(nameof(provider))).CreateReaderWriterLock(name).AcquireWriteLockAsync(timeout, cancellationToken); # endregion - + # region Composite Lock Methods /// diff --git a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index 3ed29ebe..dc961498 100644 --- a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -38,7 +38,7 @@ public static ValueTask AcquireSemaphoreAsync (provider ?? throw new ArgumentNullException(nameof(provider))).CreateSemaphore(name, maxCount).AcquireAsync(timeout, cancellationToken); # endregion - + # region Composite Lock Methods /// diff --git a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 22884c62..1f647384 100644 --- a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -38,7 +38,7 @@ public static ValueTask AcquireUpgradeableRea (provider ?? throw new ArgumentNullException(nameof(provider))).CreateUpgradeableReaderWriterLock(name).AcquireUpgradeableReadLockAsync(timeout, cancellationToken); # endregion - + # region Composite Lock Methods // Composite methods are not supported for IDistributedUpgradeableReaderWriterLock diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index d00aa8c8..b55e0aa8 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -111,7 +111,7 @@ public static class {{providerExtensionsName}} {{string.Join(Environment.NewLine + Environment.NewLine, extensionSingleMethodBodies)}} # endregion - + # region Composite Lock Methods {{string.Join(Environment.NewLine + Environment.NewLine, extensionCompositeMethodBodies)}} From ba277b3ba751e7b65527f600e2c19d7a57070bff Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 17 Dec 2025 18:05:16 +0800 Subject: [PATCH 343/399] chore: Performance Optimization --- src/Directory.Packages.props | 2 +- src/DistributedLock.Core/packages.lock.json | 6 +- .../MongoDistributedLock.cs | 154 ++++++++++++------ .../MongoDistributedLockHandle.cs | 91 +++++++---- .../packages.lock.json | 42 ++--- .../packages.lock.json | 6 +- src/DistributedLock.Tests/packages.lock.json | 16 +- src/DistributedLock/packages.lock.json | 28 ++-- src/DistributedLockTaker/packages.lock.json | 38 ++--- 9 files changed, 235 insertions(+), 148 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 2894c36a..c8bdc85e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -7,7 +7,7 @@ - + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 0e0884af..86c0653a 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -148,9 +148,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.21, )", - "resolved": "8.0.21", - "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 1fb4ec8d..ab2e2554 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -1,5 +1,7 @@ using Medallion.Threading.Internal; +using MongoDB.Bson; using MongoDB.Driver; +using System.Collections.Concurrent; namespace Medallion.Threading.MongoDB; @@ -8,6 +10,13 @@ namespace Medallion.Threading.MongoDB; /// public sealed partial class MongoDistributedLock : IInternalDistributedLock { +#if !NETSTANDARD2_1_OR_GREATER && !NET8_0_OR_GREATER + private static readonly DateTime EpochUtc = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); +#endif + + // We want to ensure indexes at most once per process per (db, collection) + private static readonly ConcurrentDictionary> IndexInitializationTasks = new(StringComparer.Ordinal); + private readonly string _collectionName; private readonly IMongoDatabase _database; private readonly MongoDistributedLockOptions _options; @@ -20,7 +29,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock /// Implements /// - public string Name => Key; + public string Name => this.Key; /// /// Constructs a lock named using the provided and . @@ -36,10 +45,10 @@ public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) { if (string.IsNullOrEmpty(key)) { throw new ArgumentNullException(nameof(key)); } - _database = database ?? throw new ArgumentNullException(nameof(database)); - _collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - Key = key; - _options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); + this._database = database ?? throw new ArgumentNullException(nameof(database)); + this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); + this.Key = key; + this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); } ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) @@ -47,70 +56,117 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti return BusyWaitHelper.WaitAsync(this, (@this, ct) => @this.TryAcquireAsync(ct), timeout, - _options.MinBusyWaitSleepTime, - _options.MaxBusyWaitSleepTime, + this._options.MinBusyWaitSleepTime, + this._options.MaxBusyWaitSleepTime, cancellationToken); } private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { - var collection = _database.GetCollection(_collectionName); - - // Ensure index exists for efficient queries - await EnsureIndexAsync(collection, cancellationToken).ConfigureAwait(false); - var lockId = Guid.NewGuid().ToString(); - var now = DateTime.UtcNow; - var expiresAt = now.Add(_options.Expiry.TimeSpan); - - // Filter: lock with this key doesn't exist OR has expired - var filter = Builders.Filter.Or(Builders.Filter.Eq(d => d.Id, Key) & Builders.Filter.Lt(d => d.ExpiresAt, now), - Builders.Filter.Eq(d => d.Id, Key) & Builders.Filter.Exists(d => d.ExpiresAt, false)); - var update = Builders.Update - .Set(d => d.Id, Key) - .Set(d => d.LockId, lockId) - .Set(d => d.ExpiresAt, expiresAt) - .Set(d => d.AcquiredAt, now); - var options = new FindOneAndUpdateOptions { IsUpsert = true, ReturnDocument = ReturnDocument.After }; - try - { - var result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + var collection = this._database.GetCollection(this._collectionName); - // Verify we actually got the lock - if (result != null && result.LockId == lockId) - { - return new(_database, - _collectionName, - Key, - lockId, - _options.Expiry, - _options.ExtensionCadence); - } - } - catch (MongoWriteException ex) when (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) + // Ensure indexes exist (TTL cleanup); do this at most once per process per (db, collection) + await EnsureIndexesCreatedAsync(collection).ConfigureAwait(false); + + // Use a unique token per acquisition attempt (like Redis' value token) + var lockId = Guid.NewGuid().ToString("N"); + var expiryMs = this._options.Expiry.InMilliseconds; + + // We avoid exception-driven contention (DuplicateKey) by using a single upsert on {_id == Key} + // and an update pipeline that only overwrites fields when the existing lock is expired. + // This is conceptually similar to Redis: SET key value NX PX . + var filter = Builders.Filter.Eq(d => d.Id, this.Key); + var update = CreateAcquireUpdate(lockId, expiryMs); + var options = new FindOneAndUpdateOptions { - // Lock is already held by someone else - return null; - } - catch (MongoCommandException) + IsUpsert = true, + ReturnDocument = ReturnDocument.After + }; + + var result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + + // Verify we actually got the lock + if (result != null && result.LockId == lockId) { - // Lock is already held - return null; + return new(collection, + this.Key, + lockId, + this._options.Expiry, + this._options.ExtensionCadence); } + return null; } - private static async Task EnsureIndexAsync(IMongoCollection collection, CancellationToken cancellationToken) + private static UpdateDefinition CreateAcquireUpdate(string lockId, int expiryMs) + { + // expired := ifNull(expiresAt, epoch) <= $$NOW + var expiredOrMissing = new BsonDocument( + "$lte", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime( +#if NETSTANDARD2_1_OR_GREATER || NET8_0_OR_GREATER + DateTime.UnixEpoch +#else + EpochUtc +#endif + ) }), + "$$NOW" + } + ); + + var newExpiresAt = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", "$$NOW" }, + { "unit", "millisecond" }, + { "amount", expiryMs } + } + ); + + var setStage = new BsonDocument( + "$set", + new BsonDocument + { + // Only overwrite lock fields when the previous lock is expired/missing + { "lockId", new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, "$lockId" }) }, + { "expiresAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newExpiresAt, "$expiresAt" }) }, + { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, "$$NOW", "$acquiredAt" }) } + } + ); + + return new PipelineUpdateDefinition(new[] { setStage }); + } + + private static Task EnsureIndexesCreatedAsync(IMongoCollection collection) + { + // Best-effort TTL index to clean up expired rows over time. + // Note: TTL monitors run on a schedule; correctness MUST NOT depend on this. + var databaseName = collection.Database.DatabaseNamespace.DatabaseName; + var key = databaseName + "/" + collection.CollectionNamespace.CollectionName; + + var lazy = IndexInitializationTasks.GetOrAdd(key, _ => new Lazy(() => CreateIndexesAsync(collection))); + return lazy.Value; + } + + private static async Task CreateIndexesAsync(IMongoCollection collection) { try { var indexKeys = Builders.IndexKeys.Ascending(d => d.ExpiresAt); - var indexOptions = new CreateIndexOptions { Background = true }; + var indexOptions = new CreateIndexOptions + { + // TTL cleanup: remove documents once expiresAt < now + ExpireAfter = TimeSpan.Zero, + }; var indexModel = new CreateIndexModel(indexKeys, indexOptions); - await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: cancellationToken).ConfigureAwait(false); + await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: CancellationToken.None).ConfigureAwait(false); } catch { - // Index might already exist, ignore errors + // Index may already exist, or server may reject options (e.g., conflicts). Ignore. } } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index 352c698c..ee8f96d8 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -1,4 +1,5 @@ using Medallion.Threading.Internal; +using MongoDB.Bson; using MongoDB.Driver; namespace Medallion.Threading.MongoDB; @@ -8,9 +9,8 @@ namespace Medallion.Threading.MongoDB; /// public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHandle { - private readonly string _collectionName; private readonly CancellationTokenSource _cts; - private readonly IMongoDatabase _database; + private readonly IMongoCollection _collection; private readonly Task _extensionTask; private readonly string _key; private readonly string _lockId; @@ -19,24 +19,22 @@ public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHand /// /// Implements /// - public CancellationToken HandleLostToken => _cts.Token; + public CancellationToken HandleLostToken => this._cts.Token; internal MongoDistributedLockHandle( - IMongoDatabase database, - string collectionName, + IMongoCollection collection, string key, string lockId, TimeoutValue expiry, TimeoutValue extensionCadence) { - _database = database; - _collectionName = collectionName; - _key = key; - _lockId = lockId; - _cts = new(); + this._collection = collection; + this._key = key; + this._lockId = lockId; + this._cts = new(); // Start background task to extend the lock - _extensionTask = ExtendLockAsync(expiry, extensionCadence, _cts.Token); + this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._cts.Token); } /// @@ -44,14 +42,16 @@ internal MongoDistributedLockHandle( /// public void Dispose() { - if (Interlocked.Exchange(ref _disposed, 1) is not 0) + if (Interlocked.Exchange(ref this._disposed, 1) is not 0) { return; } - _cts.Cancel(); + + this._cts.Cancel(); try { - _extensionTask.Wait(HandleLostToken); + // Do not use HandleLostToken here: it is backed by _cts and has been canceled above. + this._extensionTask.GetAwaiter().GetResult(); } catch { @@ -59,8 +59,15 @@ public void Dispose() } finally { - _cts.Dispose(); - ReleaseLockAsync(CancellationToken.None).AsTask().Wait(HandleLostToken); + this._cts.Dispose(); + try + { + this.ReleaseLockAsync(CancellationToken.None).AsTask().GetAwaiter().GetResult(); + } + catch + { + // Ignore errors during release + } } } @@ -69,12 +76,16 @@ public void Dispose() /// public async ValueTask DisposeAsync() { - if (Interlocked.Exchange(ref _disposed, 1) is 0) + if (Interlocked.Exchange(ref this._disposed, 1) is 0) { - _cts.Cancel(); +#if NET8_0_OR_GREATER + await this._cts.CancelAsync(); +#else + this._cts.Cancel(); +#endif try { - await _extensionTask.ConfigureAwait(false); + await this._extensionTask.ConfigureAwait(false); } catch { @@ -82,8 +93,8 @@ public async ValueTask DisposeAsync() } finally { - _cts.Dispose(); - await ReleaseLockAsync(CancellationToken.None).ConfigureAwait(false); + this._cts.Dispose(); + await this.ReleaseLockAsync(CancellationToken.None).ConfigureAwait(false); } } } @@ -95,17 +106,34 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa while (!cancellationToken.IsCancellationRequested) { await Task.Delay(extensionCadence.TimeSpan, cancellationToken).ConfigureAwait(false); - var collection = _database.GetCollection(_collectionName); - var filter = Builders.Filter.Eq(d => d.Id, _key) & Builders.Filter.Eq(d => d.LockId, _lockId); - var update = Builders.Update.Set(d => d.ExpiresAt, DateTime.UtcNow.Add(expiry.TimeSpan)); - var result = await collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + + // Use server time ($$NOW) for expiry to avoid client clock skew. + var newExpiresAt = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", "$$NOW" }, + { "unit", "millisecond" }, + { "amount", expiry.InMilliseconds } + } + ); + var update = new PipelineUpdateDefinition( + new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } + ); + + var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); // If we failed to extend, the lock was lost if (result.MatchedCount is not 0) { continue; } - _cts.Cancel(); +#if NET8_0_OR_GREATER + await this._cts.CancelAsync(); +#else + this._cts.Cancel(); +#endif break; } } @@ -116,7 +144,11 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa catch { // Lock extension failed, signal that the lock is lost - _cts.Cancel(); +#if NET8_0_OR_GREATER + await this._cts.CancelAsync(); +#else + this._cts.Cancel(); +#endif } } @@ -124,9 +156,8 @@ private async ValueTask ReleaseLockAsync(CancellationToken cancellationToken) { try { - var collection = _database.GetCollection(_collectionName); - var filter = Builders.Filter.Eq(d => d.Id, _key) & Builders.Filter.Eq(d => d.LockId, _lockId); - await collection.DeleteOneAsync(filter, cancellationToken).ConfigureAwait(false); + var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + await this._collection.DeleteOneAsync(filter, cancellationToken).ConfigureAwait(false); } catch { diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index 11abd24a..bfc80002 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -20,13 +20,13 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -78,8 +78,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -252,13 +252,13 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -301,8 +301,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -391,9 +391,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.21, )", - "resolved": "8.0.21", - "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -407,13 +407,13 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -459,8 +459,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 041eb72b..80b0048d 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -518,9 +518,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.21, )", - "resolved": "8.0.21", - "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 8fcb7525..9178bc4c 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -259,8 +259,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -523,7 +523,7 @@ "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", + "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -549,7 +549,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.0, )" + "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { @@ -629,13 +629,13 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 8d115faf..ad3986a5 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -763,8 +763,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -1088,7 +1088,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.0, )" + "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { @@ -1168,13 +1168,13 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -2100,8 +2100,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -2459,7 +2459,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.0, )" + "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { @@ -2546,13 +2546,13 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 0feb1eeb..83e81fa8 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -172,8 +172,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -482,7 +482,7 @@ "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", + "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -512,7 +512,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.0, )" + "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { @@ -592,13 +592,13 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", @@ -790,9 +790,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.21, )", - "resolved": "8.0.21", - "contentHash": "s8H5PZQs50OcNkaB6Si54+v3GWM7vzs6vxFRMlD3aXsbM+aPCtod62gmK0BYWou9diGzmo56j8cIf/PziijDqQ==" + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" }, "Azure.Core": { "type": "Transitive", @@ -964,8 +964,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.5.0", - "contentHash": "JGNK6BanLDEifgkvPLqVFCPus5EDCy416pxf1dxUBRSVd3D9+NB3AvMVX190eXlk5/UXuCxpsQv7jWfNKvppBQ==", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -1185,7 +1185,7 @@ "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", + "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" @@ -1211,7 +1211,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.0, )" + "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { @@ -1291,13 +1291,13 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.5.0, )", - "resolved": "3.5.0", - "contentHash": "ST90u7psyMkNNOWFgSkexsrB3kPn7Ynl2DlMFj2rJyYuc6SIxjmzu4ufy51yzM+cPVE1SvVcdb5UFobrRw6cMg==", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.0", + "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", "System.Buffers": "4.5.1", From e70c35c15700caf5ba1b8097d1cecaabfb8266c3 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 17 Dec 2025 18:18:04 +0800 Subject: [PATCH 344/399] fix: Ensure proper cancellation token usage with ConfigureAwait(false) --- src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index ee8f96d8..2c0b694f 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -79,7 +79,7 @@ public async ValueTask DisposeAsync() if (Interlocked.Exchange(ref this._disposed, 1) is 0) { #if NET8_0_OR_GREATER - await this._cts.CancelAsync(); + await this._cts.CancelAsync().ConfigureAwait(false); #else this._cts.Cancel(); #endif @@ -130,7 +130,7 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa continue; } #if NET8_0_OR_GREATER - await this._cts.CancelAsync(); + await this._cts.CancelAsync().ConfigureAwait(false); #else this._cts.Cancel(); #endif @@ -145,7 +145,7 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa { // Lock extension failed, signal that the lock is lost #if NET8_0_OR_GREATER - await this._cts.CancelAsync(); + await this._cts.CancelAsync().ConfigureAwait(false); #else this._cts.Cancel(); #endif From 2a7ad1581454d64dcdaec24e36a68e95668ce0c3 Mon Sep 17 00:00:00 2001 From: Joes Date: Mon, 5 Jan 2026 14:06:17 +0800 Subject: [PATCH 345/399] Supports Fencing Token and Adaptive Backoff, enhancing robustness This update introduces fencing tokens for MongoDB distributed locks. The token increments automatically upon successful lock acquisition and is exposed to the caller, facilitating idempotency and preventing concurrency issues caused by lock loss. A new UseAdaptiveBackoff configuration is added to support adaptive exponential backoff, improving performance and MongoDB's load handling in high-concurrency scenarios. The auto-renewal mechanism is more robust, supporting retries when encountering a MongoException. Distributed tracing diagnostics are integrated for .NET 8.0+. Compatibility and dependencies are updated to support net10.0. --- .../DistributedLock.MongoDB.csproj | 2 +- .../MongoDistributedLock.cs | 118 +++++++++++++- .../MongoDistributedLockHandle.cs | 67 ++++++-- ...istributedSynchronizationOptionsBuilder.cs | 22 ++- .../MongoLockDocument.cs | 6 + .../PublicAPI.Unshipped.txt | 4 +- .../packages.lock.json | 148 +++++++++--------- 7 files changed, 276 insertions(+), 91 deletions(-) diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 7259e5a4..07428793 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net472; + netstandard2.1;net8.0;net10.0;net472; Medallion.Threading.MongoDB True 4 diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index ab2e2554..d9faf44a 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -3,6 +3,10 @@ using MongoDB.Driver; using System.Collections.Concurrent; +#if NET8_0_OR_GREATER +using System.Diagnostics; +#endif + namespace Medallion.Threading.MongoDB; /// @@ -14,6 +18,13 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock + /// ActivitySource for distributed tracing and diagnostics + /// + private static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); +#endif + // We want to ensure indexes at most once per process per (db, collection) private static readonly ConcurrentDictionary> IndexInitializationTasks = new(StringComparer.Ordinal); @@ -53,6 +64,11 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { + if (this._options.UseAdaptiveBackoff) + { + return this.AdaptiveBusyWaitAsync(timeout, cancellationToken); + } + return BusyWaitHelper.WaitAsync(this, (@this, ct) => @this.TryAcquireAsync(ct), timeout, @@ -61,8 +77,77 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti cancellationToken); } + private async ValueTask AdaptiveBusyWaitAsync(TimeoutValue timeout, CancellationToken cancellationToken) + { + // Try immediately first + var result = await this.TryAcquireAsync(cancellationToken).ConfigureAwait(false); + if (result != null || timeout.IsZero) + { + return result; + } + + using var timeoutCts = timeout.IsInfinite ? null : new CancellationTokenSource(timeout.TimeSpan); + using var linkedCts = timeoutCts != null + ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token) + : null; + var effectiveToken = linkedCts?.Token ?? cancellationToken; + + var minMs = this._options.MinBusyWaitSleepTime.InMilliseconds; + var maxMs = this._options.MaxBusyWaitSleepTime.InMilliseconds; + var consecutiveFailures = 0; + const double BackoffMultiplier = 1.5; +#if NET8_0_OR_GREATER + var random = Random.Shared; +#else + var random = new Random(Guid.NewGuid().GetHashCode()); +#endif + + while (!effectiveToken.IsCancellationRequested) + { + // Exponential backoff with jitter + var backoffMs = minMs * Math.Pow(BackoffMultiplier, Math.Min(consecutiveFailures, 10)); + var sleepMs = Math.Min(backoffMs, maxMs); + // Add jitter (±20%) to prevent thundering herd + var jitter = (random.NextDouble() - 0.5) * 0.4 * sleepMs; + var finalSleepMs = Math.Max(minMs, sleepMs + jitter); + + try + { + await Task.Delay(TimeSpan.FromMilliseconds(finalSleepMs), effectiveToken).ConfigureAwait(false); + } + catch (OperationCanceledException) when (timeoutCts?.IsCancellationRequested == true && !cancellationToken.IsCancellationRequested) + { + // Timeout expired, try one last time + return await this.TryAcquireAsync(cancellationToken).ConfigureAwait(false); + } + + try + { + result = await this.TryAcquireAsync(effectiveToken).ConfigureAwait(false); + if (result != null) + { + return result; + } + consecutiveFailures++; + } + catch (OperationCanceledException) when (timeoutCts?.IsCancellationRequested == true && !cancellationToken.IsCancellationRequested) + { + return null; + } + } + + cancellationToken.ThrowIfCancellationRequested(); + return null; + } + private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { +#if NET8_0_OR_GREATER + using var activity = ActivitySource.StartActivity("MongoDistributedLock.TryAcquire"); + activity?.SetTag("lock.key", this.Key); + activity?.SetTag("lock.collection", this._collectionName); +#endif + var collection = this._database.GetCollection(this._collectionName); // Ensure indexes exist (TTL cleanup); do this at most once per process per (db, collection) @@ -88,13 +173,21 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti // Verify we actually got the lock if (result != null && result.LockId == lockId) { +#if NET8_0_OR_GREATER + activity?.SetTag("lock.acquired", true); + activity?.SetTag("lock.fencing_token", result.FencingToken); +#endif return new(collection, this.Key, lockId, + result.FencingToken, this._options.Expiry, this._options.ExtensionCadence); } +#if NET8_0_OR_GREATER + activity?.SetTag("lock.acquired", false); +#endif return null; } @@ -126,6 +219,16 @@ private static UpdateDefinition CreateAcquireUpdate(string lo } ); + // Increment fencing token only when acquiring a new lock + var newFencingToken = new BsonDocument( + "$add", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { "$fencingToken", 0L }), + 1L + } + ); + var setStage = new BsonDocument( "$set", new BsonDocument @@ -133,7 +236,8 @@ private static UpdateDefinition CreateAcquireUpdate(string lo // Only overwrite lock fields when the previous lock is expired/missing { "lockId", new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, "$lockId" }) }, { "expiresAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newExpiresAt, "$expiresAt" }) }, - { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, "$$NOW", "$acquiredAt" }) } + { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, "$$NOW", "$acquiredAt" }) }, + { "fencingToken", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newFencingToken, "$fencingToken" }) } } ); @@ -160,13 +264,21 @@ private static async Task CreateIndexesAsync(IMongoCollection { // TTL cleanup: remove documents once expiresAt < now ExpireAfter = TimeSpan.Zero, + Name = "expiresAt_ttl" }; var indexModel = new CreateIndexModel(indexKeys, indexOptions); await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: CancellationToken.None).ConfigureAwait(false); } - catch + catch (MongoCommandException ex) when ( + ex.CodeName is "IndexOptionsConflict" or "IndexKeySpecsConflict" or "IndexAlreadyExists") + { + // Index already exists with same or different options - this is acceptable. + // The existing index will still handle TTL cleanup. + } + catch (MongoException) { - // Index may already exist, or server may reject options (e.g., conflicts). Ignore. + // Other MongoDB errors (network, auth, etc.) - swallow to avoid blocking lock acquisition. + // The lock will still work correctly; TTL cleanup is a best-effort optimization. } } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index 2c0b694f..8bc704ba 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -21,16 +21,24 @@ public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHand /// public CancellationToken HandleLostToken => this._cts.Token; + /// + /// Gets the fencing token for this lock acquisition. This is a monotonically increasing value + /// that can be used to detect stale operations when working with external resources. + /// + public long FencingToken { get; } + internal MongoDistributedLockHandle( IMongoCollection collection, string key, string lockId, + long fencingToken, TimeoutValue expiry, TimeoutValue extensionCadence) { this._collection = collection; this._key = key; this._lockId = lockId; + this.FencingToken = fencingToken; this._cts = new(); // Start background task to extend the lock @@ -101,6 +109,9 @@ public async ValueTask DisposeAsync() private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCadence, CancellationToken cancellationToken) { + const int MaxConsecutiveFailures = 3; + var consecutiveFailures = 0; + try { while (!cancellationToken.IsCancellationRequested) @@ -122,19 +133,43 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } ); - var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + try + { + var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + + // If we successfully extended, reset failure count + if (result.MatchedCount is not 0) + { + consecutiveFailures = 0; + continue; + } - // If we failed to extend, the lock was lost - if (result.MatchedCount is not 0) + // Lock was truly lost (document doesn't exist or lockId changed) + await this.SignalLockLostAsync().ConfigureAwait(false); + break; + } + catch (OperationCanceledException) { - continue; + throw; // Propagate cancellation + } + catch (MongoException) when (++consecutiveFailures < MaxConsecutiveFailures) + { + // Transient network error, retry after a short delay + try + { + await Task.Delay(TimeSpan.FromMilliseconds(100 * consecutiveFailures), cancellationToken).ConfigureAwait(false); + } + catch (OperationCanceledException) + { + throw; + } + } + catch (MongoException) + { + // Too many consecutive failures, assume lock is lost + await this.SignalLockLostAsync().ConfigureAwait(false); + break; } -#if NET8_0_OR_GREATER - await this._cts.CancelAsync().ConfigureAwait(false); -#else - this._cts.Cancel(); -#endif - break; } } catch (OperationCanceledException) @@ -144,12 +179,18 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa catch { // Lock extension failed, signal that the lock is lost + await this.SignalLockLostAsync().ConfigureAwait(false); + } + } + + private async Task SignalLockLostAsync() + { #if NET8_0_OR_GREATER - await this._cts.CancelAsync().ConfigureAwait(false); + await this._cts.CancelAsync().ConfigureAwait(false); #else - this._cts.Cancel(); + this._cts.Cancel(); + await Task.CompletedTask.ConfigureAwait(false); #endif - } } private async ValueTask ReleaseLockAsync(CancellationToken cancellationToken) diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs index b021030d..5bb25e9b 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -15,6 +15,7 @@ public sealed class MongoDistributedSynchronizationOptionsBuilder private static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); private TimeoutValue? _expiry, _extensionCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; + private bool? _useAdaptiveBackoff; private MongoDistributedSynchronizationOptionsBuilder() { } @@ -73,6 +74,19 @@ public MongoDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan return this; } + /// + /// Enables adaptive exponential backoff for busy waiting. When enabled, the sleep time between + /// acquisition attempts will start at the minimum and exponentially increase towards the maximum + /// as consecutive failures occur, then reset on success. This reduces MongoDB load under high + /// contention while maintaining responsiveness when contention is low. + /// Defaults to false (random sleep time within the configured range). + /// + public MongoDistributedSynchronizationOptionsBuilder UseAdaptiveBackoff(bool enabled = true) + { + _useAdaptiveBackoff = enabled; + return this; + } + internal static MongoDistributedLockOptions GetOptions(Action? optionsBuilder) { MongoDistributedSynchronizationOptionsBuilder? options; @@ -104,7 +118,8 @@ internal static MongoDistributedLockOptions GetOptions(Action + /// Monotonically increasing fencing token for safe resource access + /// + [BsonElement("fencingToken")] + public long FencingToken { get; set; } + /// /// The lock name/key (MongoDB document ID) /// diff --git a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt index 815c9200..d521649e 100644 --- a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt @@ -1 +1,3 @@ -#nullable enable \ No newline at end of file +#nullable enable +Medallion.Threading.MongoDB.MongoDistributedLockHandle.FencingToken.get -> long +Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder.UseAdaptiveBackoff(bool enabled = true) -> Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder! \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index bfc80002..269aa23d 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -261,7 +261,6 @@ "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", - "System.Buffers": "4.5.1", "ZstdSharp.Port": "0.7.3" } }, @@ -293,8 +292,6 @@ "resolved": "5.0.0", "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", "System.Security.AccessControl": "5.0.0", "System.Security.Principal.Windows": "5.0.0" } @@ -304,7 +301,6 @@ "resolved": "3.5.2", "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { - "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -324,26 +320,6 @@ "System.Runtime.CompilerServices.Unsafe": "4.7.1" } }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", @@ -382,7 +358,7 @@ "type": "Project" } }, - "net8.0": { + "net10.0": { "Microsoft.CodeAnalysis.PublicApiAnalyzers": { "type": "Direct", "requested": "[3.3.4, )", @@ -391,9 +367,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.22, )", - "resolved": "8.0.22", - "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -416,17 +392,13 @@ "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", - "System.Buffers": "4.5.1", "ZstdSharp.Port": "0.7.3" } }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", - "dependencies": { - "Microsoft.Win32.Registry": "5.0.0" - } + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -438,33 +410,15 @@ "resolved": "2.0.0", "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "MongoDB.Bson": { "type": "Transitive", "resolved": "3.5.2", - "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==" }, "SharpCompress": { "type": "Transitive", @@ -476,34 +430,86 @@ "resolved": "1.0.0", "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" }, - "System.Buffers": { + "ZstdSharp.Port": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" }, - "System.Memory": { + "distributedlock.core": { + "type": "Project" + } + }, + "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "MongoDB.Driver": { + "type": "Direct", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.2", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "ZstdSharp.Port": "0.7.3" + } + }, + "DnsClient": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==" }, - "System.Runtime.CompilerServices.Unsafe": { + "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "System.Security.AccessControl": { + "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } + "resolved": "2.0.0", + "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" }, - "System.Security.Principal.Windows": { + "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==" + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" }, "ZstdSharp.Port": { "type": "Transitive", From 14b924d19828f1c134f10e77f077db17e9b9c08d Mon Sep 17 00:00:00 2001 From: Joes Date: Mon, 5 Jan 2026 14:18:12 +0800 Subject: [PATCH 346/399] remove dotnet 10 the current ci does not support. --- .../DistributedLock.MongoDB.csproj | 2 +- .../packages.lock.json | 148 +++++++++--------- 2 files changed, 72 insertions(+), 78 deletions(-) diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 07428793..7259e5a4 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net10.0;net472; + netstandard2.1;net8.0;net472; Medallion.Threading.MongoDB True 4 diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index 269aa23d..bfc80002 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -261,6 +261,7 @@ "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", + "System.Buffers": "4.5.1", "ZstdSharp.Port": "0.7.3" } }, @@ -292,6 +293,8 @@ "resolved": "5.0.0", "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", "System.Security.AccessControl": "5.0.0", "System.Security.Principal.Windows": "5.0.0" } @@ -301,6 +304,7 @@ "resolved": "3.5.2", "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", "dependencies": { + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, @@ -320,6 +324,26 @@ "System.Runtime.CompilerServices.Unsafe": "4.7.1" } }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", @@ -358,7 +382,7 @@ "type": "Project" } }, - "net10.0": { + "net8.0": { "Microsoft.CodeAnalysis.PublicApiAnalyzers": { "type": "Direct", "requested": "[3.3.4, )", @@ -367,9 +391,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ==" + "requested": "[8.0.22, )", + "resolved": "8.0.22", + "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -392,13 +416,17 @@ "MongoDB.Bson": "3.5.2", "SharpCompress": "0.30.1", "Snappier": "1.0.0", + "System.Buffers": "4.5.1", "ZstdSharp.Port": "0.7.3" } }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==" + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -410,15 +438,33 @@ "resolved": "2.0.0", "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, "MongoDB.Bson": { "type": "Transitive", "resolved": "3.5.2", - "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==" + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } }, "SharpCompress": { "type": "Transitive", @@ -430,86 +476,34 @@ "resolved": "1.0.0", "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" }, - "ZstdSharp.Port": { - "type": "Transitive", - "resolved": "0.7.3", - "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==" - }, - "distributedlock.core": { - "type": "Project" - } - }, - "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, - "Microsoft.NET.ILLink.Tasks": { - "type": "Direct", - "requested": "[8.0.22, )", - "resolved": "8.0.22", - "contentHash": "MhcMithKEiyyNkD2ZfbDZPmcOdi0GheGfg8saEIIEfD/fol3iHmcV8TsZkD4ZYz5gdUuoX4YtlVySUU7Sxl9SQ==" - }, - "Microsoft.SourceLink.GitHub": { - "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" - } - }, - "MongoDB.Driver": { - "type": "Direct", - "requested": "[3.5.2, )", - "resolved": "3.5.2", - "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", - "dependencies": { - "DnsClient": "1.6.1", - "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.2", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "ZstdSharp.Port": "0.7.3" - } - }, - "DnsClient": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==" - }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" - }, - "Microsoft.Extensions.Logging.Abstractions": { + "System.Buffers": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "Microsoft.SourceLink.Common": { + "System.Memory": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, - "MongoDB.Bson": { + "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "3.5.2", - "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, - "SharpCompress": { + "System.Security.AccessControl": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } }, - "Snappier": { + "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "ZstdSharp.Port": { "type": "Transitive", From 55c081a3c222cf927286e5c30abb1bc877b5ca44 Mon Sep 17 00:00:00 2001 From: Joes Date: Mon, 5 Jan 2026 15:43:22 +0800 Subject: [PATCH 347/399] feat: update docs --- src/DistributedLock.MongoDB/README.md | 414 ++++++++++++++++- src/DistributedLock.MongoDB/README.zh-CN.md | 478 ++++++++++++++++++++ 2 files changed, 871 insertions(+), 21 deletions(-) create mode 100644 src/DistributedLock.MongoDB/README.zh-CN.md diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md index 2cac9f0d..6a9ecc26 100644 --- a/src/DistributedLock.MongoDB/README.md +++ b/src/DistributedLock.MongoDB/README.md @@ -1,6 +1,6 @@ # DistributedLock.MongoDB -This library provides distributed lock implementation using MongoDB as the backing store. +Provides distributed lock implementation using MongoDB as the backing store. ## Installation @@ -8,9 +8,14 @@ This library provides distributed lock implementation using MongoDB as the backi dotnet add package DistributedLock.MongoDB ``` -## Usage +## APIs -### Basic Lock Usage +- The `MongoDistributedLock` class implements the `IDistributedLock` interface. +- The `MongoDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` interface. + +## Basic Usage + +### Creating and Acquiring a Lock ```csharp using Medallion.Threading.MongoDB; @@ -32,7 +37,27 @@ await using (var handle = await @lock.AcquireAsync()) // Lock is automatically released when disposed ``` -### Using the Provider +### TryAcquire + +While `AcquireAsync()` will block until the lock is available, there is also a `TryAcquireAsync()` variant which returns `null` if the lock could not be acquired: + +```csharp +await using (var handle = await @lock.TryAcquireAsync()) +{ + if (handle != null) + { + // Lock acquired successfully + } + else + { + // Someone else holds the lock + } +} +``` + +### Using the Provider Pattern + +For applications using dependency injection, the provider pattern makes it easy to separate lock configuration from its usage: ```csharp using Medallion.Threading.MongoDB; @@ -60,43 +85,390 @@ You can customize the lock behavior using the options builder: ```csharp var @lock = new MongoDistributedLock( - "myLockName", + "myLockName", database, options => options - .Expiry(TimeSpan.FromSeconds(30)) // Lock expiry time - .ExtensionCadence(TimeSpan.FromSeconds(10)) // How often to extend the lock - .BusyWaitSleepTime( // Sleep time between acquire attempts + .Expiry(TimeSpan.FromSeconds(30)) // How long the lock lasts before expiring + .ExtensionCadence(TimeSpan.FromSeconds(10)) // How often to extend the lock while held + .BusyWaitSleepTime( // Sleep time between acquire attempts min: TimeSpan.FromMilliseconds(10), max: TimeSpan.FromMilliseconds(800)) + .UseAdaptiveBackoff(true) // Exponential backoff under high contention ); ``` +#### Option Details + +- **Expiry**: Determines how long the lock will be held before automatic expiration. Because of automatic extension, locks can be held for much longer than this value. Defaults to 30 seconds. This is important for crash recovery—if a process crashes while holding a lock, other processes will need to wait at most this long to acquire it. + +- **ExtensionCadence**: How frequently the hold on the lock will be renewed to the full `Expiry` while the lock is actively held. Defaults to 1/3 of `Expiry` (approximately 10 seconds with default settings). + +- **BusyWaitSleepTime**: Specifies the range of time the implementation will sleep between attempts to acquire a lock that is currently held by another process. A random value in the range is chosen for each attempt to prevent thundering herd problems. Defaults to 10ms minimum and 800ms maximum. + +- **UseAdaptiveBackoff**: When enabled, uses exponential backoff instead of random sleep times under contention. This reduces MongoDB load during high contention periods while maintaining responsiveness when contention is low. Defaults to false. + ### Custom Collection Name -By default, locks are stored in a collection named "DistributedLocks". You can specify a custom collection name: +By default, locks are stored in a collection named `"DistributedLocks"`. You can specify a custom collection name: ```csharp +// Direct lock creation with custom collection var @lock = new MongoDistributedLock("myLockName", database, "MyCustomLocks"); + +// Provider with custom collection +var provider = new MongoDistributedSynchronizationProvider(database, "MyCustomLocks"); +``` + +## Architecture & Design + +### Lock Lifecycle Diagram + +```mermaid +stateDiagram-v2 + [*] --> Waiting: Create Lock + + Waiting --> Acquiring: Call AcquireAsync() + Waiting --> Expired: TTL Cleanup + + Acquiring --> Acquired: Successfully Acquired Lock + Acquiring --> Waiting: Lock Held by Others + + Acquired --> Extending: Background Extension Task + Extending --> Acquired: Extension Successful + Extending --> Lost: Extension Failed + + Acquired --> Releasing: Dispose Handle + Releasing --> Released: Lock Document Deleted + + Lost --> [*]: HandleLostToken Signaled + Released --> [*]: Lock Released + Expired --> [*]: Stale Lock Cleaned Up +``` + +### Lock Acquisition Process + +```mermaid +flowchart TD + A["Client Requests Lock"] --> B["Call FindOneAndUpdateAsync"] + B --> C{"Lock Document Exists?"} + + C -->|Yes| D{"Document Expired?"} + C -->|No| E["Create New Lock"] + + D -->|Yes| F["Replace Old Lock"] + D -->|No| G["Lock Held by Other Process"] + + E --> H["Set LockId = GUID"] + F --> H + + H --> I["Set expiresAt = Now + Expiry"] + I --> J["Set acquiredAt = Now"] + J --> K["Increment fencingToken"] + K --> L["Verify Our LockId"] + + L --> M{"LockId Matches?"} + M -->|Yes| N["✅ Lock Acquired"] + M -->|No| O["❌ Another Process Won Race"] + + G --> P["Sleep Random Time"] + O --> P + P --> Q["Retry Acquire"] + Q --> B + + N --> R["Start Background Extension Task"] + R --> S["Return LockHandle"] +``` + +### Component Architecture + +```mermaid +graph TB + Client["Client Code"] + Lock["MongoDistributedLock"] + Provider["MongoDistributedSynchronizationProvider"] + Options["MongoDistributedSynchronizationOptionsBuilder"] + Handle["MongoDistributedLockHandle"] + + MongoDB[("MongoDB Database")] + Collection["DistributedLocks Collection"] + TTLIndex["TTL Index on expiresAt"] + + Client -->|Creates| Lock + Client -->|Uses| Provider + Provider -->|Creates| Lock + Lock -->|Configured by| Options + Lock -->|Returns| Handle + Handle -->|Manages| Lock + + Lock -->|Reads/Writes| MongoDB + Handle -->|Auto-extends via| Lock + + MongoDB -->|Contains| Collection + Collection -->|Has| TTLIndex + TTLIndex -->|Cleans up| Collection + + style MongoDB fill:#13aa52 + style Collection fill:#3fa796 + style TTLIndex fill:#5fbf8c + style Handle fill:#ffa500 + style Lock fill:#4a90e2 +``` + +### Lock State Machine (Single Document in MongoDB) + +```mermaid +graph LR + NonExistent["Document Doesn't Exist"] + Active["Active Lock by Process A"] + Extending["Auto-Extending by Process A"] + Expired["Expired (expiresAt < now)"] + Deleted["Deleted"] + + NonExistent -->|Acquire Attempt| Active + Active -->|Background Task| Extending + Extending -->|Success| Active + Extending -->|Failure| Expired + Active -->|Release| Deleted + Expired -->|Other Process Acquires| Active + Expired -->|TTL Cleanup| Deleted + + style Active fill:#90EE90 + style Extending fill:#87CEEB + style Expired fill:#FFB6C1 + style Deleted fill:#D3D3D3 ``` ## How It Works -The MongoDB distributed lock uses MongoDB's document upsert and update operations to implement distributed locking: +MongoDB distributed locks use MongoDB's atomic document operations to implement safe, distributed locking: + +### Acquisition Algorithm + +The lock acquisition uses a single `FindOneAndUpdateAsync` operation with an aggregation pipeline to atomically: + +1. Check if the lock document exists and is expired +2. If expired or missing, acquire the lock by: + - Setting a unique `lockId` (GUID) + - Recording the `acquiredAt` timestamp + - Setting the `expiresAt` time based on the configured expiry + - Incrementing the `fencingToken` for ordering guarantees +3. If still held by another process, leave it unchanged + +The fencing token ensures that even if a lock holder loses its connection, any operations it performs using that token will be safely rejected. + +### Lock Maintenance -1. **Acquisition**: Attempts to insert or update a document with the lock key and a unique lock ID -2. **Extension**: Automatically extends the lock expiry while held to prevent timeout -3. **Release**: Deletes the lock document when disposed -4. **Expiry**: Locks automatically expire if not extended, allowing recovery from crashed processes +Once acquired, the lock is automatically extended in the background at the configured `ExtensionCadence` to prevent premature expiration while the process is still running. + +### Release + +The lock is released by deleting the lock document when the handle is disposed. + +### Stale Lock Cleanup + +A TTL (Time-To-Live) index on the `expiresAt` field ensures MongoDB automatically removes expired lock documents. This provides automatic cleanup of stale locks from crashed or disconnected processes without requiring manual intervention. ## Features -- ✅ Async/await support -- ✅ Automatic lock extension while held -- ✅ Configurable expiry and extension cadence -- ✅ Lock abandonment protection via expiry -- ✅ `CancellationToken` support -- ✅ Handle lost token notification -- ✅ Multi-target support: .NET 8, .NET Standard 2.1, .NET Framework 4.7.2 +- ✅ Async/await support with `async`/`await` and `await using` +- ✅ Automatic lock extension while held to prevent premature expiration +- ✅ Configurable expiry, extension cadence, and wait behavior +- ✅ Crash recovery via automatic lock expiration +- ✅ `CancellationToken` support for cooperative cancellation +- ✅ `HandleLostToken` notifications for detecting connection loss or lock theft +- ✅ Fencing tokens for distributed safety guarantees +- ✅ Adaptive backoff strategy for high-contention scenarios +- ✅ Atomic operations prevent race conditions +- ✅ Multi-framework support: .NET Standard 2.1, .NET 8, .NET Framework 4.7.2 + +## Multi-Process Lock Interaction + +The following diagram shows how multiple processes interact with the same lock: + +```mermaid +sequenceDiagram + participant PA as Process A + participant PB as Process B + participant DB as MongoDB + + PA->>DB: FindOneAndUpdateAsync (try acquire) + Note over PA,DB: expiresAt < now or missing + DB->>PA: ✅ Lock Acquired (lockId=UUID-A, token=1) + + PB->>DB: FindOneAndUpdateAsync (try acquire) + Note over PB,DB: expiresAt > now (held by A) + DB->>PB: ❌ Lock Not Acquired + + PB->>PB: Wait & Retry (exponential backoff) + + PA->>PA: Background: ExtensionCadence timer + PA->>DB: Update: Extend expiresAt += Expiry + DB->>PA: ✅ Extension Successful + + PA->>PA: Do Critical Work + + PB->>DB: FindOneAndUpdateAsync (retry) + DB->>PB: ❌ Still held by A + PB->>PB: Wait & Retry + + PA->>PA: Dispose Handle + PA->>DB: Delete Lock Document + DB->>PA: ✅ Deleted + + PB->>DB: FindOneAndUpdateAsync (retry) + Note over PB,DB: Document missing (A released) + DB->>PB: ✅ Lock Acquired (lockId=UUID-B, token=2) + PB->>PB: Do Critical Work +``` + +## Implementation Behaviors + +### Lock Extension Failures + +Lock extension happens automatically in the background at the specified `ExtensionCadence`. If extension fails (due to network issues, MongoDB connectivity problems, or the lock being stolen), the `HandleLostToken` will be signaled. Always monitor this token in critical sections: + +```csharp +await using (var handle = await @lock.AcquireAsync()) +{ + // Monitor for lock loss + var lostTokenTask = handle.HandleLostToken; + + // Do work with timeout + var completedTask = await Task.WhenAny( + lostTokenTask, + DoWorkAsync()); + + if (completedTask == lostTokenTask) + { + // Lock was lost! + throw new InvalidOperationException("Lock was lost during operation"); + } +} +``` + +### Lock Collection Management + +The lock collection is automatically created on first use. A TTL index is created on the `expiresAt` field with the configuration: + +- **Index Name**: `expiresAt_ttl` +- **Behavior**: MongoDB automatically removes documents once `expiresAt < now` + +This index is created at most once per process per (database, collection) pair. Errors during index creation do not block lock acquisition. + +### Timeout Support + +All acquire methods support optional timeout parameters: + +```csharp +// Acquire with 5-second timeout +var handle = await @lock.AcquireAsync(TimeSpan.FromSeconds(5)); + +// TryAcquire with 5-second timeout (returns null on timeout) +var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(5)); +``` + +## Safety Guarantees + +- **Atomicity**: Lock acquisition, extension, and release use atomic MongoDB operations +- **Fencing**: Fencing tokens prevent operations from processes that lost their locks +- **Crash Recovery**: Automatic expiration ensures locks are eventually released even if the holder crashes +- **No Thundering Herd**: Random and adaptive backoff prevents synchronized clients from overwhelming the database + +### Fencing Token Mechanism + +The fencing token ensures that even if a process loses its lock (due to network partition, crash, or timeout), it cannot perform operations on protected resources: + +```mermaid +sequenceDiagram + participant PA as Process A + participant Resource as Protected Resource + participant DB as MongoDB Lock + + PA->>DB: Acquire Lock → token=1 + DB->>PA: ✅ Granted + + PA->>Resource: Operation with token=1 + Resource->>Resource: Accept (token >= last_seen) + + Note over DB: Network Partition + + PB->>DB: Acquire Lock → token=2 + DB->>PB: ✅ Granted + + PB->>Resource: Operation with token=2 + Resource->>Resource: Accept (token >= last_seen) + + PA->>Resource: Operation with token=1 (stale) + Resource->>Resource: Reject ❌ (token < last_seen) +``` + +This mechanism prevents the "split brain" scenario where two processes both believe they hold the lock. + +## Performance Considerations + +- Lock acquisition requires 1-2 MongoDB operations (1 for acquisition, potentially 1 for index creation on first use) +- Lock extension happens in the background at `ExtensionCadence` intervals +- Under contention, adaptive backoff reduces the load on MongoDB compared to fixed random intervals +- The `expiresAt` TTL index keeps the collection clean without manual maintenance + +## Adaptive Backoff Strategy + +When contention is high, the adaptive backoff strategy exponentially increases the wait time between acquisition attempts: + +```mermaid +graph TD + A["Attempt to Acquire"] --> B{"Lock Available?"} + B -->|Yes| C["✅ Acquired"] + B -->|No| D["Consecutive Failures: N"] + + D --> E["Sleep Time = min * 1.5^N"] + E --> F["Add Random Jitter ±20%"] + F --> G["Wait: max(min, sleepTime + jitter)"] + G --> H["Retry"] + H --> A + + C --> I["Reset Failure Counter"] + + style C fill:#90EE90 + style E fill:#FFD700 + style F fill:#FFA500 +``` + +### Backoff Comparison Chart + +#### Low Contention Scenario + +| Attempt # | Strategy | Sleep Duration | Notes | +| --------- | -------- | -------------- | ------------------ | +| 1st | Random | 234ms | Unpredictable | +| 2nd | Random | 567ms | Unpredictable | +| 3rd | Random | 45ms | Unpredictable | +| 4th | Random | 689ms | Unpredictable | +| 1st | Adaptive | 10ms | Responsive | +| 2nd | Adaptive | 15ms | Exponential growth | +| 3rd | Adaptive | 22ms | Controlled backoff | +| 4th | Adaptive | 33ms | Still responsive | + +#### High Contention Scenario + +| Attempt # | Strategy | Sleep Duration | Impact | +| --------- | -------- | -------------- | -------------------------- | +| 1st | Random | 234ms | Constant high load | +| 2nd | Random | 567ms | Constant high load | +| 3rd | Random | 45ms | Constant high load | +| 4th | Random | 689ms | Constant high load | +| 1st | Adaptive | 10ms | Starts responsive | +| 2nd | Adaptive | 15ms | Progressive backoff | +| 3rd | Adaptive | 22ms | Reduces MongoDB load | +| 4th | Adaptive | 150ms | Significantly reduces load | + +**Key Advantage**: Adaptive backoff automatically adjusts to contention level, providing better resource utilization + +## Framework Support + +- **.NET Standard 2.1** and higher +- **.NET 8** and higher +- **.NET Framework 4.7.2** and higher ## Notes diff --git a/src/DistributedLock.MongoDB/README.zh-CN.md b/src/DistributedLock.MongoDB/README.zh-CN.md new file mode 100644 index 00000000..bb892c84 --- /dev/null +++ b/src/DistributedLock.MongoDB/README.zh-CN.md @@ -0,0 +1,478 @@ +# DistributedLock.MongoDB + +基于 MongoDB 的分布式锁实现。 + +## 安装 + +```bash +dotnet add package DistributedLock.MongoDB +``` + +## 接口 + +- `MongoDistributedLock` 类实现了 `IDistributedLock` 接口。 +- `MongoDistributedSynchronizationProvider` 类实现了 `IDistributedLockProvider` 接口。 + +## 基本用法 + +### 创建并获取锁 + +```csharp +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + +// 创建 MongoDB 客户端和数据库 +var client = new MongoClient("mongodb://localhost:27017"); +var database = client.GetDatabase("myDatabase"); + +// 创建锁 +var @lock = new MongoDistributedLock("myLockName", database); + +// 获取锁 +await using (var handle = await @lock.AcquireAsync()) +{ + // 受锁保护的关键代码段 + Console.WriteLine("已获取锁!"); +} +// 释放锁 +``` + +### TryAcquire（尝试获取） + +`AcquireAsync()` 会一直阻塞直到获取锁，而 `TryAcquireAsync()` 则会在无法获取锁时返回 `null`： + +```csharp +await using (var handle = await @lock.TryAcquireAsync()) +{ + if (handle != null) + { + // 成功获取锁 + } + else + { + // 其他进程持有锁 + } +} +``` + +### 使用提供者模式 + +对于使用依赖注入的应用，提供者模式使得锁配置与使用分离变得容易： + +```csharp +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + +var client = new MongoClient("mongodb://localhost:27017"); +var database = client.GetDatabase("myDatabase"); + +// 创建提供者 +var provider = new MongoDistributedSynchronizationProvider(database); + +// 使用提供者创建不同名称的锁 +var lock1 = provider.CreateLock("lock1"); +var lock2 = provider.CreateLock("lock2"); + +await using (var handle = await lock1.AcquireAsync()) +{ + // 使用 lock1 进行工作... +} +``` + +### 配置选项 + +您可以使用选项构建器自定义锁的行为： + +```csharp +var @lock = new MongoDistributedLock( + "myLockName", + database, + options => options + .Expiry(TimeSpan.FromSeconds(30)) // 锁过期前的持续时间 + .ExtensionCadence(TimeSpan.FromSeconds(10)) // 持有时自动续期的频率 + .BusyWaitSleepTime( // 获取尝试之间的睡眠时间 + min: TimeSpan.FromMilliseconds(10), + max: TimeSpan.FromMilliseconds(800)) + .UseAdaptiveBackoff(true) // 高竞争下的指数退避 +); +``` + +#### 选项详解 + +- **Expiry（过期时间）**：确定锁在自动过期前将被持有多长时间。由于自动续期的存在，锁可以被持有远比这个值更长的时间。默认为 30 秒。这对于崩溃恢复很重要——如果进程在持有锁时崩溃，其他进程最多需要等待这么长时间才能获取锁。 + +- **ExtensionCadence（续期节奏）**：当锁被主动持有时，将锁的保持时间续期到完整的 `Expiry` 的频率。默认为 `Expiry` 的 1/3（使用默认设置时约 10 秒）。 + +- **BusyWaitSleepTime（忙等待睡眠时间）**：指定实现在尝试获取当前由另一个进程持有的锁时，将在两次尝试之间睡眠的时间范围。每次尝试都会从范围内随机选择一个值，以防止"羊群效应"问题。默认最小 10ms，最大 800ms。 + +- **UseAdaptiveBackoff（自适应退避）**：启用后，在竞争时使用指数退避而非随机睡眠时间。这在高竞争期间减少了 MongoDB 负载，同时在竞争低时保持了响应性。默认为 false。 + +### 自定义集合名称 + +默认情况下，锁存储在名为 `"DistributedLocks"` 的集合中。您可以指定自定义集合名称： + +```csharp +// 直接创建锁并使用自定义集合 +var @lock = new MongoDistributedLock("myLockName", database, "MyCustomLocks"); + +// 使用自定义集合的提供者 +var provider = new MongoDistributedSynchronizationProvider(database, "MyCustomLocks"); +``` + +## 架构与设计 + +### 锁生命周期图 + +```mermaid +stateDiagram-v2 + [*] --> 等待中: 创建锁 + + 等待中 --> 获取中: 调用 AcquireAsync() + 等待中 --> 已过期: TTL 清理 + + 获取中 --> 已获取: 成功获取锁 + 获取中 --> 等待中: 锁被其他进程持有 + + 已获取 --> 续期中: 后台续期任务 + 续期中 --> 已获取: 续期成功 + 续期中 --> 丢失: 续期失败 + + 已获取 --> 释放中: 释放 Handle + 释放中 --> 已释放: 锁文档被删除 + + 丢失 --> [*]: HandleLostToken 信号 + 已释放 --> [*]: 锁已释放 + 已过期 --> [*]: 陈旧锁被清理 +``` + +### 锁获取流程 + +```mermaid +flowchart TD + A["客户端请求锁"] --> B["调用 FindOneAndUpdateAsync"] + B --> C{"锁文档存在?"} + + C -->|是| D{"文档已过期?"} + C -->|否| E["创建新锁"] + + D -->|是| F["替换旧锁"] + D -->|否| G["锁由其他进程持有"] + + E --> H["设置 LockId = GUID"] + F --> H + + H --> I["设置 expiresAt = Now + Expiry"] + I --> J["设置 acquiredAt = Now"] + J --> K["递增 fencingToken"] + K --> L["验证 LockId"] + + L --> M{"LockId匹配?"} + M -->|是| N["✅ 锁已获取"] + M -->|否| O["❌ 其他进程赢得竞争"] + + G --> P["随机睡眠"] + O --> P + P --> Q["重试获取"] + Q --> B + + N --> R["启动后台续期任务"] + R --> S["返回 LockHandle"] +``` + +### 组件架构 + +```mermaid +graph TB + Client["客户端代码"] + Lock["MongoDistributedLock"] + Provider["MongoDistributedSynchronizationProvider"] + Options["MongoDistributedSynchronizationOptionsBuilder"] + Handle["MongoDistributedLockHandle"] + + MongoDB[("MongoDB 数据库")] + Collection["DistributedLocks 集合"] + TTLIndex["expiresAt 上的 TTL 索引"] + + Client -->|创建| Lock + Client -->|使用| Provider + Provider -->|创建| Lock + Lock -->|配置| Options + Lock -->|返回| Handle + Handle -->|管理| Lock + + Lock -->|读/写| MongoDB + Handle -->|自动续期| Lock + + MongoDB -->|包含| Collection + Collection -->|拥有| TTLIndex + TTLIndex -->|清理| Collection + + style MongoDB fill:#13aa52 + style Collection fill:#3fa796 + style TTLIndex fill:#5fbf8c + style Handle fill:#ffa500 + style Lock fill:#4a90e2 +``` + +### 锁状态机（MongoDB 中的单个文档） + +```mermaid +graph LR + NonExistent["文档不存在"] + Active["活跃锁由进程 A 持有"] + Extending["自动续期由进程 A"] + Expired["已过期(expiresAt < now)"] + Deleted["已删除"] + + NonExistent -->|获取尝试| Active + Active -->|后台任务| Extending + Extending -->|成功| Active + Extending -->|失败| Expired + Active -->|释放| Deleted + Expired -->|其他进程获取| Active + Expired -->|TTL 清理| Deleted + + style Active fill:#90EE90 + style Extending fill:#87CEEB + style Expired fill:#FFB6C1 + style Deleted fill:#D3D3D3 +``` + +## 工作原理 + +MongoDB 分布式锁使用 MongoDB 的原子文档操作来实现安全的分布式锁定： + +### 获取算法 + +锁获取使用单个 `FindOneAndUpdateAsync` 操作和聚合管道来原子地： + +1. 检查锁文档是否存在且是否已过期 +2. 如果已过期或不存在，通过以下方式获取锁： + - 设置唯一的 `lockId`（GUID） + - 记录 `acquiredAt` 时间戳 + - 根据配置的过期时间设置 `expiresAt` + - 递增 `fencingToken` 以获得排序保证 +3. 如果仍由另一个进程持有，则保持不变 + +围栏令牌（fencing token）确保即使锁持有者失去连接，它执行的任何使用该令牌的操作都会被安全拒绝。 + +### 锁维护 + +获取后，锁会按照配置的 `ExtensionCadence` 在后台自动续期，以防止进程运行时过早过期。 + +### 释放 + +当处理被释放时，通过删除锁文档来释放锁。 + +### 陈旧锁清理 + +`expiresAt` 字段上的 TTL（生存时间）索引确保 MongoDB 自动删除已过期的锁文档。这提供了对来自崩溃或断开连接进程的陈旧锁的自动清理，无需手动干预。 + +## 特性 + +- ✅ 异步/等待支持（`async`/`await` 和 `await using`） +- ✅ 在持有时自动续期锁以防止过早过期 +- ✅ 可配置的过期时间、续期节奏和等待行为 +- ✅ 通过自动过期实现崩溃恢复 +- ✅ `CancellationToken` 支持协作取消 +- ✅ `HandleLostToken` 通知以检测连接丢失或锁被盗 +- ✅ 围栏令牌提供分布式安全保证 +- ✅ 高竞争场景的自适应退避策略 +- ✅ 原子操作防止竞态条件 +- ✅ 多框架支持：.NET Standard 2.1、.NET 8、.NET Framework 4.7.2 + +## 多进程锁交互 + +下图展示多个进程如何与同一个锁交互： + +```mermaid +sequenceDiagram + participant PA as 进程 A + participant PB as 进程 B + participant DB as MongoDB + + PA->>DB: FindOneAndUpdateAsync (尝试获取) + Note over PA,DB: expiresAt < now 或不存在 + DB->>PA: ✅ 锁已获取 (lockId=UUID-A, token=1) + + PB->>DB: FindOneAndUpdateAsync (尝试获取) + Note over PB,DB: expiresAt > now (由 A 持有) + DB->>PB: ❌ 未能获取锁 + + PB->>PB: 等待 & 重试 (指数退避) + + PA->>PA: 后台: ExtensionCadence 计时器 + PA->>DB: 更新: 续期 expiresAt += Expiry + DB->>PA: ✅ 续期成功 + + PA->>PA: 执行关键工作 + + PB->>DB: FindOneAndUpdateAsync (重试) + DB->>PB: ❌ 仍由 A 持有 + PB->>PB: 等待 & 重试 + + PA->>PA: 释放 Handle + PA->>DB: 删除锁文档 + DB->>PA: ✅ 已删除 + + PB->>DB: FindOneAndUpdateAsync (重试) + Note over PB,DB: 文档缺失 (A 已释放) + DB->>PB: ✅ 锁已获取 (lockId=UUID-B, token=2) + PB->>PB: 执行关键工作 +``` + +## 实现行为 + +### 锁续期失败 + +锁续期在后台按指定的 `ExtensionCadence` 自动进行。如果续期失败（由于网络问题、MongoDB 连接问题或锁被盗），`HandleLostToken` 将被触发。始终在关键代码段中监控此令牌： + +```csharp +await using (var handle = await @lock.AcquireAsync()) +{ + // 监控锁丢失 + var lostTokenTask = handle.HandleLostToken; + + // 进行工作，带有超时 + var completedTask = await Task.WhenAny( + lostTokenTask, + DoWorkAsync()); + + if (completedTask == lostTokenTask) + { + // 锁丢失了！ + throw new InvalidOperationException("操作期间锁被丢失"); + } +} +``` + +### 锁集合管理 + +锁集合在首次使用时自动创建。在 `expiresAt` 字段上创建 TTL 索引，配置如下： + +- **索引名称**：`expiresAt_ttl` +- **行为**：一旦 `expiresAt < now`，MongoDB 自动删除文档 + +此索引每个进程每个 (数据库, 集合) 对最多创建一次。索引创建期间的错误不会阻止锁获取。 + +### 超时支持 + +所有获取方法都支持可选的超时参数： + +```csharp +// 获取锁并设置 5 秒超时 +var handle = await @lock.AcquireAsync(TimeSpan.FromSeconds(5)); + +// TryAcquire 设置 5 秒超时（超时时返回 null） +var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(5)); +``` + +## 安全保证 + +- **原子性**：锁获取、续期和释放使用原子 MongoDB 操作 +- **围栏**：围栏令牌防止丢失锁的进程执行操作 +- **崩溃恢复**：自动过期确保锁最终被释放，即使持有者崩溃 +- **无羊群效应**：随机和自适应退避防止同步的客户端使 MongoDB 过载 + +### 围栏令牌机制 + +围栏令牌确保即使进程失去其锁（由于网络分区、崩溃或超时），它也无法对受保护的资源执行操作： + +```mermaid +sequenceDiagram + participant PA as 进程 A + participant Resource as 受保护资源 + participant DB as MongoDB 锁 + + PA->>DB: 获取锁 → token=1 + DB->>PA: ✅ 已授予 + + PA->>Resource: 操作 token=1 + Resource->>Resource: 接受 (token >= last_seen) + + Note over DB: 网络分区 + + PB->>DB: 获取锁 → token=2 + DB->>PB: ✅ 已授予 + + PB->>Resource: 操作 token=2 + Resource->>Resource: 接受 (token >= last_seen) + + PA->>Resource: 操作 token=1 (已过期) + Resource->>Resource: 拒绝 ❌ (token < last_seen) +``` + +这个机制防止了"脑裂"场景，即两个进程都认为它们持有锁。 + +## 性能考虑 + +- 锁获取需要 1-2 个 MongoDB 操作（1 个用于获取，首次使用时可能 1 个用于索引创建） +- 锁续期在后台按 `ExtensionCadence` 间隔进行 +- 在竞争下，自适应退避相比固定随机间隔减少了对 MongoDB 的负载 +- `expiresAt` TTL 索引保持集合整洁，无需手动维护 + +## 自适应退避策略 + +当竞争高时，自适应退避策略会指数级增加获取尝试之间的等待时间： + +```mermaid +graph TD + A["尝试获取"] --> B{"锁可用?"} + B -->|是| C["✅ 已获取"] + B -->|否| D["连续失败: N 次"] + + D --> E["睡眠时间 = min * 1.5^N"] + E --> F["添加随机抖动 ±20%"] + F --> G["等待: max(min, sleepTime + jitter)"] + G --> H["重试"] + H --> A + + C --> I["重置失败计数"] + + style C fill:#90EE90 + style E fill:#FFD700 + style F fill:#FFA500 +``` + +### 退避对比图 + +#### 低竞争场景 + +| 尝试次数 | 策略 | 睡眠时间 | 备注 | +| -------- | ------ | -------- | ---------- | +| 第 1 次 | 随机 | 234ms | 不可预测 | +| 第 2 次 | 随机 | 567ms | 不可预测 | +| 第 3 次 | 随机 | 45ms | 不可预测 | +| 第 4 次 | 随机 | 689ms | 不可预测 | +| 第 1 次 | 自适应 | 10ms | 响应快 | +| 第 2 次 | 自适应 | 15ms | 指数增长 | +| 第 3 次 | 自适应 | 22ms | 控制退避 | +| 第 4 次 | 自适应 | 33ms | 仍然响应快 | + +#### 高竞争场景 + +| 尝试次数 | 策略 | 睡眠时间 | 影响 | +| -------- | ------ | -------- | ----------------- | +| 第 1 次 | 随机 | 234ms | 恒定高负载 | +| 第 2 次 | 随机 | 567ms | 恒定高负载 | +| 第 3 次 | 随机 | 45ms | 恒定高负载 | +| 第 4 次 | 随机 | 689ms | 恒定高负载 | +| 第 1 次 | 自适应 | 10ms | 开始响应快 | +| 第 2 次 | 自适应 | 15ms | 逐步退避 | +| 第 3 次 | 自适应 | 22ms | 减少 MongoDB 负载 | +| 第 4 次 | 自适应 | 150ms | 显著减少负载 | + +**关键优势**：自适应退避根据竞争水平自动调整，提供更好的资源利用率 + +## 框架支持 + +- **.NET Standard 2.1** 及更高版本 +- **.NET 8** 及更高版本 +- **.NET Framework 4.7.2** 及更高版本 + +## 备注 + +- 锁集合将在 `expiresAt` 字段上有一个索引，用于高效查询 +- 锁续期在后台自动进行 +- 如果锁续期失败，`HandleLostToken` 将被触发 +- 来自崩溃进程的陈旧锁将根据过期设置自动过期 From c01cc8311f65c29a2b5da084782717a1671dad18 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 7 Jan 2026 11:22:01 +0800 Subject: [PATCH 348/399] fix: collection name and diagnostics --- src/Directory.Packages.props | 1 + src/DistributedLock.Azure/packages.lock.json | 114 ++++++------- .../DistributedLock.MongoDB.csproj | 4 + .../MongoDistributedLock.cs | 22 +-- .../packages.lock.json | 60 ++++--- src/DistributedLock.MySql/packages.lock.json | 119 ++++++------- src/DistributedLock.Oracle/packages.lock.json | 73 ++++---- .../packages.lock.json | 119 ++++++------- .../packages.lock.json | 114 ++++++------- src/DistributedLock.Tests/packages.lock.json | 18 +- src/DistributedLock/packages.lock.json | 161 +++++++++--------- src/DistributedLockTaker/packages.lock.json | 62 +++---- 12 files changed, 424 insertions(+), 443 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index c8bdc85e..f24895dc 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -22,6 +22,7 @@ + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index f491b7e4..d8dfd66d 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -79,17 +79,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.IO.Hashing": { "type": "Transitive", @@ -102,12 +93,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -129,13 +120,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -217,6 +208,16 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -300,17 +301,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.IO.Hashing": { "type": "Transitive", @@ -323,12 +315,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -342,13 +334,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -395,6 +387,16 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, ".NETStandard,Version=v2.1": { @@ -470,15 +472,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IO.Hashing": { "type": "Transitive", "resolved": "6.0.0", @@ -490,13 +483,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Memory.Data": { "type": "Transitive", @@ -514,8 +502,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -546,6 +534,16 @@ }, "distributedlock.core": { "type": "Project" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } } } diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 7259e5a4..18a50aeb 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -44,6 +44,10 @@ TRACE;DEBUG + + + + diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index d9faf44a..85fe0f82 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -2,10 +2,7 @@ using MongoDB.Bson; using MongoDB.Driver; using System.Collections.Concurrent; - -#if NET8_0_OR_GREATER using System.Diagnostics; -#endif namespace Medallion.Threading.MongoDB; @@ -18,14 +15,12 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock /// ActivitySource for distributed tracing and diagnostics /// private static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); -#endif - // We want to ensure indexes at most once per process per (db, collection) + // We want to ensure indexes are created at most once per process per (database, collection) private static readonly ConcurrentDictionary> IndexInitializationTasks = new(StringComparer.Ordinal); private readonly string _collectionName; @@ -44,10 +39,10 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock /// Constructs a lock named using the provided and . - /// The locks will be stored in a collection named "DistributedLocks" by default. + /// The locks will be stored in a collection named "distributedLocks" by default. /// public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) - : this(key, database, "DistributedLocks", options) { } + : this(key, database, "distributedLocks", options) { } /// /// Constructs a lock named using the provided , , and @@ -142,11 +137,9 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { -#if NET8_0_OR_GREATER using var activity = ActivitySource.StartActivity("MongoDistributedLock.TryAcquire"); activity?.SetTag("lock.key", this.Key); activity?.SetTag("lock.collection", this._collectionName); -#endif var collection = this._database.GetCollection(this._collectionName); @@ -173,10 +166,8 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti // Verify we actually got the lock if (result != null && result.LockId == lockId) { -#if NET8_0_OR_GREATER activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); -#endif return new(collection, this.Key, lockId, @@ -184,10 +175,7 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti this._options.Expiry, this._options.ExtensionCadence); } - -#if NET8_0_OR_GREATER activity?.SetTag("lock.acquired", false); -#endif return null; } @@ -234,7 +222,7 @@ private static UpdateDefinition CreateAcquireUpdate(string lo new BsonDocument { // Only overwrite lock fields when the previous lock is expired/missing - { "lockId", new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, "$lockId" }) }, + { nameof(lockId), new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, "$lockId" }) }, { "expiresAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newExpiresAt, "$expiresAt" }) }, { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, "$$NOW", "$acquiredAt" }) }, { "fencingToken", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newFencingToken, "$fencingToken" }) } @@ -251,7 +239,7 @@ private static Task EnsureIndexesCreatedAsync(IMongoCollection new Lazy(() => CreateIndexesAsync(collection))); + var lazy = IndexInitializationTasks.GetOrAdd(key, _ => new(() => CreateIndexesAsync(collection))); return lazy.Value; } diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index bfc80002..5d59545b 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -35,6 +35,16 @@ "ZstdSharp.Port": "0.7.3" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Direct", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -106,8 +116,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.IO": { "type": "Transitive", @@ -116,12 +126,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Net.Http": { @@ -134,8 +144,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime": { "type": "Transitive", @@ -144,8 +154,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -265,6 +275,16 @@ "ZstdSharp.Port": "0.7.3" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Direct", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "DnsClient": { "type": "Transitive", "resolved": "1.6.1", @@ -331,23 +351,13 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Security.AccessControl": { "type": "Transitive", diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index 2d1d4b8a..a0628767 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -64,37 +64,28 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -120,6 +111,16 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -190,37 +191,28 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -244,6 +236,16 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, ".NETStandard,Version=v2.1": { @@ -297,37 +299,28 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "7.0.2", - "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "distributedlock.core": { "type": "Project" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } } } diff --git a/src/DistributedLock.Oracle/packages.lock.json b/src/DistributedLock.Oracle/packages.lock.json index b511da3b..3a71b2b7 100644 --- a/src/DistributedLock.Oracle/packages.lock.json +++ b/src/DistributedLock.Oracle/packages.lock.json @@ -50,17 +50,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Formats.Asn1": { "type": "Transitive", @@ -74,23 +65,23 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -135,6 +126,16 @@ "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", "System.ValueTuple": "[4.5.0, )" } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, ".NETStandard,Version=v2.1": { @@ -188,15 +189,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", "resolved": "6.0.1", @@ -221,13 +213,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Numerics.Vectors": { "type": "Transitive", @@ -236,8 +223,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Security.Cryptography.Cng": { "type": "Transitive", @@ -292,6 +279,16 @@ }, "distributedlock.core": { "type": "Project" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } } } diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 80b0048d..b346dd12 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -83,8 +83,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -95,34 +95,25 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -180,6 +171,16 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -269,8 +270,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -281,34 +282,25 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -363,6 +355,16 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, ".NETStandard,Version=v2.1": { @@ -440,34 +442,15 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -507,6 +490,16 @@ }, "distributedlock.core": { "type": "Project" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, "net8.0": { diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 3ba9674b..89f7def3 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -172,8 +172,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -192,15 +192,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -221,12 +212,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -248,13 +239,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -368,6 +359,16 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -579,8 +580,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -600,15 +601,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -643,12 +635,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -662,8 +654,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Reflection": { "type": "Transitive", @@ -706,8 +698,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -828,6 +820,16 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } }, ".NETStandard,Version=v2.1": { @@ -1053,15 +1055,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -1096,13 +1089,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Memory.Data": { "type": "Transitive", @@ -1159,8 +1147,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -1269,6 +1257,16 @@ }, "distributedlock.core": { "type": "Project" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } } } } diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 9178bc4c..88ac826e 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -356,14 +356,6 @@ "System.Security.Cryptography.ProtectedData": "8.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -449,8 +441,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -670,6 +662,12 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==" + }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index ad3986a5..2ab4063b 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -196,8 +196,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -225,15 +225,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -278,12 +269,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -305,13 +296,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -553,6 +544,16 @@ "System.Threading.Channels": "5.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -799,8 +800,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -828,15 +829,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Formats.Asn1": { "type": "Transitive", "resolved": "8.0.1", @@ -896,12 +888,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -923,8 +915,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime": { "type": "Transitive", @@ -933,8 +925,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -1088,7 +1080,8 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.2, )" + "MongoDB.Driver": "[3.5.2, )", + "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } }, "distributedlock.mysql": { @@ -1234,6 +1227,16 @@ "System.Threading.Channels": "5.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "ZooKeeperNetEx": { "type": "CentralTransitive", "requested": "[3.4.12.4, )", @@ -1462,8 +1465,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -1492,15 +1495,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -1554,12 +1548,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -1573,8 +1567,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Reflection": { "type": "Transitive", @@ -1617,8 +1611,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -1874,6 +1868,16 @@ "System.Threading.Channels": "5.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", @@ -2163,15 +2167,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", "resolved": "6.0.1", @@ -2247,13 +2242,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "System.Memory.Data": { "type": "Transitive", @@ -2310,8 +2300,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -2459,7 +2449,8 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.2, )" + "MongoDB.Driver": "[3.5.2, )", + "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } }, "distributedlock.mysql": { @@ -2609,6 +2600,16 @@ "System.Threading.Channels": "5.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 83e81fa8..ff6bb646 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -208,8 +208,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -237,15 +237,6 @@ "System.Security.Permissions": "6.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Formats.Asn1": { "type": "Transitive", "resolved": "8.0.1", @@ -305,12 +296,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -332,8 +323,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime": { "type": "Transitive", @@ -342,8 +333,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -512,7 +503,8 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.2, )" + "MongoDB.Driver": "[3.5.2, )", + "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } }, "distributedlock.mysql": { @@ -658,6 +650,16 @@ "System.Threading.Channels": "5.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, "ZooKeeperNetEx": { "type": "CentralTransitive", "requested": "[3.4.12.4, )", @@ -1023,14 +1025,6 @@ "System.Security.Cryptography.ProtectedData": "8.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -1111,8 +1105,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -1332,6 +1326,12 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==" + }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", From 0cb242f9606f885a5869b6a50d27605bd8238bd2 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 7 Jan 2026 11:29:57 +0800 Subject: [PATCH 349/399] fix: change CPM condition introduction --- src/Directory.Packages.props | 2 +- src/DistributedLock.Azure/packages.lock.json | 82 +++++++++---------- src/DistributedLock.MySql/packages.lock.json | 82 +++++++++---------- .../packages.lock.json | 82 +++++++++---------- .../packages.lock.json | 82 +++++++++---------- src/DistributedLock.Tests/packages.lock.json | 18 ++-- src/DistributedLock/packages.lock.json | 82 +++++++++---------- src/DistributedLockTaker/packages.lock.json | 18 ++-- 8 files changed, 221 insertions(+), 227 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index f24895dc..85a8c98c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -22,7 +22,7 @@ - + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index d8dfd66d..d1945781 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -79,8 +79,17 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.IO.Hashing": { "type": "Transitive", @@ -93,12 +102,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -120,13 +129,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -208,16 +217,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -301,8 +300,17 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.IO.Hashing": { "type": "Transitive", @@ -315,12 +323,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -334,13 +342,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -387,16 +395,6 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.MySql/packages.lock.json b/src/DistributedLock.MySql/packages.lock.json index a0628767..171bb2d4 100644 --- a/src/DistributedLock.MySql/packages.lock.json +++ b/src/DistributedLock.MySql/packages.lock.json @@ -64,28 +64,37 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -111,16 +120,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -191,28 +190,37 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.2", + "contentHash": "hYr3I9N9811e0Bjf2WNwAGGyTuAFbbTgX1RPLt/3Wbm68x3IGcX5Cl75CMmgT6WlNwLQ2tCCWfqYPpypjaf2xA==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -236,16 +244,6 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index b346dd12..a469c1e9 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -83,8 +83,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -95,25 +95,34 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -171,16 +180,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -270,8 +269,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -282,25 +281,34 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -355,16 +363,6 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 89f7def3..4d56c89d 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -172,8 +172,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.ClientModel": { "type": "Transitive", @@ -192,6 +192,15 @@ "System.Security.Permissions": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -212,12 +221,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -239,13 +248,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -359,16 +368,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -580,8 +579,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.ClientModel": { "type": "Transitive", @@ -601,6 +600,15 @@ "System.Security.Permissions": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -635,12 +643,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.4", + "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -654,8 +662,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Reflection": { "type": "Transitive", @@ -698,8 +706,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -820,16 +828,6 @@ "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } } }, ".NETStandard,Version=v2.1": { diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 88ac826e..9178bc4c 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -356,6 +356,14 @@ "System.Security.Cryptography.ProtectedData": "8.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -441,8 +449,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -662,12 +670,6 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==" - }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 2ab4063b..651b9229 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -196,8 +196,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.ClientModel": { "type": "Transitive", @@ -225,6 +225,15 @@ "System.Security.Permissions": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -269,12 +278,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -296,13 +305,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -544,16 +553,6 @@ "System.Threading.Channels": "5.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.ValueTuple": { "type": "CentralTransitive", "requested": "[4.5.0, )", @@ -1465,8 +1464,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.ClientModel": { "type": "Transitive", @@ -1495,6 +1494,15 @@ "System.Security.Permissions": "6.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "6.35.0", @@ -1548,12 +1556,12 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" } }, "System.Memory.Data": { @@ -1567,8 +1575,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, "System.Reflection": { "type": "Transitive", @@ -1611,8 +1619,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Runtime.Loader": { "type": "Transitive", @@ -1868,16 +1876,6 @@ "System.Threading.Channels": "5.0.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index ff6bb646..9d3c2957 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -1025,6 +1025,14 @@ "System.Security.Cryptography.ProtectedData": "8.0.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Diagnostics.EventLog": { "type": "Transitive", "resolved": "8.0.0", @@ -1105,8 +1113,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -1326,12 +1334,6 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==" - }, "System.Threading.AccessControl": { "type": "CentralTransitive", "requested": "[8.0.0, )", From 8adb4b9a08b849d1775fa42d4fd70b26d03869e5 Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 7 Jan 2026 15:54:30 +0800 Subject: [PATCH 350/399] fix: pass all tests, change collection name to `distributed.locks` --- .../AssemblyAttributes.cs | 3 +- .../MongoDistributedLock.cs | 51 ++++-- ...MongoDistributedSynchronizationProvider.cs | 6 +- src/DistributedLock.MongoDB/README.md | 4 +- src/DistributedLock.MongoDB/README.zh-CN.md | 4 +- .../MongoDB/TestingMongoDbProviders.cs | 13 +- .../TestingMongoDbSynchronizationStrategy.cs | 27 +++- .../Shared/MongoDbCredentials.cs | 15 +- .../Tests/MongoDB/MongoDistributedLockTest.cs | 153 +++++++++++++++++- src/DistributedLockTaker/Program.cs | 7 +- 10 files changed, 246 insertions(+), 37 deletions(-) diff --git a/src/DistributedLock.MongoDB/AssemblyAttributes.cs b/src/DistributedLock.MongoDB/AssemblyAttributes.cs index f3102190..12a8b7af 100644 --- a/src/DistributedLock.MongoDB/AssemblyAttributes.cs +++ b/src/DistributedLock.MongoDB/AssemblyAttributes.cs @@ -2,4 +2,5 @@ [assembly: InternalsVisibleTo( - "DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] \ No newline at end of file + "DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 85fe0f82..6e141e4b 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -21,7 +21,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock> IndexInitializationTasks = new(StringComparer.Ordinal); + private static readonly ConcurrentDictionary>> IndexInitializationTasks = new(StringComparer.Ordinal); private readonly string _collectionName; private readonly IMongoDatabase _database; @@ -42,7 +42,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) - : this(key, database, "distributedLocks", options) { } + : this(key, database, "distributed.locks", options) { } /// /// Constructs a lock named using the provided , , and @@ -50,10 +50,9 @@ public MongoDistributedLock(string key, IMongoDatabase database, Action public MongoDistributedLock(string key, IMongoDatabase database, string collectionName, Action? options = null) { - if (string.IsNullOrEmpty(key)) { throw new ArgumentNullException(nameof(key)); } this._database = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - this.Key = key; + this.Key = key ?? throw new ArgumentNullException(nameof(key)); this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); } @@ -108,7 +107,7 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti try { - await Task.Delay(TimeSpan.FromMilliseconds(finalSleepMs), effectiveToken).ConfigureAwait(false); + await SyncViaAsync.Delay(TimeSpan.FromMilliseconds(finalSleepMs), effectiveToken).ConfigureAwait(false); } catch (OperationCanceledException) when (timeoutCts?.IsCancellationRequested == true && !cancellationToken.IsCancellationRequested) { @@ -161,7 +160,15 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti ReturnDocument = ReturnDocument.After }; - var result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + MongoLockDocument? result; + if (SyncViaAsync.IsSynchronous) + { + result = collection.FindOneAndUpdate(filter, update, options, cancellationToken); + } + else + { + result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + } // Verify we actually got the lock if (result != null && result.LockId == lockId) @@ -237,13 +244,36 @@ private static Task EnsureIndexesCreatedAsync(IMongoCollection new(() => CreateIndexesAsync(collection))); - return lazy.Value; + + // If we are executing synchronously, we must ensure the task is complete. + // This covers two cases: + // 1. We just created the task. CreateIndexesAsync will run synchronously and return a completed task. + // 2. The task was created by a previous async caller and is still running. We must block until it finishes. + if (SyncViaAsync.IsSynchronous && !lazy.Value.IsCompleted) + { + lazy.Value.GetAwaiter().GetResult(); + } + + var task = lazy.Value; + if (task.IsCompleted && !task.Result) + { + // If the task failed (returned false), we remove it so we can try again next time. + // Note: worst case we remove a *new* valid task if a race happens, which is fine (just extra work). + ((ICollection>>>)IndexInitializationTasks).Remove(new KeyValuePair>>(key, lazy)); + } + + return task; } - private static async Task CreateIndexesAsync(IMongoCollection collection) + private static async Task CreateIndexesAsync(IMongoCollection collection) { try { @@ -256,17 +286,20 @@ private static async Task CreateIndexesAsync(IMongoCollection }; var indexModel = new CreateIndexModel(indexKeys, indexOptions); await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: CancellationToken.None).ConfigureAwait(false); + return true; } catch (MongoCommandException ex) when ( ex.CodeName is "IndexOptionsConflict" or "IndexKeySpecsConflict" or "IndexAlreadyExists") { // Index already exists with same or different options - this is acceptable. // The existing index will still handle TTL cleanup. + return true; } catch (MongoException) { // Other MongoDB errors (network, auth, etc.) - swallow to avoid blocking lock acquisition. // The lock will still work correctly; TTL cleanup is a best-effort optimization. + return false; } } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs index c3a46ace..a6e7f1ed 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs @@ -13,10 +13,10 @@ public sealed class MongoDistributedSynchronizationProvider : IDistributedLockPr /// /// Constructs a that connects to the provided - /// and uses the provided . Locks will be stored in a collection named "DistributedLocks" by default. + /// and uses the provided . Locks will be stored in a collection named "distributed.locks" by default. /// public MongoDistributedSynchronizationProvider(IMongoDatabase database, Action? options = null) - : this(database, "DistributedLocks", options) { } + : this(database, "distributed.locks", options) { } /// /// Constructs a that connects to the provided , @@ -39,6 +39,6 @@ public MongoDistributedLock CreateLock(string name) IDistributedLock IDistributedLockProvider.CreateLock(string name) { - return CreateLock(name); + return this.CreateLock(name); } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md index 6a9ecc26..c154c659 100644 --- a/src/DistributedLock.MongoDB/README.md +++ b/src/DistributedLock.MongoDB/README.md @@ -109,7 +109,7 @@ var @lock = new MongoDistributedLock( ### Custom Collection Name -By default, locks are stored in a collection named `"DistributedLocks"`. You can specify a custom collection name: +By default, locks are stored in a collection named `"distributed.locks"`. You can specify a custom collection name: ```csharp // Direct lock creation with custom collection @@ -190,7 +190,7 @@ graph TB Handle["MongoDistributedLockHandle"] MongoDB[("MongoDB Database")] - Collection["DistributedLocks Collection"] + Collection["distributed.locks Collection"] TTLIndex["TTL Index on expiresAt"] Client -->|Creates| Lock diff --git a/src/DistributedLock.MongoDB/README.zh-CN.md b/src/DistributedLock.MongoDB/README.zh-CN.md index bb892c84..7e418f26 100644 --- a/src/DistributedLock.MongoDB/README.zh-CN.md +++ b/src/DistributedLock.MongoDB/README.zh-CN.md @@ -109,7 +109,7 @@ var @lock = new MongoDistributedLock( ### 自定义集合名称 -默认情况下，锁存储在名为 `"DistributedLocks"` 的集合中。您可以指定自定义集合名称： +默认情况下，锁存储在名为 `"distributed.locks"` 的集合中。您可以指定自定义集合名称： ```csharp // 直接创建锁并使用自定义集合 @@ -190,7 +190,7 @@ graph TB Handle["MongoDistributedLockHandle"] MongoDB[("MongoDB 数据库")] - Collection["DistributedLocks 集合"] + Collection["distributed.locks 集合"] TTLIndex["expiresAt 上的 TTL 索引"] Client -->|创建| Lock diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs index d873e300..251ea0ca 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs @@ -5,15 +5,16 @@ namespace Medallion.Threading.Tests.MongoDB; public sealed class TestingMongoDistributedLockProvider : TestingLockProvider { - private readonly string _collectionName = "DistributedLocks_" + Guid.NewGuid().ToString("N"); + private const string CollectionName = "distributed.locks"; private readonly IMongoDatabase _database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); public override IDistributedLock CreateLockWithExactName(string name) { - var @lock = new MongoDistributedLock(name, _database, _collectionName); - Strategy.KillHandleAction = () => + // Use a short expiry to make tests like TestHandleLostTriggersCorrectly run faster + var @lock = new MongoDistributedLock(name, _database, CollectionName, options => options.Expiry(TimeSpan.FromSeconds(5))); + this.Strategy.KillHandleAction = () => { - var collection = _database.GetCollection(_collectionName); + var collection = _database.GetCollection(CollectionName); collection.DeleteOne(Builders.Filter.Eq(d => d.Id, name)); }; return @lock; @@ -21,7 +22,7 @@ public override IDistributedLock CreateLockWithExactName(string name) public override string GetSafeName(string name) { - return new MongoDistributedLock(name, _database, _collectionName).Name; + return new MongoDistributedLock(name, _database, CollectionName).Name; } public override string GetCrossProcessLockType() @@ -34,7 +35,7 @@ public override void Dispose() // Clean up test collection try { - _database.DropCollection(_collectionName); + _database.DropCollection(CollectionName); } catch { diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs index 4324c1d5..9dc6b114 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs @@ -1,3 +1,8 @@ +using Medallion.Threading.Tests; +using Medallion.Threading.Internal; +using Medallion.Threading.MongoDB; +using MongoDB.Driver; + namespace Medallion.Threading.Tests.MongoDB; public sealed class TestingMongoDbSynchronizationStrategy : TestingSynchronizationStrategy @@ -6,6 +11,26 @@ public sealed class TestingMongoDbSynchronizationStrategy : TestingSynchronizati public override void PrepareForHandleAbandonment() { - KillHandleAction?.Invoke(); + this.KillHandleAction?.Invoke(); + } + + public override void PerformAdditionalCleanupForHandleAbandonment() + { + this.KillHandleAction?.Invoke(); + } + + public override IDisposable? PrepareForHandleLost() + { + return new DisposableAction(() => this.KillHandleAction?.Invoke()); + } + + private class DisposableAction(Action action) : IDisposable + { + private Action? _action = action; + + public void Dispose() + { + Interlocked.Exchange(ref this._action, null)?.Invoke(); + } } } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs index 8c8ce172..6769c40e 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs @@ -11,21 +11,16 @@ public static string GetConnectionString(string baseDirectory) { if (_connectionString != null) { return _connectionString; } var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mongodb.txt")); - if (File.Exists(file)) - { - _connectionString = File.ReadAllText(file).Trim(); - } - else - { - // Default local MongoDB connection - _connectionString = "mongodb://localhost:27017"; - } + _connectionString = File.Exists(file) + ? File.ReadAllText(file).Trim() + // Default local MongoDB connection + : "mongodb://localhost:27017"; return _connectionString; } public static IMongoDatabase GetDefaultDatabase(string baseDirectory) { var client = new MongoClient(GetConnectionString(baseDirectory)); - return client.GetDatabase("DistributedLockTests"); + return client.GetDatabase("distributedLockTests"); } } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 9c753478..7c8648d0 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -67,7 +67,7 @@ public async Task TestHandleLostToken() }); // Manually delete the lock document to simulate lock loss - var collection = database.GetCollection("DistributedLocks"); + var collection = database.GetCollection("distributed.locks"); await collection.DeleteOneAsync(Builders.Filter.Eq(d => d.Id, lockName)); // Wait a bit for the extension task to detect the loss @@ -113,8 +113,157 @@ public void TestValidatesConstructorParameters() { var database = new Mock(MockBehavior.Strict).Object; Assert.Throws(() => new MongoDistributedLock(null!, database)); - Assert.Throws(() => new MongoDistributedLock(string.Empty, database)); Assert.Throws(() => new MongoDistributedLock("key", null!)); Assert.Throws(() => new MongoDistributedLock("key", database, (string)null!)); } + + [Test] + public async Task TestIndexExistence() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var collectionName = "TestIndex" + Guid.NewGuid().ToString("N"); + + var @lock = new MongoDistributedLock("lock", database, collectionName); + await using (await @lock.AcquireAsync()) + { + } + + var collection = database.GetCollection(collectionName); + using var cursor = await collection.Indexes.ListAsync(); + var indexes = await cursor.ToListAsync(); + + var ttlIndex = indexes.FirstOrDefault(i => i["name"] == "expiresAt_ttl"); + Assert.That(ttlIndex, Is.Not.Null, "TTL index should exist"); + Assert.That(ttlIndex!["expireAfterSeconds"].AsInt32, Is.EqualTo(0)); // check functionality + } + + [Test] + [Category("CI")] + public async Task TestIndexCreationIsScopedToCluster() + { + // Simulate two distinct databases with SAME name/collection but treated as different + var db1 = new Mock(MockBehavior.Strict); + var db2 = new Mock(MockBehavior.Strict); + + var coll1 = new Mock>(MockBehavior.Strict); + var coll2 = new Mock>(MockBehavior.Strict); + + // We can't easily mock ClusterId equality without deeper mocking, + // but verify that if we use the *same* logic we rely on unique behavior? + // Wait, unit testing static cache with mocks is tricky because state persists. + // We need a unique db/coll name to avoid interference from other tests. + var uniqueName = "db_" + Guid.NewGuid().ToString("N"); + SetupDb(db1, coll1, uniqueName, "locks"); + SetupDb(db2, coll2, uniqueName, "locks"); + + // We want to verify ConfigureIndexes is called on BOTH. + + // Setup index creation mocks + var idx1 = new Mock>(MockBehavior.Strict); + var idx2 = new Mock>(MockBehavior.Strict); + + coll1.Setup(c => c.Indexes).Returns(idx1.Object); + coll2.Setup(c => c.Indexes).Returns(idx2.Object); + + // Allow FindOneAndUpdate + coll1.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((MongoLockDocument)null!); + coll2.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((MongoLockDocument)null!); + + // Expect CreateOneAsync + idx1.Setup(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + .ReturnsAsync("idx"); + idx2.Setup(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + .ReturnsAsync("idx"); + + var lock1 = new MongoDistributedLock("k", db1.Object, "locks"); + var lock2 = new MongoDistributedLock("k", db2.Object, "locks"); + + await lock1.TryAcquireAsync(); + await lock2.TryAcquireAsync(); + + idx1.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "First DB should create index"); + + idx2.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "Second DB should create index too because it's a different instance"); + } + + private static void SetupDb(Mock db, Mock> coll, string dbName, string collName) + { + db.Setup(d => d.GetCollection(collName, null)).Returns(coll.Object); + var dbNs = new DatabaseNamespace(dbName); + var collNs = new CollectionNamespace(dbNs, collName); + + coll.Setup(c => c.CollectionNamespace).Returns(collNs); + coll.Setup(c => c.Database).Returns(db.Object); + db.Setup(d => d.DatabaseNamespace).Returns(dbNs); + + // Mock Client and Settings + var client = new Mock(MockBehavior.Strict); + // Ensure settings are distinct by adding a random server address + var settings = new MongoClientSettings { Servers = [new("host" + Guid.NewGuid().ToString("N"))] }; + client.Setup(c => c.Settings).Returns(settings); + db.Setup(d => d.Client).Returns(client.Object); + } + + [Test] + [Category("CI")] + public async Task TestIndexCreationFailureIsCached() + { + var db = new Mock(MockBehavior.Strict); + var coll = new Mock>(MockBehavior.Strict); + SetupDb(db, coll, "db_" + Guid.NewGuid().ToString("N"), "locks"); + + var idx = new Mock>(MockBehavior.Strict); + coll.Setup(c => c.Indexes).Returns(idx.Object); + + // Fail first time + idx.SetupSequence(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + .ThrowsAsync(new MongoException("Test failure")) + .ReturnsAsync("idx"); + + // Allow FindOneAndUpdate + coll.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((MongoLockDocument)null!); + + var @lock = new MongoDistributedLock("k", db.Object, "locks"); + + // First acquire: fails to create index (swallowed), acquires lock + await @lock.TryAcquireAsync(); + + // Second acquire: should retry index creation if we fix it. + // Currently it caches the failed task, so it won't retry. + await @lock.TryAcquireAsync(); + + // Verify CreateOneAsync was called TWICE (proving retry). + // If the current bug exists, it will be called ONCE. + idx.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Exactly(2), "Should retry index creation after failure"); + } + + [Test] + public async Task TestLockDocumentStructure() + { + var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var lockName = TestHelper.UniqueName; + var collectionName = "locks_" + Guid.NewGuid().ToString("N"); + + var @lock = new MongoDistributedLock(lockName, database, collectionName, o => o.Expiry(TimeSpan.FromSeconds(10))); + await using var handle = await @lock.AcquireAsync(); + var collection = database.GetCollection(collectionName); + var doc = await collection.Find(Builders.Filter.Eq(d => d.Id, lockName)).FirstOrDefaultAsync(); + + Assert.That(doc, Is.Not.Null); + Assert.That(doc.LockId, Is.Not.Null); + Assert.That(doc.FencingToken, Is.GreaterThan(0)); + + // Allow for some clock skew/processing time + var now = DateTime.UtcNow; // Mongo assumes UTC usually, check implicit assumption + // BsonDateTime is usually UTC. + + // Depending on Mongo version and driver, dates are UTC. + // The lock sets expiresAt = $$NOW + 10s. + // Check that it is roughly in the future. + Assert.That(doc.ExpiresAt.ToUniversalTime(), Is.GreaterThan(DateTime.UtcNow.AddSeconds(5))); + Assert.That(doc.ExpiresAt.ToUniversalTime(), Is.LessThan(DateTime.UtcNow.AddSeconds(15))); + } } \ No newline at end of file diff --git a/src/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs index c15d0a5a..ee938f23 100644 --- a/src/DistributedLockTaker/Program.cs +++ b/src/DistributedLockTaker/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using Medallion.Threading.SqlServer; using Medallion.Threading.WaitHandles; using Medallion.Threading.Postgres; @@ -15,6 +15,8 @@ using Medallion.Threading.ZooKeeper; using Medallion.Threading.MySql; using Medallion.Threading.Oracle; +using Medallion.Threading.MongoDB; +using Medallion.Threading.Tests.MongoDB; namespace DistributedLockTaker; @@ -134,6 +136,9 @@ public static int Main(string[] args) ).AcquireAsync().Result; break; } + case nameof(MongoDistributedLock): + handle = new MongoDistributedLock(name, MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory), options => options.Expiry(TimeSpan.FromSeconds(5))).Acquire(); + break; default: Console.Error.WriteLine($"type: {type}"); return 123; From 91b5878ee605c9c61a67ddfe80e6c4a50996b92c Mon Sep 17 00:00:00 2001 From: Joes Date: Wed, 7 Jan 2026 15:58:45 +0800 Subject: [PATCH 351/399] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9Mongo=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=BC=8F=E9=94=81=E9=BB=98=E8=AE=A4=E9=9B=86=E5=90=88?= =?UTF-8?q?=E5=90=8D=E4=B8=BAdistributed.locks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将MongoDistributedLock构造函数中默认的锁集合名称从"distributedLocks"修改为"distributed.locks"，以统一集合命名规范。此更改会影响新建锁时的默认存储集合。 --- src/DistributedLock.MongoDB/MongoDistributedLock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 6e141e4b..fc77d1ff 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -39,7 +39,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock /// Constructs a lock named using the provided and . - /// The locks will be stored in a collection named "distributedLocks" by default. + /// The locks will be stored in a collection named "distributed.locks" by default. /// public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) : this(key, database, "distributed.locks", options) { } From 80c0738cedd0fb340b87e0763af4718150671bfc Mon Sep 17 00:00:00 2001 From: Joe Du <13188169+joesdu@users.noreply.github.com> Date: Thu, 8 Jan 2026 00:21:54 +0800 Subject: [PATCH 352/399] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../Tests/MongoDB/MongoDistributedLockTest.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 7c8648d0..5d4d2687 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -256,9 +256,8 @@ public async Task TestLockDocumentStructure() Assert.That(doc.LockId, Is.Not.Null); Assert.That(doc.FencingToken, Is.GreaterThan(0)); - // Allow for some clock skew/processing time - var now = DateTime.UtcNow; // Mongo assumes UTC usually, check implicit assumption - // BsonDateTime is usually UTC. + // Allow for some clock skew/processing time. + // Mongo and BsonDateTime usually assume UTC; check implicit assumption. // Depending on Mongo version and driver, dates are UTC. // The lock sets expiresAt = $$NOW + 10s. From 3a80fd0dd3dd2b0a94919079871834631d7d6f44 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Thu, 8 Jan 2026 20:19:28 -0500 Subject: [PATCH 353/399] Update DistributedLock.Redis.md Fix #262 --- docs/DistributedLock.Redis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DistributedLock.Redis.md b/docs/DistributedLock.Redis.md index 07805157..d7395054 100644 --- a/docs/DistributedLock.Redis.md +++ b/docs/DistributedLock.Redis.md @@ -39,8 +39,8 @@ As of 1.0.1, Redis-based primitives support the use of `IDatabase.WithKeyPrefix( In addition to specifying the name/key and database(s), some additional tuning options are available. - `Expiry` determines how long the lock will be *initially* claimed for (because of auto-extension, locks can be held for longer). Defaults to 30s. -- `ExtensionCadence` determines how frequently the hold on the lock will be renewed to the full `Expiry`. Defaults to 1/3 of `Expiry`. - `MinValidityTime` determines what fraction of `Expiry` still has to remain when the locking operation completes to consider it a success. This is mostly relevant when acquiring a lock across multiple databases (e. g. if we immediately succeed on database 1 and eventually succeed on database 2 after 30s have elapsed, then our hold on database 1 will have expired). Defaults to 90% of the `Expiry`. +- `ExtensionCadence` determines how frequently the hold on the lock will be renewed to the full `Expiry`. Defaults to 1/3 of `MinValidityTime`. - `BusyWaitSleepTime` specifies a range of times that the implementation will sleep between attempts to acquire a lock that is currently held by someone else. A random number in the range will be chosen for each sleep. If you expect contention, lowering these values may increase the responsiveness (how quickly a lock detects that it can now be taken) but will increase the number of calls made to Redis. Raising the values will have the reverse effects. From b718ce4af3696fd9071b3abdb1bd99c93776c39a Mon Sep 17 00:00:00 2001 From: Joes Date: Fri, 9 Jan 2026 19:44:06 +0800 Subject: [PATCH 354/399] chore: Implementation of MongoDB Distributed Lock, Document Optimization, and Robustness Enhancement - Documents are supplemented with instructions for MongoDB installation and Docker startup, setting the default collection name to distributed.locks - Lock key adds UTF-8 length validation, throws exceptions for limits exceeded, preventing index overflow - Adaptive backoff logic is removed, simplifying the retry mechanism - Optimization of index initialization logic, enhancing idempotency and thread safety - Adjustment of default values for MongoLockDocument fields, with more comprehensive comments - Restructuring of MongoDistributedLockHandle, supporting synchronous/asynchronous release, and more robust resource management - Addition of unit tests related to key validation, removal of GetSafeName tests, and retention of case sensitivity tests - Standardize code style and comments to improve maintainability --- docs/Developing DistributedLock.md | 162 ++++++++++++ docs/DistributedLock.MongoDB.md | 4 +- .../MongoDistributedLock.cs | 133 +++------- .../MongoDistributedLockHandle.cs | 245 +++++++++--------- ...istributedSynchronizationOptionsBuilder.cs | 22 +- ...MongoDistributedSynchronizationProvider.cs | 2 +- .../MongoLockDocument.cs | 28 +- .../DistributedLockCoreTestCases.cs | 25 +- .../Tests/MongoDB/MongoDistributedLockTest.cs | 54 +++- 9 files changed, 385 insertions(+), 290 deletions(-) diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index 380b8484..251d9afa 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -4,6 +4,167 @@ DistributedLock has a variety of back-ends; to be able to develop and run tests against all of them you'll need to install a good amount of software. +### MongoDB + +You can download the MongoDB Community Server from [here](https://www.mongodb.com/try/download/community). + +Alternatively, and recommended for quick testing, you can use Docker to spin up an instance without manual initialization. +Run the following command: + +```bat +docker run -d -p 27017:27017 --name mongo mongo:latest +``` + +Or use `docker compose` to start a replica set environment: + +```yaml +services: + mongo_primary: + image: bitnami/mongodb:latest + container_name: mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=primary + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_ROOT_USER=yourUsername + - MONGODB_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27017:27017" + volumes: + - "mongodb_master_data:/bitnami/mongodb" + + mongo_secondary: + image: bitnami/mongodb:latest + container_name: mongo_secondary + depends_on: + - mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=secondary + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 + - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal + - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername + - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27018:27017" + + mongo_arbiter: + image: bitnami/mongodb:latest + container_name: mongo_arbiter + depends_on: + - mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=arbiter + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 + - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal + - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername + - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27019:27017" + +volumes: + mongodb_master_data: + driver: local +``` + +The tests default to `mongodb://localhost:27017`. To use a custom connection string (e.g. for credentials), place it in `DistributedLock.Tests/credentials/mongodb.txt`. + +If you're using a replica set or sharded cluster, your connection string might look like this: + +``` +mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.internal:27018,host.docker.internal:27019/?replicaSet=rs0&authSource=admin&serverSelectionTimeoutMS=1000 +``` + +
+中文说明 + +对于 MongoDB,我们可以从他的官网下载社区版本来进行测试,下载地址:[MongoDB Community Server](https://www.mongodb.com/try/download/community). +或者也可以使用 Docker 快速的启动一个测试环境.建议使用 Docker 来进行快速测试,而无需进行数据库服务初始化.以下是一个使用 Docker 启动 MongoDB 的命令: + +```bat +docker run -d -p 27017:27017 --name mongo mongo:latest +``` + +或者使用 `docker compose` 来启动一个副本集环境: + +```yaml +services: + mongo_primary: + image: bitnami/mongodb:latest + container_name: mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=primary + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_ROOT_USER=yourUsername + - MONGODB_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27017:27017" + volumes: + - "mongodb_master_data:/bitnami/mongodb" + + mongo_secondary: + image: bitnami/mongodb:latest + container_name: mongo_secondary + depends_on: + - mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=secondary + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 + - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal + - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername + - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27018:27017" + + mongo_arbiter: + image: bitnami/mongodb:latest + container_name: mongo_arbiter + depends_on: + - mongo_primary + environment: + - TZ=Asia/Chongqing + - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal + - MONGODB_REPLICA_SET_MODE=arbiter + - MONGODB_REPLICA_SET_NAME=rs0 + - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 + - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal + - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername + - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword + - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + ports: + - "27019:27017" + +volumes: + mongodb_master_data: + driver: local +``` + +测试项目默认连接地址为 `mongodb://localhost:27017`. 如果需要配置用户名密码或者其他连接参数, 请在 `DistributedLock.Tests/credentials/mongodb.txt` 文件中填入完整的连接字符串. + +若是使用副本集或者分片集群模式,链接字符串可以填入类似如下格式: + +``` +mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.internal:27018,host.docker.internal:27019/?replicaSet=rs0&authSource=admin&serverSelectionTimeoutMS=1000 +``` + +
+ ### Azure For the Azure back-end, [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite) is used for local development. See [here](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage#install-azurite) for how to install. @@ -26,6 +187,7 @@ performance_schema=ON After doing this, restart MariaDB (on Windows, do this in the Services app). Next, create the `distributed_lock` database and a user for the tests to run as: + ```sql CREATE DATABASE distributed_lock; CREATE USER 'DistributedLock'@'localhost' IDENTIFIED BY ''; diff --git a/docs/DistributedLock.MongoDB.md b/docs/DistributedLock.MongoDB.md index 231bd594..aec2effa 100644 --- a/docs/DistributedLock.MongoDB.md +++ b/docs/DistributedLock.MongoDB.md @@ -7,7 +7,7 @@ The DistributedLock.MongoDB package offers distributed locks based on [MongoDB]( ```C# var client = new MongoClient("mongodb://localhost:27017"); var database = client.GetDatabase("myDatabase"); -var @lock = new MongoDistributedLock("MyLockName", database); +var @lock = new MongoDistributedLock("myLockName", database); await using (await @lock.AcquireAsync()) { // I have the lock @@ -28,7 +28,7 @@ MongoDB-based locks use MongoDB's document upsert and update operations to imple 3. **Release**: Deletes the lock document when disposed. 4. **Expiry**: Locks automatically expire if not extended, allowing recovery from crashed processes. -MongoDB locks can be constructed with an `IMongoDatabase` and an optional collection name. If no collection name is specified, locks will be stored in a collection named `"DistributedLocks"`. The collection will automatically have an index created on the `expiresAt` field for efficient queries. +MongoDB locks can be constructed with an `IMongoDatabase` and an optional collection name. If no collection name is specified, locks will be stored in a collection named `"distributed.locks"`. The collection will automatically have an index created on the `expiresAt` field for efficient queries. When using the provider pattern, you can create multiple locks with different names from the same provider: diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index fc77d1ff..ac1e9188 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -3,6 +3,7 @@ using MongoDB.Driver; using System.Collections.Concurrent; using System.Diagnostics; +using System.Text; namespace Medallion.Threading.MongoDB; @@ -11,9 +12,14 @@ namespace Medallion.Threading.MongoDB; /// public sealed partial class MongoDistributedLock : IInternalDistributedLock { -#if !NETSTANDARD2_1_OR_GREATER && !NET8_0_OR_GREATER + internal const string DefaultCollectionName = "distributed.locks"; + /// + /// MongoDB _id field maximum length in bytes. + /// See https://www.mongodb.com/docs/manual/reference/limits/#mongodb-limit-Index-Key-Limit + /// + private const int MaxKeyLength = 255; + private static readonly DateTime EpochUtc = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); -#endif /// /// ActivitySource for distributed tracing and diagnostics @@ -42,7 +48,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) - : this(key, database, "distributed.locks", options) { } + : this(key, database, DefaultCollectionName, options) { } /// /// Constructs a lock named using the provided , , and @@ -52,17 +58,15 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti { this._database = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - this.Key = key ?? throw new ArgumentNullException(nameof(key)); + + if (key == null) { throw new ArgumentNullException(nameof(key)); } + ValidateKey(key); + this.Key = key; this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); } ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) { - if (this._options.UseAdaptiveBackoff) - { - return this.AdaptiveBusyWaitAsync(timeout, cancellationToken); - } - return BusyWaitHelper.WaitAsync(this, (@this, ct) => @this.TryAcquireAsync(ct), timeout, @@ -71,69 +75,6 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti cancellationToken); } - private async ValueTask AdaptiveBusyWaitAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - // Try immediately first - var result = await this.TryAcquireAsync(cancellationToken).ConfigureAwait(false); - if (result != null || timeout.IsZero) - { - return result; - } - - using var timeoutCts = timeout.IsInfinite ? null : new CancellationTokenSource(timeout.TimeSpan); - using var linkedCts = timeoutCts != null - ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token) - : null; - var effectiveToken = linkedCts?.Token ?? cancellationToken; - - var minMs = this._options.MinBusyWaitSleepTime.InMilliseconds; - var maxMs = this._options.MaxBusyWaitSleepTime.InMilliseconds; - var consecutiveFailures = 0; - const double BackoffMultiplier = 1.5; -#if NET8_0_OR_GREATER - var random = Random.Shared; -#else - var random = new Random(Guid.NewGuid().GetHashCode()); -#endif - - while (!effectiveToken.IsCancellationRequested) - { - // Exponential backoff with jitter - var backoffMs = minMs * Math.Pow(BackoffMultiplier, Math.Min(consecutiveFailures, 10)); - var sleepMs = Math.Min(backoffMs, maxMs); - // Add jitter (±20%) to prevent thundering herd - var jitter = (random.NextDouble() - 0.5) * 0.4 * sleepMs; - var finalSleepMs = Math.Max(minMs, sleepMs + jitter); - - try - { - await SyncViaAsync.Delay(TimeSpan.FromMilliseconds(finalSleepMs), effectiveToken).ConfigureAwait(false); - } - catch (OperationCanceledException) when (timeoutCts?.IsCancellationRequested == true && !cancellationToken.IsCancellationRequested) - { - // Timeout expired, try one last time - return await this.TryAcquireAsync(cancellationToken).ConfigureAwait(false); - } - - try - { - result = await this.TryAcquireAsync(effectiveToken).ConfigureAwait(false); - if (result != null) - { - return result; - } - consecutiveFailures++; - } - catch (OperationCanceledException) when (timeoutCts?.IsCancellationRequested == true && !cancellationToken.IsCancellationRequested) - { - return null; - } - } - - cancellationToken.ThrowIfCancellationRequested(); - return null; - } - private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { using var activity = ActivitySource.StartActivity("MongoDistributedLock.TryAcquire"); @@ -171,7 +112,7 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti } // Verify we actually got the lock - if (result != null && result.LockId == lockId) + if (result is not null && result.LockId == lockId) { activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); @@ -193,13 +134,7 @@ private static UpdateDefinition CreateAcquireUpdate(string lo "$lte", new BsonArray { - new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime( -#if NETSTANDARD2_1_OR_GREATER || NET8_0_OR_GREATER - DateTime.UnixEpoch -#else - EpochUtc -#endif - ) }), + new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime(EpochUtc) }), "$$NOW" } ); @@ -239,38 +174,28 @@ private static UpdateDefinition CreateAcquireUpdate(string lo return new PipelineUpdateDefinition(new[] { setStage }); } - private static Task EnsureIndexesCreatedAsync(IMongoCollection collection) + private static async Task EnsureIndexesCreatedAsync(IMongoCollection collection) { // Best-effort TTL index to clean up expired rows over time. // Note: TTL monitors run on a schedule; correctness MUST NOT depend on this. var databaseName = collection.Database.DatabaseNamespace.DatabaseName; // include the hash code of the settings to differentiate between different clusters/clients // that happen to use the same database/collection names. - // While GetHashCode() isn't perfect, it should be sufficient to distinguish between different clients/settings + // While GetHashCode() isn't perfect, it should be sufficient to distinguish between different clients/settings // in valid use-cases (e.g. diff connection strings). var clientSettingsHash = collection.Database.Client.Settings.GetHashCode(); var key = clientSettingsHash + "|" + databaseName + "/" + collection.CollectionNamespace.CollectionName; var lazy = IndexInitializationTasks.GetOrAdd(key, _ => new(() => CreateIndexesAsync(collection))); - - // If we are executing synchronously, we must ensure the task is complete. - // This covers two cases: - // 1. We just created the task. CreateIndexesAsync will run synchronously and return a completed task. - // 2. The task was created by a previous async caller and is still running. We must block until it finishes. - if (SyncViaAsync.IsSynchronous && !lazy.Value.IsCompleted) - { - lazy.Value.GetAwaiter().GetResult(); - } var task = lazy.Value; - if (task.IsCompleted && !task.Result) + var success = await task.AwaitSyncOverAsync().ConfigureAwait(false); + if (!success) { // If the task failed (returned false), we remove it so we can try again next time. // Note: worst case we remove a *new* valid task if a race happens, which is fine (just extra work). - ((ICollection>>>)IndexInitializationTasks).Remove(new KeyValuePair>>(key, lazy)); + IndexInitializationTasks.As>>>>().Remove(new KeyValuePair>>(key, lazy)); } - - return task; } private static async Task CreateIndexesAsync(IMongoCollection collection) @@ -288,8 +213,7 @@ private static async Task CreateIndexesAsync(IMongoCollection CreateIndexesAsync(IMongoCollection + /// Validates that a key is valid for use as an exact MongoDB key. + /// + private static void ValidateKey(string key) + { + if (key == null) { throw new ArgumentNullException(nameof(key)); } + if (key.Length == 0) { throw new FormatException($"{nameof(key)}: must not be empty"); } + + var byteCount = Encoding.UTF8.GetByteCount(key); + if (byteCount > MaxKeyLength) + { + throw new FormatException($"{nameof(key)}: must be at most {MaxKeyLength} bytes when encoded as UTF-8 (was {byteCount} bytes)"); + } + } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index 8bc704ba..d172d853 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -9,17 +9,13 @@ namespace Medallion.Threading.MongoDB; /// public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHandle { - private readonly CancellationTokenSource _cts; - private readonly IMongoCollection _collection; - private readonly Task _extensionTask; - private readonly string _key; - private readonly string _lockId; - private int _disposed; + private InnerHandle? _innerHandle; + private IDisposable? _finalizerRegistration; /// /// Implements /// - public CancellationToken HandleLostToken => this._cts.Token; + public CancellationToken HandleLostToken => (this._innerHandle ?? throw this.ObjectDisposed()).HandleLostToken; /// /// Gets the fencing token for this lock acquisition. This is a monotonically increasing value @@ -35,65 +31,69 @@ internal MongoDistributedLockHandle( TimeoutValue expiry, TimeoutValue extensionCadence) { - this._collection = collection; - this._key = key; - this._lockId = lockId; this.FencingToken = fencingToken; - this._cts = new(); - - // Start background task to extend the lock - this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._cts.Token); + var innerHandle = new InnerHandle(collection, key, lockId, expiry, extensionCadence); + this._innerHandle = innerHandle; + // Register for managed finalization so the lock gets released if the handle is GC'd without being disposed + this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); } /// /// Releases the lock /// - public void Dispose() + public void Dispose() => this.DisposeSyncViaAsync(); + + /// + /// Releases the lock asynchronously + /// + public ValueTask DisposeAsync() { - if (Interlocked.Exchange(ref this._disposed, 1) is not 0) - { - return; - } + Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); + return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; + } - this._cts.Cancel(); - try - { - // Do not use HandleLostToken here: it is backed by _cts and has been canceled above. - this._extensionTask.GetAwaiter().GetResult(); - } - catch + /// + /// Inner handle that performs actual lock management and release. + /// Separated from the outer handle so it can be registered with ManagedFinalizerQueue. + /// + private sealed class InnerHandle : IAsyncDisposable + { + private readonly CancellationTokenSource _cts; + private readonly IMongoCollection _collection; + private readonly Task _extensionTask; + private readonly string _key; + private readonly string _lockId; + private int _disposed; + + public CancellationToken HandleLostToken => this._cts.Token; + + public InnerHandle( + IMongoCollection collection, + string key, + string lockId, + TimeoutValue expiry, + TimeoutValue extensionCadence) { - // Ignore exceptions during cleanup + this._collection = collection; + this._key = key; + this._lockId = lockId; + this._cts = new(); + + // Start background task to extend the lock + this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._cts.Token); } - finally + + public async ValueTask DisposeAsync() { - this._cts.Dispose(); - try - { - this.ReleaseLockAsync(CancellationToken.None).AsTask().GetAwaiter().GetResult(); - } - catch + if (Interlocked.Exchange(ref this._disposed, 1) != 0) { - // Ignore errors during release + return; } - } - } - /// - /// Releases the lock asynchronously - /// - public async ValueTask DisposeAsync() - { - if (Interlocked.Exchange(ref this._disposed, 1) is 0) - { -#if NET8_0_OR_GREATER - await this._cts.CancelAsync().ConfigureAwait(false); -#else this._cts.Cancel(); -#endif try { - await this._extensionTask.ConfigureAwait(false); + await this._extensionTask.AwaitSyncOverAsync().ConfigureAwait(false); } catch { @@ -102,107 +102,102 @@ public async ValueTask DisposeAsync() finally { this._cts.Dispose(); - await this.ReleaseLockAsync(CancellationToken.None).ConfigureAwait(false); + await this.ReleaseLockAsync().ConfigureAwait(false); } } - } - - private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCadence, CancellationToken cancellationToken) - { - const int MaxConsecutiveFailures = 3; - var consecutiveFailures = 0; - try + private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCadence, CancellationToken cancellationToken) { - while (!cancellationToken.IsCancellationRequested) + const int MaxConsecutiveFailures = 3; + var consecutiveFailures = 0; + + try { - await Task.Delay(extensionCadence.TimeSpan, cancellationToken).ConfigureAwait(false); - var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + while (!cancellationToken.IsCancellationRequested) + { + await Task.Delay(extensionCadence.TimeSpan, cancellationToken).ConfigureAwait(false); + var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + + // Use server time ($$NOW) for expiry to avoid client clock skew. + var newExpiresAt = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", "$$NOW" }, + { "unit", "millisecond" }, + { "amount", expiry.InMilliseconds } + } + ); + var update = new PipelineUpdateDefinition( + new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } + ); - // Use server time ($$NOW) for expiry to avoid client clock skew. - var newExpiresAt = new BsonDocument( - "$dateAdd", - new BsonDocument + try { - { "startDate", "$$NOW" }, - { "unit", "millisecond" }, - { "amount", expiry.InMilliseconds } + var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + + // If we successfully extended, reset failure count + if (result.MatchedCount != 0) + { + consecutiveFailures = 0; + continue; + } + + // Lock was truly lost (document doesn't exist or lockId changed) + await this.SignalLockLostAsync().ConfigureAwait(false); + break; } - ); - var update = new PipelineUpdateDefinition( - new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } - ); - - try - { - var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); - - // If we successfully extended, reset failure count - if (result.MatchedCount is not 0) + catch (OperationCanceledException) { - consecutiveFailures = 0; - continue; + throw; // Propagate cancellation } - - // Lock was truly lost (document doesn't exist or lockId changed) - await this.SignalLockLostAsync().ConfigureAwait(false); - break; - } - catch (OperationCanceledException) - { - throw; // Propagate cancellation - } - catch (MongoException) when (++consecutiveFailures < MaxConsecutiveFailures) - { - // Transient network error, retry after a short delay - try + catch (MongoException) when (++consecutiveFailures < MaxConsecutiveFailures) { + // Transient network error, retry after a short delay await Task.Delay(TimeSpan.FromMilliseconds(100 * consecutiveFailures), cancellationToken).ConfigureAwait(false); } - catch (OperationCanceledException) + catch (MongoException) { - throw; + // Too many consecutive failures, assume lock is lost + await this.SignalLockLostAsync().ConfigureAwait(false); + break; } } - catch (MongoException) - { - // Too many consecutive failures, assume lock is lost - await this.SignalLockLostAsync().ConfigureAwait(false); - break; - } + } + catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) + { + // Expected when disposing + } + catch + { + // Lock extension failed, signal that the lock is lost + await this.SignalLockLostAsync().ConfigureAwait(false); } } - catch (OperationCanceledException) - { - // Expected when disposing - } - catch - { - // Lock extension failed, signal that the lock is lost - await this.SignalLockLostAsync().ConfigureAwait(false); - } - } - private async Task SignalLockLostAsync() - { + private async Task SignalLockLostAsync() + { #if NET8_0_OR_GREATER - await this._cts.CancelAsync().ConfigureAwait(false); + await this._cts.CancelAsync().ConfigureAwait(false); #else - this._cts.Cancel(); - await Task.CompletedTask.ConfigureAwait(false); + this._cts.Cancel(); + await Task.CompletedTask.ConfigureAwait(false); #endif - } + } - private async ValueTask ReleaseLockAsync(CancellationToken cancellationToken) - { - try + private async ValueTask ReleaseLockAsync() { var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); - await this._collection.DeleteOneAsync(filter, cancellationToken).ConfigureAwait(false); - } - catch - { - // Ignore errors during release + if (SyncViaAsync.IsSynchronous) + { + // ReSharper disable once MethodHasAsyncOverload + this._collection.DeleteOne(filter); + } + else + { + // ReSharper disable once MethodSupportsCancellation + await this._collection.DeleteOneAsync(filter).ConfigureAwait(false); + } } } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs index 5bb25e9b..b021030d 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -15,7 +15,6 @@ public sealed class MongoDistributedSynchronizationOptionsBuilder private static readonly TimeoutValue MinimumExpiry = TimeSpan.FromSeconds(.1); private TimeoutValue? _expiry, _extensionCadence, _minBusyWaitSleepTime, _maxBusyWaitSleepTime; - private bool? _useAdaptiveBackoff; private MongoDistributedSynchronizationOptionsBuilder() { } @@ -74,19 +73,6 @@ public MongoDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan return this; } - /// - /// Enables adaptive exponential backoff for busy waiting. When enabled, the sleep time between - /// acquisition attempts will start at the minimum and exponentially increase towards the maximum - /// as consecutive failures occur, then reset on success. This reduces MongoDB load under high - /// contention while maintaining responsiveness when contention is low. - /// Defaults to false (random sleep time within the configured range). - /// - public MongoDistributedSynchronizationOptionsBuilder UseAdaptiveBackoff(bool enabled = true) - { - _useAdaptiveBackoff = enabled; - return this; - } - internal static MongoDistributedLockOptions GetOptions(Action? optionsBuilder) { MongoDistributedSynchronizationOptionsBuilder? options; @@ -118,8 +104,7 @@ internal static MongoDistributedLockOptions GetOptions(Action. Locks will be stored in a collection named "distributed.locks" by default. /// public MongoDistributedSynchronizationProvider(IMongoDatabase database, Action? options = null) - : this(database, "distributed.locks", options) { } + : this(database, MongoDistributedLock.DefaultCollectionName, options) { } /// /// Constructs a that connects to the provided , diff --git a/src/DistributedLock.MongoDB/MongoLockDocument.cs b/src/DistributedLock.MongoDB/MongoLockDocument.cs index 170e0361..f2a37cbb 100644 --- a/src/DistributedLock.MongoDB/MongoLockDocument.cs +++ b/src/DistributedLock.MongoDB/MongoLockDocument.cs @@ -9,6 +9,20 @@ namespace Medallion.Threading.MongoDB; // ReSharper disable once ClassNeverInstantiated.Global internal sealed class MongoLockDocument { + /// + /// The lock name/key (MongoDB document ID) + /// + [BsonId] + [BsonRepresentation(BsonType.String)] + public string Id { get; set; } = null!; + + /// + /// Unique identifier for this lock acquisition + /// + [BsonElement("lockId")] + [BsonRepresentation(BsonType.String)] + public string LockId { get; set; } = null!; + /// /// When the lock was acquired (UTC) /// @@ -28,18 +42,4 @@ internal sealed class MongoLockDocument /// [BsonElement("fencingToken")] public long FencingToken { get; set; } - - /// - /// The lock name/key (MongoDB document ID) - /// - [BsonId] - [BsonRepresentation(BsonType.String)] - public string Id { get; set; } = string.Empty; - - /// - /// Unique identifier for this lock acquisition - /// - [BsonElement("lockId")] - [BsonRepresentation(BsonType.String)] - public string LockId { get; set; } = string.Empty; } \ No newline at end of file diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index e48bf314..0004480b 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -1,4 +1,4 @@ -using Medallion.Shell; +using Medallion.Shell; using Medallion.Threading.Internal; using NUnit.Framework; using System.Runtime.InteropServices; @@ -208,29 +208,6 @@ public async Task TestParallelism() tasks.ForEach(t => t.Result.ShouldEqual(0)); } - [Test] - [NonParallelizable] // takes locks with known names - public void TestGetSafeName() - { - Assert.Catch(() => this._lockProvider.GetSafeName(null!)); - - foreach (var name in new[] { string.Empty, new string('a', 1000), @"\\\\\", new string('\\', 1000) }) - { - var safeName = this._lockProvider.GetSafeName(name); - Assert.DoesNotThrow(() => this._lockProvider.CreateLockWithExactName(safeName).Acquire(TimeSpan.FromSeconds(10)).Dispose(), $"{this.GetType().Name}: could not acquire '{name}'"); - } - } - - [Test] - public void TestGetSafeLockNameIsCaseSensitive() - { - var longName1 = new string('a', 1000); - var longName2 = new string('a', longName1.Length - 1) + "A"; - StringComparer.OrdinalIgnoreCase.Equals(longName1, longName2).ShouldEqual(true, "sanity check"); - - Assert.That(this._lockProvider.GetSafeName(longName2), Is.Not.EqualTo(this._lockProvider.GetSafeName(longName1))); - } - [Test] public async Task TestLockNamesAreCaseSensitive() { diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 7c8648d0..9a141c71 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -103,8 +103,48 @@ public void TestName() const string Name = "\0🐉汉字\b\r\n\\"; var database = new Mock(MockBehavior.Strict).Object; var @lock = new MongoDistributedLock(Name, database); - @lock.Name.ShouldEqual(Name); - @lock.Key.ShouldEqual(Name); + // With safe name conversion, the key should be the same as name since it's within byte limits + @lock.Name.ShouldEqual(@lock.Key); + } + + [Test] + [Category("CI")] + public void TestReturnsUnmodifiedKey() + { + const string Key = "my-exact-key"; + var database = new Mock(MockBehavior.Strict).Object; + var @lock = new MongoDistributedLock(Key, database); + @lock.Key.ShouldEqual(Key); + @lock.Name.ShouldEqual(Key); + } + + [Test] + [Category("CI")] + public void TestValidatesEmptyKey() + { + var database = new Mock(MockBehavior.Strict).Object; + Assert.Throws(() => new MongoDistributedLock(string.Empty, database)); + } + + [Test] + [Category("CI")] + public void TestValidatesKeyTooLong() + { + var database = new Mock(MockBehavior.Strict).Object; + // Create a string that's exactly 256 bytes in UTF-8 (over the 255 limit) + var longKey = new string('a', 256); + Assert.Throws(() => new MongoDistributedLock(longKey, database)); + } + + [Test] + [Category("CI")] + public void TestValidatesMultibyteCharacters() + { + var database = new Mock(MockBehavior.Strict).Object; + // Chinese characters are 3 bytes each in UTF-8 + // 86 characters * 3 bytes = 258 bytes (over 255 limit) + var multibyteLongKey = new string('汉', 86); + Assert.Throws(() => new MongoDistributedLock(multibyteLongKey, database)); } [Test] @@ -153,8 +193,8 @@ public async Task TestIndexCreationIsScopedToCluster() // Wait, unit testing static cache with mocks is tricky because state persists. // We need a unique db/coll name to avoid interference from other tests. var uniqueName = "db_" + Guid.NewGuid().ToString("N"); - SetupDb(db1, coll1, uniqueName, "locks"); - SetupDb(db2, coll2, uniqueName, "locks"); + SetDb(db1, coll1, uniqueName, "locks"); + SetDb(db2, coll2, uniqueName, "locks"); // We want to verify ConfigureIndexes is called on BOTH. @@ -188,9 +228,9 @@ public async Task TestIndexCreationIsScopedToCluster() idx2.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "Second DB should create index too because it's a different instance"); } - private static void SetupDb(Mock db, Mock> coll, string dbName, string collName) + private static void SetDb(Mock db, Mock> coll, string dbName, string collName) { - db.Setup(d => d.GetCollection(collName, null)).Returns(coll.Object); + db.Setup(d => d.GetCollection(collName)).Returns(coll.Object); var dbNs = new DatabaseNamespace(dbName); var collNs = new CollectionNamespace(dbNs, collName); @@ -212,7 +252,7 @@ public async Task TestIndexCreationFailureIsCached() { var db = new Mock(MockBehavior.Strict); var coll = new Mock>(MockBehavior.Strict); - SetupDb(db, coll, "db_" + Guid.NewGuid().ToString("N"), "locks"); + SetDb(db, coll, "db_" + Guid.NewGuid().ToString("N"), "locks"); var idx = new Mock>(MockBehavior.Strict); coll.Setup(c => c.Indexes).Returns(idx.Object); From 1a279a8a21b0a57586b8ca3c26f723c930e6bdb6 Mon Sep 17 00:00:00 2001 From: Joes Date: Sat, 10 Jan 2026 01:42:01 +0800 Subject: [PATCH 355/399] fix: ci error --- src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt index d521649e..beb583c7 100644 --- a/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.MongoDB/PublicAPI.Unshipped.txt @@ -1,3 +1,2 @@ #nullable enable -Medallion.Threading.MongoDB.MongoDistributedLockHandle.FencingToken.get -> long -Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder.UseAdaptiveBackoff(bool enabled = true) -> Medallion.Threading.MongoDB.MongoDistributedSynchronizationOptionsBuilder! \ No newline at end of file +Medallion.Threading.MongoDB.MongoDistributedLockHandle.FencingToken.get -> long \ No newline at end of file From 2f2861bd5a8e896c5c18aa1e6ec11285d67cd9f5 Mon Sep 17 00:00:00 2001 From: Joes Date: Sat, 10 Jan 2026 02:10:54 +0800 Subject: [PATCH 356/399] =?UTF-8?q?=E4=BF=AE=E6=AD=A3GetCollection?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E4=BB=A5=E5=8C=B9=E9=85=8D=E9=87=8D=E8=BD=BD?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将IMongoDatabase.GetCollection的模拟调用由单参数(collName)改为双参数(collName, null)，以显式匹配MongoDB驱动的重载方法签名，确保测试时参数一致性，避免因参数不匹配导致的测试失败。 --- .../Tests/MongoDB/MongoDistributedLockTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 41417dcd..87ce808f 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -230,7 +230,7 @@ public async Task TestIndexCreationIsScopedToCluster() private static void SetDb(Mock db, Mock> coll, string dbName, string collName) { - db.Setup(d => d.GetCollection(collName)).Returns(coll.Object); + db.Setup(d => d.GetCollection(collName, null)).Returns(coll.Object); var dbNs = new DatabaseNamespace(dbName); var collNs = new CollectionNamespace(dbNs, collName); From d25e049df51b7328b9466ca78e2f2e0c9e37ccab Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 10 Jan 2026 10:13:37 -0500 Subject: [PATCH 357/399] Additional work on composites For #236 --- ...mpositeDistributedSynchronizationHandle.cs | 484 +++----------- .../DistributedLockProviderExtensions.cs | 37 +- ...butedReaderWriterLockProviderExtensions.cs | 76 ++- .../DistributedSemaphoreProviderExtensions.cs | 41 +- src/DistributedLock.Core/Internal/Helpers.cs | 5 - .../Internal/SyncViaAsync.cs | 7 +- .../PublicAPI.Shipped.txt | 15 +- .../PublicAPI.Unshipped.txt | 17 - src/DistributedLock.Core/packages.lock.json | 24 - src/DistributedLock.Tests/packages.lock.json | 589 +----------------- 10 files changed, 188 insertions(+), 1107 deletions(-) diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 7abc1a9f..2e588f5e 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -4,189 +4,89 @@ namespace Medallion.Threading; internal sealed class CompositeDistributedSynchronizationHandle : IDistributedSynchronizationHandle { - private readonly IDistributedSynchronizationHandle[] _handles; - private readonly CancellationTokenSource? _linkedLostCts; - private bool _disposed; + private RefBox<(IReadOnlyList Handles, CancellationTokenSource? HandleLostSource)>? _box; - public CompositeDistributedSynchronizationHandle(IReadOnlyList handles) + private CompositeDistributedSynchronizationHandle(IReadOnlyList handles) { - ValidateHandles(handles); - this._handles = handles.ToArray(); - this._linkedLostCts = this.CreateLinkedCancellationTokenSource(); + this._box = RefBox.Create((handles, default(CancellationTokenSource))); } - public CancellationToken HandleLostToken => this._linkedLostCts?.Token ?? CancellationToken.None; - - public void Dispose() - { - if (this._disposed) - { - return; - } - - this._disposed = true; - var errors = this.DisposeHandles(h => h.Dispose()); - this._linkedLostCts?.Dispose(); - ThrowAggregateExceptionIfNeeded(errors, "disposing"); - } - - public async ValueTask DisposeAsync() + public CancellationToken HandleLostToken { - if (this._disposed) + get { - return; - } - - this._disposed = true; - var errors = await this.DisposeHandlesAsync(h => h.DisposeAsync()).ConfigureAwait(false); - this._linkedLostCts?.Dispose(); - ThrowAggregateExceptionIfNeeded(errors, "asynchronously disposing"); - } - - public static async ValueTask TryAcquireAllAsync( - TProvider provider, - Func> acquireFunc, - IReadOnlyList names, - TimeSpan timeout, - CancellationToken cancellationToken) - { - ValidateAcquireParameters(provider, acquireFunc, names); + var existingBox = Volatile.Read(ref this._box); - var timeoutTracker = new TimeoutTracker(new TimeoutValue(timeout)); - var handles = new List(names.Count); - IDistributedSynchronizationHandle? result = null; - - try - { - foreach (var name in names) + if (existingBox != null + && existingBox.Value.HandleLostSource is null + && CreateLinkedCancellationTokenSource(existingBox.Value.Handles) is { } handleLostSource) { - var handle = await acquireFunc(provider, name, timeoutTracker.Remaining, cancellationToken) - .ConfigureAwait(false); - - if (handle is null) - { - break; - } - - handles.Add(handle); - - if (timeoutTracker.IsExpired) + var newContents = existingBox.Value; + var newBox = RefBox.Create(newContents); + var newExistingBox = Interlocked.CompareExchange(ref this._box, newBox, comparand: existingBox); + if (newExistingBox != existingBox) { - break; + handleLostSource.Dispose(); + existingBox = newExistingBox; } } - if (handles.Count == names.Count) - { - result = new CompositeDistributedSynchronizationHandle(handles); - } + return existingBox is null ? throw this.ObjectDisposed() : existingBox.Value.HandleLostSource?.Token ?? CancellationToken.None; } - finally - { - if (result is null) - { - await DisposeHandlesAsync(handles).ConfigureAwait(false); - } - } - - return result; } - public static async ValueTask AcquireAllAsync( - TProvider provider, - Func> acquireFunc, - IReadOnlyList names, - TimeSpan? timeout, - CancellationToken cancellationToken) - { - var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; - var handle = await TryAcquireAllAsync( - provider, - WrapAcquireFunc(acquireFunc), - names, - effectiveTimeout, - cancellationToken) - .ConfigureAwait(false); + public void Dispose() => this.DisposeSyncViaAsync(); - if (handle is null) + public async ValueTask DisposeAsync() + { + if (Interlocked.Exchange(ref this._box, null) is { } box) { - throw new TimeoutException($"Timed out after {effectiveTimeout} while acquiring all locks."); + try { await DisposeHandlesAsync(box.Value.Handles).ConfigureAwait(false); } + finally { box.Value.HandleLostSource?.Dispose(); } } - - return handle; } - public static IDistributedSynchronizationHandle? TryAcquireAll( - TProvider provider, - Func acquireFunc, - IReadOnlyList names, - TimeSpan timeout, - CancellationToken cancellationToken) => - SyncViaAsync.Run( - state => TryAcquireAllAsync( - state.provider, - WrapSyncAcquireFunc(state.acquireFunc), - state.names, - state.timeout, - state.cancellationToken), - (provider, acquireFunc, names, timeout, cancellationToken) - ); + public static IReadOnlyList FromNames(IReadOnlyList names, TState state, Func create) + { + if (names is null) { throw new ArgumentNullException(nameof(names)); } + if (names.Count == 0) { throw new ArgumentException("At least one lock name is required.", nameof(names)); } + if (names.Contains(null)) { throw new ArgumentException("Must not contain null", nameof(names)); } - public static IDistributedSynchronizationHandle AcquireAll( - TProvider provider, - Func acquireFunc, - IReadOnlyList names, - TimeSpan? timeout, - CancellationToken cancellationToken) => - SyncViaAsync.Run( - state => AcquireAllAsync( - state.provider, - WrapSyncAcquireFuncForRequired(state.acquireFunc), - state.names, - state.timeout, - state.cancellationToken), - (provider, acquireFunc, names, timeout, cancellationToken) - ); + return names.Select(n => create(state, n)).ToArray(); + } - public static async ValueTask TryAcquireAllAsync( - TProvider provider, - Func> - acquireFunc, - IReadOnlyList names, - int maxCount, + public static async ValueTask TryAcquireAllAsync( + IReadOnlyList primitives, + Func> acquireFunc, TimeSpan timeout, CancellationToken cancellationToken) + where TPrimitive : class { - ValidateAcquireParameters(provider, acquireFunc, names); + if (primitives.Count == 1) + { + return new(await acquireFunc(primitives[0], timeout, cancellationToken) ?? primitives[0].As()); + } var timeoutTracker = new TimeoutTracker(new TimeoutValue(timeout)); - var handles = new List(names.Count); - IDistributedSynchronizationHandle? result = null; + var handles = new List(primitives.Count); + CompositeDistributedSynchronizationHandle? result = null; try { - foreach (var name in names) + foreach (var primitive in primitives) { - var handle = await acquireFunc(provider, name, maxCount, timeoutTracker.Remaining, cancellationToken) + var handle = await acquireFunc(primitive, timeoutTracker.Remaining, cancellationToken) .ConfigureAwait(false); if (handle is null) { - break; + return new(primitive); // failure } handles.Add(handle); - - if (timeoutTracker.IsExpired) - { - break; - } } - if (handles.Count == names.Count) - { - result = new CompositeDistributedSynchronizationHandle(handles); - } + result = new(handles); } finally { @@ -196,100 +96,28 @@ public static IDistributedSynchronizationHandle AcquireAll( } } - return result; - } - - - public static async ValueTask AcquireAllAsync( - TProvider provider, - Func> - acquireFunc, - IReadOnlyList names, - int maxCount, - TimeSpan? timeout, - CancellationToken cancellationToken) - { - var effectiveTimeout = timeout ?? Timeout.InfiniteTimeSpan; - var handle = await TryAcquireAllAsync( - provider, - WrapAcquireFunc(acquireFunc), - names, - maxCount, - effectiveTimeout, - cancellationToken) - .ConfigureAwait(false); - - if (handle is null) - { - throw new TimeoutException($"Timed out after {effectiveTimeout} while acquiring all locks."); - } - - return handle; + return new(result); } - public static IDistributedSynchronizationHandle? TryAcquireAll( - TProvider provider, - Func acquireFunc, - IReadOnlyList names, - int maxCount, - TimeSpan timeout, - CancellationToken cancellationToken) => - SyncViaAsync.Run( - state => TryAcquireAllAsync( - state.provider, - WrapSyncAcquireFunc(state.acquireFunc), - state.names, - state.maxCount, - state.timeout, - state.cancellationToken), - (provider, acquireFunc, names, maxCount, timeout, cancellationToken) - ); - - public static IDistributedSynchronizationHandle AcquireAll( - TProvider provider, - Func acquireFunc, - IReadOnlyList names, - int maxCount, - TimeSpan? timeout, - CancellationToken cancellationToken) => - SyncViaAsync.Run( - state => AcquireAllAsync( - state.provider, - WrapSyncAcquireFuncForRequired(state.acquireFunc), - state.names, - state.maxCount, - state.timeout, - state.cancellationToken), - (provider, acquireFunc, names, maxCount, timeout, cancellationToken) - ); - - private static void ValidateHandles(IReadOnlyList handles) + public readonly struct AcquireResult(object handleOrFailedPrimitive) { - if (handles is null) - { - throw new ArgumentNullException(nameof(handles)); - } + public IDistributedSynchronizationHandle? GetHandleOrDefault() => + handleOrFailedPrimitive as IDistributedSynchronizationHandle; + public IDistributedSynchronizationHandle Handle => + this.GetHandleOrDefault() ?? throw new TimeoutException($"Timed out acquiring '{this.GetFailedName()}'"); - if (handles.Count == 0) + private string GetFailedName() => handleOrFailedPrimitive switch { - throw new ArgumentException("At least one handle is required", nameof(handles)); - } - - for (var i = 0; i < handles.Count; ++i) - { - if (handles[i] is null) - { - throw new ArgumentException( - $"Handles must not contain null elements; found null at index {i}", - nameof(handles) - ); - } - } + IDistributedLock @lock => @lock.Name, + IDistributedReaderWriterLock @lock => @lock.Name, + IDistributedSemaphore semaphore => semaphore.Name, + _ => handleOrFailedPrimitive.ToString()! + }; } - private CancellationTokenSource? CreateLinkedCancellationTokenSource() + private static CancellationTokenSource? CreateLinkedCancellationTokenSource(IReadOnlyList handles) { - var cancellableTokens = this._handles + var cancellableTokens = handles .Select(h => h.HandleLostToken) .Where(t => t.CanBeCanceled) .ToArray(); @@ -299,194 +127,31 @@ private static void ValidateHandles(IReadOnlyList? DisposeHandles(Action disposeAction) + private static async ValueTask DisposeHandlesAsync(IReadOnlyList handles) { - List? errors = null; - - foreach (var handle in this._handles) + List? exceptions = null; + // release in reverse order of acquisition + for (var i = handles.Count - 1; i >= 0; i--) { try { - disposeAction(handle); + // in most cases Dispose() will call DisposeSyncViaAsync() anyway, but we need to do this to be + // robust to externally-implemented handle types that aren't sync-via-async friendly + if (SyncViaAsync.IsSynchronous) { handles[i].Dispose(); } + else { await handles[i].DisposeAsync().ConfigureAwait(false); } } catch (Exception ex) { - (errors ??= []).Add(ex); + (exceptions ??= []).Add(ex); } } - return errors; - } - - private async ValueTask?> DisposeHandlesAsync( - Func disposeAction) - { - List? errors = null; - - foreach (var handle in this._handles) - { - try - { - await disposeAction(handle).ConfigureAwait(false); - } - catch (Exception ex) - { - (errors ??= []).Add(ex); - } - } - - return errors; - } - - private static void ThrowAggregateExceptionIfNeeded(List? errors, string operation) - { - if (errors is not null && errors.Count > 0) - { - throw new AggregateException( - $"One or more errors occurred while {operation} a composite distributed handle.", errors); - } - } - - private static void ValidateAcquireParameters( - TProvider provider, - Func> acquireFunc, - IReadOnlyList names) - { - if (provider is null) - { - throw new ArgumentNullException(nameof(provider)); - } - - if (acquireFunc is null) - { - throw new ArgumentNullException(nameof(acquireFunc)); - } - - if (names is null) - { - throw new ArgumentNullException(nameof(names)); - } - - if (names.Count == 0) - { - throw new ArgumentException("At least one lock name is required.", nameof(names)); - } - - for (var i = 0; i < names.Count; ++i) - { - if (names[i] is null) - { - throw new ArgumentException( - $"Names must not contain null elements; found null at index {i}", - nameof(names) - ); - } - } - } - - private static void ValidateAcquireParameters( - TProvider provider, - Func> - acquireFunc, - IReadOnlyList names) - { - if (provider is null) - { - throw new ArgumentNullException(nameof(provider)); - } - - if (acquireFunc is null) - { - throw new ArgumentNullException(nameof(acquireFunc)); - } - - if (names is null) + if (exceptions != null) { - throw new ArgumentNullException(nameof(names)); - } - - if (names.Count == 0) - { - throw new ArgumentException("At least one lock name is required.", nameof(names)); - } - - for (var i = 0; i < names.Count; ++i) - { - if (names[i] is null) - { - throw new ArgumentException( - $"Names must not contain null elements; found null at index {i}", - nameof(names) - ); - } - } - } - - private static async ValueTask DisposeHandlesAsync(List handles) - { - foreach (var handle in handles) - { - try - { - await handle.DisposeAsync().ConfigureAwait(false); - } - catch - { - // Suppress exceptions during cleanup - } + throw new AggregateException(exceptions); } } - private static Func> - WrapAcquireFunc( - Func> - acquireFunc) => - async (p, n, t, c) => await acquireFunc(p, n, t, c).ConfigureAwait(false); - - private static Func> - WrapSyncAcquireFunc( - Func acquireFunc) => - (p, n, t, c) => new ValueTask(acquireFunc(p, n, t, c)); - - private static Func> - WrapSyncAcquireFuncForRequired( - Func acquireFunc) => - (p, n, t, c) => - { - var handle = acquireFunc(p, n, t, c); - return handle is not null - ? new ValueTask(handle) - : throw new TimeoutException($"Failed to acquire lock for '{n}'"); - }; - - - private static Func> - WrapAcquireFunc( - Func> - acquireFunc) => - async (p, n, mc, t, c) => await acquireFunc(p, n, mc, t, c).ConfigureAwait(false); - - private static Func> - WrapSyncAcquireFunc( - Func - acquireFunc) => - (p, n, mc, t, c) => new ValueTask(acquireFunc(p, n, mc, t, c)); - - private static Func> - WrapSyncAcquireFuncForRequired( - Func - acquireFunc) => - (p, n, mc, t, c) => - { - var handle = acquireFunc(p, n, mc, t, c); - return handle is not null - ? new ValueTask(handle) - : throw new TimeoutException($"Failed to acquire lock for '{n}'"); - }; - private readonly struct TimeoutTracker(TimeoutValue timeout) { private readonly System.Diagnostics.Stopwatch? _stopwatch = timeout.IsInfinite @@ -499,7 +164,16 @@ private readonly struct TimeoutTracker(TimeoutValue timeout) ? TimeSpan.Zero : timeout.TimeSpan - elapsed : Timeout.InfiniteTimeSpan; - - public bool IsExpired => this._stopwatch is not null && this._stopwatch.Elapsed >= timeout.TimeSpan; } +} + +internal static class CompositeDistributedLockHandleExtensions +{ + public static async ValueTask GetHandleOrDefault( + this ValueTask @this) => + (await @this.ConfigureAwait(false)).GetHandleOrDefault(); + + public static async ValueTask GetHandleOrTimeout( + this ValueTask @this) => + (await @this.ConfigureAwait(false)).Handle; } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs index 42dd78f1..4c6cd93c 100644 --- a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -1,5 +1,8 @@ // AUTO-GENERATED +using Medallion.Threading.Internal; +using System.Threading; + namespace Medallion.Threading; /// @@ -46,40 +49,42 @@ public static ValueTask AcquireLockAsync(this /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAll( - provider, - static (p, n, t, c) => p.TryAcquireLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.TryAcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAll( - provider, - static (p, n, t, c) => p.AcquireLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.AcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask TryAcquireAllLocksAsync(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - provider, - static (p, n, t, c) => p.TryAcquireLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrDefault(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllLocksAsync(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAllAsync( - provider, - static (p, n, t, c) => p.AcquireLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); + + private static ValueTask TryAcquireAllLocksInternalAsync( + this IDistributedLockProvider provider, + IReadOnlyList names, + TimeSpan timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames(names, provider ?? throw new ArgumentNullException(nameof(provider)), static (p, n) => p.CreateLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), + timeout, cancellationToken); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index 5e2dadd2..ffc89e08 100644 --- a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -1,5 +1,7 @@ // AUTO-GENERATED +using Medallion.Threading.Internal; + namespace Medallion.Threading; /// @@ -74,80 +76,90 @@ public static ValueTask AcquireWriteLockAsync /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAll( - provider, - static (p, n, t, c) => p.TryAcquireReadLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.TryAcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAll( - provider, - static (p, n, t, c) => p.AcquireReadLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.AcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask TryAcquireAllReadLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - provider, - static (p, n, t, c) => p.TryAcquireReadLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllReadLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrDefault(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllReadLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAllAsync( - provider, - static (p, n, t, c) => p.AcquireReadLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllReadLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAll( - provider, - static (p, n, t, c) => p.TryAcquireWriteLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.TryAcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAll( - provider, - static (p, n, t, c) => p.AcquireWriteLock(n, t, c), - names, timeout, cancellationToken); + SyncViaAsync.Run( + static s => s.provider.AcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), + (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask TryAcquireAllWriteLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - provider, - static (p, n, t, c) => p.TryAcquireWriteLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllWriteLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrDefault(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllWriteLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAllAsync( - provider, - static (p, n, t, c) => p.AcquireWriteLockAsync(n, t, c), - names, timeout, cancellationToken); + provider.TryAcquireAllWriteLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); + + private static ValueTask TryAcquireAllReadLocksInternalAsync( + this IDistributedReaderWriterLockProvider provider, + IReadOnlyList names, + TimeSpan timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + provider ?? throw new ArgumentNullException(nameof(provider)), + static (p, n) => p.CreateReaderWriterLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireReadLock(t, c).AsValueTask() : p.TryAcquireReadLockAsync(t, c), + timeout, cancellationToken); + + private static ValueTask TryAcquireAllWriteLocksInternalAsync( + this IDistributedReaderWriterLockProvider provider, + IReadOnlyList names, + TimeSpan timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + provider ?? throw new ArgumentNullException(nameof(provider)), + static (p, n) => p.CreateReaderWriterLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireWriteLock(t, c).AsValueTask() : p.TryAcquireWriteLockAsync(t, c), + timeout, cancellationToken); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index dc961498..c1d4b7b6 100644 --- a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -1,5 +1,7 @@ // AUTO-GENERATED +using Medallion.Threading.Internal; + namespace Medallion.Threading; /// @@ -46,40 +48,47 @@ public static ValueTask AcquireSemaphoreAsync /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAll( - provider, - static (p, n, mc, t, c) => p.TryAcquireSemaphore(n, mc, t, c), - names, maxCount, timeout, cancellationToken); + SyncViaAsync.Run( + s => provider.TryAcquireAllSemaphoresAsync(names, maxCount, timeout, cancellationToken), + (provider, names, maxCount, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAll( - provider, - static (p, n, mc, t, c) => p.AcquireSemaphore(n, mc, t, c), - names, maxCount, timeout, cancellationToken); + SyncViaAsync.Run( + s => provider.AcquireAllSemaphoresAsync(names, maxCount, timeout, cancellationToken), + (provider, names, maxCount, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask TryAcquireAllSemaphoresAsync(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - provider, - static (p, n, mc, t, c) => p.TryAcquireSemaphoreAsync(n, mc, t, c), - names, maxCount, timeout, cancellationToken); + provider.TryAcquireAllSemaphoresInternalAsync(names, maxCount, timeout, cancellationToken).GetHandleOrDefault(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllSemaphoresAsync(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - CompositeDistributedSynchronizationHandle.AcquireAllAsync( - provider, - static (p, n, mc, t, c) => p.AcquireSemaphoreAsync(n, mc, t, c), - names, maxCount, timeout, cancellationToken); + provider.TryAcquireAllSemaphoresInternalAsync(names, maxCount, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); + + private static ValueTask TryAcquireAllSemaphoresInternalAsync( + this IDistributedSemaphoreProvider provider, + IReadOnlyList names, + int maxCount, + TimeSpan timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + (provider: provider ?? throw new ArgumentNullException(nameof(provider)), maxCount), + static (s, n) => s.provider.CreateSemaphore(n, s.maxCount)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), + timeout, + cancellationToken); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index d77cd1d0..c7da045c 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -21,11 +21,6 @@ public static async ValueTask Convert(this ValueTask await task.ConfigureAwait(false); - public readonly struct TaskConversion - { - public TaskConversion To() => throw new InvalidOperationException(); - } - public readonly struct TaskConversion { } internal static async ValueTask ConvertToVoid(this ValueTask task) => await task.ConfigureAwait(false); diff --git a/src/DistributedLock.Core/Internal/SyncViaAsync.cs b/src/DistributedLock.Core/Internal/SyncViaAsync.cs index 82869991..d2c0328d 100644 --- a/src/DistributedLock.Core/Internal/SyncViaAsync.cs +++ b/src/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -26,7 +26,7 @@ static class SyncViaAsync public static void Run(Func action, TState state) { Run( - async s => + static async s => { await s.action(s.state).ConfigureAwait(false); return true; @@ -40,8 +40,9 @@ public static void Run(Func action, TState state) /// public static TResult Run(Func> action, TState state) { - Invariant.Require(!_isSynchronous); + Invariant.Require(!_isSynchronous || Environment.StackTrace.Contains(nameof(CompositeDistributedSynchronizationHandle))); + var wasSynchronous = _isSynchronous; try { _isSynchronous = true; @@ -62,7 +63,7 @@ public static TResult Run(Func> acti } finally { - _isSynchronous = false; + _isSynchronous = wasSynchronous; } } diff --git a/src/DistributedLock.Core/PublicAPI.Shipped.txt b/src/DistributedLock.Core/PublicAPI.Shipped.txt index 98ab2310..1e6c6e7f 100644 --- a/src/DistributedLock.Core/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Core/PublicAPI.Shipped.txt @@ -54,6 +54,10 @@ static Medallion.Threading.DistributedLockProviderExtensions.AcquireLock(this Me static Medallion.Threading.DistributedLockProviderExtensions.AcquireLockAsync(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireLock(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireLockAsync(this Medallion.Threading.IDistributedLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireReadLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireReadLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireWriteLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! @@ -62,11 +66,20 @@ static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcqu static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireReadLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireWriteLock(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireWriteLockAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemaphore(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphore(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTaskstatic Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle? static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock.Core/PublicAPI.Unshipped.txt b/src/DistributedLock.Core/PublicAPI.Unshipped.txt index 4b44c194..e69de29b 100644 --- a/src/DistributedLock.Core/PublicAPI.Unshipped.txt +++ b/src/DistributedLock.Core/PublicAPI.Unshipped.txt @@ -1,17 +0,0 @@ -#nullable enable -static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! -static Medallion.Threading.DistributedLockProviderExtensions.AcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocks(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? -static Medallion.Threading.DistributedLockProviderExtensions.TryAcquireAllLocksAsync(this Medallion.Threading.IDistributedLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.AcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllReadLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocks(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? -static Medallion.Threading.DistributedReaderWriterLockProviderExtensions.TryAcquireAllWriteLocksAsync(this Medallion.Threading.IDistributedReaderWriterLockProvider! provider, System.Collections.Generic.IReadOnlyList! names, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! -static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? -static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 89913e0e..813d98fe 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,593 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", - "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", - "dependencies": { - "Microsoft.Identity.Client": "4.61.3", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", - "DistributedLock.SqlServer": "[1.0.6, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Oracle.ManagedDataAccess": "[23.6.1, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.6, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.33, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.5", - "System.Threading.Channels": "8.0.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "CentralTransitive", - "requested": "[23.6.1, )", - "resolved": "23.6.1", - "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Formats.Asn1": "8.0.1", - "System.Text.Json": "8.0.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.33, )", - "resolved": "2.7.33", - "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -1072,7 +485,7 @@ "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.0, )", + "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.6, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" From 241524062d550654da74baa5c574f80d098050bd Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 10:22:50 -0500 Subject: [PATCH 358/399] Testing for composites For #236 --- docs/Developing DistributedLock.md | 6 +- ...mpositeDistributedSynchronizationHandle.cs | 85 +++++++++--- .../DistributedLockProviderExtensions.cs | 21 +-- ...butedReaderWriterLockProviderExtensions.cs | 46 +------ .../DistributedSemaphoreProviderExtensions.cs | 25 +--- ...eableReaderWriterLockProviderExtensions.cs | 2 + .../IDistributedSynchronizationHandle.cs | 4 +- .../Data/MultiplexedConnectionLock.cs | 26 ++-- .../Composites/TestingCompositesProviders.cs | 31 +++++ .../Infrastructure/Shared/Composites.cs | 84 +++++++++++ .../Tests/CombinatorialTests.cs | 9 ++ .../DistributedLockProviderExtensionsTest.cs | 48 +++---- .../Tests/TestSetupTest.cs | 5 +- .../GenerateProviders.cs | 130 +++++++----------- src/DistributedLockTaker/Program.cs | 12 ++ 15 files changed, 308 insertions(+), 226 deletions(-) create mode 100644 src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs create mode 100644 src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index 380b8484..a96d434a 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -55,13 +55,17 @@ You can install Postgres from [here](https://www.enterprisedb.com/downloads/post In `C:\Program Files\PostgreSQL\\data\postgresql.conf`, update `max_connections` to 200. +(Windows) If you don't want Postgres always running on your machine, set the Startup type to "Manual" for `postgresql-x64-{VERSION} - PostgresSQL Server {VERSION}`. + Add your username (e.g. postgres) and password to `DistributedLock.Tests/credentials/postgres.txt`, with the username on line 1 and the password on line 2. ### SQL Server Download SQL developer edition from [here](https://www.microsoft.com/en-us/sql-server/sql-server-downloads). -The tests connect via integrated security. +(Windows) If you don't want SQLServer always running on your machine, set the Startup type to "Manual" for `SQL Server (MSSQLSERVER)`. + +The tests connect via integrated security. ### Redis diff --git a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs index 2e588f5e..d567f0cd 100644 --- a/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/CompositeDistributedSynchronizationHandle.cs @@ -15,23 +15,21 @@ public CancellationToken HandleLostToken { get { - var existingBox = Volatile.Read(ref this._box); + var currentBox = Volatile.Read(ref this._box); - if (existingBox != null - && existingBox.Value.HandleLostSource is null - && CreateLinkedCancellationTokenSource(existingBox.Value.Handles) is { } handleLostSource) + if (currentBox != null + && currentBox.Value.HandleLostSource is null + && CreateLinkedCancellationTokenSource(currentBox.Value.Handles) is { } newHandleLostSource) { - var newContents = existingBox.Value; - var newBox = RefBox.Create(newContents); - var newExistingBox = Interlocked.CompareExchange(ref this._box, newBox, comparand: existingBox); - if (newExistingBox != existingBox) - { - handleLostSource.Dispose(); - existingBox = newExistingBox; - } + var newBox = RefBox.Create(currentBox.Value with { HandleLostSource = newHandleLostSource }); + var result = Interlocked.CompareExchange(ref this._box, newBox, comparand: currentBox); + if (result == currentBox) { currentBox = newBox; } + else { newHandleLostSource.Dispose(); } // lost the race } - return existingBox is null ? throw this.ObjectDisposed() : existingBox.Value.HandleLostSource?.Token ?? CancellationToken.None; + return currentBox is null + ? throw this.ObjectDisposed() + : (currentBox.Value.HandleLostSource?.Token ?? CancellationToken.None); } } @@ -58,17 +56,17 @@ public static IReadOnlyList FromNames(IReadOnlyL public static async ValueTask TryAcquireAllAsync( IReadOnlyList primitives, Func> acquireFunc, - TimeSpan timeout, + TimeoutValue timeout, CancellationToken cancellationToken) where TPrimitive : class { if (primitives.Count == 1) { - return new(await acquireFunc(primitives[0], timeout, cancellationToken) ?? primitives[0].As()); + return new(await acquireFunc(primitives[0], timeout.TimeSpan, cancellationToken).ConfigureAwait(false) ?? primitives[0].As()); } - var timeoutTracker = new TimeoutTracker(new TimeoutValue(timeout)); - var handles = new List(primitives.Count); + TimeoutTracker timeoutTracker = new(timeout); + List handles = new(primitives.Count); CompositeDistributedSynchronizationHandle? result = null; try @@ -104,7 +102,7 @@ public readonly struct AcquireResult(object handleOrFailedPrimitive) public IDistributedSynchronizationHandle? GetHandleOrDefault() => handleOrFailedPrimitive as IDistributedSynchronizationHandle; public IDistributedSynchronizationHandle Handle => - this.GetHandleOrDefault() ?? throw new TimeoutException($"Timed out acquiring '{this.GetFailedName()}'"); + this.GetHandleOrDefault() ?? throw new TimeoutException($"Timed out acquiring '{this.GetFailedName()}'"); private string GetFailedName() => handleOrFailedPrimitive switch { @@ -176,4 +174,55 @@ internal static class CompositeDistributedLockHandleExtensions public static async ValueTask GetHandleOrTimeout( this ValueTask @this) => (await @this.ConfigureAwait(false)).Handle; + + public static ValueTask TryAcquireAllLocksInternalAsync( + this IDistributedLockProvider provider, + IReadOnlyList names, + TimeoutValue timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames(names, provider ?? throw new ArgumentNullException(nameof(provider)), static (p, n) => p.CreateLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), + timeout, cancellationToken); + + public static ValueTask TryAcquireAllReadLocksInternalAsync( + this IDistributedReaderWriterLockProvider provider, + IReadOnlyList names, + TimeoutValue timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + provider ?? throw new ArgumentNullException(nameof(provider)), + static (p, n) => p.CreateReaderWriterLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireReadLock(t, c).AsValueTask() : p.TryAcquireReadLockAsync(t, c), + timeout, cancellationToken); + + public static ValueTask TryAcquireAllWriteLocksInternalAsync( + this IDistributedReaderWriterLockProvider provider, + IReadOnlyList names, + TimeoutValue timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + provider ?? throw new ArgumentNullException(nameof(provider)), + static (p, n) => p.CreateReaderWriterLock(n)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireWriteLock(t, c).AsValueTask() : p.TryAcquireWriteLockAsync(t, c), + timeout, cancellationToken); + + public static ValueTask TryAcquireAllSemaphoresInternalAsync( + this IDistributedSemaphoreProvider provider, + IReadOnlyList names, + int maxCount, + TimeoutValue timeout, + CancellationToken cancellationToken) => + CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( + CompositeDistributedSynchronizationHandle.FromNames( + names, + (provider: provider ?? throw new ArgumentNullException(nameof(provider)), maxCount), + static (s, n) => s.provider.CreateSemaphore(n, s.maxCount)), + static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), + timeout, + cancellationToken); } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs index 4c6cd93c..be307746 100644 --- a/src/DistributedLock.Core/DistributedLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedLockProviderExtensions.cs @@ -1,7 +1,6 @@ // AUTO-GENERATED using Medallion.Threading.Internal; -using System.Threading; namespace Medallion.Threading; @@ -49,18 +48,14 @@ public static ValueTask AcquireLockAsync(this /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.TryAcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.TryAcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllLocks(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.AcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.AcquireAllLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then @@ -74,17 +69,7 @@ public static IDistributedSynchronizationHandle AcquireAllLocks(this IDistribute /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllLocksAsync(this IDistributedLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - provider.TryAcquireAllLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); - - private static ValueTask TryAcquireAllLocksInternalAsync( - this IDistributedLockProvider provider, - IReadOnlyList names, - TimeSpan timeout, - CancellationToken cancellationToken) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - CompositeDistributedSynchronizationHandle.FromNames(names, provider ?? throw new ArgumentNullException(nameof(provider)), static (p, n) => p.CreateLock(n)), - static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), - timeout, cancellationToken); + provider.TryAcquireAllLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrTimeout(); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs index ffc89e08..cf8876a9 100644 --- a/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedReaderWriterLockProviderExtensions.cs @@ -76,18 +76,14 @@ public static ValueTask AcquireWriteLockAsync /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.TryAcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.TryAcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllReadLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.AcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.AcquireAllReadLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then @@ -101,25 +97,21 @@ public static IDistributedSynchronizationHandle AcquireAllReadLocks(this IDistri /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllReadLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - provider.TryAcquireAllReadLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); + provider.TryAcquireAllReadLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrTimeout(); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.TryAcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.TryAcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllWriteLocks(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - static s => s.provider.AcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), - (provider, names, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.AcquireAllWriteLocksAsync(s.names, s.timeout, s.cancellationToken), (provider, names, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then @@ -133,33 +125,7 @@ public static IDistributedSynchronizationHandle AcquireAllWriteLocks(this IDistr /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllWriteLocksAsync(this IDistributedReaderWriterLockProvider provider, IReadOnlyList names, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - provider.TryAcquireAllWriteLocksInternalAsync(names, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); - - private static ValueTask TryAcquireAllReadLocksInternalAsync( - this IDistributedReaderWriterLockProvider provider, - IReadOnlyList names, - TimeSpan timeout, - CancellationToken cancellationToken) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - CompositeDistributedSynchronizationHandle.FromNames( - names, - provider ?? throw new ArgumentNullException(nameof(provider)), - static (p, n) => p.CreateReaderWriterLock(n)), - static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireReadLock(t, c).AsValueTask() : p.TryAcquireReadLockAsync(t, c), - timeout, cancellationToken); - - private static ValueTask TryAcquireAllWriteLocksInternalAsync( - this IDistributedReaderWriterLockProvider provider, - IReadOnlyList names, - TimeSpan timeout, - CancellationToken cancellationToken) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - CompositeDistributedSynchronizationHandle.FromNames( - names, - provider ?? throw new ArgumentNullException(nameof(provider)), - static (p, n) => p.CreateReaderWriterLock(n)), - static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquireWriteLock(t, c).AsValueTask() : p.TryAcquireWriteLockAsync(t, c), - timeout, cancellationToken); + provider.TryAcquireAllWriteLocksInternalAsync(names, timeout, cancellationToken).GetHandleOrTimeout(); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs index c1d4b7b6..578348ae 100644 --- a/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedSemaphoreProviderExtensions.cs @@ -48,18 +48,14 @@ public static ValueTask AcquireSemaphoreAsync /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle? TryAcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan timeout = default, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - s => provider.TryAcquireAllSemaphoresAsync(names, maxCount, timeout, cancellationToken), - (provider, names, maxCount, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.TryAcquireAllSemaphoresAsync(s.names, s.maxCount, s.timeout, s.cancellationToken), (provider, names, maxCount, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then /// on each created instance, combining the results into a composite handle. /// public static IDistributedSynchronizationHandle AcquireAllSemaphores(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - SyncViaAsync.Run( - s => provider.AcquireAllSemaphoresAsync(names, maxCount, timeout, cancellationToken), - (provider, names, maxCount, timeout, cancellationToken)); + SyncViaAsync.Run(static s => s.provider.AcquireAllSemaphoresAsync(s.names, s.maxCount, s.timeout, s.cancellationToken), (provider, names, maxCount, timeout, cancellationToken)); /// /// Equivalent to calling for each name in and then @@ -73,22 +69,7 @@ public static IDistributedSynchronizationHandle AcquireAllSemaphores(this IDistr /// on each created instance, combining the results into a composite handle. /// public static ValueTask AcquireAllSemaphoresAsync(this IDistributedSemaphoreProvider provider, IReadOnlyList names, int maxCount, TimeSpan? timeout = null, CancellationToken cancellationToken = default) => - provider.TryAcquireAllSemaphoresInternalAsync(names, maxCount, timeout ?? Timeout.InfiniteTimeSpan, cancellationToken).GetHandleOrTimeout(); - - private static ValueTask TryAcquireAllSemaphoresInternalAsync( - this IDistributedSemaphoreProvider provider, - IReadOnlyList names, - int maxCount, - TimeSpan timeout, - CancellationToken cancellationToken) => - CompositeDistributedSynchronizationHandle.TryAcquireAllAsync( - CompositeDistributedSynchronizationHandle.FromNames( - names, - (provider: provider ?? throw new ArgumentNullException(nameof(provider)), maxCount), - static (s, n) => s.provider.CreateSemaphore(n, s.maxCount)), - static (p, t, c) => SyncViaAsync.IsSynchronous ? p.TryAcquire(t, c).AsValueTask() : p.TryAcquireAsync(t, c), - timeout, - cancellationToken); + provider.TryAcquireAllSemaphoresInternalAsync(names, maxCount, timeout, cancellationToken).GetHandleOrTimeout(); # endregion } \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs index 1f647384..577db81a 100644 --- a/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs +++ b/src/DistributedLock.Core/DistributedUpgradeableReaderWriterLockProviderExtensions.cs @@ -1,5 +1,7 @@ // AUTO-GENERATED +using Medallion.Threading.Internal; + namespace Medallion.Threading; /// diff --git a/src/DistributedLock.Core/IDistributedSynchronizationHandle.cs b/src/DistributedLock.Core/IDistributedSynchronizationHandle.cs index c7c7512a..785f0fea 100644 --- a/src/DistributedLock.Core/IDistributedSynchronizationHandle.cs +++ b/src/DistributedLock.Core/IDistributedSynchronizationHandle.cs @@ -19,7 +19,9 @@ public interface IDistributedSynchronizationHandle /// which can be detected by checking . /// /// For lock types that do support this, accessing this property may incur additional - /// costs, such as polling to detect connectivity loss. + /// costs, such as polling to detect connectivity loss. In general, it is only recommended + /// when you (a) will be holding a lock for a long time, (b) have experienced/expect flakiness in holding + /// a lock, and (c) are very sensitive to the lock semantics being violated. /// CancellationToken HandleLostToken { get; } } diff --git a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs index 51870174..ad8a3cd4 100644 --- a/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs +++ b/src/DistributedLock.Core/Internal/Data/MultiplexedConnectionLock.cs @@ -228,27 +228,19 @@ public CancellationToken HandleLostToken { get { - var existingBox = Volatile.Read(ref this._box); + var currentBox = Volatile.Read(ref this._box); - if (existingBox != null && existingBox.Value.monitoringHandle == null) + if (currentBox != null && currentBox.Value.monitoringHandle == null) { - var newHandle = existingBox.Value.@lock._connection.ConnectionMonitor.GetMonitoringHandle(); - var newContents = existingBox.Value; - newContents.monitoringHandle = newHandle; - var newBox = RefBox.Create(newContents); - var newExistingBox = Interlocked.CompareExchange(ref this._box, newBox, comparand: existingBox); - if (newExistingBox == existingBox) - { - return newHandle.ConnectionLostToken; - } - - existingBox = newExistingBox; + var newHandle = currentBox.Value.@lock._connection.ConnectionMonitor.GetMonitoringHandle(); + var newBox = RefBox.Create(currentBox.Value with { monitoringHandle = newHandle }); + var result = Interlocked.CompareExchange(ref this._box, newBox, comparand: currentBox); + if (result == currentBox) { currentBox = newBox; } + else { newHandle.Dispose(); } // lost the race } - if (existingBox == null) { throw this.ObjectDisposed(); } - - // must exist here since we only clear the box on dispose or update the contents when creating a token - return existingBox.Value.monitoringHandle!.ConnectionLostToken; + // Now the handle must exist or we must be disposed + return currentBox?.Value.monitoringHandle!.ConnectionLostToken ?? throw this.ObjectDisposed(); } } diff --git a/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs b/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs new file mode 100644 index 00000000..51f14f24 --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs @@ -0,0 +1,31 @@ +using Medallion.Threading.Tests.Data; +using Medallion.Threading.Tests.FileSystem; +using Medallion.Threading.Tests.Postgres; +using Medallion.Threading.Tests.WaitHandles; + +namespace Medallion.Threading.Tests; + +[SupportsContinuousIntegration] +public sealed class TestingCompositeDistributedLockProvider : TestingLockProvider +{ + public override IDistributedLock CreateLockWithExactName(string name) => new TestingCompositeFileDistributedLock(name); + + public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); +} + +[SupportsContinuousIntegration(WindowsOnly = true)] +public sealed class TestingCompositeDistributedSemaphoreProvider : TestingSemaphoreProvider +{ + public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, int maxCount) => + new TestingCompositeWaitHandleDistributedSemaphore(name, maxCount); + + public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); +} + +public sealed class TestingCompositeReaderWriterLockProvider : TestingReaderWriterLockProvider> +{ + public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => + new TestingCompositePostgresReaderWriterLock(name, this.Strategy.GetConnectionOptions().ConnectionString!); + + public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs new file mode 100644 index 00000000..c7ab283e --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs @@ -0,0 +1,84 @@ +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using Medallion.Threading.FileSystem; +using Medallion.Threading.Postgres; +using Medallion.Threading.WaitHandles; + +namespace Medallion.Threading.Tests; + +public class TestingCompositeFileDistributedLock(string name) : IDistributedLock +{ + private readonly FileDistributedSynchronizationProvider _provider = new( + new DirectoryInfo(Path.Combine(Path.GetTempPath(), typeof(TestingCompositeFileDistributedLock).Name))); + private readonly string[] _names = [name + "_1", name + "_2"]; + + public string Name => name; + + public IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllLocks(this._names, timeout, cancellationToken); + + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllLocksAsync(this._names, timeout, cancellationToken); + + public IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllLocks(this._names, timeout, cancellationToken); + + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllLocksAsync(this._names, timeout, cancellationToken); +} + +public class TestingCompositeWaitHandleDistributedSemaphore(string name, int maxCount) : IDistributedSemaphore +{ + private readonly WaitHandleDistributedSynchronizationProvider _provider = new(); + private readonly string[] _names = [name + "_1", name + "_2"]; + + public string Name => name; + + public int MaxCount => maxCount; + + public IDistributedSynchronizationHandle Acquire(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllSemaphores(this._names, maxCount, timeout, cancellationToken); + + public ValueTask AcquireAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllSemaphoresAsync(this._names, maxCount, timeout, cancellationToken); + + public IDistributedSynchronizationHandle? TryAcquire(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllSemaphores(this._names, maxCount, timeout, cancellationToken); + + public ValueTask TryAcquireAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllSemaphoresAsync(this._names, maxCount, timeout, cancellationToken); +} + +public class TestingCompositePostgresReaderWriterLock(string name, string connectionString) : IDistributedReaderWriterLock +{ + private readonly PostgresDistributedSynchronizationProvider _provider = new(connectionString); + private readonly string[] _names = [name + "_1", name + "_2"]; + + public string Name => name; + + public IDistributedSynchronizationHandle AcquireReadLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllReadLocks(this._names, timeout, cancellationToken); + + public ValueTask AcquireReadLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllReadLocksAsync(this._names, timeout, cancellationToken); + + public IDistributedSynchronizationHandle AcquireWriteLock(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllWriteLocks(this._names, timeout, cancellationToken); + + public ValueTask AcquireWriteLockAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) => + this._provider.AcquireAllWriteLocksAsync(this._names, timeout, cancellationToken); + + public IDistributedSynchronizationHandle? TryAcquireReadLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllReadLocks(this._names, timeout, cancellationToken); + + public ValueTask TryAcquireReadLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllReadLocksAsync(this._names, timeout, cancellationToken); + + public IDistributedSynchronizationHandle? TryAcquireWriteLock(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllWriteLocks(this._names, timeout, cancellationToken); + + public ValueTask TryAcquireWriteLockAsync(TimeSpan timeout = default, CancellationToken cancellationToken = default) => + this._provider.TryAcquireAllWriteLocksAsync(this._names, timeout, cancellationToken); +} \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/CombinatorialTests.cs b/src/DistributedLock.Tests/Tests/CombinatorialTests.cs index cfa4c9ab..4326bd6a 100644 --- a/src/DistributedLock.Tests/Tests/CombinatorialTests.cs +++ b/src/DistributedLock.Tests/Tests/CombinatorialTests.cs @@ -1,3 +1,4 @@ +// AUTO-GENERATED using Medallion.Threading.Tests.Data; using NUnit.Framework; @@ -8,6 +9,7 @@ public class Core_AzureBlobLease_AzureBlobLeaseSynchronizationStrategyTest : Dis namespace Medallion.Threading.Tests.FileSystem { + [Category("CI")] public class Core_Composite_FileSynchronizationStrategyTest : DistributedLockCoreTestCases { } [Category("CI")] public class Core_File_FileSynchronizationStrategyTest : DistributedLockCoreTestCases { } } @@ -97,6 +99,7 @@ namespace Medallion.Threading.Tests.Postgres public class ConnectionStringStrategy_Postgres_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } public class ConnectionStringStrategy_Postgres_OwnedConnectionSynchronizationStrategy_PostgresDb_OwnedConnectionSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy, TestingPostgresDb> { } public class ConnectionStringStrategy_Postgres_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy, TestingPostgresDb> { } + public class ConnectionStringStrategy_ReaderWriterAsMutex_CompositeReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } public class ConnectionStringStrategy_ReaderWriterAsMutex_PostgresReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingConnectionMultiplexingSynchronizationStrategy, TestingPostgresDb> { } public class ConnectionStringStrategy_ReaderWriterAsMutex_PostgresReaderWriter_OwnedConnectionSynchronizationStrategy_PostgresDb_OwnedConnectionSynchronizationStrategy_PostgresDb_OwnedConnectionSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy>, TestingOwnedConnectionSynchronizationStrategy, TestingPostgresDb> { } public class ConnectionStringStrategy_ReaderWriterAsMutex_PostgresReaderWriter_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : ConnectionStringStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy>, TestingOwnedTransactionSynchronizationStrategy, TestingPostgresDb> { } @@ -105,6 +108,7 @@ public class Core_Postgres_ExternalConnectionSynchronizationStrategy_PostgresDb_ public class Core_Postgres_ExternalTransactionSynchronizationStrategy_PostgresDb_ExternalTransactionSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } public class Core_Postgres_OwnedConnectionSynchronizationStrategy_PostgresDb_OwnedConnectionSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingOwnedConnectionSynchronizationStrategy> { } public class Core_Postgres_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingOwnedTransactionSynchronizationStrategy> { } + public class Core_ReaderWriterAsMutex_CompositeReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } public class Core_ReaderWriterAsMutex_PostgresReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingConnectionMultiplexingSynchronizationStrategy> { } public class Core_ReaderWriterAsMutex_PostgresReaderWriter_ExternalConnectionSynchronizationStrategy_PostgresDb_ExternalConnectionSynchronizationStrategy_PostgresDb_ExternalConnectionSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy>, TestingExternalConnectionSynchronizationStrategy> { } public class Core_ReaderWriterAsMutex_PostgresReaderWriter_ExternalTransactionSynchronizationStrategy_PostgresDb_ExternalTransactionSynchronizationStrategy_PostgresDb_ExternalTransactionSynchronizationStrategy_PostgresDbTest : DistributedLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy>, TestingExternalTransactionSynchronizationStrategy> { } @@ -119,11 +123,13 @@ public class ExternalConnectionStrategy_ReaderWriterAsMutex_PostgresReaderWriter public class ExternalTransactionStrategy_Postgres_ExternalTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : ExternalTransactionStrategyTestCases>, TestingPostgresDb> { } public class ExternalTransactionStrategy_ReaderWriterAsMutex_PostgresReaderWriter_ExternalTransactionSynchronizationStrategy_PostgresDb_ExternalTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : ExternalTransactionStrategyTestCases>, TestingExternalTransactionSynchronizationStrategy>, TestingPostgresDb> { } public class MultiplexingConnectionStrategy_Postgres_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : MultiplexingConnectionStrategyTestCases>, TestingPostgresDb> { } + public class MultiplexingConnectionStrategy_ReaderWriterAsMutex_CompositeReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : MultiplexingConnectionStrategyTestCases>, TestingPostgresDb> { } public class MultiplexingConnectionStrategy_ReaderWriterAsMutex_PostgresReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_PostgresDbTest : MultiplexingConnectionStrategyTestCases>, TestingConnectionMultiplexingSynchronizationStrategy>, TestingPostgresDb> { } public class OwnedConnectionStrategy_Postgres_OwnedConnectionSynchronizationStrategy_PostgresDb_PostgresDbTest : OwnedConnectionStrategyTestCases>, TestingPostgresDb> { } public class OwnedConnectionStrategy_ReaderWriterAsMutex_PostgresReaderWriter_OwnedConnectionSynchronizationStrategy_PostgresDb_OwnedConnectionSynchronizationStrategy_PostgresDb_PostgresDbTest : OwnedConnectionStrategyTestCases>, TestingOwnedConnectionSynchronizationStrategy>, TestingPostgresDb> { } public class OwnedTransactionStrategy_Postgres_OwnedTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : OwnedTransactionStrategyTestCases>, TestingPostgresDb> { } public class OwnedTransactionStrategy_ReaderWriterAsMutex_PostgresReaderWriter_OwnedTransactionSynchronizationStrategy_PostgresDb_OwnedTransactionSynchronizationStrategy_PostgresDb_PostgresDbTest : OwnedTransactionStrategyTestCases>, TestingOwnedTransactionSynchronizationStrategy>, TestingPostgresDb> { } + public class ReaderWriterCore_CompositeReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDbTest : DistributedReaderWriterLockCoreTestCases> { } public class ReaderWriterCore_PostgresReaderWriter_ConnectionMultiplexingSynchronizationStrategy_PostgresDb_ConnectionMultiplexingSynchronizationStrategy_PostgresDbTest : DistributedReaderWriterLockCoreTestCases>, TestingConnectionMultiplexingSynchronizationStrategy> { } public class ReaderWriterCore_PostgresReaderWriter_ExternalConnectionSynchronizationStrategy_PostgresDb_ExternalConnectionSynchronizationStrategy_PostgresDbTest : DistributedReaderWriterLockCoreTestCases>, TestingExternalConnectionSynchronizationStrategy> { } public class ReaderWriterCore_PostgresReaderWriter_ExternalTransactionSynchronizationStrategy_PostgresDb_ExternalTransactionSynchronizationStrategy_PostgresDbTest : DistributedReaderWriterLockCoreTestCases>, TestingExternalTransactionSynchronizationStrategy> { } @@ -281,8 +287,11 @@ public class UpgradeableReaderWriterCore_SqlReaderWriter_OwnedTransactionSynchro namespace Medallion.Threading.Tests.WaitHandles { [Category("CIWindows")] public class Core_EventWaitHandle_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases { } + [Category("CIWindows")] public class Core_Semaphore1AsMutex_CompositeSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } [Category("CIWindows")] public class Core_Semaphore1AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } + [Category("CIWindows")] public class Core_Semaphore5AsMutex_CompositeSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } [Category("CIWindows")] public class Core_Semaphore5AsMutex_WaitHandleSemaphore_WaitHandleSynchronizationStrategy_WaitHandleSynchronizationStrategyTest : DistributedLockCoreTestCases, TestingWaitHandleSynchronizationStrategy> { } + [Category("CIWindows")] public class SemaphoreCore_CompositeSemaphore_WaitHandleSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } [Category("CIWindows")] public class SemaphoreCore_WaitHandleSemaphore_WaitHandleSynchronizationStrategyTest : DistributedSemaphoreCoreTestCases { } } diff --git a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index 9ca1a407..9762cb05 100644 --- a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -5,6 +5,7 @@ namespace Medallion.Threading.Tests.Core; // Note: we don't bother testing the extensions for the other providers since they are all auto-generated by the same component. +[Category("CI")] public class DistributedLockProviderExtensionsTest { [Test] @@ -131,7 +132,8 @@ public async Task TestCompositePartialAcquisitionFailure([Values] bool isAsync) Assert.That(result, Is.Null); - mockHandleA.Verify(h => h.DisposeAsync(), Times.Once); + if (isAsync) { mockHandleA.Verify(h => h.DisposeAsync(), Times.Once); } + else { mockHandleA.Verify(h => h.Dispose(), Times.Once); } } [Test, Combinatorial] @@ -148,37 +150,25 @@ public async Task TestCompositeSuccessfulAcquisition([Values] bool isTry, [Value if (isAsync) { - if (isTry) - { - mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) - .ReturnsAsync(mockHandleA.Object); - mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) - .ReturnsAsync(mockHandleB.Object); - } - else - { - mockLockA.Setup(l => l.AcquireAsync(It.IsAny(), default)) - .ReturnsAsync(mockHandleA.Object); - mockLockB.Setup(l => l.AcquireAsync(It.IsAny(), default)) - .ReturnsAsync(mockHandleB.Object); - } + mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleB.Object); + mockLockA.Setup(l => l.AcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleA.Object); + mockLockB.Setup(l => l.AcquireAsync(It.IsAny(), default)) + .ReturnsAsync(mockHandleB.Object); } else { - if (isTry) - { - mockLockA.Setup(l => l.TryAcquire(It.IsAny(), default)) - .Returns(mockHandleA.Object); - mockLockB.Setup(l => l.TryAcquire(It.IsAny(), default)) - .Returns(mockHandleB.Object); - } - else - { - mockLockA.Setup(l => l.Acquire(It.IsAny(), default)) - .Returns(mockHandleA.Object); - mockLockB.Setup(l => l.Acquire(It.IsAny(), default)) - .Returns(mockHandleB.Object); - } + mockLockA.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns(mockHandleA.Object); + mockLockB.Setup(l => l.TryAcquire(It.IsAny(), default)) + .Returns(mockHandleB.Object); + mockLockA.Setup(l => l.Acquire(It.IsAny(), default)) + .Returns(mockHandleA.Object); + mockLockB.Setup(l => l.Acquire(It.IsAny(), default)) + .Returns(mockHandleB.Object); } var names = new List { "A", "B" }; diff --git a/src/DistributedLock.Tests/Tests/TestSetupTest.cs b/src/DistributedLock.Tests/Tests/TestSetupTest.cs index b683cba9..e471f8ed 100644 --- a/src/DistributedLock.Tests/Tests/TestSetupTest.cs +++ b/src/DistributedLock.Tests/Tests/TestSetupTest.cs @@ -29,7 +29,8 @@ public void VerifyAllTestsAreCreated() var combinatorialTestsFile = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "Tests", "CombinatorialTests.cs")); var expectedTestContents = -$@"using Medallion.Threading.Tests.Data; +$@"// AUTO-GENERATED +using Medallion.Threading.Tests.Data; using NUnit.Framework; {string.Join( @@ -104,7 +105,7 @@ static string GetCSharpName(Type type) .Where(ns => ns.StartsWith(typeof(TestSetupTest).Namespace!)) .ToList(); if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns == typeof(TestSetupTest).Namespace); } - if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns.EndsWith(".Data")); } + if (namespaces.Count > 1) { namespaces.RemoveAll(ns => ns.EndsWith(".Data") || ns.EndsWith(".Composites")); } if (namespaces.Count > 1) { Assert.Fail(string.Join(", ", namespaces)); } return (declaration, namespaces.Single()); } diff --git a/src/DistributedLockCodeGen/GenerateProviders.cs b/src/DistributedLockCodeGen/GenerateProviders.cs index b55e0aa8..5258ff67 100644 --- a/src/DistributedLockCodeGen/GenerateProviders.cs +++ b/src/DistributedLockCodeGen/GenerateProviders.cs @@ -33,21 +33,21 @@ public void GenerateProviderInterfaceAndExtensions(string interfaceName) var createMethodName = $"Create{interfaceName.Replace("IDistributed", string.Empty)}"; var providerInterfaceCode = $$""" - // AUTO-GENERATED - namespace Medallion.Threading; - - /// - /// Acts as a factory for instances of a certain type. This interface may be - /// easier to use than in dependency injection scenarios. - /// - public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)}} - { - /// - /// Constructs an instance with the given . - /// - {{interfaceName}} {{createMethodName}}(string name{{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}}); - } - """; + // AUTO-GENERATED + namespace Medallion.Threading; + + /// + /// Acts as a factory for instances of a certain type. This interface may be + /// easier to use than in dependency injection scenarios. + /// + public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgradeableReaderWriterLock" ? ": IDistributedReaderWriterLockProvider" : string.Empty)}} + { + /// + /// Constructs an instance with the given . + /// + {{interfaceName}} {{createMethodName}}(string name{{(interfaceName.Contains("Semaphore") ? ", int maxCount" : string.Empty)}}); + } + """; var interfaceMethods = Regex.Matches( File.ReadAllText(interfaceFile), @@ -78,47 +78,58 @@ public interface {{providerInterfaceName}}{{(interfaceName == "IDistributedUpgra : interfaceMethods .Select(m => { - var (extensionMethodName, innerCallName) = GetAllExtensionMethodName(m.Groups["name"].Value); + var baseExtensionMethodName = GetExtensionMethodName(m.Groups["name"].Value); + var isAsync = baseExtensionMethodName.EndsWith("Async"); + var isTry = baseExtensionMethodName.StartsWith("Try"); + var extensionMethodName = baseExtensionMethodName.Replace("Async", "") + .Replace("Acquire", "AcquireAll") + + "s" + + (isAsync ? "Async" : ""); var isSemaphore = interfaceName.Contains("Semaphore"); + string MaxCountArg(string prefix = "") => isSemaphore ? prefix + "maxCount, " : ""; return $""" - /// - /// Equivalent to calling for each name in and then - /// c.Value))})" /> on each created instance, combining the results into a composite handle. - /// - public static {m.Groups["returnType"].Value} {extensionMethodName}(this {providerInterfaceName} provider, IReadOnlyList names{(isSemaphore ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => - CompositeDistributedSynchronizationHandle.{innerCallName}( - provider, - static (p, n{(isSemaphore ? ", mc" : string.Empty)}, t, c) => p.{GetExtensionMethodName(m.Groups["name"].Value)}(n{(isSemaphore ? ", mc" : string.Empty)}, t, c), - names,{(isSemaphore ? " maxCount," : string.Empty)} timeout, cancellationToken); - """; + /// + /// Equivalent to calling for each name in and then + /// c.Value))})" /> on each created instance, combining the results into a composite handle. + /// + public static {m.Groups["returnType"].Value} {extensionMethodName}(this {providerInterfaceName} provider, IReadOnlyList names{(isSemaphore ? ", int maxCount" : string.Empty)}, {m.Groups["parameters"].Value}) => + {( + isAsync + ? $"provider.Try{extensionMethodName.Replace("Try", "").Replace("Async", "InternalAsync")}(names, {MaxCountArg()}timeout, cancellationToken).GetHandleOr{(isTry ? "Default" : "Timeout")}();" + : $"SyncViaAsync.Run(static s => s.provider.{extensionMethodName}Async(s.names, {MaxCountArg("s.")}s.timeout, s.cancellationToken), (provider, names, {MaxCountArg()}timeout, cancellationToken));" + )} + """; } ); var providerExtensionsName = providerInterfaceName.TrimStart('I') + "Extensions"; + var providerExtensionsCode = $$""" - // AUTO-GENERATED + // AUTO-GENERATED + + using Medallion.Threading.Internal; - namespace Medallion.Threading; + namespace Medallion.Threading; - /// - /// Productivity helper methods for - /// - public static class {{providerExtensionsName}} - { - # region Single Lock Methods + /// + /// Productivity helper methods for + /// + public static class {{providerExtensionsName}} + { + # region Single Lock Methods - {{string.Join(Environment.NewLine + Environment.NewLine, extensionSingleMethodBodies)}} + {{string.Join(Environment.NewLine + Environment.NewLine, extensionSingleMethodBodies)}} - # endregion + # endregion - # region Composite Lock Methods + # region Composite Lock Methods - {{string.Join(Environment.NewLine + Environment.NewLine, extensionCompositeMethodBodies)}} + {{string.Join(Environment.NewLine + Environment.NewLine, extensionCompositeMethodBodies)}} - # endregion - } - """; + # endregion + } + """; var changes = new[] { @@ -140,42 +151,5 @@ string GetExtensionMethodName(string interfaceMethodName) => + interfaceName.Replace("IDistributed", string.Empty) + (interfaceMethodName.EndsWith("Async") ? "Async" : string.Empty) : interfaceMethodName; - - (string extensionMethodName, string innerCallName) GetAllExtensionMethodName(string interfaceMethodName) - { - var isExactAcquire = Regex.IsMatch(interfaceMethodName, "^(Try)?Acquire(Async)?$"); - var isAsync = interfaceMethodName.EndsWith("Async", StringComparison.Ordinal); - var isTryVariant = interfaceMethodName.StartsWith("Try", StringComparison.Ordinal); - - string extensionMethodName; - - if (!isExactAcquire) - { - // e.g. TryAcquireReadLock -> TryAcquireAllReadLocks - // TryAcquireSemaphore -> TryAcquireAllSemaphores - // TryAcquireUpgradeableReadLockAsync -> TryAcquireUpgradeableAllReadLockAsync - extensionMethodName = interfaceMethodName - .Replace("Acquire", "AcquireAll") // Acquire -> AcquireAll - .Replace("Async", string.Empty) // strip Async (add back later) - + "s" // pluralise - + (isAsync ? "Async" : string.Empty); // restore Async if needed - } - else - { - // e.g. TryAcquire -> TryAcquireAllLocks - // AcquireAsync -> AcquireAllLocksAsync - extensionMethodName = interfaceMethodName.Replace("Async", string.Empty) - + "All" - + interfaceName.Replace("IDistributed", string.Empty) + "s" - + (isAsync ? "Async" : string.Empty); - } - - // - “Try…” methods -> TryAcquireAll[Async] - // - plain Acquire… -> AcquireAll[Async] - var innerCallName = (isTryVariant ? "TryAcquireAll" : "AcquireAll") - + (isAsync ? "Async" : string.Empty); - - return (extensionMethodName, innerCallName); - } } } \ No newline at end of file diff --git a/src/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs index c15d0a5a..0d5673d4 100644 --- a/src/DistributedLockTaker/Program.cs +++ b/src/DistributedLockTaker/Program.cs @@ -134,6 +134,18 @@ public static int Main(string[] args) ).AcquireAsync().Result; break; } + case nameof(TestingCompositeFileDistributedLock): + handle = new TestingCompositeFileDistributedLock(name).Acquire(); + break; + case nameof(TestingCompositeWaitHandleDistributedSemaphore) + "1AsMutex": + handle = new TestingCompositeWaitHandleDistributedSemaphore(name, maxCount: 1).Acquire(); + break; + case nameof(TestingCompositeWaitHandleDistributedSemaphore) + "5AsMutex": + handle = new TestingCompositeWaitHandleDistributedSemaphore(name, maxCount: 5).Acquire(); + break; + case "Write" + nameof(TestingCompositePostgresReaderWriterLock): + handle = new TestingCompositePostgresReaderWriterLock(name, PostgresCredentials.GetConnectionString(Environment.CurrentDirectory)).AcquireWriteLock(); + break; default: Console.Error.WriteLine($"type: {type}"); return 123; From 027112385292e1734f616642e8ee58025d6298c6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 15:17:52 -0500 Subject: [PATCH 359/399] Deprecate Helpers.TryGetValue internal utility --- src/DistributedLock.Core/Internal/Helpers.cs | 1 + .../RedisDistributedReaderWriterLock.cs | 2 +- src/DistributedLock.SqlServer/SqlSemaphore.cs | 6 +++--- .../ExternalConnectionOrTransactionStrategyTestCases.cs | 2 +- src/DistributedLock.Tests/Tests/ApiTest.cs | 9 +++++++++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/DistributedLock.Core/Internal/Helpers.cs b/src/DistributedLock.Core/Internal/Helpers.cs index c7da045c..84a2916b 100644 --- a/src/DistributedLock.Core/Internal/Helpers.cs +++ b/src/DistributedLock.Core/Internal/Helpers.cs @@ -99,6 +99,7 @@ public TTask GetResult() public void UnsafeOnCompleted(Action continuation) => this._taskAwaiter.UnsafeOnCompleted(continuation); } + [Obsolete("Will be removed in DistributedLock.Core 1.1")] public static bool TryGetValue(this T? nullable, out T value) where T : struct { diff --git a/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs b/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs index 72b93c07..1c0b5577 100644 --- a/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs +++ b/src/DistributedLock.Redis/RedisDistributedReaderWriterLock.cs @@ -86,7 +86,7 @@ public RedisDistributedReaderWriterLock(string name, IEnumerable data { // If we failed to take the write lock but we took the writer waiting lock, release // the writer waiting lock on our way out. - if (handle == null && acquireWriteLockState.WriterWaiting.TryGetValue(out var writerWaiting)) + if (handle == null && acquireWriteLockState.WriterWaiting is { } writerWaiting) { await new RedLockRelease(writerWaiting.Primitive, writerWaiting.TryAcquireTasks).ReleaseAsync().ConfigureAwait(false); } diff --git a/src/DistributedLock.SqlServer/SqlSemaphore.cs b/src/DistributedLock.SqlServer/SqlSemaphore.cs index 0fd5f70a..dc085422 100644 --- a/src/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/src/DistributedLock.SqlServer/SqlSemaphore.cs @@ -160,7 +160,7 @@ private void AddCommonParameters(DatabaseCommand command, string semaphoreName, { command.AddParameter(SemaphoreNameParameter, semaphoreName); command.AddParameter(MaxCountParameter, this.MaxCount); - if (timeout.TryGetValue(out var timeoutValue)) + if (timeout is { } timeoutValue) { command.AddParameter(TimeoutMillisParameter, timeoutValue.InMilliseconds); } @@ -353,7 +353,7 @@ IF @waiterCount < @{MaxCountParameter} {( // if this is the end of the query, we have to set an exit code. If we are going to retry we indicate the special code that will trigger that and otherwise we indicate // timeout. If this is not the end of the query, we just release the preamble lock and keep going - willRetryInSeparateQueryAfterPreamble.TryGetValue(out var willRetryInSeparateQueryAfterPreambleValue) + willRetryInSeparateQueryAfterPreamble is { } willRetryInSeparateQueryAfterPreambleValue ? $@"SET @{ResultCodeParameter} = {(willRetryInSeparateQueryAfterPreambleValue ? FinishedPreambleWithoutAcquiringCode : SqlApplicationLock.TimeoutExitCode)}" : $"EXEC sys.sp_releaseapplock @{PreambleLockNameVariable}, @{LockScopeVariable}" )}"; @@ -446,7 +446,7 @@ IF APPLOCK_MODE('public', @{TicketLockNameParameter}, @{LockScopeVariable}) = 'N across and allow that wait to be 32ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket becomes available. Note that we used to wait just 1ms here. However, in testing that proved flaky in detecting deadlocks; empirically, 32ms seems to be sufficient to work reliably. The longer wait should also reduce the - CPU load without meaningfully adding delay overhead. */} + CPU load without meaningfully adding delay overhead (SQL_SEMAPHORE_ONE_WAIT) */} {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 32 ELSE 0 END" : null)} SET @anyNotHeld = 1 diff --git a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs index 3a0e097b..12467d3c 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/Data/ExternalConnectionOrTransactionStrategyTestCases.cs @@ -16,7 +16,7 @@ public abstract class ExternalConnectionOrTransactionStrategyTestCases this._lockProvider.Dispose(); [Test] - [NonParallelizable, Retry(tryCount: 3)] // timing sensitive for SqlSemaphore (see comment in that file regarding the 32ms wait) + [NonParallelizable, Retry(tryCount: 3)] // timing sensitive for SqlSemaphore (see SQL_SEMAPHORE_ONE_WAIT) public async Task TestDeadlockDetection() { var timeout = TimeSpan.FromSeconds(20); diff --git a/src/DistributedLock.Tests/Tests/ApiTest.cs b/src/DistributedLock.Tests/Tests/ApiTest.cs index 32708bec..464aeb58 100644 --- a/src/DistributedLock.Tests/Tests/ApiTest.cs +++ b/src/DistributedLock.Tests/Tests/ApiTest.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System.Runtime.CompilerServices; using System.Text.RegularExpressions; +using Medallion.Threading.Internal; namespace Medallion.Threading.Tests; @@ -157,6 +158,14 @@ public void TestAssemblyVersioning(AssemblyName assemblyName) Assert.That(informationalVersion?.InformationalVersion, Does.StartWith($"{version.Major}.")); } + [Test] + public void RememberToRemoveObsoleteMembers() + { + Assert.That( + typeof(Helpers).Assembly.GetName().Version < new Version(1, 1) + || typeof(Helpers).GetMethod("TryGetValue") is null); + } + private static IEnumerable GetPublicTypes(Assembly assembly) => assembly.GetTypes() .Where(IsInPublicApi) #if DEBUG From e2a4f510867a86b759af92291f5e8736586efa95 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 15:21:40 -0500 Subject: [PATCH 360/399] Fix public API files --- .../PublicAPI.Shipped.txt | 5 +- src/DistributedLock.Core/packages.lock.json | 24 + src/DistributedLock.Tests/packages.lock.json | 587 ++++++++++++++++++ 3 files changed, 615 insertions(+), 1 deletion(-) diff --git a/src/DistributedLock.Core/PublicAPI.Shipped.txt b/src/DistributedLock.Core/PublicAPI.Shipped.txt index 1e6c6e7f..ddeaca34 100644 --- a/src/DistributedLock.Core/PublicAPI.Shipped.txt +++ b/src/DistributedLock.Core/PublicAPI.Shipped.txt @@ -78,8 +78,11 @@ static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemapho static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphore(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireSemaphoreAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, string! name, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle! static Medallion.Threading.DistributedSemaphoreProviderExtensions.AcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask -static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTaskstatic Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphores(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedSynchronizationHandle? +static Medallion.Threading.DistributedSemaphoreProviderExtensions.TryAcquireAllSemaphoresAsync(this Medallion.Threading.IDistributedSemaphoreProvider! provider, System.Collections.Generic.IReadOnlyList! names, int maxCount, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask +static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle! static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.AcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan? timeout = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLock(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Medallion.Threading.IDistributedLockUpgradeableHandle? static Medallion.Threading.DistributedUpgradeableReaderWriterLockProviderExtensions.TryAcquireUpgradeableReadLockAsync(this Medallion.Threading.IDistributedUpgradeableReaderWriterLockProvider! provider, string! name, System.TimeSpan timeout = default(System.TimeSpan), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask \ No newline at end of file diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 813d98fe..0274d143 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,593 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "dependencies": { + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "dependencies": { + "Microsoft.Identity.Client": "4.61.3", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.4, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.1, )", + "DistributedLock.SqlServer": "[1.0.6, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "Npgsql": "[8.0.6, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "StackExchange.Redis": "[2.7.33, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.8, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", + "dependencies": { + "Azure.Identity": "1.11.4", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.5", + "System.Threading.Channels": "8.0.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From 66918b241f02449fb7f6f469b9be3fefd55fd43a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 17:48:58 -0500 Subject: [PATCH 361/399] Auto-launch mongo container in tests For #121 --- .../Infrastructure/DisposableCollection.cs | 12 ++-- .../MongoDB/MongoDBSetUpFixture.cs | 58 +++++++++++++++++++ .../MongoDB/TestingMongoDbProviders.cs | 27 +++------ .../TestingMongoDbSynchronizationStrategy.cs | 25 +------- .../Shared/MongoDbCredentials.cs | 25 ++++---- .../Tests/MongoDB/MongoDistributedLockTest.cs | 12 ++-- ...ibutedSynchronizationOptionsBuilderTest.cs | 8 +-- ...oDistributedSynchronizationProviderTest.cs | 8 +-- src/DistributedLockTaker/Program.cs | 2 +- 9 files changed, 101 insertions(+), 76 deletions(-) create mode 100644 src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs diff --git a/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs b/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs index 43f33169..97c95d2a 100644 --- a/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs +++ b/src/DistributedLock.Tests/Infrastructure/DisposableCollection.cs @@ -48,13 +48,13 @@ private void InternalClearAndDisposeAll(bool isDispose) } } } +} - private class ReleaseAction : IDisposable - { - private Action? _action; +internal class ReleaseAction : IDisposable +{ + private Action? _action; - public ReleaseAction(Action action) { this._action = action; } + public ReleaseAction(Action action) { this._action = action; } - public void Dispose() => Interlocked.Exchange(ref this._action, null)?.Invoke(); - } + public void Dispose() => Interlocked.Exchange(ref this._action, null)?.Invoke(); } diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs new file mode 100644 index 00000000..40cb4986 --- /dev/null +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs @@ -0,0 +1,58 @@ +using MongoDB.Driver; +using NUnit.Framework; +using MongoDB.Bson; +using Medallion.Shell; + +namespace Medallion.Threading.Tests.MongoDB; + +[SetUpFixture] +internal class MongoDBSetUpFixture +{ + [OneTimeSetUp] + public void OneTimeSetUp() + { + var settings = MongoClientSettings.FromConnectionString(MongoDBCredentials.GetConnectionString(Environment.CurrentDirectory)); + if (IsMongoReady(settings, TimeSpan.FromSeconds(3))) { return; } + + // start mongo via docker + const string ContainerName = "distributed-lock-mongo"; + DockerCommand(["stop", ContainerName]); + DockerCommand(["rm", ContainerName]); + var port = settings.Server.Port; + DockerCommand(["run", "-d", "-p", $"{port}:{port}", "--name", ContainerName, "mongo:latest"]); + + settings.ServerSelectionTimeout = TimeSpan.FromSeconds(15); + for (var i = 0; i < 4; ++i) + { + if (IsMongoReady(settings, TimeSpan.FromSeconds(15))) { return; } + } + + throw new Exception("Failed to start Mongo!"); + + static bool DockerCommand(string[] args, bool throwOnError = false) => + Command.Run("docker", args, o => o.ThrowOnError(throwOnError)) + .RedirectTo(Console.Out) + .RedirectStandardErrorTo(Console.Error) + .Result.Success; + } + + private static bool IsMongoReady(MongoClientSettings settings, TimeSpan timeout) + { + settings.ServerSelectionTimeout = settings.ConnectTimeout = settings.SocketTimeout = timeout; + try + { + var client = new MongoClient(settings); + var adminDb = client.GetDatabase("admin"); + + adminDb.RunCommand(new BsonDocument("ping", 1)); + return true; + } + catch + { + return false; + } + } + + [OneTimeTearDown] + public void OneTimeTearDown() { } +} diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs index 251ea0ca..22040b9d 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs @@ -6,41 +6,28 @@ namespace Medallion.Threading.Tests.MongoDB; public sealed class TestingMongoDistributedLockProvider : TestingLockProvider { private const string CollectionName = "distributed.locks"; - private readonly IMongoDatabase _database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + private readonly IMongoDatabase _database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); public override IDistributedLock CreateLockWithExactName(string name) { // Use a short expiry to make tests like TestHandleLostTriggersCorrectly run faster - var @lock = new MongoDistributedLock(name, _database, CollectionName, options => options.Expiry(TimeSpan.FromSeconds(5))); + var @lock = new MongoDistributedLock(name, this._database, CollectionName, options => options.Expiry(TimeSpan.FromSeconds(5))); this.Strategy.KillHandleAction = () => { - var collection = _database.GetCollection(CollectionName); + var collection = this._database.GetCollection(CollectionName); collection.DeleteOne(Builders.Filter.Eq(d => d.Id, name)); }; return @lock; } - public override string GetSafeName(string name) - { - return new MongoDistributedLock(name, _database, CollectionName).Name; - } + public override string GetSafeName(string name) => + new MongoDistributedLock(name, this._database, CollectionName).Name; - public override string GetCrossProcessLockType() - { - return nameof(MongoDistributedLock); - } + public override string GetCrossProcessLockType() => nameof(MongoDistributedLock); public override void Dispose() { - // Clean up test collection - try - { - _database.DropCollection(CollectionName); - } - catch - { - // Ignore cleanup errors - } + this._database.DropCollection(CollectionName); base.Dispose(); } } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs index 9dc6b114..164a3df6 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs @@ -9,28 +9,9 @@ public sealed class TestingMongoDbSynchronizationStrategy : TestingSynchronizati { public Action? KillHandleAction { get; set; } - public override void PrepareForHandleAbandonment() - { - this.KillHandleAction?.Invoke(); - } + public override void PrepareForHandleAbandonment() => this.KillHandleAction?.Invoke(); - public override void PerformAdditionalCleanupForHandleAbandonment() - { - this.KillHandleAction?.Invoke(); - } + public override void PerformAdditionalCleanupForHandleAbandonment() => this.KillHandleAction?.Invoke(); - public override IDisposable? PrepareForHandleLost() - { - return new DisposableAction(() => this.KillHandleAction?.Invoke()); - } - - private class DisposableAction(Action action) : IDisposable - { - private Action? _action = action; - - public void Dispose() - { - Interlocked.Exchange(ref this._action, null)?.Invoke(); - } - } + public override IDisposable? PrepareForHandleLost() => new ReleaseAction(() => this.KillHandleAction?.Invoke()); } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs index 6769c40e..1f4ad9d7 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs @@ -1,22 +1,21 @@ using MongoDB.Driver; -using System.IO; +using System.Collections.Concurrent; namespace Medallion.Threading.Tests.MongoDB; -internal static class MongoDbCredentials +internal static class MongoDBCredentials { - private static string? _connectionString; + private static readonly ConcurrentDictionary ConnectionStringsByBaseDirectory = []; - public static string GetConnectionString(string baseDirectory) - { - if (_connectionString != null) { return _connectionString; } - var file = Path.GetFullPath(Path.Combine(baseDirectory, "..", "..", "..", "credentials", "mongodb.txt")); - _connectionString = File.Exists(file) - ? File.ReadAllText(file).Trim() - // Default local MongoDB connection - : "mongodb://localhost:27017"; - return _connectionString; - } + public static string GetConnectionString(string baseDirectory) => + ConnectionStringsByBaseDirectory.GetOrAdd(baseDirectory, static d => + { + var file = Path.GetFullPath(Path.Combine(d, "..", "..", "..", "credentials", "mongodb.txt")); + return File.Exists(file) + ? File.ReadAllText(file).Trim() + // Default local MongoDB connection + : "mongodb://localhost:27017"; + }); public static IMongoDatabase GetDefaultDatabase(string baseDirectory) { diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 87ce808f..0e1eb7f8 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -10,7 +10,7 @@ public class MongoDistributedLockTest [Test] public async Task TestBasicLockFunctionality() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; var @lock = new MongoDistributedLock(lockName, database); await using (var handle = await @lock.AcquireAsync()) @@ -34,7 +34,7 @@ public async Task TestBasicLockFunctionality() [Test] public async Task TestCustomCollectionName() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; const string CustomCollectionName = "CustomLocks"; var @lock = new MongoDistributedLock(lockName, database, CustomCollectionName); @@ -54,7 +54,7 @@ public async Task TestCustomCollectionName() [Test] public async Task TestHandleLostToken() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; // Configure a short extension cadence so the test doesn't have to wait too long var @lock = new MongoDistributedLock(lockName, database, options: o => o.ExtensionCadence(TimeSpan.FromMilliseconds(500))); @@ -78,7 +78,7 @@ public async Task TestHandleLostToken() [Test] public async Task TestLockContentionAsync() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; var lock1 = new MongoDistributedLock(lockName, database); var lock2 = new MongoDistributedLock(lockName, database); @@ -160,7 +160,7 @@ public void TestValidatesConstructorParameters() [Test] public async Task TestIndexExistence() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var collectionName = "TestIndex" + Guid.NewGuid().ToString("N"); var @lock = new MongoDistributedLock("lock", database, collectionName); @@ -283,7 +283,7 @@ public async Task TestIndexCreationFailureIsCached() [Test] public async Task TestLockDocumentStructure() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; var collectionName = "locks_" + Guid.NewGuid().ToString("N"); diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs index 1e2ae9c0..cbdf4cc6 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationOptionsBuilderTest.cs @@ -8,7 +8,7 @@ public class MongoDistributedSynchronizationOptionsBuilderTest [Test] public void TestBusyWaitSleepTimeValidation() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); Assert.Throws(() => new MongoDistributedLock("test", database, options => options .BusyWaitSleepTime(TimeSpan.FromSeconds(1), TimeSpan.FromMilliseconds(500)))); @@ -23,7 +23,7 @@ public void TestBusyWaitSleepTimeValidation() [Test] public void TestExpiryValidation() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); Assert.Throws(() => new MongoDistributedLock("test", database, options => options.Expiry(TimeSpan.FromMilliseconds(50)))); Assert.Throws(() => @@ -35,7 +35,7 @@ public void TestExpiryValidation() [Test] public void TestExtensionCadenceValidation() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); Assert.Throws(() => new MongoDistributedLock("test", database, options => options .Expiry(TimeSpan.FromSeconds(5)) @@ -49,7 +49,7 @@ public void TestExtensionCadenceValidation() [Test] public async Task TestOptionsAreApplied() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; var @lock = new MongoDistributedLock(lockName, database, options => options .Expiry(TimeSpan.FromSeconds(60)) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs index 1aa97e1e..efd865ab 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedSynchronizationProviderTest.cs @@ -9,7 +9,7 @@ public class MongoDistributedSynchronizationProviderTest [Test] public void TestArgumentValidation() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); Assert.Throws(() => new MongoDistributedSynchronizationProvider(null!)); Assert.Throws(() => new MongoDistributedSynchronizationProvider(database, (string)null!)); Assert.DoesNotThrow(() => new MongoDistributedSynchronizationProvider(database)); @@ -19,7 +19,7 @@ public void TestArgumentValidation() [Test] public void TestIDistributedLockProviderInterface() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); IDistributedLockProvider provider = new MongoDistributedSynchronizationProvider(database); var @lock = provider.CreateLock("interfaceTest"); Assert.That(@lock, Is.Not.Null); @@ -30,7 +30,7 @@ public void TestIDistributedLockProviderInterface() [Test] public async Task TestProviderCreateLock() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var provider = new MongoDistributedSynchronizationProvider(database); var lock1 = provider.CreateLock("testLock1"); var lock2 = provider.CreateLock("testLock2"); @@ -51,7 +51,7 @@ public async Task TestProviderCreateLock() [Test] public async Task TestProviderWithCustomCollection() { - var database = MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory); + var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); const string CustomCollection = "TestProviderLocks"; var provider = new MongoDistributedSynchronizationProvider(database, CustomCollection); var @lock = provider.CreateLock("testLock"); diff --git a/src/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs index bc955fac..460ba112 100644 --- a/src/DistributedLockTaker/Program.cs +++ b/src/DistributedLockTaker/Program.cs @@ -137,7 +137,7 @@ public static int Main(string[] args) break; } case nameof(MongoDistributedLock): - handle = new MongoDistributedLock(name, MongoDbCredentials.GetDefaultDatabase(Environment.CurrentDirectory), options => options.Expiry(TimeSpan.FromSeconds(5))).Acquire(); + handle = new MongoDistributedLock(name, MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory), options => options.Expiry(TimeSpan.FromSeconds(5))).Acquire(); break; case nameof(TestingCompositeFileDistributedLock): handle = new TestingCompositeFileDistributedLock(name).Acquire(); From ed957e2ed28ec23becac4f2b1027e666a029e4f2 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 19:18:12 -0500 Subject: [PATCH 362/399] Clean up key validation For #121 --- .../Tests/MongoDB/MongoDistributedLockTest.cs | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 0e1eb7f8..295b767c 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -2,6 +2,7 @@ using MongoDB.Driver; using Moq; using NUnit.Framework; +using System.Text; namespace Medallion.Threading.Tests.MongoDB; @@ -51,6 +52,40 @@ public async Task TestCustomCollectionName() await database.DropCollectionAsync(CustomCollectionName); } + [Test] + public async Task TestLockNameSupport() + { + using var provider = new TestingMongoDistributedLockProvider(); + + var randomBytes = new byte[100_000]; + new Random(12345).NextBytes(randomBytes); + var utf8 = Encoding.GetEncoding( + "utf-8", + new EncoderReplacementFallback("?"), + new DecoderReplacementFallback("?")); + var name = TestHelper.UniqueName + utf8.GetString(randomBytes); + + var @lock = provider.CreateLockWithExactName(name); + await using var handle = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle); + + @lock = provider.CreateLockWithExactName(TestHelper.UniqueName + new string('z', 16_000_000)); + await using var handle2 = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle2); + + @lock = provider.CreateLockWithExactName(""); + await using var handle3 = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle3); + + @lock = provider.CreateLockWithExactName(" "); + await using var handle4 = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle4); + + @lock = provider.CreateLockWithExactName("\0"); + await using var handle5 = await @lock.TryAcquireAsync(); + Assert.IsNotNull(handle5); + } + [Test] public async Task TestHandleLostToken() { @@ -118,35 +153,6 @@ public void TestReturnsUnmodifiedKey() @lock.Name.ShouldEqual(Key); } - [Test] - [Category("CI")] - public void TestValidatesEmptyKey() - { - var database = new Mock(MockBehavior.Strict).Object; - Assert.Throws(() => new MongoDistributedLock(string.Empty, database)); - } - - [Test] - [Category("CI")] - public void TestValidatesKeyTooLong() - { - var database = new Mock(MockBehavior.Strict).Object; - // Create a string that's exactly 256 bytes in UTF-8 (over the 255 limit) - var longKey = new string('a', 256); - Assert.Throws(() => new MongoDistributedLock(longKey, database)); - } - - [Test] - [Category("CI")] - public void TestValidatesMultibyteCharacters() - { - var database = new Mock(MockBehavior.Strict).Object; - // Chinese characters are 3 bytes each in UTF-8 - // 86 characters * 3 bytes = 258 bytes (over 255 limit) - var multibyteLongKey = new string('汉', 86); - Assert.Throws(() => new MongoDistributedLock(multibyteLongKey, database)); - } - [Test] [Category("CI")] public void TestValidatesConstructorParameters() From cc7d5b1a9d2078e0f58217c84ad9ee1bf8881897 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 19:55:44 -0500 Subject: [PATCH 363/399] Minor mongo cleanup For #121 --- .../AssemblyAttributes.cs | 5 +- .../MongoDistributedLock.cs | 75 ++++++------------- .../MongoDistributedLockHandle.cs | 20 +++-- ...istributedSynchronizationOptionsBuilder.cs | 11 +-- .../Tests/MongoDB/MongoDistributedLockTest.cs | 9 +++ 5 files changed, 47 insertions(+), 73 deletions(-) diff --git a/src/DistributedLock.MongoDB/AssemblyAttributes.cs b/src/DistributedLock.MongoDB/AssemblyAttributes.cs index 12a8b7af..95195306 100644 --- a/src/DistributedLock.MongoDB/AssemblyAttributes.cs +++ b/src/DistributedLock.MongoDB/AssemblyAttributes.cs @@ -1,6 +1,5 @@ using System.Runtime.CompilerServices; -[assembly: - InternalsVisibleTo( - "DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +[assembly: InternalsVisibleTo("DistributedLock.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fd3af56ccc8ed94fffe25bfd651e6a5674f8f20a76d37de800dd0f7380e04f0fde2da6fa200380b14fe398605b6f470c87e5e0a0bf39ae871f07536a4994aa7a0057c4d3bcedc8fef3eecb0c88c2024a1b3289305c2393acd9fb9f9a42d0bd7826738ce864d507575ea3a1fe1746ab19823303269f79379d767949807f494be8")] +// Allow mocking internals [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index ac1e9188..129eb1d0 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -3,7 +3,6 @@ using MongoDB.Driver; using System.Collections.Concurrent; using System.Diagnostics; -using System.Text; namespace Medallion.Threading.MongoDB; @@ -13,18 +12,13 @@ namespace Medallion.Threading.MongoDB; public sealed partial class MongoDistributedLock : IInternalDistributedLock { internal const string DefaultCollectionName = "distributed.locks"; - /// - /// MongoDB _id field maximum length in bytes. - /// See https://www.mongodb.com/docs/manual/reference/limits/#mongodb-limit-Index-Key-Limit - /// - private const int MaxKeyLength = 255; private static readonly DateTime EpochUtc = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); /// /// ActivitySource for distributed tracing and diagnostics /// - private static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); + internal static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); // We want to ensure indexes are created at most once per process per (database, collection) private static readonly ConcurrentDictionary>> IndexInitializationTasks = new(StringComparer.Ordinal); @@ -58,26 +52,24 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti { this._database = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - - if (key == null) { throw new ArgumentNullException(nameof(key)); } - ValidateKey(key); - this.Key = key; + // From what I can tell, modern (and all supported) MongoDB versions have no limits on index keys or + // _id lengths other than the 16MB document limit. This is so high that providing "safe name" functionality as a fallback doesn't + // see worth it. + this.Key = key ?? throw new ArgumentNullException(nameof(key)); this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); } - ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) - { - return BusyWaitHelper.WaitAsync(this, + ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => + BusyWaitHelper.WaitAsync(this, (@this, ct) => @this.TryAcquireAsync(ct), timeout, - this._options.MinBusyWaitSleepTime, - this._options.MaxBusyWaitSleepTime, + minSleepTime: this._options.MinBusyWaitSleepTime, + maxSleepTime: this._options.MaxBusyWaitSleepTime, cancellationToken); - } private async ValueTask TryAcquireAsync(CancellationToken cancellationToken) { - using var activity = ActivitySource.StartActivity("MongoDistributedLock.TryAcquire"); + using var activity = ActivitySource.StartActivity(nameof(MongoDistributedLock) + ".TryAcquire"); activity?.SetTag("lock.key", this.Key); activity?.SetTag("lock.collection", this._collectionName); @@ -88,37 +80,30 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti // Use a unique token per acquisition attempt (like Redis' value token) var lockId = Guid.NewGuid().ToString("N"); - var expiryMs = this._options.Expiry.InMilliseconds; - + // We avoid exception-driven contention (DuplicateKey) by using a single upsert on {_id == Key} // and an update pipeline that only overwrites fields when the existing lock is expired. // This is conceptually similar to Redis: SET key value NX PX . var filter = Builders.Filter.Eq(d => d.Id, this.Key); - var update = CreateAcquireUpdate(lockId, expiryMs); + var update = CreateAcquireUpdate(lockId, this._options.Expiry); var options = new FindOneAndUpdateOptions { IsUpsert = true, ReturnDocument = ReturnDocument.After }; - MongoLockDocument? result; - if (SyncViaAsync.IsSynchronous) - { - result = collection.FindOneAndUpdate(filter, update, options, cancellationToken); - } - else - { - result = await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); - } + var result = SyncViaAsync.IsSynchronous + ? collection.FindOneAndUpdate(filter, update, options, cancellationToken) + : await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); // Verify we actually got the lock - if (result is not null && result.LockId == lockId) + if (result?.LockId == lockId) { activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); return new(collection, - this.Key, - lockId, + key: this.Key, + lockId: lockId, result.FencingToken, this._options.Expiry, this._options.ExtensionCadence); @@ -127,8 +112,10 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti return null; } - private static UpdateDefinition CreateAcquireUpdate(string lockId, int expiryMs) + private static UpdateDefinition CreateAcquireUpdate(string lockId, TimeoutValue expiry) { + Invariant.Require(!expiry.IsInfinite); + // expired := ifNull(expiresAt, epoch) <= $$NOW var expiredOrMissing = new BsonDocument( "$lte", @@ -145,7 +132,7 @@ private static UpdateDefinition CreateAcquireUpdate(string lo { { "startDate", "$$NOW" }, { "unit", "millisecond" }, - { "amount", expiryMs } + { "amount", expiry.InMilliseconds } } ); @@ -188,8 +175,7 @@ private static async Task EnsureIndexesCreatedAsync(IMongoCollection new(() => CreateIndexesAsync(collection))); - var task = lazy.Value; - var success = await task.AwaitSyncOverAsync().ConfigureAwait(false); + var success = await lazy.Value.AwaitSyncOverAsync().ConfigureAwait(false); if (!success) { // If the task failed (returned false), we remove it so we can try again next time. @@ -226,19 +212,4 @@ private static async Task CreateIndexesAsync(IMongoCollection - /// Validates that a key is valid for use as an exact MongoDB key. - /// - private static void ValidateKey(string key) - { - if (key == null) { throw new ArgumentNullException(nameof(key)); } - if (key.Length == 0) { throw new FormatException($"{nameof(key)}: must not be empty"); } - - var byteCount = Encoding.UTF8.GetByteCount(key); - if (byteCount > MaxKeyLength) - { - throw new FormatException($"{nameof(key)}: must be at most {MaxKeyLength} bytes when encoded as UTF-8 (was {byteCount} bytes)"); - } - } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index d172d853..28a6c59e 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -32,7 +32,7 @@ internal MongoDistributedLockHandle( TimeoutValue extensionCadence) { this.FencingToken = fencingToken; - var innerHandle = new InnerHandle(collection, key, lockId, expiry, extensionCadence); + var innerHandle = new InnerHandle(collection, key: key, lockId: lockId, expiry, extensionCadence); this._innerHandle = innerHandle; // Register for managed finalization so the lock gets released if the handle is GC'd without being disposed this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); @@ -58,14 +58,14 @@ public ValueTask DisposeAsync() /// private sealed class InnerHandle : IAsyncDisposable { - private readonly CancellationTokenSource _cts; + private readonly CancellationTokenSource _handleLostSource; private readonly IMongoCollection _collection; private readonly Task _extensionTask; private readonly string _key; private readonly string _lockId; private int _disposed; - public CancellationToken HandleLostToken => this._cts.Token; + public CancellationToken HandleLostToken => this._handleLostSource.Token; public InnerHandle( IMongoCollection collection, @@ -77,10 +77,10 @@ public InnerHandle( this._collection = collection; this._key = key; this._lockId = lockId; - this._cts = new(); + this._handleLostSource = new(); // Start background task to extend the lock - this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._cts.Token); + this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._handleLostSource.Token); } public async ValueTask DisposeAsync() @@ -90,7 +90,7 @@ public async ValueTask DisposeAsync() return; } - this._cts.Cancel(); + this._handleLostSource.Cancel(); try { await this._extensionTask.AwaitSyncOverAsync().ConfigureAwait(false); @@ -101,7 +101,7 @@ public async ValueTask DisposeAsync() } finally { - this._cts.Dispose(); + this._handleLostSource.Dispose(); await this.ReleaseLockAsync().ConfigureAwait(false); } } @@ -178,9 +178,9 @@ private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCa private async Task SignalLockLostAsync() { #if NET8_0_OR_GREATER - await this._cts.CancelAsync().ConfigureAwait(false); + await this._handleLostSource.CancelAsync().ConfigureAwait(false); #else - this._cts.Cancel(); + this._handleLostSource.Cancel(); await Task.CompletedTask.ConfigureAwait(false); #endif } @@ -190,12 +190,10 @@ private async ValueTask ReleaseLockAsync() var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); if (SyncViaAsync.IsSynchronous) { - // ReSharper disable once MethodHasAsyncOverload this._collection.DeleteOne(filter); } else { - // ReSharper disable once MethodSupportsCancellation await this._collection.DeleteOneAsync(filter).ConfigureAwait(false); } } diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs index b021030d..76603be2 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -114,11 +114,8 @@ internal readonly struct MongoDistributedLockOptions( TimeoutValue minBusyWaitSleepTime, TimeoutValue maxBusyWaitSleepTime) { - public TimeoutValue Expiry { get; } = expiry; - - public TimeoutValue ExtensionCadence { get; } = extensionCadence; - - public TimeoutValue MinBusyWaitSleepTime { get; } = minBusyWaitSleepTime; - - public TimeoutValue MaxBusyWaitSleepTime { get; } = maxBusyWaitSleepTime; + public TimeoutValue Expiry => expiry; + public TimeoutValue ExtensionCadence => extensionCadence; + public TimeoutValue MinBusyWaitSleepTime => minBusyWaitSleepTime; + public TimeoutValue MaxBusyWaitSleepTime => maxBusyWaitSleepTime; } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 295b767c..8e259d71 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -163,6 +163,15 @@ public void TestValidatesConstructorParameters() Assert.Throws(() => new MongoDistributedLock("key", database, (string)null!)); } + [Test] + [Category("CI")] + public void TestActivitySourceNaming() + { + var assemblyName = typeof(MongoDistributedLock).Assembly.GetName()!; + Assert.That(MongoDistributedLock.ActivitySource.Name, Is.EqualTo(assemblyName.Name)); + Assert.That(MongoDistributedLock.ActivitySource.Version, Is.EqualTo(assemblyName.Version!.ToString(3))); + } + [Test] public async Task TestIndexExistence() { From c466596d70614679b15feb990e9990aac169c774 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 20:28:36 -0500 Subject: [PATCH 364/399] Fix handle lost token being canceled when handle is released For #121 --- .../MongoDistributedLock.cs | 76 +++++++- .../MongoDistributedLockHandle.cs | 162 +----------------- ...istributedSynchronizationOptionsBuilder.cs | 13 +- .../DistributedLockCoreTestCases.cs | 8 + 4 files changed, 88 insertions(+), 171 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 129eb1d0..72a56f34 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -101,12 +101,7 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti { activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); - return new(collection, - key: this.Key, - lockId: lockId, - result.FencingToken, - this._options.Expiry, - this._options.ExtensionCadence); + return new(new(this, lockId, collection), result.FencingToken); } activity?.SetTag("lock.acquired", false); return null; @@ -212,4 +207,73 @@ private static async Task CreateIndexesAsync(IMongoCollection + /// Inner handle that performs actual lock management and release. + /// Separated from the outer handle so it can be registered with ManagedFinalizerQueue. + /// + internal sealed class InnerHandle : IAsyncDisposable, LeaseMonitor.ILeaseHandle + { + private readonly MongoDistributedLock _lock; + private readonly string _lockId; + private readonly IMongoCollection _collection; + private readonly LeaseMonitor _monitor; + + public CancellationToken HandleLostToken => this._monitor.HandleLostToken; + + TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.Expiry; + + // todo what if inf? + TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._lock._options.ExtensionCadence; + + public InnerHandle(MongoDistributedLock @lock, string lockId, IMongoCollection collection) + { + this._lock = @lock; + this._lockId = lockId; + // important to set this last, since the monitor constructor will read other fields of this + this._monitor = new(this); + this._collection = collection; + } + + public async ValueTask DisposeAsync() + { + try { await this._monitor.DisposeAsync().ConfigureAwait(false); } + finally { await this.ReleaseLockAsync().ConfigureAwait(false); } + } + + private async ValueTask ReleaseLockAsync() + { + var filter = Builders.Filter.Eq(d => d.Id, this._lock.Key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + if (SyncViaAsync.IsSynchronous) + { + this._collection.DeleteOne(filter); + } + else + { + await this._collection.DeleteOneAsync(filter).ConfigureAwait(false); + } + } + + async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) + { + var filter = Builders.Filter.Eq(d => d.Id, this._lock.Key) & Builders.Filter.Eq(d => d.LockId, this._lockId); + + // Use server time ($$NOW) for expiry to avoid client clock skew. + var newExpiresAt = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", "$$NOW" }, + { "unit", "millisecond" }, + { "amount", this._lock._options.Expiry.InMilliseconds } + } + ); + var update = new PipelineUpdateDefinition( + new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } + ); + + var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + return result.MatchedCount > 0 ? LeaseMonitor.LeaseState.Renewed : LeaseMonitor.LeaseState.Lost; + } + } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs index 28a6c59e..0d2b4391 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLockHandle.cs @@ -1,6 +1,4 @@ using Medallion.Threading.Internal; -using MongoDB.Bson; -using MongoDB.Driver; namespace Medallion.Threading.MongoDB; @@ -9,7 +7,7 @@ namespace Medallion.Threading.MongoDB; /// public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHandle { - private InnerHandle? _innerHandle; + private MongoDistributedLock.InnerHandle? _innerHandle; private IDisposable? _finalizerRegistration; /// @@ -23,17 +21,10 @@ public sealed class MongoDistributedLockHandle : IDistributedSynchronizationHand /// public long FencingToken { get; } - internal MongoDistributedLockHandle( - IMongoCollection collection, - string key, - string lockId, - long fencingToken, - TimeoutValue expiry, - TimeoutValue extensionCadence) + internal MongoDistributedLockHandle(MongoDistributedLock.InnerHandle innerHandle, long fencingToken) { - this.FencingToken = fencingToken; - var innerHandle = new InnerHandle(collection, key: key, lockId: lockId, expiry, extensionCadence); this._innerHandle = innerHandle; + this.FencingToken = fencingToken; // Register for managed finalization so the lock gets released if the handle is GC'd without being disposed this._finalizerRegistration = ManagedFinalizerQueue.Instance.Register(this, innerHandle); } @@ -51,151 +42,4 @@ public ValueTask DisposeAsync() Interlocked.Exchange(ref this._finalizerRegistration, null)?.Dispose(); return Interlocked.Exchange(ref this._innerHandle, null)?.DisposeAsync() ?? default; } - - /// - /// Inner handle that performs actual lock management and release. - /// Separated from the outer handle so it can be registered with ManagedFinalizerQueue. - /// - private sealed class InnerHandle : IAsyncDisposable - { - private readonly CancellationTokenSource _handleLostSource; - private readonly IMongoCollection _collection; - private readonly Task _extensionTask; - private readonly string _key; - private readonly string _lockId; - private int _disposed; - - public CancellationToken HandleLostToken => this._handleLostSource.Token; - - public InnerHandle( - IMongoCollection collection, - string key, - string lockId, - TimeoutValue expiry, - TimeoutValue extensionCadence) - { - this._collection = collection; - this._key = key; - this._lockId = lockId; - this._handleLostSource = new(); - - // Start background task to extend the lock - this._extensionTask = this.ExtendLockAsync(expiry, extensionCadence, this._handleLostSource.Token); - } - - public async ValueTask DisposeAsync() - { - if (Interlocked.Exchange(ref this._disposed, 1) != 0) - { - return; - } - - this._handleLostSource.Cancel(); - try - { - await this._extensionTask.AwaitSyncOverAsync().ConfigureAwait(false); - } - catch - { - // Ignore exceptions during cleanup - } - finally - { - this._handleLostSource.Dispose(); - await this.ReleaseLockAsync().ConfigureAwait(false); - } - } - - private async Task ExtendLockAsync(TimeoutValue expiry, TimeoutValue extensionCadence, CancellationToken cancellationToken) - { - const int MaxConsecutiveFailures = 3; - var consecutiveFailures = 0; - - try - { - while (!cancellationToken.IsCancellationRequested) - { - await Task.Delay(extensionCadence.TimeSpan, cancellationToken).ConfigureAwait(false); - var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); - - // Use server time ($$NOW) for expiry to avoid client clock skew. - var newExpiresAt = new BsonDocument( - "$dateAdd", - new BsonDocument - { - { "startDate", "$$NOW" }, - { "unit", "millisecond" }, - { "amount", expiry.InMilliseconds } - } - ); - var update = new PipelineUpdateDefinition( - new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } - ); - - try - { - var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); - - // If we successfully extended, reset failure count - if (result.MatchedCount != 0) - { - consecutiveFailures = 0; - continue; - } - - // Lock was truly lost (document doesn't exist or lockId changed) - await this.SignalLockLostAsync().ConfigureAwait(false); - break; - } - catch (OperationCanceledException) - { - throw; // Propagate cancellation - } - catch (MongoException) when (++consecutiveFailures < MaxConsecutiveFailures) - { - // Transient network error, retry after a short delay - await Task.Delay(TimeSpan.FromMilliseconds(100 * consecutiveFailures), cancellationToken).ConfigureAwait(false); - } - catch (MongoException) - { - // Too many consecutive failures, assume lock is lost - await this.SignalLockLostAsync().ConfigureAwait(false); - break; - } - } - } - catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested) - { - // Expected when disposing - } - catch - { - // Lock extension failed, signal that the lock is lost - await this.SignalLockLostAsync().ConfigureAwait(false); - } - } - - private async Task SignalLockLostAsync() - { -#if NET8_0_OR_GREATER - await this._handleLostSource.CancelAsync().ConfigureAwait(false); -#else - this._handleLostSource.Cancel(); - await Task.CompletedTask.ConfigureAwait(false); -#endif - } - - private async ValueTask ReleaseLockAsync() - { - var filter = Builders.Filter.Eq(d => d.Id, this._key) & Builders.Filter.Eq(d => d.LockId, this._lockId); - if (SyncViaAsync.IsSynchronous) - { - this._collection.DeleteOne(filter); - } - else - { - await this._collection.DeleteOneAsync(filter).ConfigureAwait(false); - } - } - } } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs index 76603be2..49e88485 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationOptionsBuilder.cs @@ -61,8 +61,8 @@ public MongoDistributedSynchronizationOptionsBuilder ExtensionCadence(TimeSpan e /// public MongoDistributedSynchronizationOptionsBuilder BusyWaitSleepTime(TimeSpan min, TimeSpan max) { - var minTimeoutValue = new TimeoutValue(min, nameof(min)); - var maxTimeoutValue = new TimeoutValue(max, nameof(max)); + TimeoutValue minTimeoutValue = new(min, nameof(min)), + maxTimeoutValue = new(max, nameof(max)); if (minTimeoutValue.IsInfinite) { throw new ArgumentOutOfRangeException(nameof(min), "may not be infinite"); } if (maxTimeoutValue.IsInfinite || maxTimeoutValue.CompareTo(min) < 0) { @@ -101,10 +101,11 @@ internal static MongoDistributedLockOptions GetOptions(Action(() => handle.HandleLostToken.GetType()); + + CancellationToken handleLostToken; + await using (var handle2 = await @lock.AcquireAsync()) + { + handleLostToken = handle2.HandleLostToken; + Assert.IsFalse(handleLostToken.IsCancellationRequested); + } + Assert.IsFalse(handleLostToken.IsCancellationRequested, "Token should not be canceled by manual release"); } [Test] From c32d3fba946a0f377c9e6194b2b16a665290087f Mon Sep 17 00:00:00 2001 From: Joe Du <13188169+joesdu@users.noreply.github.com> Date: Tue, 13 Jan 2026 10:34:22 +0800 Subject: [PATCH 365/399] Remove adaptive backoff strategy details from README Removed adaptive backoff strategy section and comparison tables from the README. --- src/DistributedLock.MongoDB/README.zh-CN.md | 55 +-------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/src/DistributedLock.MongoDB/README.zh-CN.md b/src/DistributedLock.MongoDB/README.zh-CN.md index 7e418f26..07d7174a 100644 --- a/src/DistributedLock.MongoDB/README.zh-CN.md +++ b/src/DistributedLock.MongoDB/README.zh-CN.md @@ -299,7 +299,7 @@ sequenceDiagram Note over PB,DB: expiresAt > now (由 A 持有) DB->>PB: ❌ 未能获取锁 - PB->>PB: 等待 & 重试 (指数退避) + PB->>PB: 等待 & 重试 PA->>PA: 后台: ExtensionCadence 计时器 PA->>DB: 更新: 续期 expiresAt += Expiry @@ -411,59 +411,6 @@ sequenceDiagram - 在竞争下，自适应退避相比固定随机间隔减少了对 MongoDB 的负载 - `expiresAt` TTL 索引保持集合整洁，无需手动维护 -## 自适应退避策略 - -当竞争高时，自适应退避策略会指数级增加获取尝试之间的等待时间： - -```mermaid -graph TD - A["尝试获取"] --> B{"锁可用?"} - B -->|是| C["✅ 已获取"] - B -->|否| D["连续失败: N 次"] - - D --> E["睡眠时间 = min * 1.5^N"] - E --> F["添加随机抖动 ±20%"] - F --> G["等待: max(min, sleepTime + jitter)"] - G --> H["重试"] - H --> A - - C --> I["重置失败计数"] - - style C fill:#90EE90 - style E fill:#FFD700 - style F fill:#FFA500 -``` - -### 退避对比图 - -#### 低竞争场景 - -| 尝试次数 | 策略 | 睡眠时间 | 备注 | -| -------- | ------ | -------- | ---------- | -| 第 1 次 | 随机 | 234ms | 不可预测 | -| 第 2 次 | 随机 | 567ms | 不可预测 | -| 第 3 次 | 随机 | 45ms | 不可预测 | -| 第 4 次 | 随机 | 689ms | 不可预测 | -| 第 1 次 | 自适应 | 10ms | 响应快 | -| 第 2 次 | 自适应 | 15ms | 指数增长 | -| 第 3 次 | 自适应 | 22ms | 控制退避 | -| 第 4 次 | 自适应 | 33ms | 仍然响应快 | - -#### 高竞争场景 - -| 尝试次数 | 策略 | 睡眠时间 | 影响 | -| -------- | ------ | -------- | ----------------- | -| 第 1 次 | 随机 | 234ms | 恒定高负载 | -| 第 2 次 | 随机 | 567ms | 恒定高负载 | -| 第 3 次 | 随机 | 45ms | 恒定高负载 | -| 第 4 次 | 随机 | 689ms | 恒定高负载 | -| 第 1 次 | 自适应 | 10ms | 开始响应快 | -| 第 2 次 | 自适应 | 15ms | 逐步退避 | -| 第 3 次 | 自适应 | 22ms | 减少 MongoDB 负载 | -| 第 4 次 | 自适应 | 150ms | 显著减少负载 | - -**关键优势**：自适应退避根据竞争水平自动调整，提供更好的资源利用率 - ## 框架支持 - **.NET Standard 2.1** 及更高版本 From 8bad320e4e9f9154eee88a2ceea2cf64d17c5a2b Mon Sep 17 00:00:00 2001 From: Joe Du <13188169+joesdu@users.noreply.github.com> Date: Tue, 13 Jan 2026 10:35:40 +0800 Subject: [PATCH 366/399] Remove adaptive backoff strategy section from README Removed adaptive backoff strategy details and comparison charts from the README. --- src/DistributedLock.MongoDB/README.md | 55 +-------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md index c154c659..4ff47a06 100644 --- a/src/DistributedLock.MongoDB/README.md +++ b/src/DistributedLock.MongoDB/README.md @@ -299,7 +299,7 @@ sequenceDiagram Note over PB,DB: expiresAt > now (held by A) DB->>PB: ❌ Lock Not Acquired - PB->>PB: Wait & Retry (exponential backoff) + PB->>PB: Wait & Retry PA->>PA: Background: ExtensionCadence timer PA->>DB: Update: Extend expiresAt += Expiry @@ -411,59 +411,6 @@ This mechanism prevents the "split brain" scenario where two processes both beli - Under contention, adaptive backoff reduces the load on MongoDB compared to fixed random intervals - The `expiresAt` TTL index keeps the collection clean without manual maintenance -## Adaptive Backoff Strategy - -When contention is high, the adaptive backoff strategy exponentially increases the wait time between acquisition attempts: - -```mermaid -graph TD - A["Attempt to Acquire"] --> B{"Lock Available?"} - B -->|Yes| C["✅ Acquired"] - B -->|No| D["Consecutive Failures: N"] - - D --> E["Sleep Time = min * 1.5^N"] - E --> F["Add Random Jitter ±20%"] - F --> G["Wait: max(min, sleepTime + jitter)"] - G --> H["Retry"] - H --> A - - C --> I["Reset Failure Counter"] - - style C fill:#90EE90 - style E fill:#FFD700 - style F fill:#FFA500 -``` - -### Backoff Comparison Chart - -#### Low Contention Scenario - -| Attempt # | Strategy | Sleep Duration | Notes | -| --------- | -------- | -------------- | ------------------ | -| 1st | Random | 234ms | Unpredictable | -| 2nd | Random | 567ms | Unpredictable | -| 3rd | Random | 45ms | Unpredictable | -| 4th | Random | 689ms | Unpredictable | -| 1st | Adaptive | 10ms | Responsive | -| 2nd | Adaptive | 15ms | Exponential growth | -| 3rd | Adaptive | 22ms | Controlled backoff | -| 4th | Adaptive | 33ms | Still responsive | - -#### High Contention Scenario - -| Attempt # | Strategy | Sleep Duration | Impact | -| --------- | -------- | -------------- | -------------------------- | -| 1st | Random | 234ms | Constant high load | -| 2nd | Random | 567ms | Constant high load | -| 3rd | Random | 45ms | Constant high load | -| 4th | Random | 689ms | Constant high load | -| 1st | Adaptive | 10ms | Starts responsive | -| 2nd | Adaptive | 15ms | Progressive backoff | -| 3rd | Adaptive | 22ms | Reduces MongoDB load | -| 4th | Adaptive | 150ms | Significantly reduces load | - -**Key Advantage**: Adaptive backoff automatically adjusts to contention level, providing better resource utilization - ## Framework Support - **.NET Standard 2.1** and higher From a16e54730dc100eceb676d71fc07a5be78873c86 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sun, 11 Jan 2026 21:52:01 -0500 Subject: [PATCH 367/399] Fix build --- .../Infrastructure/Shared/MongoDbCredentials.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs index 1f4ad9d7..cf87621f 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/MongoDbCredentials.cs @@ -1,5 +1,6 @@ using MongoDB.Driver; using System.Collections.Concurrent; +using System.IO; namespace Medallion.Threading.Tests.MongoDB; From 0cec9fc98581b015c7ecc0ec2056ada2f7297453 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 09:54:01 -0500 Subject: [PATCH 368/399] Various mongo updates * Remove some duplicate code * Make index creation resilient to no permissions and non-blocking * Rename default collection to match perceived convention --- docs/Developing DistributedLock.md | 146 +++++++------- src/DistributedLock.Core/packages.lock.json | 24 --- .../DistributedLock.MongoDB.csproj | 2 +- .../MongoDistributedLock.cs | 68 +------ ...MongoDistributedSynchronizationProvider.cs | 18 +- .../MongoIndexInitializer.cs | 136 +++++++++++++ src/DistributedLock.MongoDB/README.md | 4 +- .../MongoDB/MongoDBSetUpFixture.cs | 2 +- .../MongoDB/TestingMongoDbProviders.cs | 9 +- .../TestingMongoDbSynchronizationStrategy.cs | 2 +- .../TestingRedisSynchronizationStrategy.cs | 36 +--- .../Tests/MongoDB/MongoDistributedLockTest.cs | 181 ++++++++++++------ 12 files changed, 363 insertions(+), 265 deletions(-) create mode 100644 src/DistributedLock.MongoDB/MongoIndexInitializer.cs diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index 43b7fd83..cc9a4503 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -4,6 +4,81 @@ DistributedLock has a variety of back-ends; to be able to develop and run tests against all of them you'll need to install a good amount of software. +### Azure + +For the Azure back-end, [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite) is used for local development. See [here](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage#install-azurite) for how to install. + +### MySQL + +The MySQL driver covers both MySQL and MariaDB; so we'll need to install both. + +#### MariaDB + +The MariaDB installer can be downloaded [here](https://mariadb.org/download/?t=mariadb&p=mariadb&os=windows&cpu=x86_64&pkg=msi&m=acorn). + +After downloading, you'll need to enable the performance_schema which is used by DistributedLock's tests. You can do this by adding the following to your my.ini/my.cnf file (C:\Program Files\MariaDB {version}\data\my.ini on windows): + +```ini +# activates the performance_schema tables which are needed by DistributedLock tests +performance_schema=ON +``` + +After doing this, restart MariaDB (on Windows, do this in the Services app). + +Next, create the `distributed_lock` database and a user for the tests to run as: + +```sql +CREATE DATABASE distributed_lock; +CREATE USER 'DistributedLock'@'localhost' IDENTIFIED BY ''; +GRANT ALL PRIVILEGES ON distributed_lock.* TO 'DistributedLock'@'localhost'; +GRANT SELECT ON performance_schema.* TO 'DistributedLock'@'localhost'; +``` + +(Windows) If you don't want MySQL always running on your machine, set the Startup type to "Manual" for `MariaDB`. + +Finally, add your username (DistributedLock) and password to `DistributedLock.Tests/credentials/mariadb.txt`, with the username on line 1 and the password on line 2. + +#### MySQL + +You can install MySQL from [here](https://dev.mysql.com/downloads/mysql/). Run on port 3307 to avoid conflicting with MariaDB. + +(Windows) If you don't want MySQL always running on your machine, set the Startup type to "Manual" for `MySQL{Version}`. + +Add your username and password to `DistributedLock.Tests/credentials/mysql.txt`, with the username on line 1 and the password on line 2. + +### Oracle + +You can install Oracle from [here](https://www.oracle.com/database/technologies/oracle-database-software-downloads.html#db_free). It claims not to support Windows 11 Home, but it seems to install and work fine. + +Add your username (e.g. SYSTEM) and password to `DistributedLock.Tests/credentials/oracle.txt`, with the username on line 1 and the password on line 2. + +(Windows) If the Oracle tests fail with `ORA-12541: TNS:no listener`, you may have to start the `OracleOraDB21Home1TNSListener` service in services.svc and/or restart the `OracleServiceXE`. After starting these it can take a few minutes for the DB to come online. + +### Postgres + +You can install Postgres from [here](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). + +In `C:\Program Files\PostgreSQL\\data\postgresql.conf`, update `max_connections` to 200. + +(Windows) If you don't want Postgres always running on your machine, set the Startup type to "Manual" for `postgresql-x64-{VERSION} - PostgresSQL Server {VERSION}`. + +Add your username (e.g. postgres) and password to `DistributedLock.Tests/credentials/postgres.txt`, with the username on line 1 and the password on line 2. + +### SQL Server + +Download SQL developer edition from [here](https://www.microsoft.com/en-us/sql-server/sql-server-downloads). + +(Windows) If you don't want SQLServer always running on your machine, set the Startup type to "Manual" for `SQL Server (MSSQLSERVER)`. + +The tests connect via integrated security. + +### Redis + +Install Redis locally. On Windows, install it via WSL as described [here](https://developer.redis.com/create/windows/). + +You do not need it running as a service: the tests will start and stop instances automatically. + + ### MongoDB You can download the MongoDB Community Server from [here](https://www.mongodb.com/try/download/community). @@ -84,6 +159,7 @@ If you're using a replica set or sharded cluster, your connection string might l mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.internal:27018,host.docker.internal:27019/?replicaSet=rs0&authSource=admin&serverSelectionTimeoutMS=1000 ``` +TODO cleanup
中文说明 @@ -165,76 +241,6 @@ mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.inter
-### Azure - -For the Azure back-end, [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite) is used for local development. See [here](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage#install-azurite) for how to install. - -### MySQL - -The MySQL driver covers both MySQL and MariaDB; so we'll need to install both. - -#### MariaDB - -The MariaDB installer can be downloaded [here](https://mariadb.org/download/?t=mariadb&p=mariadb&os=windows&cpu=x86_64&pkg=msi&m=acorn). - -After downloading, you'll need to enable the performance_schema which is used by DistributedLock's tests. You can do this by adding the following to your my.ini/my.cnf file (C:\Program Files\MariaDB {version}\data\my.ini on windows): - -```ini -# activates the performance_schema tables which are needed by DistributedLock tests -performance_schema=ON -``` - -After doing this, restart MariaDB (on Windows, do this in the Services app). - -Next, create the `distributed_lock` database and a user for the tests to run as: - -```sql -CREATE DATABASE distributed_lock; -CREATE USER 'DistributedLock'@'localhost' IDENTIFIED BY ''; -GRANT ALL PRIVILEGES ON distributed_lock.* TO 'DistributedLock'@'localhost'; -GRANT SELECT ON performance_schema.* TO 'DistributedLock'@'localhost'; -``` - -Finally, add your username (DistributedLock) and password to `DistributedLock.Tests/credentials/mariadb.txt`, with the username on line 1 and the password on line 2. - -#### MySQL - -You can install MySQL from [here](https://dev.mysql.com/downloads/mysql/). Run on port 3307 to avoid conflicting with MariaDB. - -Add your username and password to `DistributedLock.Tests/credentials/mysql.txt`, with the username on line 1 and the password on line 2. - -### Oracle - -You can install Oracle from [here](https://www.oracle.com/database/technologies/oracle-database-software-downloads.html#db_free). It claims not to support Windows 11 Home, but it seems to install and work fine. - -Add your username (e.g. SYSTEM) and password to `DistributedLock.Tests/credentials/oracle.txt`, with the username on line 1 and the password on line 2. - -If the Oracle tests fail with `ORA-12541: TNS:no listener`, you may have to start the OracleOraDB21Home1TNSListener service in services.svc and/or restart the OracleServiceXE. After starting these it can take a few minutes for the DB to come online. - -### Postgres - -You can install Postgres from [here](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads). - -In `C:\Program Files\PostgreSQL\\data\postgresql.conf`, update `max_connections` to 200. - -(Windows) If you don't want Postgres always running on your machine, set the Startup type to "Manual" for `postgresql-x64-{VERSION} - PostgresSQL Server {VERSION}`. - -Add your username (e.g. postgres) and password to `DistributedLock.Tests/credentials/postgres.txt`, with the username on line 1 and the password on line 2. - -### SQL Server - -Download SQL developer edition from [here](https://www.microsoft.com/en-us/sql-server/sql-server-downloads). - -(Windows) If you don't want SQLServer always running on your machine, set the Startup type to "Manual" for `SQL Server (MSSQLSERVER)`. - -The tests connect via integrated security. - -### Redis - -Install Redis locally. On Windows, install it via WSL as described [here](https://developer.redis.com/create/windows/). - -You do not need it running as a service: the tests will start and stop instances automatically. - ### ZooKeeper Download a ZooKeeper installation by going to [https://zookeeper.apache.org/](https://zookeeper.apache.org/)->Documentation->Release ...->Getting Started->Download->stable. diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 18a50aeb..2d9a4cdd 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -15,7 +15,7 @@ 1.0.0.0 Michael Adelson, joesdu Provides a distributed lock implementation based on MongoDB - Copyright © 2020 Michael Adelson + Copyright © 2026 Michael Adelson MIT distributed lock async mongodb https://github.com/madelson/DistributedLock diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 72a56f34..536766cd 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -11,18 +11,16 @@ namespace Medallion.Threading.MongoDB; /// public sealed partial class MongoDistributedLock : IInternalDistributedLock { - internal const string DefaultCollectionName = "distributed.locks"; + internal const string DefaultCollectionName = "distributed_locks"; private static readonly DateTime EpochUtc = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); + private static readonly MongoIndexInitializer IndexInitializer = new(); /// /// ActivitySource for distributed tracing and diagnostics /// internal static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); - // We want to ensure indexes are created at most once per process per (database, collection) - private static readonly ConcurrentDictionary>> IndexInitializationTasks = new(StringComparer.Ordinal); - private readonly string _collectionName; private readonly IMongoDatabase _database; private readonly MongoDistributedLockOptions _options; @@ -39,7 +37,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock /// Constructs a lock named using the provided and . - /// The locks will be stored in a collection named "distributed.locks" by default. + /// The locks will be stored in a collection named "distributed_locks" by default. /// public MongoDistributedLock(string key, IMongoDatabase database, Action? options = null) : this(key, database, DefaultCollectionName, options) { } @@ -75,9 +73,6 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti var collection = this._database.GetCollection(this._collectionName); - // Ensure indexes exist (TTL cleanup); do this at most once per process per (db, collection) - await EnsureIndexesCreatedAsync(collection).ConfigureAwait(false); - // Use a unique token per acquisition attempt (like Redis' value token) var lockId = Guid.NewGuid().ToString("N"); @@ -99,6 +94,7 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti // Verify we actually got the lock if (result?.LockId == lockId) { + _ = IndexInitializer.InitializeTtlIndex(collection); activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); return new(new(this, lockId, collection), result.FencingToken); @@ -156,58 +152,6 @@ private static UpdateDefinition CreateAcquireUpdate(string lo return new PipelineUpdateDefinition(new[] { setStage }); } - private static async Task EnsureIndexesCreatedAsync(IMongoCollection collection) - { - // Best-effort TTL index to clean up expired rows over time. - // Note: TTL monitors run on a schedule; correctness MUST NOT depend on this. - var databaseName = collection.Database.DatabaseNamespace.DatabaseName; - // include the hash code of the settings to differentiate between different clusters/clients - // that happen to use the same database/collection names. - // While GetHashCode() isn't perfect, it should be sufficient to distinguish between different clients/settings - // in valid use-cases (e.g. diff connection strings). - var clientSettingsHash = collection.Database.Client.Settings.GetHashCode(); - var key = clientSettingsHash + "|" + databaseName + "/" + collection.CollectionNamespace.CollectionName; - - var lazy = IndexInitializationTasks.GetOrAdd(key, _ => new(() => CreateIndexesAsync(collection))); - - var success = await lazy.Value.AwaitSyncOverAsync().ConfigureAwait(false); - if (!success) - { - // If the task failed (returned false), we remove it so we can try again next time. - // Note: worst case we remove a *new* valid task if a race happens, which is fine (just extra work). - IndexInitializationTasks.As>>>>().Remove(new KeyValuePair>>(key, lazy)); - } - } - - private static async Task CreateIndexesAsync(IMongoCollection collection) - { - try - { - var indexKeys = Builders.IndexKeys.Ascending(d => d.ExpiresAt); - var indexOptions = new CreateIndexOptions - { - // TTL cleanup: remove documents once expiresAt < now - ExpireAfter = TimeSpan.Zero, - Name = "expiresAt_ttl" - }; - var indexModel = new CreateIndexModel(indexKeys, indexOptions); - await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: CancellationToken.None).ConfigureAwait(false); - return true; - } - catch (MongoCommandException ex) when (ex.CodeName is "IndexOptionsConflict" or "IndexKeySpecsConflict" or "IndexAlreadyExists") - { - // Index already exists with same or different options - this is acceptable. - // The existing index will still handle TTL cleanup. - return true; - } - catch (MongoException) - { - // Other MongoDB errors (network, auth, etc.) - swallow to avoid blocking lock acquisition. - // The lock will still work correctly; TTL cleanup is a best-effort optimization. - return false; - } - } - /// /// Inner handle that performs actual lock management and release. /// Separated from the outer handle so it can be registered with ManagedFinalizerQueue. @@ -222,17 +166,15 @@ internal sealed class InnerHandle : IAsyncDisposable, LeaseMonitor.ILeaseHandle public CancellationToken HandleLostToken => this._monitor.HandleLostToken; TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.Expiry; - - // todo what if inf? TimeoutValue LeaseMonitor.ILeaseHandle.MonitoringCadence => this._lock._options.ExtensionCadence; public InnerHandle(MongoDistributedLock @lock, string lockId, IMongoCollection collection) { this._lock = @lock; this._lockId = lockId; + this._collection = collection; // important to set this last, since the monitor constructor will read other fields of this this._monitor = new(this); - this._collection = collection; } public async ValueTask DisposeAsync() diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs index 04ea34fa..05a00035 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs @@ -13,7 +13,7 @@ public sealed class MongoDistributedSynchronizationProvider : IDistributedLockPr /// /// Constructs a that connects to the provided - /// and uses the provided . Locks will be stored in a collection named "distributed.locks" by default. + /// and uses the provided . Locks will be stored in a collection named "distributed_locks" by default. /// public MongoDistributedSynchronizationProvider(IMongoDatabase database, Action? options = null) : this(database, MongoDistributedLock.DefaultCollectionName, options) { } @@ -24,21 +24,15 @@ public MongoDistributedSynchronizationProvider(IMongoDatabase database, Action public MongoDistributedSynchronizationProvider(IMongoDatabase database, string collectionName, Action? options = null) { - _database = database ?? throw new ArgumentNullException(nameof(database)); - _collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - _options = options; + this._database = database ?? throw new ArgumentNullException(nameof(database)); + this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); + this._options = options; } /// /// Creates a using the given . /// - public MongoDistributedLock CreateLock(string name) - { - return new(name, _database, _collectionName, _options); - } + public MongoDistributedLock CreateLock(string name) => new(name, this._database, this._collectionName, this._options); - IDistributedLock IDistributedLockProvider.CreateLock(string name) - { - return this.CreateLock(name); - } + IDistributedLock IDistributedLockProvider.CreateLock(string name) => this.CreateLock(name); } \ No newline at end of file diff --git a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs new file mode 100644 index 00000000..8a799fd8 --- /dev/null +++ b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs @@ -0,0 +1,136 @@ +using MongoDB.Driver; +using System.Collections.Concurrent; + +namespace Medallion.Threading.MongoDB; + +internal class MongoIndexInitializer +{ + private const string IndexName = "expiresAt_ttl"; + + // We want to ensure indexes are created at most once per process per (database, collection) + private readonly ConcurrentDictionary<(int SettingsHash, CollectionNamespace Namespace), Lazy>> _indexInitializationTasks = []; + + /// + /// Idempotently creates a best-effort TTL index to clean up expired rows over time. + /// Note: TTL monitors run on a schedule; correctness MUST NOT depend on this index existing. + /// + public Task InitializeTtlIndex(IMongoCollection collection) + { + // Include the hash code of the settings to differentiate between different clusters/clients + // that happen to use the same database/collection names. + // While GetHashCode() isn't perfect, it should be sufficient to distinguish between different clients/settings + // in valid use-cases (e.g. diff connection strings). + var clientSettingsHash = collection.Database.Client.Settings.GetHashCode(); + var key = (clientSettingsHash, collection.CollectionNamespace); + + // If we already have a task and it is in-progress or finished conclusively, noop + if (this._indexInitializationTasks.TryGetValue(key, out var existingTask) + && (!existingTask.Value.IsCompleted || existingTask.Value.Result.HasValue)) + { + return existingTask.Value; + } + + var newTask = this._indexInitializationTasks.AddOrUpdate( + key, + addValueFactory: static (k, a) => new(() => a.initializer.CreateIndexIfNotExistsWrapperAsync(a.collection)), + updateValueFactory: static (k, existing, a) => existing == a.existingTask ? new(() => a.initializer.CreateIndexIfNotExistsWrapperAsync(a.collection)) : existing, + factoryArgument: (initializer: this, collection, existingTask)); + return newTask.Value; + } + + private async Task CreateIndexIfNotExistsWrapperAsync(IMongoCollection collection) + { + if (await this.CreateIndexIfNotExistsAsync(collection).ConfigureAwait(false) is { } result) + { + return result; + } + + // On a retryable failure, avoid resolving the task for a bit so we don't retry immediately and spam the DB + await this.DelayBeforeRetry().ConfigureAwait(false); + + return null; + } + + // exposed for mocking + internal virtual Task DelayBeforeRetry() => Task.Delay(TimeSpan.FromMinutes(1)); + + private async Task CreateIndexIfNotExistsAsync(IMongoCollection collection) + { + using var activity = MongoDistributedLock.ActivitySource.StartActivity(nameof(MongoIndexInitializer) + ".CreateIndexIfNotExists"); + activity?.AddTag("collection", collection.CollectionNamespace.FullName); + + const string TagKey = "ttl_index"; + try + { + var indexKeys = Builders.IndexKeys.Ascending(d => d.ExpiresAt); + var indexOptions = new CreateIndexOptions + { + // TTL cleanup: remove documents once expiresAt < now + ExpireAfter = TimeSpan.Zero, + Name = IndexName, + }; + var indexModel = new CreateIndexModel(indexKeys, indexOptions); + await collection.Indexes.CreateOneAsync(indexModel, cancellationToken: CancellationToken.None).ConfigureAwait(false); + activity?.SetTag(TagKey, "created"); + return true; + } + catch (MongoCommandException ex) when (ex.CodeName is "IndexOptionsConflict" or "IndexKeySpecsConflict" or "IndexAlreadyExists") + { + // Index already exists with same or different options - this is acceptable. + // The existing index will still handle TTL cleanup. + activity?.SetTag(TagKey, "exists"); + return true; + } + catch (MongoCommandException ex) when (ex.CodeName == "Unauthorized") + { + try + { + // If we don't have permissions to create an index, we may still be able to affirm + // that it exists by querying for it + if (await CheckIfIndexExists(collection).ConfigureAwait(false)) + { + activity?.SetTag(TagKey, "exists"); + return true; + } + } + catch (Exception checkException) + { + activity?.SetTag("exists_check", $"failed: {checkException.GetType()}: {checkException.Message}"); + } + + activity?.SetTag(TagKey, "failed: " + ex.CodeName); + return false; // if we're not authorized, there's no point in retrying + } + catch (Exception ex) + { + activity?.SetTag(TagKey, $"failed: {ex.GetType()}: {ex.Message}"); + activity?.SetTag("will_retry", true); + return null; // retry ephemeral failures + } + } + + // exposed for testing + internal static async Task CheckIfIndexExists(IMongoCollection collection) + { + using var cursor = await collection.Indexes.ListAsync().ConfigureAwait(false); + while (await cursor.MoveNextAsync().ConfigureAwait(false)) + { + foreach (var index in cursor.Current) + { + if (index["name"].AsString == IndexName) { return true; } + + // Check if it is a TTL index on column "expiresAt" + + // TTL indexes contain the "expireAfterSeconds" field in their options + if (index.Contains("expireAfterSeconds")) + { + var keyElement = index["key"].AsBsonDocument; + // Check if the first key in the index is "foo" + if (keyElement.Contains("expiresAt")) { return true; } + } + } + } + + return false; + } +} diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md index 4ff47a06..ff6299bb 100644 --- a/src/DistributedLock.MongoDB/README.md +++ b/src/DistributedLock.MongoDB/README.md @@ -109,7 +109,7 @@ var @lock = new MongoDistributedLock( ### Custom Collection Name -By default, locks are stored in a collection named `"distributed.locks"`. You can specify a custom collection name: +By default, locks are stored in a collection named `"distributed_locks"`. You can specify a custom collection name: ```csharp // Direct lock creation with custom collection @@ -190,7 +190,7 @@ graph TB Handle["MongoDistributedLockHandle"] MongoDB[("MongoDB Database")] - Collection["distributed.locks Collection"] + Collection["distributed_locks Collection"] TTLIndex["TTL Index on expiresAt"] Client -->|Creates| Lock diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs index 40cb4986..0103102a 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs @@ -27,7 +27,7 @@ public void OneTimeSetUp() if (IsMongoReady(settings, TimeSpan.FromSeconds(15))) { return; } } - throw new Exception("Failed to start Mongo!"); + throw new Exception("Failed to start Mongo! Make sure Docker is started!"); static bool DockerCommand(string[] args, bool throwOnError = false) => Command.Run("docker", args, o => o.ThrowOnError(throwOnError)) diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs index 22040b9d..a98302ae 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbProviders.cs @@ -5,29 +5,28 @@ namespace Medallion.Threading.Tests.MongoDB; public sealed class TestingMongoDistributedLockProvider : TestingLockProvider { - private const string CollectionName = "distributed.locks"; private readonly IMongoDatabase _database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); public override IDistributedLock CreateLockWithExactName(string name) { // Use a short expiry to make tests like TestHandleLostTriggersCorrectly run faster - var @lock = new MongoDistributedLock(name, this._database, CollectionName, options => options.Expiry(TimeSpan.FromSeconds(5))); + var @lock = new MongoDistributedLock(name, this._database, options => options.Expiry(TimeSpan.FromSeconds(5)).ExtensionCadence(TimeSpan.FromSeconds(.5))); this.Strategy.KillHandleAction = () => { - var collection = this._database.GetCollection(CollectionName); + var collection = this._database.GetCollection(MongoDistributedLock.DefaultCollectionName); collection.DeleteOne(Builders.Filter.Eq(d => d.Id, name)); }; return @lock; } public override string GetSafeName(string name) => - new MongoDistributedLock(name, this._database, CollectionName).Name; + new MongoDistributedLock(name, this._database, MongoDistributedLock.DefaultCollectionName).Name; public override string GetCrossProcessLockType() => nameof(MongoDistributedLock); public override void Dispose() { - this._database.DropCollection(CollectionName); + this._database.DropCollection(MongoDistributedLock.DefaultCollectionName); base.Dispose(); } } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs index 164a3df6..fc0b53cf 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/TestingMongoDbSynchronizationStrategy.cs @@ -7,7 +7,7 @@ namespace Medallion.Threading.Tests.MongoDB; public sealed class TestingMongoDbSynchronizationStrategy : TestingSynchronizationStrategy { - public Action? KillHandleAction { get; set; } + public Action? KillHandleAction { get; set; } public override void PrepareForHandleAbandonment() => this.KillHandleAction?.Invoke(); diff --git a/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs index 041ac2d8..ebf8ded4 100644 --- a/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs +++ b/src/DistributedLock.Tests/Infrastructure/Redis/TestingRedisSynchronizationStrategy.cs @@ -38,7 +38,16 @@ public void Options(RedisDistributedSynchronizationOptionsBuilder options) { Invariant.Require(!this._preparedForHandleLost); this._preparedForHandleLost = true; - return new HandleLostScope(this); + return new ReleaseAction(() => + { + Invariant.Require(this._preparedForHandleLost); + try { this._killHandleAction?.Invoke(); } + finally + { + this._killHandleAction = null; + this._preparedForHandleLost = false; + } + }); } public override void PrepareForHandleAbandonment() => this._preparedForHandleAbandonment = true; @@ -56,29 +65,4 @@ public void RegisterKillHandleAction(Action action) this._killHandleAction += action; } } - - private class HandleLostScope : IDisposable - { - private TestingRedisSynchronizationStrategy? _strategy; - - public HandleLostScope(TestingRedisSynchronizationStrategy strategy) - { - this._strategy = strategy; - } - - public void Dispose() - { - var strategy = Interlocked.Exchange(ref this._strategy, null); - if (strategy != null) - { - Invariant.Require(strategy._preparedForHandleLost); - try { strategy._killHandleAction?.Invoke(); } - finally - { - strategy._killHandleAction = null; - strategy._preparedForHandleLost = false; - } - } - } - } } diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 8e259d71..858755f3 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -1,3 +1,4 @@ +using Medallion.Threading.Internal; using Medallion.Threading.MongoDB; using MongoDB.Driver; using Moq; @@ -30,6 +31,10 @@ public async Task TestBasicLockFunctionality() { Assert.That(handle, Is.Not.Null, "Lock should be released"); } + + // Make sure index was created + var collection = database.GetCollection(MongoDistributedLock.DefaultCollectionName); + await TestHelper.WaitForAsync(() => MongoIndexInitializer.CheckIfIndexExists(collection).AsValueTask(), TimeSpan.FromSeconds(15)); } [Test] @@ -37,19 +42,23 @@ public async Task TestCustomCollectionName() { var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); var lockName = TestHelper.UniqueName; - const string CustomCollectionName = "CustomLocks"; - var @lock = new MongoDistributedLock(lockName, database, CustomCollectionName); + var customCollectionName = TestHelper.UniqueName + "-locks"; + var @lock = new MongoDistributedLock(lockName, database, customCollectionName); await using (var handle = await @lock.AcquireAsync()) { Assert.That(handle, Is.Not.Null); } // Verify the collection was created - var collectionExists = (await database.ListCollectionNamesAsync()).ToList().Contains(CustomCollectionName); + var collectionExists = (await database.ListCollectionNamesAsync()).ToList().Contains(customCollectionName); Assert.That(collectionExists, Is.True); + // Make sure index was created + var collection = database.GetCollection(customCollectionName); + await TestHelper.WaitForAsync(() => MongoIndexInitializer.CheckIfIndexExists(collection).AsValueTask(), TimeSpan.FromSeconds(15)); + // Cleanup - await database.DropCollectionAsync(CustomCollectionName); + await database.DropCollectionAsync(customCollectionName); } [Test] @@ -90,9 +99,8 @@ public async Task TestLockNameSupport() public async Task TestHandleLostToken() { var database = MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory); - var lockName = TestHelper.UniqueName; // Configure a short extension cadence so the test doesn't have to wait too long - var @lock = new MongoDistributedLock(lockName, database, options: o => o.ExtensionCadence(TimeSpan.FromMilliseconds(500))); + var @lock = new MongoDistributedLock(TestHelper.UniqueName, database, options: o => o.ExtensionCadence(TimeSpan.FromMilliseconds(500))); await using var handle = await @lock.AcquireAsync(); Assert.That(handle, Is.Not.Null); Assert.Multiple(() => @@ -102,11 +110,12 @@ public async Task TestHandleLostToken() }); // Manually delete the lock document to simulate lock loss - var collection = database.GetCollection("distributed.locks"); - await collection.DeleteOneAsync(Builders.Filter.Eq(d => d.Id, lockName)); + var collection = database.GetCollection(MongoDistributedLock.DefaultCollectionName); + Assert.That((await collection.DeleteOneAsync(Builders.Filter.Eq(d => d.Id, @lock.Key))).DeletedCount, Is.EqualTo(1)); // Wait a bit for the extension task to detect the loss - await Task.Delay(TimeSpan.FromSeconds(2)); + var timeout = Task.Delay(TimeSpan.FromSeconds(4)); + while (!handle.HandleLostToken.IsCancellationRequested && !timeout.IsCompleted) { } Assert.That(handle.HandleLostToken.IsCancellationRequested, Is.True, "HandleLostToken should be signaled when lock is lost"); } @@ -184,12 +193,15 @@ public async Task TestIndexExistence() } var collection = database.GetCollection(collectionName); - using var cursor = await collection.Indexes.ListAsync(); - var indexes = await cursor.ToListAsync(); - - var ttlIndex = indexes.FirstOrDefault(i => i["name"] == "expiresAt_ttl"); - Assert.That(ttlIndex, Is.Not.Null, "TTL index should exist"); - Assert.That(ttlIndex!["expireAfterSeconds"].AsInt32, Is.EqualTo(0)); // check functionality + await TestHelper.WaitForAsync(async () => + { + using var cursor = await collection.Indexes.ListAsync(); + var indexes = await cursor.ToListAsync(); + var ttlIndex = indexes.FirstOrDefault(i => i["name"] == "expiresAt_ttl"); + if (ttlIndex is null) { return false; } + Assert.That(ttlIndex!["expireAfterSeconds"].AsInt32, Is.EqualTo(0)); // check functionality + return true; + }, TimeSpan.FromSeconds(15)); } [Test] @@ -200,47 +212,52 @@ public async Task TestIndexCreationIsScopedToCluster() var db1 = new Mock(MockBehavior.Strict); var db2 = new Mock(MockBehavior.Strict); - var coll1 = new Mock>(MockBehavior.Strict); - var coll2 = new Mock>(MockBehavior.Strict); + var collection1 = new Mock>(MockBehavior.Strict); + var collection2 = new Mock>(MockBehavior.Strict); // We can't easily mock ClusterId equality without deeper mocking, - // but verify that if we use the *same* logic we rely on unique behavior? - // Wait, unit testing static cache with mocks is tricky because state persists. - // We need a unique db/coll name to avoid interference from other tests. + // We need a unique db/coll name to avoid interference from other tests but we want + // it to be the same otherwise. var uniqueName = "db_" + Guid.NewGuid().ToString("N"); - SetDb(db1, coll1, uniqueName, "locks"); - SetDb(db2, coll2, uniqueName, "locks"); - // We want to verify ConfigureIndexes is called on BOTH. - // Setup index creation mocks - var idx1 = new Mock>(MockBehavior.Strict); - var idx2 = new Mock>(MockBehavior.Strict); - - coll1.Setup(c => c.Indexes).Returns(idx1.Object); - coll2.Setup(c => c.Indexes).Returns(idx2.Object); - - // Allow FindOneAndUpdate - coll1.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) - .ReturnsAsync((MongoLockDocument)null!); - coll2.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) - .ReturnsAsync((MongoLockDocument)null!); + var index1 = new Mock>(MockBehavior.Strict); + var index2 = new Mock>(MockBehavior.Strict); - // Expect CreateOneAsync - idx1.Setup(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) - .ReturnsAsync("idx"); - idx2.Setup(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) - .ReturnsAsync("idx"); - - var lock1 = new MongoDistributedLock("k", db1.Object, "locks"); - var lock2 = new MongoDistributedLock("k", db2.Object, "locks"); - - await lock1.TryAcquireAsync(); - await lock2.TryAcquireAsync(); + foreach (var (index, collection, db) in new[] { (index1, collection1, db1), (index2, collection2, db2) }) + { + SetDb(db, collection, uniqueName, "locks"); + + collection.Setup(c => c.Indexes).Returns(index.Object); + + // Expect CreateOneAsync + index.Setup(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + .ReturnsAsync("idx"); + + var @lock = new MongoDistributedLock("k", db.Object, "locks"); + + // First set it up so that acquire will fail + collection.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((MongoLockDocument)null!); + await @lock.TryAcquireAsync(); + index.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Never, "Failed acquire does not trigger index creation"); + + // Allow FindOneAndUpdate + collection.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((FilterDefinition filter, UpdateDefinition update, FindOneAndUpdateOptions findAndUpdate, CancellationToken _) => + { + // this is reversing the construction in MongoDistributedLock.CreateAcquireUpdate() + var pipeline = (BsonDocumentStagePipelineDefinition)((PipelineUpdateDefinition)update).Pipeline; + var lockId = pipeline.Documents[0]["$set"]["lockId"]["$cond"][1].AsString; + return new MongoLockDocument { Id = Guid.NewGuid().ToString(), LockId = lockId }; + }); + + await @lock.TryAcquireAsync(); + } - idx1.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "First DB should create index"); - - idx2.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "Second DB should create index too because it's a different instance"); + // We want to verify ConfigureIndexes is called on BOTH. + index1.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "First DB should create index"); + index2.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once, "Second DB should create index too because it's a different instance"); } private static void SetDb(Mock db, Mock> coll, string dbName, string collName) @@ -266,33 +283,77 @@ private static void SetDb(Mock db, Mock(MockBehavior.Strict); - var coll = new Mock>(MockBehavior.Strict); - SetDb(db, coll, "db_" + Guid.NewGuid().ToString("N"), "locks"); + var collection = new Mock>(MockBehavior.Strict); + SetDb(db, collection, "db_" + Guid.NewGuid().ToString("N"), "locks"); - var idx = new Mock>(MockBehavior.Strict); - coll.Setup(c => c.Indexes).Returns(idx.Object); + var index = new Mock>(MockBehavior.Strict); + collection.Setup(c => c.Indexes).Returns(index.Object); // Fail first time - idx.SetupSequence(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + index.SetupSequence(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) .ThrowsAsync(new MongoException("Test failure")) .ReturnsAsync("idx"); // Allow FindOneAndUpdate - coll.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) - .ReturnsAsync((MongoLockDocument)null!); - + collection.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((FilterDefinition filter, UpdateDefinition update, FindOneAndUpdateOptions findAndUpdate, CancellationToken _) => + { + // this is reversing the construction in MongoDistributedLock.CreateAcquireUpdate() + var pipeline = (BsonDocumentStagePipelineDefinition)((PipelineUpdateDefinition)update).Pipeline; + var lockId = pipeline.Documents[0]["$set"]["lockId"]["$cond"][1].AsString; + return new MongoLockDocument { Id = Guid.NewGuid().ToString(), LockId = lockId }; + }); + var @lock = new MongoDistributedLock("k", db.Object, "locks"); // First acquire: fails to create index (swallowed), acquires lock await @lock.TryAcquireAsync(); + // Second acquire: caches the failed task, so it won't retry. + await @lock.TryAcquireAsync(); + + // Verify CreateOneAsync was called ONCE (proving caching). + index.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once(), "Should retry index creation after failure"); + } + + [Test, Category("CI")] + public async Task TestFailedIndexCreationEventuallyRetries() + { + var db = new Mock(MockBehavior.Strict); + var collection = new Mock>(MockBehavior.Strict); + SetDb(db, collection, "db_" + Guid.NewGuid().ToString("N"), "locks"); + + var index = new Mock>(MockBehavior.Strict); + collection.Setup(c => c.Indexes).Returns(index.Object); + + // Fail first time + index.SetupSequence(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny())) + .ThrowsAsync(new MongoException("Test failure")) + .ReturnsAsync("idx"); + + // Allow FindOneAndUpdate + collection.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) + .ReturnsAsync((FilterDefinition filter, UpdateDefinition update, FindOneAndUpdateOptions findAndUpdate, CancellationToken _) => + { + // this is reversing the construction in MongoDistributedLock.CreateAcquireUpdate() + var pipeline = (BsonDocumentStagePipelineDefinition)((PipelineUpdateDefinition)update).Pipeline; + var lockId = pipeline.Documents[0]["$set"]["lockId"]["$cond"][1].AsString; + return new MongoLockDocument { Id = Guid.NewGuid().ToString(), LockId = lockId }; + }); + + Mock initializer = new(); + // set cache time to 0 + initializer.Setup(i => i.DelayBeforeRetry()).Returns(Task.CompletedTask); + + // First acquire: fails to create index (swallowed), acquires lock + await initializer.Object.InitializeTtlIndex(collection.Object); + // Second acquire: should retry index creation if we fix it. // Currently it caches the failed task, so it won't retry. - await @lock.TryAcquireAsync(); + await initializer.Object.InitializeTtlIndex(collection.Object); // Verify CreateOneAsync was called TWICE (proving retry). - // If the current bug exists, it will be called ONCE. - idx.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Exactly(2), "Should retry index creation after failure"); + index.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Exactly(2), "Should retry index creation after failure"); } [Test] From 50e7cb8f598ab13945cd8390d2610511b2abcf2b Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 09:58:19 -0500 Subject: [PATCH 369/399] Mongo docs cleanup --- docs/Developing DistributedLock.md | 94 +++--------------------------- 1 file changed, 8 insertions(+), 86 deletions(-) diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index cc9a4503..4c55515e 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -81,15 +81,17 @@ You do not need it running as a service: the tests will start and stop instances ### MongoDB -You can download the MongoDB Community Server from [here](https://www.mongodb.com/try/download/community). - -Alternatively, and recommended for quick testing, you can use Docker to spin up an instance without manual initialization. -Run the following command: +The recommended approach for MongoDB is to use Docker (e.g. Docker desktop on Windows). To spin up an instance without manual initialization. The test suite assumes docker is running and will try to start the container with: ```bat -docker run -d -p 27017:27017 --name mongo mongo:latest +docker run -d -p 27017:27017 --name distributed-lock-mong mongo:latest ``` +
+Advanced setup options +

+You can download the MongoDB Community Server from [here](https://www.mongodb.com/try/download/community). + Or use `docker compose` to start a replica set environment: ```yaml @@ -158,87 +160,7 @@ If you're using a replica set or sharded cluster, your connection string might l ``` mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.internal:27018,host.docker.internal:27019/?replicaSet=rs0&authSource=admin&serverSelectionTimeoutMS=1000 ``` - -TODO cleanup -

-中文说明 - -对于 MongoDB,我们可以从他的官网下载社区版本来进行测试,下载地址:[MongoDB Community Server](https://www.mongodb.com/try/download/community). -或者也可以使用 Docker 快速的启动一个测试环境.建议使用 Docker 来进行快速测试,而无需进行数据库服务初始化.以下是一个使用 Docker 启动 MongoDB 的命令: - -```bat -docker run -d -p 27017:27017 --name mongo mongo:latest -``` - -或者使用 `docker compose` 来启动一个副本集环境: - -```yaml -services: - mongo_primary: - image: bitnami/mongodb:latest - container_name: mongo_primary - environment: - - TZ=Asia/Chongqing - - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - - MONGODB_REPLICA_SET_MODE=primary - - MONGODB_REPLICA_SET_NAME=rs0 - - MONGODB_ROOT_USER=yourUsername - - MONGODB_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE - ports: - - "27017:27017" - volumes: - - "mongodb_master_data:/bitnami/mongodb" - - mongo_secondary: - image: bitnami/mongodb:latest - container_name: mongo_secondary - depends_on: - - mongo_primary - environment: - - TZ=Asia/Chongqing - - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - - MONGODB_REPLICA_SET_MODE=secondary - - MONGODB_REPLICA_SET_NAME=rs0 - - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 - - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal - - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername - - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE - ports: - - "27018:27017" - - mongo_arbiter: - image: bitnami/mongodb:latest - container_name: mongo_arbiter - depends_on: - - mongo_primary - environment: - - TZ=Asia/Chongqing - - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - - MONGODB_REPLICA_SET_MODE=arbiter - - MONGODB_REPLICA_SET_NAME=rs0 - - MONGODB_INITIAL_PRIMARY_PORT_NUMBER=27017 - - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal - - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername - - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE - ports: - - "27019:27017" - -volumes: - mongodb_master_data: - driver: local -``` - -测试项目默认连接地址为 `mongodb://localhost:27017`. 如果需要配置用户名密码或者其他连接参数, 请在 `DistributedLock.Tests/credentials/mongodb.txt` 文件中填入完整的连接字符串. - -若是使用副本集或者分片集群模式,链接字符串可以填入类似如下格式: - -``` -mongodb://yourUsername:yourPassword@host.docker.internal:27017,host.docker.internal:27018,host.docker.internal:27019/?replicaSet=rs0&authSource=admin&serverSelectionTimeoutMS=1000 -``` - +

### ZooKeeper From f3e3e8c166d30160f07a922c598e9830acb5a3ed Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 10:08:59 -0500 Subject: [PATCH 370/399] readme cleanup --- README.md | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 504a420e..d8d85f5a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ DistributedLock is a .NET library that provides robust and easy-to-use distributed mutexes, reader-writer locks, and semaphores based on a variety of underlying technologies. With DistributedLock, synchronizing access to a region of code across multiple applications/machines is as simple as: - ```C# await using (await myDistributedLock.AcquireAsync()) { @@ -13,20 +12,18 @@ await using (await myDistributedLock.AcquireAsync()) ## Implementations -DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. _Note that each package is versioned independently according to SemVer_. - -- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) - : uses Microsoft SQL Server -- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) - : uses Postgresql -- **[DistributedLock.MongoDB](docs/DistributedLock.MongoDB.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MongoDB.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MongoDB/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MongoDB.html): uses MongoDB -- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MySql.html): uses MySQL or MariaDB -- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html): uses Oracle -- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Redis.html): uses Redis -- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Azure.html): uses Azure blobs -- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.ZooKeeper.html): uses Apache ZooKeeper -- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.FileSystem.html): uses lock files -- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.WaitHandles.html): uses operating system global `WaitHandle`s (Windows only) +DistributedLock contains implementations based on various technologies; you can install implementation packages individually or just install the [DistributedLock NuGet package](https://www.nuget.org/packages/DistributedLock) [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.svg?style=flat)](https://www.nuget.org/packages/DistributedLock/), a ["meta" package](https://endjin.com/blog/2020/09/streamline-dependency-management-with-nuget-meta-packages) which includes all implementations as dependencies. *Note that each package is versioned independently according to SemVer*. + +- **[DistributedLock.SqlServer](docs/DistributedLock.SqlServer.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.SqlServer.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.SqlServer/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.SqlServer.html) (uses Microsoft SQL Server) +- **[DistributedLock.Postgres](docs/DistributedLock.Postgres.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Postgres.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Postgres/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Postgres.html) (uses Postgresql) +- **[DistributedLock.MySql](docs/DistributedLock.MySql.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MySql.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MySql/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MySql.html) (uses MySQL or MariaDB) +- **[DistributedLock.Oracle](docs/DistributedLock.Oracle.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Oracle.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Oracle/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Oracle.html) (uses Oracle) +- **[DistributedLock.Redis](docs/DistributedLock.Redis.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Redis.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Redis/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Redis.html) (uses Redis) +- **[DistributedLock.Azure](docs/DistributedLock.Azure.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.Azure.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.Azure/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.Azure.html) (uses Azure blobs) +- **[DistributedLock.MongoDB](docs/DistributedLock.MongoDB.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.MongoDB.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.MongoDB/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.MongoDB.html) (uses MongoDB) +- **[DistributedLock.ZooKeeper](docs/DistributedLock.ZooKeeper.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.ZooKeeper.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.ZooKeeper/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.ZooKeeper.html) (uses Apache ZooKeeper) +- **[DistributedLock.FileSystem](docs/DistributedLock.FileSystem.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.FileSystem.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.FileSystem/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.FileSystem.html) (uses lock files) +- **[DistributedLock.WaitHandles](docs/DistributedLock.WaitHandles.md)** [![NuGet Status](http://img.shields.io/nuget/v/DistributedLock.WaitHandles.svg?style=flat)](https://www.nuget.org/packages/DistributedLock.WaitHandles/) [![Static Badge](https://img.shields.io/badge/API%20Docs-DNDocs-190088?logo=readme&logoColor=white)](https://dndocs.com/d/distributedlock/api/Medallion.Threading.WaitHandles.html) (*Windows only*: uses operating system global `WaitHandle`s) **Click on the name** of any of the above packages to see the documentation specific to that implementation, or read on for general documentation that applies to all implementations. @@ -145,7 +142,7 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes - 2.7.1 - - Improve compatibility with Redis clusters that require keys in Lua scripts to be passed via the KEYS array. Thanks [@pengweiqhca](https://github.com/pengweiqhca) for reporting a identifying the fix! ([#254](https://github.com/madelson/DistributedLock/issues/254), DistributedLock.Redis 1.1.1) + - Improve compatibility with Redis clusters that require keys in Lua scripts to be passed via the KEYS array. Thanks [@pengweiqhca](https://github.com/pengweiqhca) for reporting a identifying the fix! ([#254](https://github.com/madelson/DistributedLock/issues/254), DistributedLock.Redis 1.1.1) - 2.7 - Add support for fetching a Redis-based semaphore's current available count. Thanks [@teesoftech](https://github.com/teesofttech) for implementing! ([#234](https://github.com/madelson/DistributedLock/issues/234), DistributedLock.Redis 1.1) - 2.6 From 1ce9b9b6d39685a60df362f2f622ddcd2f631f52 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 20:46:00 -0500 Subject: [PATCH 371/399] mongo cleanup --- docs/Developing DistributedLock.md | 14 +- docs/DistributedLock.MongoDB.md | 234 ++++++++++ src/DistributedLock.MongoDB/README.md | 425 ------------------ src/DistributedLock.MongoDB/README.zh-CN.md | 425 ------------------ .../DistributedLockCoreTestCases.cs | 23 + .../DistributedLock.Tests.csproj | 1 - src/DistributedLock.sln | 4 +- src/DistributedLockTaker/Program.cs | 2 +- 8 files changed, 267 insertions(+), 861 deletions(-) delete mode 100644 src/DistributedLock.MongoDB/README.md delete mode 100644 src/DistributedLock.MongoDB/README.zh-CN.md diff --git a/docs/Developing DistributedLock.md b/docs/Developing DistributedLock.md index 4c55515e..8a3b3dbb 100644 --- a/docs/Developing DistributedLock.md +++ b/docs/Developing DistributedLock.md @@ -34,7 +34,7 @@ GRANT ALL PRIVILEGES ON distributed_lock.* TO 'DistributedLock'@'localhost'; GRANT SELECT ON performance_schema.* TO 'DistributedLock'@'localhost'; ``` -(Windows) If you don't want MySQL always running on your machine, set the Startup type to "Manual" for `MariaDB`. +(Windows) If you don't want MariaDB always running on your machine, set the Startup type to "Manual" for `MariaDB`. Finally, add your username (DistributedLock) and password to `DistributedLock.Tests/credentials/mariadb.txt`, with the username on line 1 and the password on line 2. @@ -100,13 +100,13 @@ services: image: bitnami/mongodb:latest container_name: mongo_primary environment: - - TZ=Asia/Chongqing + - TZ=UTC - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - MONGODB_REPLICA_SET_MODE=primary - MONGODB_REPLICA_SET_NAME=rs0 - MONGODB_ROOT_USER=yourUsername - MONGODB_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + - MONGODB_REPLICA_SET_KEY=yourKey ports: - "27017:27017" volumes: @@ -118,7 +118,7 @@ services: depends_on: - mongo_primary environment: - - TZ=Asia/Chongqing + - TZ=UTC - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - MONGODB_REPLICA_SET_MODE=secondary - MONGODB_REPLICA_SET_NAME=rs0 @@ -126,7 +126,7 @@ services: - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + - MONGODB_REPLICA_SET_KEY=yourKey ports: - "27018:27017" @@ -136,7 +136,7 @@ services: depends_on: - mongo_primary environment: - - TZ=Asia/Chongqing + - TZ=UTC - MONGODB_ADVERTISED_HOSTNAME=host.docker.internal - MONGODB_REPLICA_SET_MODE=arbiter - MONGODB_REPLICA_SET_NAME=rs0 @@ -144,7 +144,7 @@ services: - MONGODB_INITIAL_PRIMARY_HOST=host.docker.internal - MONGODB_INITIAL_PRIMARY_ROOT_USER=yourUsername - MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD=yourPassword - - MONGODB_REPLICA_SET_KEY=HxplckY2jXSwfDRE + - MONGODB_REPLICA_SET_KEY=yourKey ports: - "27019:27017" diff --git a/docs/DistributedLock.MongoDB.md b/docs/DistributedLock.MongoDB.md index aec2effa..a580d9bc 100644 --- a/docs/DistributedLock.MongoDB.md +++ b/docs/DistributedLock.MongoDB.md @@ -80,3 +80,237 @@ var @lock = new MongoDistributedLock("MyLockName", database, "MyCustomLocks"); ## Stale lock cleanup Stale locks from crashed processes will automatically expire based on the `Expiry` setting. MongoDB's built-in TTL index support ensures that expired lock documents are cleaned up automatically by the database. This means that if a process crashes while holding a lock, the lock will become available again after the expiry time has elapsed. + +## Architecture & Design + +### Lock Lifecycle Diagram + +```mermaid +stateDiagram-v2 + [*] --> Waiting: Create Lock + + Waiting --> Acquiring: Call AcquireAsync() + Waiting --> Expired: TTL Cleanup + + Acquiring --> Acquired: Successfully Acquired Lock + Acquiring --> Waiting: Lock Held by Others + + Acquired --> Extending: Background Extension Task + Extending --> Acquired: Extension Successful + Extending --> Lost: Extension Failed + + Acquired --> Releasing: Dispose Handle + Releasing --> Released: Lock Document Deleted + + Lost --> [*]: HandleLostToken Signaled + Released --> [*]: Lock Released + Expired --> [*]: Stale Lock Cleaned Up +``` + +### Lock Acquisition Process + +```mermaid +flowchart TD + A["Client Requests Lock"] --> B["Call FindOneAndUpdateAsync"] + B --> C{"Lock Document Exists?"} + + C -->|Yes| D{"Document Expired?"} + C -->|No| E["Create New Lock"] + + D -->|Yes| F["Replace Old Lock"] + D -->|No| G["Lock Held by Other Process"] + + E --> H["Set LockId = GUID"] + F --> H + + H --> I["Set expiresAt = Now + Expiry"] + I --> J["Set acquiredAt = Now"] + J --> K["Increment fencingToken"] + K --> L["Verify Our LockId"] + + L --> M{"LockId Matches?"} + M -->|Yes| N["✅ Lock Acquired"] + M -->|No| O["❌ Another Process Won Race"] + + G --> P["Sleep Random Time"] + O --> P + P --> Q["Retry Acquire"] + Q --> B + + N --> R["Start Background Extension Task"] + R --> S["Return LockHandle"] +``` + +### Component Architecture + +```mermaid +graph TB + Client["Client Code"] + Lock["MongoDistributedLock"] + Provider["MongoDistributedSynchronizationProvider"] + Options["MongoDistributedSynchronizationOptionsBuilder"] + Handle["MongoDistributedLockHandle"] + + MongoDB[("MongoDB Database")] + Collection["distributed_locks Collection"] + TTLIndex["TTL Index on expiresAt"] + + Client -->|Creates| Lock + Client -->|Uses| Provider + Provider -->|Creates| Lock + Lock -->|Configured by| Options + Lock -->|Returns| Handle + Handle -->|Manages| Lock + + Lock -->|Reads/Writes| MongoDB + Handle -->|Auto-extends via| Lock + + MongoDB -->|Contains| Collection + Collection -->|Has| TTLIndex + TTLIndex -->|Cleans up| Collection + + style MongoDB fill:#13aa52 + style Collection fill:#3fa796 + style TTLIndex fill:#5fbf8c + style Handle fill:#ffa500 + style Lock fill:#4a90e2 +``` + +### Lock State Machine (Single Document in MongoDB) + +```mermaid +graph LR + NonExistent["Document Doesn't Exist"] + Active["Active Lock by Process A"] + Extending["Auto-Extending by Process A"] + Expired["Expired (expiresAt < now)"] + Deleted["Deleted"] + + NonExistent -->|Acquire Attempt| Active + Active -->|Background Task| Extending + Extending -->|Success| Active + Extending -->|Failure| Expired + Active -->|Release| Deleted + Expired -->|Other Process Acquires| Active + Expired -->|TTL Cleanup| Deleted + + style Active fill:#90EE90 + style Extending fill:#87CEEB + style Expired fill:#FFB6C1 + style Deleted fill:#D3D3D3 +``` + +## How It Works + +MongoDB distributed locks use MongoDB's atomic document operations to implement safe, distributed locking: + +### Acquisition Algorithm + +The lock acquisition uses a single `FindOneAndUpdateAsync` operation with an aggregation pipeline to atomically: + +1. Check if the lock document exists and is expired +2. If expired or missing, acquire the lock by: + - Setting a unique `lockId` (GUID) + - Recording the `acquiredAt` timestamp + - Setting the `expiresAt` time based on the configured expiry + - Incrementing the `fencingToken` for ordering guarantees +3. If still held by another process, leave it unchanged + +The fencing token ensures that even if a lock holder loses its connection, any operations it performs using that token will be safely rejected. + +### Lock Maintenance + +Once acquired, the lock is automatically extended in the background at the configured `ExtensionCadence` to prevent premature expiration while the process is still running. + +### Release + +The lock is released by deleting the lock document when the handle is disposed. + +### Stale Lock Cleanup + +A TTL (Time-To-Live) index on the `expiresAt` field ensures MongoDB automatically removes expired lock documents. This provides automatic cleanup of stale locks from crashed or disconnected processes without requiring manual intervention. + +### Multi-Process Lock Interaction + +The following diagram shows how multiple processes interact with the same lock: + +```mermaid +sequenceDiagram + participant PA as Process A + participant PB as Process B + participant DB as MongoDB + + PA->>DB: FindOneAndUpdateAsync (try acquire) + Note over PA,DB: expiresAt < now or missing + DB->>PA: ✅ Lock Acquired (lockId=UUID-A, token=1) + + PB->>DB: FindOneAndUpdateAsync (try acquire) + Note over PB,DB: expiresAt > now (held by A) + DB->>PB: ❌ Lock Not Acquired + + PB->>PB: Wait & Retry + + PA->>PA: Background: ExtensionCadence timer + PA->>DB: Update: Extend expiresAt += Expiry + DB->>PA: ✅ Extension Successful + + PA->>PA: Do Critical Work + + PB->>DB: FindOneAndUpdateAsync (retry) + DB->>PB: ❌ Still held by A + PB->>PB: Wait & Retry + + PA->>PA: Dispose Handle + PA->>DB: Delete Lock Document + DB->>PA: ✅ Deleted + + PB->>DB: FindOneAndUpdateAsync (retry) + Note over PB,DB: Document missing (A released) + DB->>PB: ✅ Lock Acquired (lockId=UUID-B, token=2) + PB->>PB: Do Critical Work +``` + +### Fencing Token Mechanism + +The fencing token ensures that even if a process loses its lock (due to network partition, crash, or timeout), it cannot perform operations on protected resources: + +```mermaid +sequenceDiagram + participant PA as Process A + participant Resource as Protected Resource + participant DB as MongoDB Lock + + PA->>DB: Acquire Lock → token=1 + DB->>PA: ✅ Granted + + PA->>Resource: Operation with token=1 + Resource->>Resource: Accept (token >= last_seen) + + Note over DB: Network Partition + + PB->>DB: Acquire Lock → token=2 + DB->>PB: ✅ Granted + + PB->>Resource: Operation with token=2 + Resource->>Resource: Accept (token >= last_seen) + + PA->>Resource: Operation with token=1 (stale) + Resource->>Resource: Reject ❌ (token < last_seen) +``` + +This mechanism prevents the "split brain" scenario where two processes both believe they hold the lock. + +### Performance Considerations + +- Lock acquisition requires 1 MongoDB operation. Additionally, the first lock acquisition for a given collection will attempt to create the TTL index on the collection in a fire-and-forget manner +- Lock extension happens in the background at `ExtensionCadence` intervals +- Under contention, adaptive backoff reduces the load on MongoDB compared to fixed random intervals +- The `expiresAt` TTL index keeps the collection clean without manual maintenance. This is not required for correctness, but without it (or some equivalent process), connectivity errors or process crashes will result in orphaned lock documents. + +### Notes + +- The lock collection will have an index on the `expiresAt` field for efficient queries +- Lock extension happens automatically in the background +- If lock extension fails, the `HandleLostToken` will be signaled +- Stale locks (from crashed processes) will automatically expire based on the expiry setting + diff --git a/src/DistributedLock.MongoDB/README.md b/src/DistributedLock.MongoDB/README.md deleted file mode 100644 index ff6299bb..00000000 --- a/src/DistributedLock.MongoDB/README.md +++ /dev/null @@ -1,425 +0,0 @@ -# DistributedLock.MongoDB - -Provides distributed lock implementation using MongoDB as the backing store. - -## Installation - -```bash -dotnet add package DistributedLock.MongoDB -``` - -## APIs - -- The `MongoDistributedLock` class implements the `IDistributedLock` interface. -- The `MongoDistributedSynchronizationProvider` class implements the `IDistributedLockProvider` interface. - -## Basic Usage - -### Creating and Acquiring a Lock - -```csharp -using Medallion.Threading.MongoDB; -using MongoDB.Driver; - -// Create MongoDB client and database -var client = new MongoClient("mongodb://localhost:27017"); -var database = client.GetDatabase("myDatabase"); - -// Create a lock -var @lock = new MongoDistributedLock("myLockName", database); - -// Acquire the lock -await using (var handle = await @lock.AcquireAsync()) -{ - // Critical section protected by the lock - Console.WriteLine("Lock acquired!"); -} -// Lock is automatically released when disposed -``` - -### TryAcquire - -While `AcquireAsync()` will block until the lock is available, there is also a `TryAcquireAsync()` variant which returns `null` if the lock could not be acquired: - -```csharp -await using (var handle = await @lock.TryAcquireAsync()) -{ - if (handle != null) - { - // Lock acquired successfully - } - else - { - // Someone else holds the lock - } -} -``` - -### Using the Provider Pattern - -For applications using dependency injection, the provider pattern makes it easy to separate lock configuration from its usage: - -```csharp -using Medallion.Threading.MongoDB; -using MongoDB.Driver; - -var client = new MongoClient("mongodb://localhost:27017"); -var database = client.GetDatabase("myDatabase"); - -// Create a provider -var provider = new MongoDistributedSynchronizationProvider(database); - -// Use the provider to create locks -var lock1 = provider.CreateLock("lock1"); -var lock2 = provider.CreateLock("lock2"); - -await using (var handle = await lock1.AcquireAsync()) -{ - // Do work... -} -``` - -### Configuration Options - -You can customize the lock behavior using the options builder: - -```csharp -var @lock = new MongoDistributedLock( - "myLockName", - database, - options => options - .Expiry(TimeSpan.FromSeconds(30)) // How long the lock lasts before expiring - .ExtensionCadence(TimeSpan.FromSeconds(10)) // How often to extend the lock while held - .BusyWaitSleepTime( // Sleep time between acquire attempts - min: TimeSpan.FromMilliseconds(10), - max: TimeSpan.FromMilliseconds(800)) - .UseAdaptiveBackoff(true) // Exponential backoff under high contention -); -``` - -#### Option Details - -- **Expiry**: Determines how long the lock will be held before automatic expiration. Because of automatic extension, locks can be held for much longer than this value. Defaults to 30 seconds. This is important for crash recovery—if a process crashes while holding a lock, other processes will need to wait at most this long to acquire it. - -- **ExtensionCadence**: How frequently the hold on the lock will be renewed to the full `Expiry` while the lock is actively held. Defaults to 1/3 of `Expiry` (approximately 10 seconds with default settings). - -- **BusyWaitSleepTime**: Specifies the range of time the implementation will sleep between attempts to acquire a lock that is currently held by another process. A random value in the range is chosen for each attempt to prevent thundering herd problems. Defaults to 10ms minimum and 800ms maximum. - -- **UseAdaptiveBackoff**: When enabled, uses exponential backoff instead of random sleep times under contention. This reduces MongoDB load during high contention periods while maintaining responsiveness when contention is low. Defaults to false. - -### Custom Collection Name - -By default, locks are stored in a collection named `"distributed_locks"`. You can specify a custom collection name: - -```csharp -// Direct lock creation with custom collection -var @lock = new MongoDistributedLock("myLockName", database, "MyCustomLocks"); - -// Provider with custom collection -var provider = new MongoDistributedSynchronizationProvider(database, "MyCustomLocks"); -``` - -## Architecture & Design - -### Lock Lifecycle Diagram - -```mermaid -stateDiagram-v2 - [*] --> Waiting: Create Lock - - Waiting --> Acquiring: Call AcquireAsync() - Waiting --> Expired: TTL Cleanup - - Acquiring --> Acquired: Successfully Acquired Lock - Acquiring --> Waiting: Lock Held by Others - - Acquired --> Extending: Background Extension Task - Extending --> Acquired: Extension Successful - Extending --> Lost: Extension Failed - - Acquired --> Releasing: Dispose Handle - Releasing --> Released: Lock Document Deleted - - Lost --> [*]: HandleLostToken Signaled - Released --> [*]: Lock Released - Expired --> [*]: Stale Lock Cleaned Up -``` - -### Lock Acquisition Process - -```mermaid -flowchart TD - A["Client Requests Lock"] --> B["Call FindOneAndUpdateAsync"] - B --> C{"Lock Document Exists?"} - - C -->|Yes| D{"Document Expired?"} - C -->|No| E["Create New Lock"] - - D -->|Yes| F["Replace Old Lock"] - D -->|No| G["Lock Held by Other Process"] - - E --> H["Set LockId = GUID"] - F --> H - - H --> I["Set expiresAt = Now + Expiry"] - I --> J["Set acquiredAt = Now"] - J --> K["Increment fencingToken"] - K --> L["Verify Our LockId"] - - L --> M{"LockId Matches?"} - M -->|Yes| N["✅ Lock Acquired"] - M -->|No| O["❌ Another Process Won Race"] - - G --> P["Sleep Random Time"] - O --> P - P --> Q["Retry Acquire"] - Q --> B - - N --> R["Start Background Extension Task"] - R --> S["Return LockHandle"] -``` - -### Component Architecture - -```mermaid -graph TB - Client["Client Code"] - Lock["MongoDistributedLock"] - Provider["MongoDistributedSynchronizationProvider"] - Options["MongoDistributedSynchronizationOptionsBuilder"] - Handle["MongoDistributedLockHandle"] - - MongoDB[("MongoDB Database")] - Collection["distributed_locks Collection"] - TTLIndex["TTL Index on expiresAt"] - - Client -->|Creates| Lock - Client -->|Uses| Provider - Provider -->|Creates| Lock - Lock -->|Configured by| Options - Lock -->|Returns| Handle - Handle -->|Manages| Lock - - Lock -->|Reads/Writes| MongoDB - Handle -->|Auto-extends via| Lock - - MongoDB -->|Contains| Collection - Collection -->|Has| TTLIndex - TTLIndex -->|Cleans up| Collection - - style MongoDB fill:#13aa52 - style Collection fill:#3fa796 - style TTLIndex fill:#5fbf8c - style Handle fill:#ffa500 - style Lock fill:#4a90e2 -``` - -### Lock State Machine (Single Document in MongoDB) - -```mermaid -graph LR - NonExistent["Document Doesn't Exist"] - Active["Active Lock by Process A"] - Extending["Auto-Extending by Process A"] - Expired["Expired (expiresAt < now)"] - Deleted["Deleted"] - - NonExistent -->|Acquire Attempt| Active - Active -->|Background Task| Extending - Extending -->|Success| Active - Extending -->|Failure| Expired - Active -->|Release| Deleted - Expired -->|Other Process Acquires| Active - Expired -->|TTL Cleanup| Deleted - - style Active fill:#90EE90 - style Extending fill:#87CEEB - style Expired fill:#FFB6C1 - style Deleted fill:#D3D3D3 -``` - -## How It Works - -MongoDB distributed locks use MongoDB's atomic document operations to implement safe, distributed locking: - -### Acquisition Algorithm - -The lock acquisition uses a single `FindOneAndUpdateAsync` operation with an aggregation pipeline to atomically: - -1. Check if the lock document exists and is expired -2. If expired or missing, acquire the lock by: - - Setting a unique `lockId` (GUID) - - Recording the `acquiredAt` timestamp - - Setting the `expiresAt` time based on the configured expiry - - Incrementing the `fencingToken` for ordering guarantees -3. If still held by another process, leave it unchanged - -The fencing token ensures that even if a lock holder loses its connection, any operations it performs using that token will be safely rejected. - -### Lock Maintenance - -Once acquired, the lock is automatically extended in the background at the configured `ExtensionCadence` to prevent premature expiration while the process is still running. - -### Release - -The lock is released by deleting the lock document when the handle is disposed. - -### Stale Lock Cleanup - -A TTL (Time-To-Live) index on the `expiresAt` field ensures MongoDB automatically removes expired lock documents. This provides automatic cleanup of stale locks from crashed or disconnected processes without requiring manual intervention. - -## Features - -- ✅ Async/await support with `async`/`await` and `await using` -- ✅ Automatic lock extension while held to prevent premature expiration -- ✅ Configurable expiry, extension cadence, and wait behavior -- ✅ Crash recovery via automatic lock expiration -- ✅ `CancellationToken` support for cooperative cancellation -- ✅ `HandleLostToken` notifications for detecting connection loss or lock theft -- ✅ Fencing tokens for distributed safety guarantees -- ✅ Adaptive backoff strategy for high-contention scenarios -- ✅ Atomic operations prevent race conditions -- ✅ Multi-framework support: .NET Standard 2.1, .NET 8, .NET Framework 4.7.2 - -## Multi-Process Lock Interaction - -The following diagram shows how multiple processes interact with the same lock: - -```mermaid -sequenceDiagram - participant PA as Process A - participant PB as Process B - participant DB as MongoDB - - PA->>DB: FindOneAndUpdateAsync (try acquire) - Note over PA,DB: expiresAt < now or missing - DB->>PA: ✅ Lock Acquired (lockId=UUID-A, token=1) - - PB->>DB: FindOneAndUpdateAsync (try acquire) - Note over PB,DB: expiresAt > now (held by A) - DB->>PB: ❌ Lock Not Acquired - - PB->>PB: Wait & Retry - - PA->>PA: Background: ExtensionCadence timer - PA->>DB: Update: Extend expiresAt += Expiry - DB->>PA: ✅ Extension Successful - - PA->>PA: Do Critical Work - - PB->>DB: FindOneAndUpdateAsync (retry) - DB->>PB: ❌ Still held by A - PB->>PB: Wait & Retry - - PA->>PA: Dispose Handle - PA->>DB: Delete Lock Document - DB->>PA: ✅ Deleted - - PB->>DB: FindOneAndUpdateAsync (retry) - Note over PB,DB: Document missing (A released) - DB->>PB: ✅ Lock Acquired (lockId=UUID-B, token=2) - PB->>PB: Do Critical Work -``` - -## Implementation Behaviors - -### Lock Extension Failures - -Lock extension happens automatically in the background at the specified `ExtensionCadence`. If extension fails (due to network issues, MongoDB connectivity problems, or the lock being stolen), the `HandleLostToken` will be signaled. Always monitor this token in critical sections: - -```csharp -await using (var handle = await @lock.AcquireAsync()) -{ - // Monitor for lock loss - var lostTokenTask = handle.HandleLostToken; - - // Do work with timeout - var completedTask = await Task.WhenAny( - lostTokenTask, - DoWorkAsync()); - - if (completedTask == lostTokenTask) - { - // Lock was lost! - throw new InvalidOperationException("Lock was lost during operation"); - } -} -``` - -### Lock Collection Management - -The lock collection is automatically created on first use. A TTL index is created on the `expiresAt` field with the configuration: - -- **Index Name**: `expiresAt_ttl` -- **Behavior**: MongoDB automatically removes documents once `expiresAt < now` - -This index is created at most once per process per (database, collection) pair. Errors during index creation do not block lock acquisition. - -### Timeout Support - -All acquire methods support optional timeout parameters: - -```csharp -// Acquire with 5-second timeout -var handle = await @lock.AcquireAsync(TimeSpan.FromSeconds(5)); - -// TryAcquire with 5-second timeout (returns null on timeout) -var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(5)); -``` - -## Safety Guarantees - -- **Atomicity**: Lock acquisition, extension, and release use atomic MongoDB operations -- **Fencing**: Fencing tokens prevent operations from processes that lost their locks -- **Crash Recovery**: Automatic expiration ensures locks are eventually released even if the holder crashes -- **No Thundering Herd**: Random and adaptive backoff prevents synchronized clients from overwhelming the database - -### Fencing Token Mechanism - -The fencing token ensures that even if a process loses its lock (due to network partition, crash, or timeout), it cannot perform operations on protected resources: - -```mermaid -sequenceDiagram - participant PA as Process A - participant Resource as Protected Resource - participant DB as MongoDB Lock - - PA->>DB: Acquire Lock → token=1 - DB->>PA: ✅ Granted - - PA->>Resource: Operation with token=1 - Resource->>Resource: Accept (token >= last_seen) - - Note over DB: Network Partition - - PB->>DB: Acquire Lock → token=2 - DB->>PB: ✅ Granted - - PB->>Resource: Operation with token=2 - Resource->>Resource: Accept (token >= last_seen) - - PA->>Resource: Operation with token=1 (stale) - Resource->>Resource: Reject ❌ (token < last_seen) -``` - -This mechanism prevents the "split brain" scenario where two processes both believe they hold the lock. - -## Performance Considerations - -- Lock acquisition requires 1-2 MongoDB operations (1 for acquisition, potentially 1 for index creation on first use) -- Lock extension happens in the background at `ExtensionCadence` intervals -- Under contention, adaptive backoff reduces the load on MongoDB compared to fixed random intervals -- The `expiresAt` TTL index keeps the collection clean without manual maintenance - -## Framework Support - -- **.NET Standard 2.1** and higher -- **.NET 8** and higher -- **.NET Framework 4.7.2** and higher - -## Notes - -- The lock collection will have an index on the `expiresAt` field for efficient queries -- Lock extension happens automatically in the background -- If lock extension fails, the `HandleLostToken` will be signaled -- Stale locks (from crashed processes) will automatically expire based on the expiry setting diff --git a/src/DistributedLock.MongoDB/README.zh-CN.md b/src/DistributedLock.MongoDB/README.zh-CN.md deleted file mode 100644 index 07d7174a..00000000 --- a/src/DistributedLock.MongoDB/README.zh-CN.md +++ /dev/null @@ -1,425 +0,0 @@ -# DistributedLock.MongoDB - -基于 MongoDB 的分布式锁实现。 - -## 安装 - -```bash -dotnet add package DistributedLock.MongoDB -``` - -## 接口 - -- `MongoDistributedLock` 类实现了 `IDistributedLock` 接口。 -- `MongoDistributedSynchronizationProvider` 类实现了 `IDistributedLockProvider` 接口。 - -## 基本用法 - -### 创建并获取锁 - -```csharp -using Medallion.Threading.MongoDB; -using MongoDB.Driver; - -// 创建 MongoDB 客户端和数据库 -var client = new MongoClient("mongodb://localhost:27017"); -var database = client.GetDatabase("myDatabase"); - -// 创建锁 -var @lock = new MongoDistributedLock("myLockName", database); - -// 获取锁 -await using (var handle = await @lock.AcquireAsync()) -{ - // 受锁保护的关键代码段 - Console.WriteLine("已获取锁!"); -} -// 释放锁 -``` - -### TryAcquire（尝试获取） - -`AcquireAsync()` 会一直阻塞直到获取锁，而 `TryAcquireAsync()` 则会在无法获取锁时返回 `null`： - -```csharp -await using (var handle = await @lock.TryAcquireAsync()) -{ - if (handle != null) - { - // 成功获取锁 - } - else - { - // 其他进程持有锁 - } -} -``` - -### 使用提供者模式 - -对于使用依赖注入的应用，提供者模式使得锁配置与使用分离变得容易： - -```csharp -using Medallion.Threading.MongoDB; -using MongoDB.Driver; - -var client = new MongoClient("mongodb://localhost:27017"); -var database = client.GetDatabase("myDatabase"); - -// 创建提供者 -var provider = new MongoDistributedSynchronizationProvider(database); - -// 使用提供者创建不同名称的锁 -var lock1 = provider.CreateLock("lock1"); -var lock2 = provider.CreateLock("lock2"); - -await using (var handle = await lock1.AcquireAsync()) -{ - // 使用 lock1 进行工作... -} -``` - -### 配置选项 - -您可以使用选项构建器自定义锁的行为： - -```csharp -var @lock = new MongoDistributedLock( - "myLockName", - database, - options => options - .Expiry(TimeSpan.FromSeconds(30)) // 锁过期前的持续时间 - .ExtensionCadence(TimeSpan.FromSeconds(10)) // 持有时自动续期的频率 - .BusyWaitSleepTime( // 获取尝试之间的睡眠时间 - min: TimeSpan.FromMilliseconds(10), - max: TimeSpan.FromMilliseconds(800)) - .UseAdaptiveBackoff(true) // 高竞争下的指数退避 -); -``` - -#### 选项详解 - -- **Expiry（过期时间）**：确定锁在自动过期前将被持有多长时间。由于自动续期的存在，锁可以被持有远比这个值更长的时间。默认为 30 秒。这对于崩溃恢复很重要——如果进程在持有锁时崩溃，其他进程最多需要等待这么长时间才能获取锁。 - -- **ExtensionCadence（续期节奏）**：当锁被主动持有时，将锁的保持时间续期到完整的 `Expiry` 的频率。默认为 `Expiry` 的 1/3（使用默认设置时约 10 秒）。 - -- **BusyWaitSleepTime（忙等待睡眠时间）**：指定实现在尝试获取当前由另一个进程持有的锁时，将在两次尝试之间睡眠的时间范围。每次尝试都会从范围内随机选择一个值，以防止"羊群效应"问题。默认最小 10ms，最大 800ms。 - -- **UseAdaptiveBackoff（自适应退避）**：启用后，在竞争时使用指数退避而非随机睡眠时间。这在高竞争期间减少了 MongoDB 负载，同时在竞争低时保持了响应性。默认为 false。 - -### 自定义集合名称 - -默认情况下，锁存储在名为 `"distributed.locks"` 的集合中。您可以指定自定义集合名称： - -```csharp -// 直接创建锁并使用自定义集合 -var @lock = new MongoDistributedLock("myLockName", database, "MyCustomLocks"); - -// 使用自定义集合的提供者 -var provider = new MongoDistributedSynchronizationProvider(database, "MyCustomLocks"); -``` - -## 架构与设计 - -### 锁生命周期图 - -```mermaid -stateDiagram-v2 - [*] --> 等待中: 创建锁 - - 等待中 --> 获取中: 调用 AcquireAsync() - 等待中 --> 已过期: TTL 清理 - - 获取中 --> 已获取: 成功获取锁 - 获取中 --> 等待中: 锁被其他进程持有 - - 已获取 --> 续期中: 后台续期任务 - 续期中 --> 已获取: 续期成功 - 续期中 --> 丢失: 续期失败 - - 已获取 --> 释放中: 释放 Handle - 释放中 --> 已释放: 锁文档被删除 - - 丢失 --> [*]: HandleLostToken 信号 - 已释放 --> [*]: 锁已释放 - 已过期 --> [*]: 陈旧锁被清理 -``` - -### 锁获取流程 - -```mermaid -flowchart TD - A["客户端请求锁"] --> B["调用 FindOneAndUpdateAsync"] - B --> C{"锁文档存在?"} - - C -->|是| D{"文档已过期?"} - C -->|否| E["创建新锁"] - - D -->|是| F["替换旧锁"] - D -->|否| G["锁由其他进程持有"] - - E --> H["设置 LockId = GUID"] - F --> H - - H --> I["设置 expiresAt = Now + Expiry"] - I --> J["设置 acquiredAt = Now"] - J --> K["递增 fencingToken"] - K --> L["验证 LockId"] - - L --> M{"LockId匹配?"} - M -->|是| N["✅ 锁已获取"] - M -->|否| O["❌ 其他进程赢得竞争"] - - G --> P["随机睡眠"] - O --> P - P --> Q["重试获取"] - Q --> B - - N --> R["启动后台续期任务"] - R --> S["返回 LockHandle"] -``` - -### 组件架构 - -```mermaid -graph TB - Client["客户端代码"] - Lock["MongoDistributedLock"] - Provider["MongoDistributedSynchronizationProvider"] - Options["MongoDistributedSynchronizationOptionsBuilder"] - Handle["MongoDistributedLockHandle"] - - MongoDB[("MongoDB 数据库")] - Collection["distributed.locks 集合"] - TTLIndex["expiresAt 上的 TTL 索引"] - - Client -->|创建| Lock - Client -->|使用| Provider - Provider -->|创建| Lock - Lock -->|配置| Options - Lock -->|返回| Handle - Handle -->|管理| Lock - - Lock -->|读/写| MongoDB - Handle -->|自动续期| Lock - - MongoDB -->|包含| Collection - Collection -->|拥有| TTLIndex - TTLIndex -->|清理| Collection - - style MongoDB fill:#13aa52 - style Collection fill:#3fa796 - style TTLIndex fill:#5fbf8c - style Handle fill:#ffa500 - style Lock fill:#4a90e2 -``` - -### 锁状态机（MongoDB 中的单个文档） - -```mermaid -graph LR - NonExistent["文档不存在"] - Active["活跃锁由进程 A 持有"] - Extending["自动续期由进程 A"] - Expired["已过期(expiresAt < now)"] - Deleted["已删除"] - - NonExistent -->|获取尝试| Active - Active -->|后台任务| Extending - Extending -->|成功| Active - Extending -->|失败| Expired - Active -->|释放| Deleted - Expired -->|其他进程获取| Active - Expired -->|TTL 清理| Deleted - - style Active fill:#90EE90 - style Extending fill:#87CEEB - style Expired fill:#FFB6C1 - style Deleted fill:#D3D3D3 -``` - -## 工作原理 - -MongoDB 分布式锁使用 MongoDB 的原子文档操作来实现安全的分布式锁定： - -### 获取算法 - -锁获取使用单个 `FindOneAndUpdateAsync` 操作和聚合管道来原子地： - -1. 检查锁文档是否存在且是否已过期 -2. 如果已过期或不存在，通过以下方式获取锁： - - 设置唯一的 `lockId`（GUID） - - 记录 `acquiredAt` 时间戳 - - 根据配置的过期时间设置 `expiresAt` - - 递增 `fencingToken` 以获得排序保证 -3. 如果仍由另一个进程持有，则保持不变 - -围栏令牌（fencing token）确保即使锁持有者失去连接，它执行的任何使用该令牌的操作都会被安全拒绝。 - -### 锁维护 - -获取后，锁会按照配置的 `ExtensionCadence` 在后台自动续期，以防止进程运行时过早过期。 - -### 释放 - -当处理被释放时，通过删除锁文档来释放锁。 - -### 陈旧锁清理 - -`expiresAt` 字段上的 TTL（生存时间）索引确保 MongoDB 自动删除已过期的锁文档。这提供了对来自崩溃或断开连接进程的陈旧锁的自动清理，无需手动干预。 - -## 特性 - -- ✅ 异步/等待支持（`async`/`await` 和 `await using`） -- ✅ 在持有时自动续期锁以防止过早过期 -- ✅ 可配置的过期时间、续期节奏和等待行为 -- ✅ 通过自动过期实现崩溃恢复 -- ✅ `CancellationToken` 支持协作取消 -- ✅ `HandleLostToken` 通知以检测连接丢失或锁被盗 -- ✅ 围栏令牌提供分布式安全保证 -- ✅ 高竞争场景的自适应退避策略 -- ✅ 原子操作防止竞态条件 -- ✅ 多框架支持：.NET Standard 2.1、.NET 8、.NET Framework 4.7.2 - -## 多进程锁交互 - -下图展示多个进程如何与同一个锁交互： - -```mermaid -sequenceDiagram - participant PA as 进程 A - participant PB as 进程 B - participant DB as MongoDB - - PA->>DB: FindOneAndUpdateAsync (尝试获取) - Note over PA,DB: expiresAt < now 或不存在 - DB->>PA: ✅ 锁已获取 (lockId=UUID-A, token=1) - - PB->>DB: FindOneAndUpdateAsync (尝试获取) - Note over PB,DB: expiresAt > now (由 A 持有) - DB->>PB: ❌ 未能获取锁 - - PB->>PB: 等待 & 重试 - - PA->>PA: 后台: ExtensionCadence 计时器 - PA->>DB: 更新: 续期 expiresAt += Expiry - DB->>PA: ✅ 续期成功 - - PA->>PA: 执行关键工作 - - PB->>DB: FindOneAndUpdateAsync (重试) - DB->>PB: ❌ 仍由 A 持有 - PB->>PB: 等待 & 重试 - - PA->>PA: 释放 Handle - PA->>DB: 删除锁文档 - DB->>PA: ✅ 已删除 - - PB->>DB: FindOneAndUpdateAsync (重试) - Note over PB,DB: 文档缺失 (A 已释放) - DB->>PB: ✅ 锁已获取 (lockId=UUID-B, token=2) - PB->>PB: 执行关键工作 -``` - -## 实现行为 - -### 锁续期失败 - -锁续期在后台按指定的 `ExtensionCadence` 自动进行。如果续期失败（由于网络问题、MongoDB 连接问题或锁被盗），`HandleLostToken` 将被触发。始终在关键代码段中监控此令牌： - -```csharp -await using (var handle = await @lock.AcquireAsync()) -{ - // 监控锁丢失 - var lostTokenTask = handle.HandleLostToken; - - // 进行工作，带有超时 - var completedTask = await Task.WhenAny( - lostTokenTask, - DoWorkAsync()); - - if (completedTask == lostTokenTask) - { - // 锁丢失了！ - throw new InvalidOperationException("操作期间锁被丢失"); - } -} -``` - -### 锁集合管理 - -锁集合在首次使用时自动创建。在 `expiresAt` 字段上创建 TTL 索引，配置如下： - -- **索引名称**：`expiresAt_ttl` -- **行为**：一旦 `expiresAt < now`，MongoDB 自动删除文档 - -此索引每个进程每个 (数据库, 集合) 对最多创建一次。索引创建期间的错误不会阻止锁获取。 - -### 超时支持 - -所有获取方法都支持可选的超时参数： - -```csharp -// 获取锁并设置 5 秒超时 -var handle = await @lock.AcquireAsync(TimeSpan.FromSeconds(5)); - -// TryAcquire 设置 5 秒超时（超时时返回 null） -var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(5)); -``` - -## 安全保证 - -- **原子性**：锁获取、续期和释放使用原子 MongoDB 操作 -- **围栏**：围栏令牌防止丢失锁的进程执行操作 -- **崩溃恢复**：自动过期确保锁最终被释放，即使持有者崩溃 -- **无羊群效应**：随机和自适应退避防止同步的客户端使 MongoDB 过载 - -### 围栏令牌机制 - -围栏令牌确保即使进程失去其锁（由于网络分区、崩溃或超时），它也无法对受保护的资源执行操作： - -```mermaid -sequenceDiagram - participant PA as 进程 A - participant Resource as 受保护资源 - participant DB as MongoDB 锁 - - PA->>DB: 获取锁 → token=1 - DB->>PA: ✅ 已授予 - - PA->>Resource: 操作 token=1 - Resource->>Resource: 接受 (token >= last_seen) - - Note over DB: 网络分区 - - PB->>DB: 获取锁 → token=2 - DB->>PB: ✅ 已授予 - - PB->>Resource: 操作 token=2 - Resource->>Resource: 接受 (token >= last_seen) - - PA->>Resource: 操作 token=1 (已过期) - Resource->>Resource: 拒绝 ❌ (token < last_seen) -``` - -这个机制防止了"脑裂"场景，即两个进程都认为它们持有锁。 - -## 性能考虑 - -- 锁获取需要 1-2 个 MongoDB 操作（1 个用于获取，首次使用时可能 1 个用于索引创建） -- 锁续期在后台按 `ExtensionCadence` 间隔进行 -- 在竞争下，自适应退避相比固定随机间隔减少了对 MongoDB 的负载 -- `expiresAt` TTL 索引保持集合整洁，无需手动维护 - -## 框架支持 - -- **.NET Standard 2.1** 及更高版本 -- **.NET 8** 及更高版本 -- **.NET Framework 4.7.2** 及更高版本 - -## 备注 - -- 锁集合将在 `expiresAt` 字段上有一个索引，用于高效查询 -- 锁续期在后台自动进行 -- 如果锁续期失败，`HandleLostToken` 将被触发 -- 来自崩溃进程的陈旧锁将根据过期设置自动过期 diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index b18c023a..e873c152 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -208,6 +208,29 @@ public async Task TestParallelism() tasks.ForEach(t => t.Result.ShouldEqual(0)); } + [Test] + [NonParallelizable] // takes locks with known names + public void TestGetSafeName() + { + Assert.Catch(() => this._lockProvider.GetSafeName(null!)); + + foreach (var name in new[] { string.Empty, new string('a', 1000), @"\\\\\", new string('\\', 1000) }) + { + var safeName = this._lockProvider.GetSafeName(name); + Assert.DoesNotThrow(() => this._lockProvider.CreateLockWithExactName(safeName).Acquire(TimeSpan.FromSeconds(10)).Dispose(), $"{this.GetType().Name}: could not acquire '{name}'"); + } + } + + [Test] + public void TestGetSafeLockNameIsCaseSensitive() + { + var longName1 = new string('a', 1000); + var longName2 = new string('a', longName1.Length - 1) + "A"; + StringComparer.OrdinalIgnoreCase.Equals(longName1, longName2).ShouldEqual(true, "sanity check"); + + Assert.That(this._lockProvider.GetSafeName(longName2), Is.Not.EqualTo(this._lockProvider.GetSafeName(longName1))); + } + [Test] public async Task TestLockNamesAreCaseSensitive() { diff --git a/src/DistributedLock.Tests/DistributedLock.Tests.csproj b/src/DistributedLock.Tests/DistributedLock.Tests.csproj index 07020675..be82219e 100644 --- a/src/DistributedLock.Tests/DistributedLock.Tests.csproj +++ b/src/DistributedLock.Tests/DistributedLock.Tests.csproj @@ -31,7 +31,6 @@ - \ No newline at end of file diff --git a/src/DistributedLock.sln b/src/DistributedLock.sln index 30c8dd91..39196b2d 100644 --- a/src/DistributedLock.sln +++ b/src/DistributedLock.sln @@ -37,6 +37,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.MySql", "Di EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedLock.Oracle", "DistributedLock.Oracle\DistributedLock.Oracle.csproj", "{1CAB9A1D-0C02-459C-A90E-47819832BD58}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.MongoDB", "DistributedLock.MongoDB\DistributedLock.MongoDB.csproj", "{92074E6D-99D1-46B1-A0AE-442EA1FEA397}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FC144BB6-BA58-41E6-BB7E-76069FCDD293}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig @@ -47,8 +49,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution package.readme.md = package.readme.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DistributedLock.MongoDB", "DistributedLock.MongoDB\DistributedLock.MongoDB.csproj", "{92074E6D-99D1-46B1-A0AE-442EA1FEA397}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/DistributedLockTaker/Program.cs b/src/DistributedLockTaker/Program.cs index 460ba112..ff0866c6 100644 --- a/src/DistributedLockTaker/Program.cs +++ b/src/DistributedLockTaker/Program.cs @@ -137,7 +137,7 @@ public static int Main(string[] args) break; } case nameof(MongoDistributedLock): - handle = new MongoDistributedLock(name, MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory), options => options.Expiry(TimeSpan.FromSeconds(5))).Acquire(); + handle = new MongoDistributedLock(name, MongoDBCredentials.GetDefaultDatabase(Environment.CurrentDirectory), options => options.Expiry(TimeSpan.FromSeconds(2))).Acquire(); break; case nameof(TestingCompositeFileDistributedLock): handle = new TestingCompositeFileDistributedLock(name).Acquire(); From 42a1c29e610feda6b3b42847447657270215334a Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 21:15:20 -0500 Subject: [PATCH 372/399] Version bumps & readme --- README.md | 3 + docs/Other topics.md | 22 +- .../DistributedLock.Core.csproj | 2 +- .../Internal/SyncViaAsync.cs | 1 + src/DistributedLock.Core/packages.lock.json | 24 + .../DistributedLock.MongoDB.csproj | 2 +- src/DistributedLock.Tests/packages.lock.json | 725 ------------------ 7 files changed, 50 insertions(+), 729 deletions(-) diff --git a/README.md b/README.md index d8d85f5a..644ae946 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,9 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes +- 2.8.0 + - Add MongoDB support! Thanks [@joesdu](https://github.com/joesdu) for implementing! ([#121](https://github.com/madelson/DistributedLock/issues/121), DistributedLock.MongoDB 1.0) + - Add composite lock support. Thanks [@moeen](https://github.com/moeen) for implementing! ([#236](https://github.com/madelson/DistributedLock/issues/236), DistributedLock.Core 1.0.9) - 2.7.1 - Improve compatibility with Redis clusters that require keys in Lua scripts to be passed via the KEYS array. Thanks [@pengweiqhca](https://github.com/pengweiqhca) for reporting a identifying the fix! ([#254](https://github.com/madelson/DistributedLock/issues/254), DistributedLock.Redis 1.1.1) - 2.7 diff --git a/docs/Other topics.md b/docs/Other topics.md index 3ae731f8..8f314944 100644 --- a/docs/Other topics.md +++ b/docs/Other topics.md @@ -30,6 +30,25 @@ However, in a large and complex system there is always risk that this doesn't ha To provide additional protection against the "leaking" of lock handles, DistributedLock's primitives are designed so that a handle being garbage collected without being disposed or a handle-holding process exiting unexpectedly **will not cause a lock to be held forever**. This helps ensure that systems built on distributed locking are robust to unexpected failures. +## Composite locking + +Sometimes, you need to acquire multiple fine-grained locks in an all-or-nothing manner (e.g. acquiring 2 per-account locks before doing an operation that affects both). Since DistributedLock.Core 1.0.9, the library now supports this via provider extension methods. For example: + +``` +IDistributedLockProvider provider = ... +await using (var handle = await provider.TryAcquireAllLocksAsync(new[] { "lockName1", "lockName2", ... }, timeout, cancellationToken)) +{ + if (handle != null) + { + // all locks successfully acquired! + } +} +``` + +An equivalent operation is supported for read locks, write locks, and semaphores. + +NOTE: the locks will be acquired in the order provided. It is up to the caller to ensure ordering consistency across operations to prevent deadlocks (e.g. you might sort the lock names before acquiring). + ## Safety of distributed locking Distributed locking is one of the easiest ways to add robustness to a distributed system without overly-complex design. However, the nature of the approach means that for certain scenarios it may not always be the best fit. @@ -40,5 +59,4 @@ In some cases, tying together the locking technology with the underlying resourc In other cases, this sort of unification isn't possible. If any violation of the locking guarantees is unacceptable, you may have to consider more complex approaches such as the techniques discussed in [this article](https://martin.kleppmann.com/2016/02/08/how-to-do-distributed-locking.html). In many cases, you simply won't be able to achieve true safety because of constraints driven by the resources you are trying to protect. -As mentioned at the start, the distributed locking approaches offered by this library are, in my experience, good enough for a large number of real-life scenarios. Furthermore, they are easy to use correctly and easy to reason about. However, it is worth being aware of any technology's limitations! - +As mentioned at the start, the distributed locking approaches offered by this library are, in my experience, good enough for a large number of real-life scenarios. Furthermore, they are easy to use correctly and easy to reason about. However, it is worth being aware of any technology's limitations! \ No newline at end of file diff --git a/src/DistributedLock.Core/DistributedLock.Core.csproj b/src/DistributedLock.Core/DistributedLock.Core.csproj index c7c207fb..b21e5b66 100644 --- a/src/DistributedLock.Core/DistributedLock.Core.csproj +++ b/src/DistributedLock.Core/DistributedLock.Core.csproj @@ -11,7 +11,7 @@ - 1.0.8 + 1.0.9 1.0.0.0 Michael Adelson Core interfaces and utilities that support the DistributedLock.* family of packages diff --git a/src/DistributedLock.Core/Internal/SyncViaAsync.cs b/src/DistributedLock.Core/Internal/SyncViaAsync.cs index d2c0328d..1a1df322 100644 --- a/src/DistributedLock.Core/Internal/SyncViaAsync.cs +++ b/src/DistributedLock.Core/Internal/SyncViaAsync.cs @@ -40,6 +40,7 @@ public static void Run(Func action, TState state) ///
public static TResult Run(Func> action, TState state) { + // Currently composites is the one place where we are reentrant wrt SyncViaAsync Invariant.Require(!_isSynchronous || Environment.StackTrace.Contains(nameof(CompositeDistributedSynchronizationHandle))); var wasSynchronous = _isSynchronous; diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 2d9a4cdd..8447f194 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -11,7 +11,7 @@ - 1.3.0 + 1.0.0 1.0.0.0 Michael Adelson, joesdu Provides a distributed lock implementation based on MongoDB diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index a6a6d12a..9178bc4c 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,731 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", - "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "DnsClient": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", - "dependencies": { - "Microsoft.Win32.Registry": "5.0.0", - "System.Buffers": "4.5.1" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", - "dependencies": { - "Microsoft.Identity.Client": "4.61.3", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "MongoDB.Bson": { - "type": "Transitive", - "resolved": "3.5.2", - "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "SharpCompress": { - "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" - } - }, - "Snappier": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "ZstdSharp.Port": { - "type": "Transitive", - "resolved": "0.7.3", - "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Memory": "4.5.5" - } - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.3.0, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.1, )", - "DistributedLock.SqlServer": "[1.0.6, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.mongodb": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "MongoDB.Driver": "[3.5.2, )", - "System.Diagnostics.DiagnosticSource": "[10.0.1, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Oracle.ManagedDataAccess": "[23.6.1, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Npgsql": "[8.0.6, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "StackExchange.Redis": "[2.7.33, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MongoDB.Driver": { - "type": "CentralTransitive", - "requested": "[3.5.2, )", - "resolved": "3.5.2", - "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", - "dependencies": { - "DnsClient": "1.6.1", - "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.2", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", - "System.Net.Http": "4.3.4", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "ZstdSharp.Port": "0.7.3" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.5", - "System.Threading.Channels": "8.0.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "CentralTransitive", - "requested": "[23.6.1, )", - "resolved": "23.6.1", - "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Formats.Asn1": "8.0.1", - "System.Text.Json": "8.0.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.33, )", - "resolved": "2.7.33", - "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From 40a38ef5305dbba20ec0e55713533bc0c958de62 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 21:37:24 -0500 Subject: [PATCH 373/399] Avoid ever orphaning handles, even in tests --- .../Tests/MongoDB/MongoDistributedLockTest.cs | 23 +- src/DistributedLock.Tests/packages.lock.json | 747 +++++++++++++++++- 2 files changed, 748 insertions(+), 22 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs index 858755f3..992b50e1 100644 --- a/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/MongoDB/MongoDistributedLockTest.cs @@ -19,12 +19,8 @@ public async Task TestBasicLockFunctionality() { Assert.That(handle, Is.Not.Null); // Use async TryAcquireAsync instead of synchronous IsHeld() - var handle2 = await @lock.TryAcquireAsync(TimeSpan.Zero); + await using var handle2 = await @lock.TryAcquireAsync(TimeSpan.Zero); Assert.That(handle2, Is.Null, "Lock should be held"); - if (handle2 != null) - { - await handle2.DisposeAsync(); - } } // Verify lock is released await using (var handle = await @lock.TryAcquireAsync(TimeSpan.FromSeconds(1))) @@ -129,7 +125,7 @@ public async Task TestLockContentionAsync() await using (var handle1 = await lock1.AcquireAsync()) { Assert.That(handle1, Is.Not.Null); - var handle2 = await lock2.TryAcquireAsync(TimeSpan.FromMilliseconds(100)); + await using var handle2 = await lock2.TryAcquireAsync(TimeSpan.FromMilliseconds(100)); Assert.That(handle2, Is.Null, "Should not acquire lock while held by another instance"); } @@ -239,7 +235,8 @@ public async Task TestIndexCreationIsScopedToCluster() // First set it up so that acquire will fail collection.Setup(c => c.FindOneAndUpdateAsync(It.IsAny>(), It.IsAny>(), It.IsAny>(), It.IsAny())) .ReturnsAsync((MongoLockDocument)null!); - await @lock.TryAcquireAsync(); + await using var handle = await @lock.TryAcquireAsync(); + Assert.IsNull(handle); index.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Never, "Failed acquire does not trigger index creation"); // Allow FindOneAndUpdate @@ -251,8 +248,10 @@ public async Task TestIndexCreationIsScopedToCluster() var lockId = pipeline.Documents[0]["$set"]["lockId"]["$cond"][1].AsString; return new MongoLockDocument { Id = Guid.NewGuid().ToString(), LockId = lockId }; }); - - await @lock.TryAcquireAsync(); + collection.Setup(c => c.DeleteOneAsync(It.IsAny>(), It.IsAny())) + .ReturnsAsync(new DeleteResult.Acknowledged(1)); + + await (await @lock.AcquireAsync()).DisposeAsync(); } // We want to verify ConfigureIndexes is called on BOTH. @@ -303,14 +302,16 @@ public async Task TestIndexCreationFailureIsCached() var lockId = pipeline.Documents[0]["$set"]["lockId"]["$cond"][1].AsString; return new MongoLockDocument { Id = Guid.NewGuid().ToString(), LockId = lockId }; }); + collection.Setup(c => c.DeleteOneAsync(It.IsAny>(), It.IsAny())) + .ReturnsAsync(new DeleteResult.Acknowledged(1)); var @lock = new MongoDistributedLock("k", db.Object, "locks"); // First acquire: fails to create index (swallowed), acquires lock - await @lock.TryAcquireAsync(); + await (await @lock.AcquireAsync()).DisposeAsync(); // Second acquire: caches the failed task, so it won't retry. - await @lock.TryAcquireAsync(); + await (await @lock.AcquireAsync()).DisposeAsync(); // Verify CreateOneAsync was called ONCE (proving caching). index.Verify(i => i.CreateOneAsync(It.IsAny>(), It.IsAny(), It.IsAny()), Times.Once(), "Should retry index creation after failure"); diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 9178bc4c..32339304 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,731 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.38.0", + "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.1", + "System.ClientModel": "1.0.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Memory.Data": "1.0.2", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.11.4", + "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "dependencies": { + "Azure.Core": "1.38.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", + "System.Memory": "4.5.4", + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Text.Json": "4.7.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.61.3", + "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "dependencies": { + "Microsoft.Identity.Client": "4.61.3", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "6.35.0", + "System.IdentityModel.Tokens.Jwt": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "6.35.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "dependencies": { + "System.Memory.Data": "1.0.2", + "System.Text.Json": "4.7.2" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "dependencies": { + "System.Security.Permissions": "6.0.0" + } + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "6.35.0", + "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Tokens": "6.35.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "1.0.2", + "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "dependencies": { + "System.Text.Encodings.Web": "4.7.2", + "System.Text.Json": "4.6.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Permissions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "dependencies": { + "System.Security.AccessControl": "6.0.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.5", + "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.4, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.1, )", + "DistributedLock.SqlServer": "[1.0.6, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MongoDB.Driver": "[3.5.2, )", + "System.Diagnostics.DiagnosticSource": "[10.0.1, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Npgsql": "[8.0.6, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "StackExchange.Redis": "[2.7.33, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[5.2.2, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[5.2.2, )", + "resolved": "5.2.2", + "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", + "dependencies": { + "Azure.Identity": "1.11.4", + "Microsoft.Data.SqlClient.SNI": "5.2.0", + "Microsoft.Identity.Client": "4.61.3", + "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "System.Buffers": "4.5.1", + "System.Configuration.ConfigurationManager": "6.0.1", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Encodings.Web": "6.0.0" + } + }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.2", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.5", + "System.Threading.Channels": "8.0.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -519,7 +1244,7 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.3.0, )", + "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", @@ -533,7 +1258,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -542,62 +1267,62 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mongodb": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Microsoft.Data.SqlClient": "[5.2.2, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, From abab5e8b493b7cf0dced4b9203486d01ff2a237e Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:16:14 -0500 Subject: [PATCH 374/399] Test fixes --- .../DistributedLockCoreTestCases.cs | 16 ++++++++-------- .../MongoDB/MongoDBSetUpFixture.cs | 2 ++ .../Infrastructure/TestHelper.cs | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs index e873c152..77d791a4 100644 --- a/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs +++ b/src/DistributedLock.Tests/AbstractTestCases/DistributedLockCoreTestCases.cs @@ -297,6 +297,14 @@ public async Task TestHandleLostTriggersCorrectly() var @lock = this._lockProvider.CreateLock(nameof(TestHandleLostTriggersCorrectly)); + CancellationToken handleLostToken; + await using (var notLostHandle = await @lock.AcquireAsync()) + { + handleLostToken = notLostHandle.HandleLostToken; + Assert.IsFalse(handleLostToken.IsCancellationRequested); + } + Assert.IsFalse(handleLostToken.IsCancellationRequested, "Token should not be canceled by manual release"); + var handle = await @lock.AcquireAsync(); try { @@ -324,14 +332,6 @@ public async Task TestHandleLostTriggersCorrectly() } Assert.Throws(() => handle.HandleLostToken.GetType()); - - CancellationToken handleLostToken; - await using (var handle2 = await @lock.AcquireAsync()) - { - handleLostToken = handle2.HandleLostToken; - Assert.IsFalse(handleLostToken.IsCancellationRequested); - } - Assert.IsFalse(handleLostToken.IsCancellationRequested, "Token should not be canceled by manual release"); } [Test] diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs index 0103102a..f63e028e 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs @@ -11,6 +11,8 @@ internal class MongoDBSetUpFixture [OneTimeSetUp] public void OneTimeSetUp() { + if (!TestHelper.IsCi) { return; } + var settings = MongoClientSettings.FromConnectionString(MongoDBCredentials.GetConnectionString(Environment.CurrentDirectory)); if (IsMongoReady(settings, TimeSpan.FromSeconds(3))) { return; } diff --git a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs index 22cb16cd..c3e71259 100644 --- a/src/DistributedLock.Tests/Infrastructure/TestHelper.cs +++ b/src/DistributedLock.Tests/Infrastructure/TestHelper.cs @@ -11,6 +11,8 @@ internal static class TestHelper /// public static string UniqueName => $"{TestContext.CurrentContext.Test.FullName}_{TargetFramework.Current}"; + public static bool IsCi { get; } = Environment.GetEnvironmentVariable("CI")?.ToLowerInvariant() == "true"; + public static T ShouldEqual(this T @this, T that, string? message = null) { Assert.That(@this, Is.EqualTo(that), message: message); From ed195c3b12824c0807f42d8414b9b2883b63f719 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:35:46 -0500 Subject: [PATCH 375/399] Fix composite postgres tests --- .../Composites/TestingCompositesProviders.cs | 9 ++++++++- .../Infrastructure/Postgres/TestingPostgresProviders.cs | 3 +-- .../Infrastructure/Shared/Composites.cs | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs b/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs index 51f14f24..3a1287ae 100644 --- a/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/Composites/TestingCompositesProviders.cs @@ -25,7 +25,14 @@ public override IDistributedSemaphore CreateSemaphoreWithExactName(string name, public sealed class TestingCompositeReaderWriterLockProvider : TestingReaderWriterLockProvider> { public override IDistributedReaderWriterLock CreateReaderWriterLockWithExactName(string name) => - new TestingCompositePostgresReaderWriterLock(name, this.Strategy.GetConnectionOptions().ConnectionString!); + this.Strategy.GetConnectionOptions() + .Create( + fromConnectionString: (connectionString, options) => new TestingCompositePostgresReaderWriterLock( + name, + connectionString, + TestingPostgresDistributedLockProvider>.ToPostgresOptions(options)), + fromConnection: _ => throw new Exception(), + fromTransaction: _ => throw new Exception()); public override string GetSafeName(string name) => name ?? throw new ArgumentNullException(nameof(name)); } \ No newline at end of file diff --git a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs index 8d89e66d..f77fab22 100644 --- a/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs +++ b/src/DistributedLock.Tests/Infrastructure/Postgres/TestingPostgresProviders.cs @@ -1,5 +1,4 @@ -using Medallion.Threading.Internal; -using Medallion.Threading.Postgres; +using Medallion.Threading.Postgres; using Medallion.Threading.Tests.Data; namespace Medallion.Threading.Tests.Postgres; diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs index c7ab283e..0dcc38ef 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs @@ -51,9 +51,9 @@ public ValueTask AcquireAsync(TimeSpan? timeo this._provider.TryAcquireAllSemaphoresAsync(this._names, maxCount, timeout, cancellationToken); } -public class TestingCompositePostgresReaderWriterLock(string name, string connectionString) : IDistributedReaderWriterLock +public class TestingCompositePostgresReaderWriterLock(string name, string connectionString, Action? options) : IDistributedReaderWriterLock { - private readonly PostgresDistributedSynchronizationProvider _provider = new(connectionString); + private readonly PostgresDistributedSynchronizationProvider _provider = new(connectionString, options); private readonly string[] _names = [name + "_1", name + "_2"]; public string Name => name; From d51b3018074dd9890bc8ceac96ba3091bc29993d Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:44:38 -0500 Subject: [PATCH 376/399] More composite test fixes --- .../Core/DistributedLockProviderExtensionsTest.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs index 9762cb05..71799e7c 100644 --- a/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs +++ b/src/DistributedLock.Tests/Tests/Core/DistributedLockProviderExtensionsTest.cs @@ -247,7 +247,7 @@ public void TestCompositeAcquireThrowsOnTimeout([Values] bool isAsync) } } - [Test] + [Test, Retry(3)] // timing-sensitive public async Task TestCompositeRemainingTimeDistribution() { var mockProvider = new Mock(); @@ -259,13 +259,13 @@ public async Task TestCompositeRemainingTimeDistribution() mockProvider.Setup(p => p.CreateLock("A")).Returns(mockLockA.Object); mockProvider.Setup(p => p.CreateLock("B")).Returns(mockLockB.Object); - var capturedTimeouts = new List(); + List capturedTimeouts = []; mockLockA.Setup(l => l.TryAcquireAsync(It.IsAny(), default)) - .ReturnsAsync((TimeSpan timeout, CancellationToken _) => + .Returns(async (TimeSpan timeout, CancellationToken _) => { capturedTimeouts.Add(timeout); - Task.Delay(TimeSpan.FromMilliseconds(100)).Wait(); + await Task.Delay(TimeSpan.FromMilliseconds(100)); return mockHandleA.Object; }); @@ -279,17 +279,15 @@ public async Task TestCompositeRemainingTimeDistribution() var names = new List { "A", "B" }; var totalTimeout = TimeSpan.FromSeconds(5); - var result = await mockProvider.Object.TryAcquireAllLocksAsync(names, totalTimeout, default); + await using var result = await mockProvider.Object.TryAcquireAllLocksAsync(names, totalTimeout, default); Assert.That(result, Is.Not.Null); Assert.That(capturedTimeouts.Count, Is.EqualTo(2)); - Assert.That(capturedTimeouts[0].TotalMilliseconds, Is.EqualTo(totalTimeout.TotalMilliseconds).Within(1.0)); + Assert.That(capturedTimeouts[0].TotalMilliseconds, Is.EqualTo(totalTimeout.TotalMilliseconds).Within(TestHelper.IsCi ? 50 : 2)); Assert.That(capturedTimeouts[1], Is.LessThan(totalTimeout)); Assert.That(capturedTimeouts[1], Is.GreaterThanOrEqualTo(TimeSpan.Zero)); - - await result!.DisposeAsync(); } [Test] From 5fa4fff7ee03db00ddd403655a0ffdb0650f9df3 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:45:30 -0500 Subject: [PATCH 377/399] Version bump for umbrella --- src/DistributedLock/DistributedLock.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index f75fd8cb..82f921dc 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.7.1 + 2.8.0 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 1a1f5d265e885a3a9774e04544dca29a9446abd6 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 22:51:18 -0500 Subject: [PATCH 378/399] Fix build --- src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs index 0dcc38ef..d11fce04 100644 --- a/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs +++ b/src/DistributedLock.Tests/Infrastructure/Shared/Composites.cs @@ -51,7 +51,7 @@ public ValueTask AcquireAsync(TimeSpan? timeo this._provider.TryAcquireAllSemaphoresAsync(this._names, maxCount, timeout, cancellationToken); } -public class TestingCompositePostgresReaderWriterLock(string name, string connectionString, Action? options) : IDistributedReaderWriterLock +public class TestingCompositePostgresReaderWriterLock(string name, string connectionString, Action? options = null) : IDistributedReaderWriterLock { private readonly PostgresDistributedSynchronizationProvider _provider = new(connectionString, options); private readonly string[] _names = [name + "_1", name + "_2"]; From 7bab748a9f6ee931991a128596f11bcad437b94e Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 23:06:20 -0500 Subject: [PATCH 379/399] attempt CI fix --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index d4cd381d..7bf7e552 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,8 @@ version: 1.0.{build} +environment: + CI: true + image: # Ubuntu2204 needed for .NET 8 for now (see https://www.appveyor.com/docs/linux-images-software/) - Ubuntu2204 From f69f908cd469779d758364ec032aa45ca0fdebe3 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 23:23:44 -0500 Subject: [PATCH 380/399] Fix CI branch --- appveyor.yml | 3 --- .../Infrastructure/MongoDB/MongoDBSetUpFixture.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7bf7e552..d4cd381d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,5 @@ version: 1.0.{build} -environment: - CI: true - image: # Ubuntu2204 needed for .NET 8 for now (see https://www.appveyor.com/docs/linux-images-software/) - Ubuntu2204 diff --git a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs index f63e028e..fc04f961 100644 --- a/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs +++ b/src/DistributedLock.Tests/Infrastructure/MongoDB/MongoDBSetUpFixture.cs @@ -11,7 +11,7 @@ internal class MongoDBSetUpFixture [OneTimeSetUp] public void OneTimeSetUp() { - if (!TestHelper.IsCi) { return; } + if (TestHelper.IsCi) { return; } // currently we don't attempt integration tests on CI var settings = MongoClientSettings.FromConnectionString(MongoDBCredentials.GetConnectionString(Environment.CurrentDirectory)); if (IsMongoReady(settings, TimeSpan.FromSeconds(3))) { return; } From 346033625161ecf8236ebc6b293411a571b40445 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Sat, 17 Jan 2026 23:43:19 -0500 Subject: [PATCH 381/399] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 644ae946..a4ecd46a 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ public class SomeService - [Interfaces](docs/Other%20topics.md#interfaces) - [Detecting handle loss](docs/Other%20topics.md#detecting-handle-loss) - [Handle abandonment](docs/Other%20topics.md#handle-abandonment) +- [Composite locks](docs/Other%20topics.md#composite-locking) - [Safety of distributed locking](docs/Other%20topics.md#safety-of-distributed-locking) ## Contributing From dcee4e154765bbf9dee5c2d44ce0bbeda7a54e03 Mon Sep 17 00:00:00 2001 From: Matthew Marston Date: Fri, 6 Feb 2026 09:54:51 -0500 Subject: [PATCH 382/399] simple fix for invalid sql --- src/DistributedLock.Oracle/OracleDatabaseConnection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Oracle/OracleDatabaseConnection.cs b/src/DistributedLock.Oracle/OracleDatabaseConnection.cs index df6aa519..b901e93f 100644 --- a/src/DistributedLock.Oracle/OracleDatabaseConnection.cs +++ b/src/DistributedLock.Oracle/OracleDatabaseConnection.cs @@ -36,7 +36,7 @@ private OracleDatabaseConnection(IDbConnection connection, bool isExternallyOwne // from https://docs.oracle.com/html/E10927_01/OracleCommandClass.htm "this method is a no-op" wrt "Prepare()" public override bool ShouldPrepareCommands => false; - public override bool IsCommandCancellationException(Exception exception) => + public override bool IsCommandCancellationException(Exception exception) => exception is OracleException oracleException // based on https://docs.oracle.com/cd/E85694_01/ODPNT/CommandCancel.htm && (oracleException.Number == 01013 || oracleException.Number == 00936 || oracleException.Number == 00604); @@ -44,7 +44,7 @@ exception is OracleException oracleException public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func> executor) { using var sleepCommand = this.CreateCommand(); - sleepCommand.SetCommandText("BEGIN sys.DBMS_SESSION.SLEEP(:seconds) END;"); + sleepCommand.SetCommandText("BEGIN sys.DBMS_SESSION.SLEEP(:seconds); END;"); sleepCommand.AddParameter("seconds", sleepTime.TotalSeconds); try From f2420fd9ad1c5ad6b59c008c7fe235942cb100e0 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Wed, 11 Feb 2026 20:43:22 -0500 Subject: [PATCH 383/399] Update Microsoft.Data.SqlClient Fix #273 --- src/Directory.Packages.props | 2 +- src/DistributedLock.Core/packages.lock.json | 24 - .../packages.lock.json | 1179 +++++++------- src/DistributedLock.Tests/packages.lock.json | 999 ++---------- src/DistributedLock/packages.lock.json | 1420 ++++++++--------- src/DistributedLockTaker/packages.lock.json | 745 ++++----- 6 files changed, 1680 insertions(+), 2689 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 85a8c98c..b65321ae 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,7 +15,7 @@ - + diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..a861f7bd 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -81,12 +75,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -136,12 +124,6 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -164,12 +146,6 @@ } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.SqlServer/packages.lock.json b/src/DistributedLock.SqlServer/packages.lock.json index 4d56c89d..a76fd007 100644 --- a/src/DistributedLock.SqlServer/packages.lock.json +++ b/src/DistributedLock.SqlServer/packages.lock.json @@ -10,19 +10,25 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -46,33 +52,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Net.Http": "4.3.4", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Microsoft.Build.Tasks.Git": { @@ -82,82 +83,136 @@ }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" } }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { @@ -172,42 +227,51 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, - "System.Configuration.ConfigurationManager": { + "System.Data.Common": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.FileSystem.AccessControl": { @@ -221,135 +285,91 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Algorithms": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Text.Encodings.Web": "4.7.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4", "System.ValueTuple": "4.5.0" } }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "distributedlock.core": { @@ -384,26 +404,23 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "Microsoft.Win32.Registry": "5.0.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Runtime.Caching": "6.0.0", - "System.Runtime.Loader": "4.3.0", - "System.Security.Cryptography.Cng": "5.0.0", - "System.Security.Principal.Windows": "5.0.0", - "System.Text.Encoding.CodePages": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6" } }, "Microsoft.SourceLink.GitHub": { @@ -427,31 +444,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Microsoft.Build.Tasks.Git": { @@ -466,84 +480,137 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ComponentModel.Annotations": "5.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Cng": "5.0.0", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Logging": "7.7.1", "System.Security.Cryptography.Cng": "4.5.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "System.Text.Json": "8.0.4" } }, "Microsoft.NETCore.Platforms": { @@ -551,11 +618,6 @@ "resolved": "1.1.0", "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -566,68 +628,60 @@ "resolved": "1.0.0", "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", "dependencies": { - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.IdentityModel.Tokens.Jwt": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" } }, - "System.IO": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.FileSystem.AccessControl": { @@ -643,86 +697,37 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Loader": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -732,20 +737,23 @@ "resolved": "5.0.0", "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==", "dependencies": { - "System.Memory": "4.5.4" + "System.Buffers": "4.5.1", + "System.Formats.Asn1": "8.0.1", + "System.Memory": "4.5.5", + "System.Security.Cryptography.Cng": "5.0.0" } }, - "System.Security.Permissions": { + "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==", "dependencies": { - "System.Security.AccessControl": "6.0.0" + "System.Memory": "4.5.5" } }, "System.Security.Principal.Windows": { @@ -753,66 +761,41 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Text.Encodings.Web": "4.7.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Threading.Tasks": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "distributedlock.core": { "type": "Project", @@ -839,25 +822,23 @@ }, "Microsoft.Data.SqlClient": { "type": "Direct", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "Microsoft.Win32.Registry": "5.0.0", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Runtime.Caching": "6.0.0", - "System.Runtime.Loader": "4.3.0", - "System.Security.Cryptography.Cng": "5.0.0", - "System.Security.Principal.Windows": "5.0.0", - "System.Text.Encoding.CodePages": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6" } }, "Microsoft.SourceLink.GitHub": { @@ -872,40 +853,34 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -919,96 +894,135 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ComponentModel.Annotations": "5.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Cng": "5.0.0", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Logging": "7.7.1", "System.Security.Cryptography.Cng": "4.5.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "System.Text.Json": "8.0.4" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -1019,17 +1033,6 @@ "resolved": "1.0.0", "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1037,41 +1040,44 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, - "System.IdentityModel.Tokens.Jwt": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" } }, - "System.IO": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.FileSystem.AccessControl": { @@ -1092,11 +1098,11 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { @@ -1104,64 +1110,15 @@ "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.1.2", "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, - "System.Runtime.Loader": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -1171,20 +1128,21 @@ "resolved": "5.0.0", "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==", "dependencies": { - "System.Memory": "4.5.4" + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Cng": "5.0.0" } }, - "System.Security.Permissions": { + "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==", "dependencies": { - "System.Security.AccessControl": "6.0.0" + "System.Memory": "4.5.5" } }, "System.Security.Principal.Windows": { @@ -1192,66 +1150,41 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", + "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Text.Encodings.Web": "4.7.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Threading.Tasks": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "distributedlock.core": { "type": "Project" diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 32339304..0f80e634 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,731 +1,6 @@ { "version": 2, "dependencies": { - ".NETFramework,Version=v4.7.2": { - "MedallionShell.StrongName": { - "type": "Direct", - "requested": "[1.6.2, )", - "resolved": "1.6.2", - "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" - }, - "Microsoft.NET.Test.Sdk": { - "type": "Direct", - "requested": "[17.9.0, )", - "resolved": "17.9.0", - "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", - "dependencies": { - "Microsoft.CodeCoverage": "17.9.0" - } - }, - "Moq": { - "type": "Direct", - "requested": "[4.20.70, )", - "resolved": "4.20.70", - "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", - "dependencies": { - "Castle.Core": "5.1.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "NUnit": { - "type": "Direct", - "requested": "[3.14.0, )", - "resolved": "3.14.0", - "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" - }, - "NUnit.Analyzers": { - "type": "Direct", - "requested": "[4.1.0, )", - "resolved": "4.1.0", - "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" - }, - "NUnit3TestAdapter": { - "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" - }, - "System.Data.SqlClient": { - "type": "Direct", - "requested": "[4.8.6, )", - "resolved": "4.8.6", - "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" - }, - "Azure.Core": { - "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Identity": { - "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", - "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Azure.Storage.Common": { - "type": "Transitive", - "resolved": "12.18.1", - "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", - "dependencies": { - "Azure.Core": "1.36.0", - "System.IO.Hashing": "6.0.0" - } - }, - "Castle.Core": { - "type": "Transitive", - "resolved": "5.1.1", - "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" - }, - "DnsClient": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", - "dependencies": { - "Microsoft.Win32.Registry": "5.0.0", - "System.Buffers": "4.5.1" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.HashCode": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" - }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "17.9.0", - "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" - }, - "Microsoft.Data.SqlClient.SNI": { - "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - } - }, - "Microsoft.Identity.Client": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" - } - }, - "Microsoft.Identity.Client.Extensions.Msal": { - "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", - "dependencies": { - "Microsoft.Identity.Client": "4.61.3", - "System.IO.FileSystem.AccessControl": "5.0.0", - "System.Security.Cryptography.ProtectedData": "4.5.0" - } - }, - "Microsoft.IdentityModel.Abstractions": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" - }, - "Microsoft.IdentityModel.JsonWebTokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", - "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Logging": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", - "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "Microsoft.IdentityModel.Protocols.OpenIdConnect": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", - "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.IdentityModel.Tokens": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", - "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "MongoDB.Bson": { - "type": "Transitive", - "resolved": "3.5.2", - "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "Pipelines.Sockets.Unofficial": { - "type": "Transitive", - "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } - }, - "SharpCompress": { - "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" - } - }, - "Snappier": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" - }, - "System.ClientModel": { - "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", - "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" - } - }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, - "System.Formats.Asn1": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.ValueTuple": "4.5.0" - } - }, - "System.IdentityModel.Tokens.Jwt": { - "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", - "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" - }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" - }, - "System.IO.FileSystem.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.IO.Hashing": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, - "System.Memory.Data": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", - "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.1.2", - "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" - }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } - }, - "System.ValueTuple": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" - }, - "ZstdSharp.Port": { - "type": "Transitive", - "resolved": "0.7.3", - "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Memory": "4.5.5" - } - }, - "distributedlock": { - "type": "Project", - "dependencies": { - "DistributedLock.Azure": "[1.0.2, )", - "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.0.0, )", - "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", - "DistributedLock.Postgres": "[1.3.0, )", - "DistributedLock.Redis": "[1.1.1, )", - "DistributedLock.SqlServer": "[1.0.6, )", - "DistributedLock.WaitHandles": "[1.0.1, )", - "DistributedLock.ZooKeeper": "[1.0.0, )" - } - }, - "distributedlock.azure": { - "type": "Project", - "dependencies": { - "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.9, )" - } - }, - "distributedlock.core": { - "type": "Project", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", - "System.ValueTuple": "[4.5.0, )" - } - }, - "distributedlock.filesystem": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )" - } - }, - "distributedlock.mongodb": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.5.2, )", - "System.Diagnostics.DiagnosticSource": "[10.0.1, )" - } - }, - "distributedlock.mysql": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "MySqlConnector": "[2.3.5, )" - } - }, - "distributedlock.oracle": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "Oracle.ManagedDataAccess": "[23.6.1, )" - } - }, - "distributedlock.postgres": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "Npgsql": "[8.0.6, )" - } - }, - "distributedlock.redis": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "StackExchange.Redis": "[2.7.33, )" - } - }, - "distributedlock.sqlserver": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" - } - }, - "distributedlock.waithandles": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )" - } - }, - "distributedlock.zookeeper": { - "type": "Project", - "dependencies": { - "DistributedLock.Core": "[1.0.9, )", - "ZooKeeperNetEx": "[3.4.12.4, )" - } - }, - "Azure.Storage.Blobs": { - "type": "CentralTransitive", - "requested": "[12.19.1, )", - "resolved": "12.19.1", - "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", - "dependencies": { - "Azure.Storage.Common": "12.18.1", - "System.Text.Json": "4.7.2" - } - }, - "Microsoft.Data.SqlClient": { - "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" - } - }, - "MongoDB.Driver": { - "type": "CentralTransitive", - "requested": "[3.5.2, )", - "resolved": "3.5.2", - "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", - "dependencies": { - "DnsClient": "1.6.1", - "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.5.2", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", - "System.Net.Http": "4.3.4", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "ZstdSharp.Port": "0.7.3" - } - }, - "MySqlConnector": { - "type": "CentralTransitive", - "requested": "[2.3.5, )", - "resolved": "2.3.5", - "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "7.0.1", - "System.Diagnostics.DiagnosticSource": "7.0.2", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Npgsql": { - "type": "CentralTransitive", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "System.Collections.Immutable": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Json": "8.0.5", - "System.Threading.Channels": "8.0.0" - } - }, - "Oracle.ManagedDataAccess": { - "type": "CentralTransitive", - "requested": "[23.6.1, )", - "resolved": "23.6.1", - "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Formats.Asn1": "8.0.1", - "System.Text.Json": "8.0.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "StackExchange.Redis": { - "type": "CentralTransitive", - "requested": "[2.7.33, )", - "resolved": "2.7.33", - "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "6.0.0", - "Pipelines.Sockets.Unofficial": "2.2.8", - "System.IO.Compression": "4.3.0", - "System.Threading.Channels": "5.0.0" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", - "dependencies": { - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, - "ZooKeeperNetEx": { - "type": "CentralTransitive", - "requested": "[3.4.12.4, )", - "resolved": "3.4.12.4", - "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" - } - }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -786,31 +61,22 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Memory.Data": "8.0.1" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0" } }, "Azure.Storage.Common": { @@ -840,105 +106,129 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" }, "Microsoft.CodeCoverage": { "type": "Transitive", "resolved": "17.9.0", "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" }, - "Microsoft.CSharp": { + "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" }, - "Microsoft.Data.SqlClient.SNI.runtime": { + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" } }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.7.1" } }, "Microsoft.NETCore.Platforms": { @@ -946,11 +236,6 @@ "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SqlServer.Server": { "type": "Transitive", "resolved": "1.0.0", @@ -1065,34 +350,31 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Memory.Data": "8.0.1" } }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", + "System.Diagnostics.EventLog": "8.0.1", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "8.0.1", + "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg==" }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1114,11 +396,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.Hashing": { @@ -1138,44 +420,18 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==" }, "System.Reflection.Metadata": { "type": "Transitive", "resolved": "1.6.0", "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "8.0.0" - } - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -1186,18 +442,10 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", @@ -1209,30 +457,15 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" - }, "System.Text.Json": { "type": "Transitive", "resolved": "4.7.2", "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "ZstdSharp.Port": { "type": "Transitive", @@ -1309,7 +542,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { @@ -1338,18 +571,22 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Runtime.Caching": "8.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1" } }, "MongoDB.Driver": { diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 651b9229..5380951e 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -29,33 +29,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Net.Http": "4.3.4", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Azure.Storage.Common": { @@ -79,13 +74,34 @@ }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" @@ -93,87 +109,101 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "System.Buffers": "4.5.1", "System.Memory": "4.5.5" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" } }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { @@ -196,16 +226,18 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, "System.Collections.Immutable": { @@ -217,30 +249,37 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Configuration.ConfigurationManager": { + "System.Data.Common": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.Compression": { @@ -278,40 +317,32 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Net.Http": { - "type": "Transitive", - "resolved": "4.3.4", - "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Security.Cryptography.X509Certificates": "4.3.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", @@ -320,62 +351,27 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Algorithms": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "dependencies": { - "System.Security.Cryptography.Primitives": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" - }, - "System.Security.Cryptography.Primitives": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Cryptography.X509Certificates": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "dependencies": { - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -388,8 +384,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -400,6 +396,11 @@ "System.ValueTuple": "4.5.0" } }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, "System.Threading.Channels": { "type": "Transitive", "resolved": "8.0.0", @@ -410,17 +411,17 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "distributedlock.azure": { "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -433,47 +434,47 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -498,19 +499,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" } }, "MySqlConnector": { @@ -585,31 +592,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Azure.Storage.Common": { @@ -650,13 +654,34 @@ }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" @@ -664,87 +689,101 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "System.Buffers": "4.5.1", "System.Memory": "4.5.5" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" } }, "Microsoft.SourceLink.Common": { @@ -804,11 +843,13 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, "System.Collections.Immutable": { @@ -820,13 +861,10 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Configuration.ConfigurationManager": { + "System.Data.Common": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" }, "System.Formats.Asn1": { "type": "Transitive", @@ -840,11 +878,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO": { @@ -897,11 +935,11 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Net.Http": { @@ -934,8 +972,8 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -956,6 +994,11 @@ "resolved": "4.3.0", "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" + }, "System.Security.Cryptography.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -963,8 +1006,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", @@ -975,24 +1018,11 @@ "System.Security.Cryptography.Encoding": "4.3.0" } }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "5.0.0", @@ -1013,8 +1043,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -1025,6 +1055,11 @@ "System.ValueTuple": "4.5.0" } }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, "System.Threading.Channels": { "type": "Transitive", "resolved": "8.0.0", @@ -1035,10 +1070,10 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "System.ValueTuple": { @@ -1059,7 +1094,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -1072,13 +1107,13 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mongodb": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MongoDB.Driver": "[3.5.2, )", "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } @@ -1086,48 +1121,48 @@ "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Oracle.ManagedDataAccess": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1143,19 +1178,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" } }, "MongoDB.Driver": { @@ -1271,31 +1312,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Azure.Storage.Common": { @@ -1324,13 +1362,33 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" @@ -1338,89 +1396,103 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "System.Buffers": "4.5.1", "System.Memory": "4.5.5" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ComponentModel.Annotations": "5.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Cng": "5.0.0", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Logging": "7.7.1", "System.Security.Cryptography.Cng": "4.5.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "System.Text.Json": "8.0.4" } }, "Microsoft.NETCore.Platforms": { @@ -1428,11 +1500,6 @@ "resolved": "1.1.0", "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -1443,17 +1510,6 @@ "resolved": "1.0.0", "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", @@ -1464,16 +1520,18 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, "System.Collections.Immutable": { @@ -1485,43 +1543,44 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.IdentityModel.Tokens.Jwt": { + "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" } }, - "System.IO": { + "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.FileSystem.AccessControl": { @@ -1556,81 +1615,32 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Loader": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -1645,20 +1655,23 @@ "resolved": "5.0.0", "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==" }, - "System.Security.Cryptography.ProtectedData": { + "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==", "dependencies": { - "System.Memory": "4.5.4" + "System.Buffers": "4.5.1", + "System.Formats.Asn1": "8.0.1", + "System.Memory": "4.5.5", + "System.Security.Cryptography.Cng": "5.0.0" } }, - "System.Security.Permissions": { + "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==", "dependencies": { - "System.Security.AccessControl": "6.0.0" + "System.Memory": "4.5.5" } }, "System.Security.Principal.Windows": { @@ -1666,25 +1679,6 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "8.0.0", @@ -1697,8 +1691,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -1716,29 +1710,24 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Threading.Tasks": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "distributedlock.azure": { "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -1750,48 +1739,48 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1816,26 +1805,23 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "Microsoft.Win32.Registry": "5.0.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Runtime.Caching": "6.0.0", - "System.Runtime.Loader": "4.3.0", - "System.Security.Cryptography.Cng": "5.0.0", - "System.Security.Principal.Windows": "5.0.0", - "System.Text.Encoding.CodePages": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6" } }, "MySqlConnector": { @@ -1913,31 +1899,28 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Azure.Storage.Common": { @@ -1974,111 +1957,135 @@ }, "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "System.Buffers": "4.5.1", "System.Memory": "4.5.5" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ComponentModel.Annotations": "5.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Security.Cryptography.Cng": "5.0.0", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", + "Microsoft.IdentityModel.Logging": "7.7.1", "System.Security.Cryptography.Cng": "4.5.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "System.Text.Json": "8.0.4" } }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -2140,11 +2147,13 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, "System.Collections.Immutable": { @@ -2156,13 +2165,17 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" + }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "6.0.0", - "System.Security.Permissions": "6.0.0" + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.PerformanceCounter": { @@ -2180,32 +2193,20 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "glgtKqWJpH9GDw0m9I5xFiF6WDIQqi/eZXU6MkMRPzAWEERGGAJh+qztkrlWSDbokQ1jalj5NcBNIvVoSDpSSA==", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", "dependencies": { "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "System.Memory": "4.5.5" } }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.FileSystem.AccessControl": { @@ -2245,11 +2246,11 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Numerics.Vectors": { @@ -2257,60 +2258,11 @@ "resolved": "4.5.0", "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "E0e03kUp5X2k+UAoVl6efmI7uU7JRBWi5EIdlQ7cr0NpBGjHG4fWII35PgsBY9T4fJQ8E4QPsL0rKksU9gcL5A==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.1.2", "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, - "System.Runtime.Loader": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHMaRn8D8YCK2GG2pw+UzNxn/OHVfaWx7OTLBD/hPegHZZgcZh3H6seWegrC4BYwsfuGrywIuT+MQs+rPqRLTQ==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "6.0.0", @@ -2326,27 +2278,19 @@ }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==", "dependencies": { - "System.Formats.Asn1": "6.0.0", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Cng": "5.0.0" } }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "rp1gMNEZpvx9vP0JW0oHLxlf8oSiQgtno77Y4PLUBjSiDYoD77Y8uXHr1Ea5XG4/pIKhqAdxZ8v8OTUtqo9PeQ==", - "dependencies": { - "System.Memory": "4.5.4" - } - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==", "dependencies": { - "System.Security.AccessControl": "6.0.0" + "System.Memory": "4.5.5" } }, "System.Security.Principal.Windows": { @@ -2354,23 +2298,12 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "System.Runtime.CompilerServices.Unsafe": "5.0.0" } }, "System.Text.Encodings.Web": { @@ -2385,8 +2318,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -2401,23 +2334,18 @@ "resolved": "8.0.0", "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" }, - "System.Threading.Tasks": { + "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" - } + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "ZstdSharp.Port": { "type": "Transitive", @@ -2431,7 +2359,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -2440,13 +2368,13 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mongodb": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MongoDB.Driver": "[3.5.2, )", "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } @@ -2454,49 +2382,49 @@ "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -2512,25 +2440,23 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "Microsoft.Win32.Registry": "5.0.0", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Runtime.Caching": "6.0.0", - "System.Runtime.Loader": "4.3.0", - "System.Security.Cryptography.Cng": "5.0.0", - "System.Security.Principal.Windows": "5.0.0", - "System.Text.Encoding.CodePages": "6.0.0", - "System.Text.Encodings.Web": "6.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6" } }, "MongoDB.Driver": { diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 03dfd0b2..4de3adc4 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -4,31 +4,28 @@ ".NETFramework,Version=v4.7.2": { "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" } }, "Azure.Storage.Common": { @@ -64,13 +61,34 @@ }, "Microsoft.Data.SqlClient.SNI": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "0p2KMVc8WSC5JWgO+OdhYJiRM41dp6w2Dsd9JfEiHLPc6nyxBQgSrx9TYlbC8fRT2RK+HyWzDlv9ofFtxMOwQg==" + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Threading.Tasks.Extensions": "4.5.4" @@ -78,87 +96,101 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", "System.Buffers": "4.5.1", "System.Memory": "4.5.5" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.IO.FileSystem.AccessControl": "5.0.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" } }, "Microsoft.Win32.Registry": { @@ -213,11 +245,13 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" } }, "System.Collections.Immutable": { @@ -229,13 +263,10 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, - "System.Configuration.ConfigurationManager": { + "System.Data.Common": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" }, "System.Formats.Asn1": { "type": "Transitive", @@ -249,11 +280,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO": { @@ -306,11 +337,11 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" } }, "System.Net.Http": { @@ -343,8 +374,8 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -365,6 +396,11 @@ "resolved": "4.3.0", "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" + }, "System.Security.Cryptography.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -372,8 +408,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", @@ -384,24 +420,11 @@ "System.Security.Cryptography.Encoding": "4.3.0" } }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==" - }, "System.Text.Encoding.CodePages": { "type": "Transitive", "resolved": "5.0.0", @@ -422,8 +445,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "8.0.0", "System.Buffers": "4.5.1", @@ -434,6 +457,11 @@ "System.ValueTuple": "4.5.0" } }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, "System.Threading.Channels": { "type": "Transitive", "resolved": "8.0.0", @@ -444,10 +472,10 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Runtime.CompilerServices.Unsafe": "6.1.0" } }, "System.ValueTuple": { @@ -469,7 +497,7 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.3.0, )", + "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", @@ -483,7 +511,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -496,13 +524,13 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mongodb": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MongoDB.Driver": "[3.5.2, )", "System.Diagnostics.DiagnosticSource": "[10.0.1, )" } @@ -510,48 +538,48 @@ "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Oracle.ManagedDataAccess": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -567,19 +595,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" } }, "MongoDB.Driver": { @@ -677,14 +711,6 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Configuration.ConfigurationManager": { - "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "jXw9MlUu/kRfEU0WyTptAVueupqIeE3/rl0EZDMlf8pcvJnitQ8HeVEp69rZdaStXwTV72boi/Bhw8lOeO+U2w==", - "dependencies": { - "System.Security.Permissions": "6.0.0" - } - }, "System.IO.Compression": { "type": "Transitive", "resolved": "4.3.0", @@ -714,8 +740,8 @@ }, "System.Security.AccessControl": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "AUADIc0LIEQe7MzC+I0cl0rAT8RrTAKFHl53yHjEUzNVIaUlhFY11vc2ebiVJzVBuOzun6F7FBA+8KAbGTTedQ==", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", "dependencies": { "System.Security.Principal.Windows": "5.0.0" } @@ -738,8 +764,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", @@ -750,14 +776,6 @@ "System.Security.Cryptography.Encoding": "4.3.0" } }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", - "dependencies": { - "System.Security.AccessControl": "6.0.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", @@ -773,19 +791,25 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", - "System.Buffers": "4.5.1", - "System.Configuration.ConfigurationManager": "6.0.1", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Text.Encodings.Web": "6.0.0" + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" } } }, @@ -798,31 +822,22 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.38.0", - "contentHash": "IuEgCoVA0ef7E4pQtpC3+TkPbzaoQfa77HlfJDmfuaJUCVJmn7fT0izamZiryW5sYUFKizsftIxMkXKbgIcPMQ==", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Memory.Data": "8.0.1" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.11.4", - "contentHash": "Sf4BoE6Q3jTgFkgBkx7qztYOFELBCo+wQgpYDwal/qJ1unBH73ywPztIJKXBXORRzAeNijsuxhk94h0TIMvfYg==", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", "dependencies": { - "Azure.Core": "1.38.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.Identity.Client.Extensions.Msal": "4.61.3", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0" } }, "Azure.Storage.Common": { @@ -844,100 +859,124 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" }, - "Microsoft.CSharp": { + "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "kaj6Wb4qoMuH3HySFJhxwQfe8R/sJsNJnANrvv8WdFPMoNbKY5htfNscv+LHCu5ipz+49m2e+WQXpLXr9XYemQ==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" }, - "Microsoft.Data.SqlClient.SNI.runtime": { + "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0" + } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "naJo/Qm35Caaoxp5utcw+R8eU8ZtLz2ALh8S+gkekOYQ1oazfCQMWVT4NJ/FnHzdIJlm8dMz0oMpMGCabx5odA==", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.ValueTuple": "4.5.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.61.3", - "contentHash": "PWnJcznrSGr25MN8ajlc2XIDW4zCFu0U6FkpaNLEWLgd1NgFCp5uDY3mqLDgM8zCN8hqj8yo5wHYfLB2HjcdGw==", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", "dependencies": { - "Microsoft.Identity.Client": "4.61.3", + "Microsoft.Identity.Client": "4.78.0", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg==" + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "9wxai3hKgZUb4/NjdRKfQd0QJvtXKDlvmGMYACbEC8DFaicMFCFhQFZq9ZET1kJLwZahf2lfY5Gtcpsx8zYzbg==", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "6.35.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "jePrSfGAmqT81JDCNSY+fxVWoGuJKt9e6eJ+vT7+quVS55nWl//jGjUQn4eFtVKt4rt5dXaleZdHRB9J9AJZ7Q==", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0" + "Microsoft.IdentityModel.Abstractions": "7.7.1" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "BPQhlDzdFvv1PzaUxNSk+VEPwezlDEVADIKmyxubw7IiELK18uJ06RQ9QKKkds30XI+gDu9n8j24XQ8w7fjWcg==", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "LMtVqnECCCdSmyFoCOxIE5tXQqkOLrvGrL7OxHg41DIm1bpWtaCdGyVcTAfOQpJXvzND9zUKIN/lhngPkYR8vg==", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "6.35.0", - "System.IdentityModel.Tokens.Jwt": "6.35.0" + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "RN7lvp7s3Boucg1NaNAbqDbxtlLj5Qeb+4uSS1TeK5FSBVM40P4DKaTKChT43sHyKfh7V0zkrMph6DdHvyA4bg==", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", "dependencies": { - "Microsoft.CSharp": "4.5.0", - "Microsoft.IdentityModel.Logging": "6.35.0", - "System.Security.Cryptography.Cng": "4.5.0" + "Microsoft.IdentityModel.Logging": "7.7.1" } }, "Microsoft.NETCore.Platforms": { @@ -945,11 +984,6 @@ "resolved": "5.0.0", "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Microsoft.SqlServer.Server": { "type": "Transitive", "resolved": "1.0.0", @@ -1009,34 +1043,31 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Memory.Data": "8.0.1" } }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", "dependencies": { - "System.Diagnostics.EventLog": "8.0.0", + "System.Diagnostics.EventLog": "8.0.1", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "KiLYDu2k2J82Q9BJpWiuQqCkFjRBWVq4jDzKKWawVi9KWzyD0XG3cmfX0vqTQlL14Wi9EufJrbL0+KCLTbqWiQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "8.0.1", + "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg==" }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1058,11 +1089,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "6.35.0", - "contentHash": "yxGIQd3BFK7F6S62/7RdZk3C/mfwyVxvh6ngd1VYMBmbJ1YZZA9+Ku6suylVtso0FjI0wbElpJ0d27CdsyLpBQ==", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Tokens": "6.35.0" + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" } }, "System.IO.Hashing": { @@ -1082,39 +1113,13 @@ }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", - "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "8.0.0" - } + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -1125,18 +1130,10 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", @@ -1148,30 +1145,15 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==" - }, "System.Text.Json": { "type": "Transitive", "resolved": "4.7.2", "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==" }, - "System.Threading.Tasks.Extensions": { + "System.ValueTuple": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, "ZstdSharp.Port": { "type": "Transitive", @@ -1183,7 +1165,7 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.3.0, )", + "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.4, )", "DistributedLock.Postgres": "[1.3.0, )", @@ -1197,7 +1179,7 @@ "type": "Project", "dependencies": { "Azure.Storage.Blobs": "[12.19.1, )", - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.core": { @@ -1206,62 +1188,62 @@ "distributedlock.filesystem": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )" + "DistributedLock.Core": "[1.0.9, )" } }, "distributedlock.mongodb": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MongoDB.Driver": "[3.5.2, )" } }, "distributedlock.mysql": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "MySqlConnector": "[2.3.5, )" } }, "distributedlock.oracle": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Oracle.ManagedDataAccess.Core": "[23.6.1, )" } }, "distributedlock.postgres": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "Npgsql": "[8.0.6, )" } }, "distributedlock.redis": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "StackExchange.Redis": "[2.7.33, )" } }, "distributedlock.sqlserver": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", - "Microsoft.Data.SqlClient": "[5.2.2, )" + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" } }, "distributedlock.waithandles": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "System.Threading.AccessControl": "[8.0.0, )" } }, "distributedlock.zookeeper": { "type": "Project", "dependencies": { - "DistributedLock.Core": "[1.0.8, )", + "DistributedLock.Core": "[1.0.9, )", "ZooKeeperNetEx": "[3.4.12.4, )" } }, @@ -1277,18 +1259,22 @@ }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Runtime.Caching": "8.0.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1" } }, "MongoDB.Driver": { @@ -1350,13 +1336,8 @@ "net8.0/win7-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", - "resolved": "5.2.0", - "contentHash": "po1jhvFd+8pbfvJR/puh+fkHi0GRanAdvayh/0e47yaM6CXWZ6opUjCMFuYlAnD2LcbyvQE7fPJKvogmaUcN+w==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.3", - "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" }, "Microsoft.Win32.Registry": { "type": "Transitive", @@ -1367,28 +1348,10 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "runtime.any.System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", - "dependencies": { - "System.Private.Uri": "4.3.0" - } - }, - "runtime.any.System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" - }, - "runtime.win7.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" - }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + "resolved": "8.0.1", + "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg==" }, "System.Diagnostics.PerformanceCounter": { "type": "Transitive", @@ -1403,24 +1366,6 @@ "resolved": "8.0.0", "contentHash": "puwJxURHDrYLGTQdsHyeMS72ClTqYa4lDYz6LHSbkZEk5hq8H8JfsO4MyYhB5BMMxg93jsQzLUwrnCumj11UIg==" }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.any.System.Runtime": "4.3.0" - } - }, - "System.Runtime.Caching": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "4TmlmvGp4kzZomm7J2HJn6IIx0UUrQyhBDyb5O1XiunZlQImXW+B8b7W/sTPcXhSf9rp5NR5aDtQllwbB5elOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "8.0.0" - } - }, "System.Security.AccessControl": { "type": "Transitive", "resolved": "5.0.0", @@ -1430,60 +1375,34 @@ "System.Security.Principal.Windows": "5.0.0" } }, - "System.Security.Cryptography.Cng": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A==" - }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Text.Encoding": "4.3.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", - "requested": "[5.2.2, )", - "resolved": "5.2.2", - "contentHash": "mtoeRMh7F/OA536c/Cnh8L4H0uLSKB5kSmoi54oN7Fp0hNJDy22IqyMhaMH4PkDCqI7xL//Fvg9ldtuPHG0h5g==", - "dependencies": { - "Azure.Identity": "1.11.4", - "Microsoft.Data.SqlClient.SNI.runtime": "5.2.0", - "Microsoft.Identity.Client": "4.61.3", - "Microsoft.IdentityModel.JsonWebTokens": "6.35.0", - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", "Microsoft.SqlServer.Server": "1.0.0", - "System.Configuration.ConfigurationManager": "8.0.0", - "System.Runtime.Caching": "8.0.0" - } - }, - "System.Private.Uri": { - "type": "CentralTransitive", - "requested": "[4.3.2, )", - "resolved": "4.3.2", - "contentHash": "o1+7RJnu3Ik3PazR7Z7tJhjPdE000Eq2KGLLWhqJJKXj04wrS8lwb1OFtDF9jzXXADhUuZNJZlPc98uwwqmpFA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.1", - "Microsoft.NETCore.Targets": "1.1.3", - "runtime.win7.System.Private.Uri": "4.3.0" + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1" } }, "System.Threading.AccessControl": { From bb9557f5c47398a8b3b18c7d6b2c76c6e9fb15c1 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 13 Feb 2026 22:31:47 -0500 Subject: [PATCH 384/399] Lengthen internal semaphore wait a bit to increase test stability Fix #264 --- src/DistributedLock.SqlServer/SqlSemaphore.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DistributedLock.SqlServer/SqlSemaphore.cs b/src/DistributedLock.SqlServer/SqlSemaphore.cs index dc085422..7e1d60e5 100644 --- a/src/DistributedLock.SqlServer/SqlSemaphore.cs +++ b/src/DistributedLock.SqlServer/SqlSemaphore.cs @@ -331,7 +331,7 @@ FROM tempdb.sys.tables WITH(NOLOCK) {C/* Prefix search here is important since it uses an index. We don't need escaping because we bound the name to use a fixed character set */} WHERE name LIKE '##' + @{SemaphoreNameParameter} + '%' - {C/* Create the marker table. This table is exists to give others a count of the number of waiting/holding processes. + {C/* Create the marker table. This table exists to give others a count of the number of waiting/holding processes. we name our marker table using the form ##[sem name][spid][separator][value]. We use SPID over a random value since SPID values are typically small integers that recycle over time; this means that we may be able to take advantage of SQL temp table caching. The reason we need SPID here at all is because if another transaction creates and destroys a table of name X, we will be blocked if we try to create table X before the transaction ends. */} @@ -443,11 +443,11 @@ IF APPLOCK_MODE('public', @{TicketLockNameParameter}, @{LockScopeVariable}) = 'N AND (@{LockScopeVariable} = 'Session' OR APPLOCK_MODE('public', @{TicketLockNameParameter}, 'Session') = 'NoLock') BEGIN {C/* "allowOneWait" will be specified when we are in a busy wait loop. To avoid burning CPU we pick the first unheld ticket we come - across and allow that wait to be 32ms instead of 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket + across and allow that wait to be > 0. This is preferable to doing WAITFOR since the wait will be broken if that ticket becomes available. Note that we used to wait just 1ms here. However, in testing that proved flaky in detecting - deadlocks; empirically, 32ms seems to be sufficient to work reliably. The longer wait should also reduce the + deadlocks; empirically, 64ms seems to be sufficient to work reliably. The longer wait should also reduce the CPU load without meaningfully adding delay overhead (SQL_SEMAPHORE_ONE_WAIT) */} - {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 32 ELSE 0 END" : null)} + {(allowOneWait ? "DECLARE @lockTimeoutMillis INT = CASE @anyNotHeld WHEN 0 THEN 64 ELSE 0 END" : null)} SET @anyNotHeld = 1 {( @@ -458,7 +458,7 @@ CPU load without meaningfully adding delay overhead (SQL_SEMAPHORE_ONE_WAIT) */} DECLARE @createIntentMarkerTableSql NVARCHAR(MAX) = 'CREATE TABLE ' + @intentMarkerTableName + ' (_ BIT)' EXEC sp_executeSql @createIntentMarkerTableSql" : null - )} + )} EXEC @{LockResultVariable} = sys.sp_getapplock @{TicketLockNameParameter}, 'Exclusive', @{LockScopeVariable}, {(allowOneWait ? "@lockTimeoutMillis" : "0")} IF @{LockResultVariable} >= 0 @@ -473,7 +473,7 @@ GOTO CODA ? $@"DECLARE @dropIntentMarkerTableSql NVARCHAR(MAX) = 'DROP TABLE ' + @intentMarkerTableName EXEC sp_executeSql @dropIntentMarkerTableSql" : null - )} + )} {C/* on any unexpected lock failure, quit */} IF @{LockResultVariable} < -1 GOTO CODA From 707a04ca26b764a6eac0126573ce412bfaba16d2 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Fri, 13 Feb 2026 22:42:03 -0500 Subject: [PATCH 385/399] Version bump and release notes --- README.md | 4 + src/DistributedLock.Core/packages.lock.json | 24 + .../DistributedLock.Oracle.csproj | 2 +- .../DistributedLock.SqlServer.csproj | 2 +- src/DistributedLock.Tests/packages.lock.json | 763 +++++++++++++++++- src/DistributedLock/DistributedLock.csproj | 2 +- 6 files changed, 792 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a4ecd46a..d0594268 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,10 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes +- 2.8.1 + - Fix connection monitoring query on Oracle. Thanks [@matthew-marston](https://github.com/matthew-marston) for implementing! ([#271](https://github.com/madelson/DistributedLock/issues/271), DistributedLock.Oracle 1.0.5) + - Bump Microsoft.Data.SqlClient version ([#273](https://github.com/madelson/DistributedLock/issues/273), DistributedLock.SqlServer 1.0.7) + - Improve `SqlDistributedSemaphore` deadlock detection ([#264](https://github.com/madelson/DistributedLock/issues/264), DistributedLock.SqlServer 1.0.7) - 2.8.0 - Add MongoDB support! Thanks [@joesdu](https://github.com/joesdu) for implementing! ([#121](https://github.com/madelson/DistributedLock/issues/121), DistributedLock.MongoDB 1.0) - Add composite lock support. Thanks [@moeen](https://github.com/moeen) for implementing! ([#236](https://github.com/madelson/DistributedLock/issues/236), DistributedLock.Core 1.0.9) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index a861f7bd..2f96fece 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -75,6 +81,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -124,6 +136,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -146,6 +164,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.4, )", diff --git a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj index ee509ea1..c203a623 100644 --- a/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj +++ b/src/DistributedLock.Oracle/DistributedLock.Oracle.csproj @@ -11,7 +11,7 @@ - 1.0.4 + 1.0.5 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Oracle Database diff --git a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj index 2b53749a..c7ea2101 100644 --- a/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj +++ b/src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj @@ -11,7 +11,7 @@ - 1.0.6 + 1.0.7 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on SQL Server diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 0f80e634..7aa53ca4 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,765 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", + "dependencies": { + "Microsoft.Identity.Client": "4.78.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.5.2", + "contentHash": "aTlbKclBjXi4j3AkrHiaeuKCvdoGA029VbvXJUmmsCXDz+DEfBFq6n9uOvXJu2YXcJiW9Vay1ZctY5Iu0JRXdw==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Data.Common": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.1.0" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.5, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.1, )", + "DistributedLock.SqlServer": "[1.0.7, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MongoDB.Driver": "[3.5.2, )", + "System.Diagnostics.DiagnosticSource": "[10.0.1, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Npgsql": "[8.0.6, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "StackExchange.Redis": "[2.7.33, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" + } + }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.5.2, )", + "resolved": "3.5.2", + "contentHash": "Z1EW+CI18wOQqyAnhZkQXvUVXycrHoOb8/dlJzPHKFfNp9XPB6sEJJR67GUVYyB03B5xzt1RlwSyLXAx9B5+yQ==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.5.2", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.5", + "System.Threading.Channels": "8.0.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", @@ -479,10 +1238,10 @@ "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", + "DistributedLock.Oracle": "[1.0.5, )", "DistributedLock.Postgres": "[1.3.0, )", "DistributedLock.Redis": "[1.1.1, )", - "DistributedLock.SqlServer": "[1.0.6, )", + "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 82f921dc..7782a09e 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.8.0 + 2.8.1 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 112272851baabfe49ecfb217e513621e05e137a2 Mon Sep 17 00:00:00 2001 From: Joes Date: Fri, 27 Mar 2026 16:06:31 +0800 Subject: [PATCH 386/399] perf(MongoDB): reduce allocations and improve robustness in lock hot paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Cache IMongoCollection reference in constructor instead of calling GetCollection on every TryAcquireAsync invocation - Promote immutable BsonDocument sub-expressions (expiredOrMissing, newFencingToken) to static readonly fields; cache newExpiresAt as an instance field (depends on expiry) to avoid rebuilding ~10 BsonDocument objects per busy-wait iteration - Move TTL index initialization to the start of TryAcquireAsync so it is triggered on every acquisition attempt, not only on success - Cache ownerFilter and renewUpdate in InnerHandle constructor; lease renewal (~every 10 s) no longer allocates new filter/update objects - Wrap ReleaseLockAsync in try-catch so network failures during Dispose do not surface unexpected exceptions to callers (TTL index provides eventual cleanup) - Add internal constructor accepting pre-parsed MongoDistributedLockOptions so MongoDistributedSynchronizationProvider can parse options once and reuse the result across all CreateLock calls - Fix stale comment "foo" → "expiresAt" in CheckIfIndexExists - Upgraded Microsoft.SourceLink.GitHub, Microsoft.Build.Tasks.Git, and Microsoft.SourceLink.Common to version 10.0.201 in DistributedLock.ZooKeeper, DistributedLock, and DistributedLockTaker. - Updated System.IO.Hashing to version 10.0.5 and added its dependencies. - Increased MongoDB.Bson and MongoDB.Driver versions to 3.7.1. - Updated System.Diagnostics.DiagnosticSource to version 10.0.5. - Adjusted DistributedLock.Oracle and DistributedLock.SqlServer versions to 1.0.5 and 1.0.7 respectively. - Made various transitive dependency updates to ensure compatibility and stability. --- src/Directory.Packages.props | 6 +- src/DistributedLock.Azure/packages.lock.json | 112 ++- src/DistributedLock.Core/packages.lock.json | 173 ++-- .../packages.lock.json | 116 ++- .../MongoDistributedLock.cs | 154 ++-- ...MongoDistributedSynchronizationProvider.cs | 4 +- .../MongoIndexInitializer.cs | 16 +- .../packages.lock.json | 149 ++-- src/DistributedLock.MySql/packages.lock.json | 114 +-- src/DistributedLock.Oracle/packages.lock.json | 78 +- .../packages.lock.json | 147 ++-- src/DistributedLock.Redis/packages.lock.json | 122 +-- .../packages.lock.json | 92 ++- src/DistributedLock.Tests/packages.lock.json | 773 +----------------- .../packages.lock.json | 121 ++- .../packages.lock.json | 116 ++- src/DistributedLock/packages.lock.json | 160 ++-- src/DistributedLockTaker/packages.lock.json | 55 +- 18 files changed, 986 insertions(+), 1522 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index b65321ae..9158afbd 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -4,10 +4,10 @@ true - + - + @@ -22,7 +22,7 @@ - + diff --git a/src/DistributedLock.Azure/packages.lock.json b/src/DistributedLock.Azure/packages.lock.json index d1945781..a4c67c2f 100644 --- a/src/DistributedLock.Azure/packages.lock.json +++ b/src/DistributedLock.Azure/packages.lock.json @@ -29,13 +29,9 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" - } + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==" }, "Azure.Core": { "type": "Transitive", @@ -62,21 +58,11 @@ "System.IO.Hashing": "6.0.0" } }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" - }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", "resolved": "1.0.3", "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -243,12 +229,13 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "NETStandard.Library": { @@ -285,8 +272,11 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -295,13 +285,13 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", @@ -314,21 +304,21 @@ }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" } }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Memory.Data": { @@ -342,13 +332,13 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Text.Encodings.Web": { "type": "Transitive", @@ -416,12 +406,13 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "Azure.Core": { @@ -457,26 +448,29 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" } }, "System.Memory": { @@ -535,9 +529,9 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "wVYO4/71Pk177uQ3TG8ZQFS3Pnmr98cF9pYxnpuIb/bMnbEWsdZZoLU/euv29mfSi2/Iuypj0TRUchPk7aqBGg==", + "requested": "[10.0.5, )", + "resolved": "10.0.5", + "contentHash": "CCbzHQ26L3jskdwHh+4bxxW84lUMIrAAmeSlpO69AlrQV0DKbj1/I+feLaLSuZeqXPr9UlSy0OcgZoXOk2a6/g==", "dependencies": { "System.Memory": "4.6.3", "System.Runtime.CompilerServices.Unsafe": "6.1.2" diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..aead9bfa 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,12 +11,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -28,13 +22,9 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" - } + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==" }, "System.ValueTuple": { "type": "Direct", @@ -42,21 +32,11 @@ "resolved": "4.5.0", "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" - }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", "resolved": "1.0.3", "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "4.5.3", @@ -81,20 +61,15 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "NETStandard.Library": { @@ -108,8 +83,11 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -118,13 +96,42 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -136,65 +143,85 @@ } }, ".NETStandard,Version=v2.1": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" } }, "net8.0": { - "Microsoft.CodeAnalysis.PublicApiAnalyzers": { - "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" - }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.24, )", + "resolved": "8.0.24", + "contentHash": "1gnadp//+DoGJvV4AFdzPqYPxkypaWYjYMCr7KAacV0iadsHz1nU+rrkoxBCna4FCmeKH49CisEwa7g94/MbEg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==" } } } diff --git a/src/DistributedLock.FileSystem/packages.lock.json b/src/DistributedLock.FileSystem/packages.lock.json index adc5221f..bdf49de5 100644 --- a/src/DistributedLock.FileSystem/packages.lock.json +++ b/src/DistributedLock.FileSystem/packages.lock.json @@ -19,13 +19,9 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", - "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" - } + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==" }, "Nullable": { "type": "Direct", @@ -33,21 +29,11 @@ "resolved": "1.3.1", "contentHash": "Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==" }, - "Microsoft.Build.Tasks.Git": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" - }, "Microsoft.NETFramework.ReferenceAssemblies.net462": { "type": "Transitive", "resolved": "1.0.3", "contentHash": "IzAV30z22ESCeQfxP29oVf4qEo8fBGXLXSU6oacv/9Iqe6PzgHDKCaWfwMBak7bSJQM0F5boXWoZS+kChztRIQ==" }, - "Microsoft.SourceLink.Common": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" - }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "4.5.3", @@ -93,12 +79,13 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "NETStandard.Library": { @@ -118,8 +105,11 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -128,13 +118,42 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Threading.Tasks.Extensions": { "type": "Transitive", @@ -169,23 +188,46 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "requested": "[10.0.201, )", + "resolved": "10.0.201", + "contentHash": "qxYAmO4ktzd9L+HMdnqWucxpu7bI9undPyACXOMqPyhaiMtbpbYL/n0ACyWIJlbyEJrXFwxiOaBOSasLtDvsCg==", "dependencies": { - "Microsoft.Build.Tasks.Git": "8.0.0", - "Microsoft.SourceLink.Common": "8.0.0" + "Microsoft.Build.Tasks.Git": "10.0.201", + "Microsoft.SourceLink.Common": "10.0.201", + "System.IO.Hashing": "10.0.5" } }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + "resolved": "10.0.201", + "contentHash": "DMYBnrFZvLnBKn14VavEuuIr31CY6YY2i2L9P8DorS/Qp6ifRR8ZPLdJCFLFfjikNq8DykbYyLd/RP6lSqHcWw==", + "dependencies": { + "System.IO.Hashing": "10.0.5" + } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + "resolved": "10.0.201", + "contentHash": "QbBYhkjgL6rCnBfDbzsAJLlsad13TlBHqYCFDIw56OO2g6ix+9RsmY8uxiQGdWwFKbZXaXyAA6jDCzFYVGCZDw==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "10.0.5", + "contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Memory": "4.6.3" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==" }, "distributedlock.core": { "type": "Project" diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 536766cd..f485e697 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -1,7 +1,6 @@ using Medallion.Threading.Internal; using MongoDB.Bson; using MongoDB.Driver; -using System.Collections.Concurrent; using System.Diagnostics; namespace Medallion.Threading.MongoDB; @@ -22,8 +21,29 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock _collection; + + // Cached immutable BsonDocument sub-expressions to reduce GC pressure on hot paths + private static readonly BsonDocument ExpiredOrMissingExpr = new( + "$lte", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime(EpochUtc) }), + "$$NOW" + } + ); + + private static readonly BsonDocument NewFencingTokenExpr = new( + "$add", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { "$fencingToken", 0L }), + 1L + } + ); + + private readonly BsonDocument _newExpiresAtExpr; /// /// The MongoDB key used to implement the lock @@ -47,14 +67,27 @@ public MongoDistributedLock(string key, IMongoDatabase database, Action. /// public MongoDistributedLock(string key, IMongoDatabase database, string collectionName, Action? options = null) + : this(key, database, collectionName, MongoDistributedSynchronizationOptionsBuilder.GetOptions(options)) { } + + internal MongoDistributedLock(string key, IMongoDatabase database, string collectionName, MongoDistributedLockOptions options) { - this._database = database ?? throw new ArgumentNullException(nameof(database)); + var database1 = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); // From what I can tell, modern (and all supported) MongoDB versions have no limits on index keys or // _id lengths other than the 16MB document limit. This is so high that providing "safe name" functionality as a fallback doesn't // see worth it. this.Key = key ?? throw new ArgumentNullException(nameof(key)); - this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); + this._options = options; + this._collection = database1.GetCollection(this._collectionName); + this._newExpiresAtExpr = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", "$$NOW" }, + { "unit", "millisecond" }, + { "amount", this._options.Expiry.InMilliseconds } + } + ); } ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => @@ -71,16 +104,18 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti activity?.SetTag("lock.key", this.Key); activity?.SetTag("lock.collection", this._collectionName); - var collection = this._database.GetCollection(this._collectionName); + // Ensure TTL index exists (fire-and-forget, idempotent). Triggered on every attempt + // so that cleanup is set up even when all acquisition attempts fail. + _ = IndexInitializer.InitializeTtlIndex(this._collection); // Use a unique token per acquisition attempt (like Redis' value token) var lockId = Guid.NewGuid().ToString("N"); - + // We avoid exception-driven contention (DuplicateKey) by using a single upsert on {_id == Key} // and an update pipeline that only overwrites fields when the existing lock is expired. // This is conceptually similar to Redis: SET key value NX PX . var filter = Builders.Filter.Eq(d => d.Id, this.Key); - var update = CreateAcquireUpdate(lockId, this._options.Expiry); + var update = this.CreateAcquireUpdate(lockId); var options = new FindOneAndUpdateOptions { IsUpsert = true, @@ -88,64 +123,33 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti }; var result = SyncViaAsync.IsSynchronous - ? collection.FindOneAndUpdate(filter, update, options, cancellationToken) - : await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + ? this._collection.FindOneAndUpdate(filter, update, options, cancellationToken) + : await this._collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); // Verify we actually got the lock if (result?.LockId == lockId) { - _ = IndexInitializer.InitializeTtlIndex(collection); activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); - return new(new(this, lockId, collection), result.FencingToken); + return new(new(this, lockId, this._collection), result.FencingToken); } activity?.SetTag("lock.acquired", false); return null; } - private static UpdateDefinition CreateAcquireUpdate(string lockId, TimeoutValue expiry) + private UpdateDefinition CreateAcquireUpdate(string lockId) { - Invariant.Require(!expiry.IsInfinite); - - // expired := ifNull(expiresAt, epoch) <= $$NOW - var expiredOrMissing = new BsonDocument( - "$lte", - new BsonArray - { - new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime(EpochUtc) }), - "$$NOW" - } - ); - - var newExpiresAt = new BsonDocument( - "$dateAdd", - new BsonDocument - { - { "startDate", "$$NOW" }, - { "unit", "millisecond" }, - { "amount", expiry.InMilliseconds } - } - ); - - // Increment fencing token only when acquiring a new lock - var newFencingToken = new BsonDocument( - "$add", - new BsonArray - { - new BsonDocument("$ifNull", new BsonArray { "$fencingToken", 0L }), - 1L - } - ); - + // ExpiredOrMissingExpr, _newExpiresAtExpr, and NewFencingTokenExpr are pre-cached + // immutable BsonDocuments to reduce allocations on the busy-wait hot path. var setStage = new BsonDocument( "$set", new BsonDocument { // Only overwrite lock fields when the previous lock is expired/missing - { nameof(lockId), new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, "$lockId" }) }, - { "expiresAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newExpiresAt, "$expiresAt" }) }, - { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, "$$NOW", "$acquiredAt" }) }, - { "fencingToken", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newFencingToken, "$fencingToken" }) } + { nameof(lockId), new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, lockId, "$lockId" }) }, + { "expiresAt", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, this._newExpiresAtExpr, "$expiresAt" }) }, + { "acquiredAt", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, "$$NOW", "$acquiredAt" }) }, + { "fencingToken", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, NewFencingTokenExpr, "$fencingToken" }) } } ); @@ -159,10 +163,13 @@ private static UpdateDefinition CreateAcquireUpdate(string lo internal sealed class InnerHandle : IAsyncDisposable, LeaseMonitor.ILeaseHandle { private readonly MongoDistributedLock _lock; - private readonly string _lockId; private readonly IMongoCollection _collection; private readonly LeaseMonitor _monitor; - + + // Cached filter and update definitions to avoid repeated allocations during renewal cycles + private readonly FilterDefinition _ownerFilter; + private readonly PipelineUpdateDefinition _renewUpdate; + public CancellationToken HandleLostToken => this._monitor.HandleLostToken; TimeoutValue LeaseMonitor.ILeaseHandle.LeaseDuration => this._lock._options.Expiry; @@ -171,8 +178,17 @@ internal sealed class InnerHandle : IAsyncDisposable, LeaseMonitor.ILeaseHandle public InnerHandle(MongoDistributedLock @lock, string lockId, IMongoCollection collection) { this._lock = @lock; - this._lockId = lockId; this._collection = collection; + + // Cache the filter that identifies this specific lock ownership + this._ownerFilter = Builders.Filter.Eq(d => d.Id, @lock.Key) + & Builders.Filter.Eq(d => d.LockId, lockId); + + // Cache the renewal update pipeline (expiry is fixed for the lock's lifetime) + this._renewUpdate = new PipelineUpdateDefinition( + new[] { new BsonDocument("$set", new BsonDocument("expiresAt", @lock._newExpiresAtExpr)) } + ); + // important to set this last, since the monitor constructor will read other fields of this this._monitor = new(this); } @@ -185,36 +201,28 @@ public async ValueTask DisposeAsync() private async ValueTask ReleaseLockAsync() { - var filter = Builders.Filter.Eq(d => d.Id, this._lock.Key) & Builders.Filter.Eq(d => d.LockId, this._lockId); - if (SyncViaAsync.IsSynchronous) + try { - this._collection.DeleteOne(filter); + if (SyncViaAsync.IsSynchronous) + { + // ReSharper disable once MethodHasAsyncOverload + this._collection.DeleteOne(this._ownerFilter); + } + else + { + await this._collection.DeleteOneAsync(this._ownerFilter, this.HandleLostToken).ConfigureAwait(false); + } } - else + catch (Exception) { - await this._collection.DeleteOneAsync(filter).ConfigureAwait(false); + // Release failure is non-fatal: the TTL index will eventually clean up expired documents. + // Swallowing exceptions here prevents surprising callers during Dispose. } } async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) { - var filter = Builders.Filter.Eq(d => d.Id, this._lock.Key) & Builders.Filter.Eq(d => d.LockId, this._lockId); - - // Use server time ($$NOW) for expiry to avoid client clock skew. - var newExpiresAt = new BsonDocument( - "$dateAdd", - new BsonDocument - { - { "startDate", "$$NOW" }, - { "unit", "millisecond" }, - { "amount", this._lock._options.Expiry.InMilliseconds } - } - ); - var update = new PipelineUpdateDefinition( - new[] { new BsonDocument("$set", new BsonDocument("expiresAt", newExpiresAt)) } - ); - - var result = await this._collection.UpdateOneAsync(filter, update, cancellationToken: cancellationToken).ConfigureAwait(false); + var result = await this._collection.UpdateOneAsync(this._ownerFilter, this._renewUpdate, cancellationToken: cancellationToken).ConfigureAwait(false); return result.MatchedCount > 0 ? LeaseMonitor.LeaseState.Renewed : LeaseMonitor.LeaseState.Lost; } } diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs index 05a00035..32a8ec67 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs @@ -9,7 +9,7 @@ public sealed class MongoDistributedSynchronizationProvider : IDistributedLockPr { private readonly string _collectionName; private readonly IMongoDatabase _database; - private readonly Action? _options; + private readonly MongoDistributedLockOptions _options; /// /// Constructs a that connects to the provided @@ -26,7 +26,7 @@ public MongoDistributedSynchronizationProvider(IMongoDatabase database, string c { this._database = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - this._options = options; + this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); } /// diff --git a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs index 8a799fd8..021c2bba 100644 --- a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs +++ b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs @@ -1,8 +1,9 @@ -using MongoDB.Driver; +using MongoDB.Driver; using System.Collections.Concurrent; namespace Medallion.Threading.MongoDB; +// ReSharper disable once ClassWithVirtualMembersNeverInherited.Global internal class MongoIndexInitializer { private const string IndexName = "expiresAt_ttl"; @@ -40,7 +41,7 @@ public Task InitializeTtlIndex(IMongoCollection collection) private async Task CreateIndexIfNotExistsWrapperAsync(IMongoCollection collection) { - if (await this.CreateIndexIfNotExistsAsync(collection).ConfigureAwait(false) is { } result) + if (await CreateIndexIfNotExistsAsync(collection).ConfigureAwait(false) is { } result) { return result; } @@ -54,7 +55,7 @@ public Task InitializeTtlIndex(IMongoCollection collection) // exposed for mocking internal virtual Task DelayBeforeRetry() => Task.Delay(TimeSpan.FromMinutes(1)); - private async Task CreateIndexIfNotExistsAsync(IMongoCollection collection) + private static async Task CreateIndexIfNotExistsAsync(IMongoCollection collection) { using var activity = MongoDistributedLock.ActivitySource.StartActivity(nameof(MongoIndexInitializer) + ".CreateIndexIfNotExists"); activity?.AddTag("collection", collection.CollectionNamespace.FullName); @@ -122,12 +123,13 @@ internal static async Task CheckIfIndexExists(IMongoCollection Date: Fri, 27 Mar 2026 16:21:43 +0800 Subject: [PATCH 387/399] fix(MongoDB): change collection field to Lazy> for improved initialization --- .../MongoDistributedLock.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index f485e697..ec44a0b8 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -22,7 +22,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock _collection; + private readonly Lazy> _collection; // Cached immutable BsonDocument sub-expressions to reduce GC pressure on hot paths private static readonly BsonDocument ExpiredOrMissingExpr = new( @@ -78,7 +78,7 @@ internal MongoDistributedLock(string key, IMongoDatabase database, string collec // see worth it. this.Key = key ?? throw new ArgumentNullException(nameof(key)); this._options = options; - this._collection = database1.GetCollection(this._collectionName); + this._collection = new(() => database1.GetCollection(this._collectionName)); this._newExpiresAtExpr = new BsonDocument( "$dateAdd", new BsonDocument @@ -104,13 +104,11 @@ internal MongoDistributedLock(string key, IMongoDatabase database, string collec activity?.SetTag("lock.key", this.Key); activity?.SetTag("lock.collection", this._collectionName); - // Ensure TTL index exists (fire-and-forget, idempotent). Triggered on every attempt - // so that cleanup is set up even when all acquisition attempts fail. - _ = IndexInitializer.InitializeTtlIndex(this._collection); - // Use a unique token per acquisition attempt (like Redis' value token) var lockId = Guid.NewGuid().ToString("N"); + var collection = this._collection.Value; + // We avoid exception-driven contention (DuplicateKey) by using a single upsert on {_id == Key} // and an update pipeline that only overwrites fields when the existing lock is expired. // This is conceptually similar to Redis: SET key value NX PX . @@ -123,15 +121,18 @@ internal MongoDistributedLock(string key, IMongoDatabase database, string collec }; var result = SyncViaAsync.IsSynchronous - ? this._collection.FindOneAndUpdate(filter, update, options, cancellationToken) - : await this._collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); + ? collection.FindOneAndUpdate(filter, update, options, cancellationToken) + : await collection.FindOneAndUpdateAsync(filter, update, options, cancellationToken).ConfigureAwait(false); // Verify we actually got the lock if (result?.LockId == lockId) { + // Fire-and-forget TTL index creation only on successful acquire to avoid + // unnecessary DB calls when the lock is contended. + _ = IndexInitializer.InitializeTtlIndex(collection); activity?.SetTag("lock.acquired", true); activity?.SetTag("lock.fencing_token", result.FencingToken); - return new(new(this, lockId, this._collection), result.FencingToken); + return new(new(this, lockId, collection), result.FencingToken); } activity?.SetTag("lock.acquired", false); return null; From 4c3da54ed22bc85fbf266f2f3a863644ad2efd0a Mon Sep 17 00:00:00 2001 From: Joes Date: Fri, 27 Mar 2026 16:27:02 +0800 Subject: [PATCH 388/399] refactor(MongoDB): improve code clarity and exception handling in MongoDistributedLock --- src/DistributedLock.MongoDB/MongoDistributedLock.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index ec44a0b8..8be431fb 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -24,7 +24,8 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock> _collection; - // Cached immutable BsonDocument sub-expressions to reduce GC pressure on hot paths + // Shared read-only BsonDocument sub-expressions cached to reduce GC pressure on hot paths. + // BsonDocument is mutable; these instances must never be modified after initialization. private static readonly BsonDocument ExpiredOrMissingExpr = new( "$lte", new BsonArray @@ -71,14 +72,14 @@ public MongoDistributedLock(string key, IMongoDatabase database, string collecti internal MongoDistributedLock(string key, IMongoDatabase database, string collectionName, MongoDistributedLockOptions options) { - var database1 = database ?? throw new ArgumentNullException(nameof(database)); + var validatedDatabase = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); // From what I can tell, modern (and all supported) MongoDB versions have no limits on index keys or // _id lengths other than the 16MB document limit. This is so high that providing "safe name" functionality as a fallback doesn't // see worth it. this.Key = key ?? throw new ArgumentNullException(nameof(key)); this._options = options; - this._collection = new(() => database1.GetCollection(this._collectionName)); + this._collection = new(() => validatedDatabase.GetCollection(this._collectionName)); this._newExpiresAtExpr = new BsonDocument( "$dateAdd", new BsonDocument @@ -214,10 +215,11 @@ private async ValueTask ReleaseLockAsync() await this._collection.DeleteOneAsync(this._ownerFilter, this.HandleLostToken).ConfigureAwait(false); } } - catch (Exception) + catch (Exception ex) when (ex is MongoException or TimeoutException or OperationCanceledException) { // Release failure is non-fatal: the TTL index will eventually clean up expired documents. - // Swallowing exceptions here prevents surprising callers during Dispose. + // Swallowing only expected network/write/cancellation failures prevents surprising callers + // during Dispose without hiding programming errors (e.g. ArgumentException). } } From b6e8275b42b8bd451f553823c66a79f2cdaf45ad Mon Sep 17 00:00:00 2001 From: Joes Date: Fri, 27 Mar 2026 16:33:29 +0800 Subject: [PATCH 389/399] fix(MongoDB): avoid using disposed CancellationTokenSource in DeleteOneAsync --- src/DistributedLock.MongoDB/MongoDistributedLock.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 8be431fb..272802d8 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -212,7 +212,9 @@ private async ValueTask ReleaseLockAsync() } else { - await this._collection.DeleteOneAsync(this._ownerFilter, this.HandleLostToken).ConfigureAwait(false); + // Do not use HandleLostToken here: the monitor (and its CancellationTokenSource) is + // already disposed before ReleaseLockAsync is called from DisposeAsync. + await this._collection.DeleteOneAsync(this._ownerFilter, CancellationToken.None).ConfigureAwait(false); } } catch (Exception ex) when (ex is MongoException or TimeoutException or OperationCanceledException) From 3d1f3f804a4108b9bdd2823e8675a71e6ce1b252 Mon Sep 17 00:00:00 2001 From: Joes Date: Tue, 31 Mar 2026 10:43:55 +0800 Subject: [PATCH 390/399] refactor(MongoDB): streamline BsonDocument usage and improve index checks in MongoIndexInitializer --- .../MongoDistributedLock.cs | 143 ++++++++++-------- ...MongoDistributedSynchronizationProvider.cs | 4 +- .../MongoIndexInitializer.cs | 12 +- 3 files changed, 87 insertions(+), 72 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 272802d8..0061e305 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -20,32 +20,19 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock internal static readonly ActivitySource ActivitySource = new("DistributedLock.MongoDB", "1.0.0"); + // Safe static caches: BsonDateTime and BsonValue wrappers are immutable, + // so they can be safely shared across threads and driver calls without risk of mutation. + private static readonly BsonDateTime EpochBsonDateTime = new(EpochUtc); + private static readonly BsonValue ExpiresAtFieldRef = "$expiresAt"; + private static readonly BsonValue AcquiredAtFieldRef = "$acquiredAt"; + private static readonly BsonValue FencingTokenFieldRef = "$fencingToken"; + private static readonly BsonValue LockIdFieldRef = "$lockId"; + private static readonly BsonValue NowRef = "$$NOW"; + private readonly string _collectionName; private readonly MongoDistributedLockOptions _options; private readonly Lazy> _collection; - // Shared read-only BsonDocument sub-expressions cached to reduce GC pressure on hot paths. - // BsonDocument is mutable; these instances must never be modified after initialization. - private static readonly BsonDocument ExpiredOrMissingExpr = new( - "$lte", - new BsonArray - { - new BsonDocument("$ifNull", new BsonArray { "$expiresAt", new BsonDateTime(EpochUtc) }), - "$$NOW" - } - ); - - private static readonly BsonDocument NewFencingTokenExpr = new( - "$add", - new BsonArray - { - new BsonDocument("$ifNull", new BsonArray { "$fencingToken", 0L }), - 1L - } - ); - - private readonly BsonDocument _newExpiresAtExpr; - /// /// The MongoDB key used to implement the lock /// @@ -80,15 +67,6 @@ internal MongoDistributedLock(string key, IMongoDatabase database, string collec this.Key = key ?? throw new ArgumentNullException(nameof(key)); this._options = options; this._collection = new(() => validatedDatabase.GetCollection(this._collectionName)); - this._newExpiresAtExpr = new BsonDocument( - "$dateAdd", - new BsonDocument - { - { "startDate", "$$NOW" }, - { "unit", "millisecond" }, - { "amount", this._options.Expiry.InMilliseconds } - } - ); } ValueTask IInternalDistributedLock.InternalTryAcquireAsync(TimeoutValue timeout, CancellationToken cancellationToken) => @@ -141,17 +119,47 @@ internal MongoDistributedLock(string key, IMongoDatabase database, string collec private UpdateDefinition CreateAcquireUpdate(string lockId) { - // ExpiredOrMissingExpr, _newExpiresAtExpr, and NewFencingTokenExpr are pre-cached - // immutable BsonDocuments to reduce allocations on the busy-wait hot path. + Invariant.Require(!this._options.Expiry.IsInfinite); + + // expired := ifNull(expiresAt, epoch) <= $$NOW + var expiredOrMissing = new BsonDocument( + "$lte", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { ExpiresAtFieldRef, EpochBsonDateTime }), + NowRef + } + ); + + var newExpiresAt = new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", NowRef }, + { "unit", "millisecond" }, + { "amount", this._options.Expiry.InMilliseconds } + } + ); + + // Increment fencing token only when acquiring a new lock + var newFencingToken = new BsonDocument( + "$add", + new BsonArray + { + new BsonDocument("$ifNull", new BsonArray { FencingTokenFieldRef, 0L }), + 1L + } + ); + var setStage = new BsonDocument( "$set", new BsonDocument { // Only overwrite lock fields when the previous lock is expired/missing - { nameof(lockId), new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, lockId, "$lockId" }) }, - { "expiresAt", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, this._newExpiresAtExpr, "$expiresAt" }) }, - { "acquiredAt", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, "$$NOW", "$acquiredAt" }) }, - { "fencingToken", new BsonDocument("$cond", new BsonArray { ExpiredOrMissingExpr, NewFencingTokenExpr, "$fencingToken" }) } + { nameof(lockId), new BsonDocument("$cond", new BsonArray { expiredOrMissing, lockId, LockIdFieldRef }) }, + { "expiresAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newExpiresAt, ExpiresAtFieldRef }) }, + { "acquiredAt", new BsonDocument("$cond", new BsonArray { expiredOrMissing, NowRef, AcquiredAtFieldRef }) }, + { "fencingToken", new BsonDocument("$cond", new BsonArray { expiredOrMissing, newFencingToken, FencingTokenFieldRef }) } } ); @@ -168,9 +176,10 @@ internal sealed class InnerHandle : IAsyncDisposable, LeaseMonitor.ILeaseHandle private readonly IMongoCollection _collection; private readonly LeaseMonitor _monitor; - // Cached filter and update definitions to avoid repeated allocations during renewal cycles + // Cached filter to avoid repeated allocations during renewal and release private readonly FilterDefinition _ownerFilter; - private readonly PipelineUpdateDefinition _renewUpdate; + // Lazily initialized: most locks are released quickly and never need renewal + private PipelineUpdateDefinition? _renewUpdate; public CancellationToken HandleLostToken => this._monitor.HandleLostToken; @@ -186,49 +195,57 @@ public InnerHandle(MongoDistributedLock @lock, string lockId, IMongoCollection.Filter.Eq(d => d.Id, @lock.Key) & Builders.Filter.Eq(d => d.LockId, lockId); - // Cache the renewal update pipeline (expiry is fixed for the lock's lifetime) - this._renewUpdate = new PipelineUpdateDefinition( - new[] { new BsonDocument("$set", new BsonDocument("expiresAt", @lock._newExpiresAtExpr)) } - ); - // important to set this last, since the monitor constructor will read other fields of this this._monitor = new(this); } public async ValueTask DisposeAsync() { - try { await this._monitor.DisposeAsync().ConfigureAwait(false); } - finally { await this.ReleaseLockAsync().ConfigureAwait(false); } + try + { + await this._monitor.DisposeAsync().ConfigureAwait(false); + } + finally + { + await this.ReleaseLockAsync().ConfigureAwait(false); + } } private async ValueTask ReleaseLockAsync() { - try + if (SyncViaAsync.IsSynchronous) { - if (SyncViaAsync.IsSynchronous) - { - // ReSharper disable once MethodHasAsyncOverload - this._collection.DeleteOne(this._ownerFilter); - } - else - { - // Do not use HandleLostToken here: the monitor (and its CancellationTokenSource) is - // already disposed before ReleaseLockAsync is called from DisposeAsync. - await this._collection.DeleteOneAsync(this._ownerFilter, CancellationToken.None).ConfigureAwait(false); - } + // ReSharper disable once MethodHasAsyncOverload + this._collection.DeleteOne(this._ownerFilter); } - catch (Exception ex) when (ex is MongoException or TimeoutException or OperationCanceledException) + else { - // Release failure is non-fatal: the TTL index will eventually clean up expired documents. - // Swallowing only expected network/write/cancellation failures prevents surprising callers - // during Dispose without hiding programming errors (e.g. ArgumentException). + // Do not use HandleLostToken here: the monitor (and its CancellationTokenSource) is + // already disposed before ReleaseLockAsync is called from DisposeAsync. + await this._collection.DeleteOneAsync(this._ownerFilter, CancellationToken.None).ConfigureAwait(false); } } async Task LeaseMonitor.ILeaseHandle.RenewOrValidateLeaseAsync(CancellationToken cancellationToken) { + // Lazily create the renewal update on first use to avoid allocations for short-lived locks + this._renewUpdate ??= new PipelineUpdateDefinition( + new[] + { + new BsonDocument("$set", new BsonDocument("expiresAt", new BsonDocument( + "$dateAdd", + new BsonDocument + { + { "startDate", NowRef }, + { "unit", "millisecond" }, + { "amount", this._lock._options.Expiry.InMilliseconds } + } + ))) + } + ); + var result = await this._collection.UpdateOneAsync(this._ownerFilter, this._renewUpdate, cancellationToken: cancellationToken).ConfigureAwait(false); return result.MatchedCount > 0 ? LeaseMonitor.LeaseState.Renewed : LeaseMonitor.LeaseState.Lost; } } -} \ No newline at end of file +} diff --git a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs index 32a8ec67..05a00035 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedSynchronizationProvider.cs @@ -9,7 +9,7 @@ public sealed class MongoDistributedSynchronizationProvider : IDistributedLockPr { private readonly string _collectionName; private readonly IMongoDatabase _database; - private readonly MongoDistributedLockOptions _options; + private readonly Action? _options; /// /// Constructs a that connects to the provided @@ -26,7 +26,7 @@ public MongoDistributedSynchronizationProvider(IMongoDatabase database, string c { this._database = database ?? throw new ArgumentNullException(nameof(database)); this._collectionName = collectionName ?? throw new ArgumentNullException(nameof(collectionName)); - this._options = MongoDistributedSynchronizationOptionsBuilder.GetOptions(options); + this._options = options; } /// diff --git a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs index 021c2bba..f5a3704d 100644 --- a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs +++ b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs @@ -120,16 +120,14 @@ internal static async Task CheckIfIndexExists(IMongoCollection Date: Tue, 31 Mar 2026 10:48:58 +0800 Subject: [PATCH 391/399] refactor(MongoDB): remove unnecessary ReSharper directive in MongoIndexInitializer --- src/DistributedLock.MongoDB/MongoIndexInitializer.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs index f5a3704d..cf3089e5 100644 --- a/src/DistributedLock.MongoDB/MongoIndexInitializer.cs +++ b/src/DistributedLock.MongoDB/MongoIndexInitializer.cs @@ -3,7 +3,6 @@ namespace Medallion.Threading.MongoDB; -// ReSharper disable once ClassWithVirtualMembersNeverInherited.Global internal class MongoIndexInitializer { private const string IndexName = "expiresAt_ttl"; @@ -121,7 +120,6 @@ internal static async Task CheckIfIndexExists(IMongoCollection Date: Thu, 4 Jun 2026 22:02:55 -0400 Subject: [PATCH 392/399] Avoid lock parsing Fix #277 --- src/DistributedLock.Core/packages.lock.json | 6 +++--- .../packages.lock.json | 6 +++--- .../PostgresAdvisoryLock.cs | 19 ++++++++++--------- .../packages.lock.json | 6 +++--- .../Postgres/PostgresDistributedLockTest.cs | 11 ++++++----- src/DistributedLockTaker/packages.lock.json | 18 +++++++++--------- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 2f96fece..f96ce941 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -172,9 +172,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.26, )", + "resolved": "8.0.26", + "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index abc52f88..a0b0784f 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -401,9 +401,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.26, )", + "resolved": "8.0.26", + "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index 6601b8b3..fbe623a4 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -208,7 +208,7 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post var statementTimeout = await GetCurrentSetting("statement_timeout", connection, cancellationToken).ConfigureAwait(false); var lockTimeout = await GetCurrentSetting("lock_timeout", connection, cancellationToken).ConfigureAwait(false); - var capturedTimeoutSettings = new CapturedTimeoutSettings(statementTimeout!, lockTimeout!); + CapturedTimeoutSettings capturedTimeoutSettings = new(statementTimeout!, lockTimeout!); return capturedTimeoutSettings; @@ -258,8 +258,8 @@ private static async ValueTask RestoreTimeoutSettingsIfNeededAsync(CapturedTimeo using var restoreTimeoutSettingsCommand = connection.CreateCommand(); StringBuilder commandText = new(); - commandText.AppendLine($"SET LOCAL statement_timeout = {settings.Value.StatementTimeout};"); - commandText.AppendLine($"SET LOCAL lock_timeout = {settings.Value.LockTimeout};"); + commandText.AppendLine($"SET LOCAL statement_timeout = '{settings.Value.StatementTimeout}';"); + commandText.AppendLine($"SET LOCAL lock_timeout = '{settings.Value.LockTimeout}';"); restoreTimeoutSettingsCommand.SetCommandText(commandText.ToString()); @@ -334,13 +334,14 @@ private static string AddPGLocksFilterParametersAndGetFilterExpression(DatabaseC private readonly struct CapturedTimeoutSettings(string statementTimeout, string lockTimeout) { - public int StatementTimeout { get; } = ParsePostgresTimeout(statementTimeout); + public string StatementTimeout { get; } = ValidatePostgresTimeout(statementTimeout); - public int LockTimeout { get; } = ParsePostgresTimeout(lockTimeout); + public string LockTimeout { get; } = ValidatePostgresTimeout(lockTimeout); - private static int ParsePostgresTimeout(string timeout) => - Regex.Match(timeout, @"^\d+(?=(?:ms)?$)") is { Success: true, Value: var value } - ? int.Parse(value) - : throw new FormatException($"Unexpected timeout setting value '{timeout}'"); + private static string ValidatePostgresTimeout(string timeout) => + // make sure it's safe to use as a SQL literal + timeout.IndexOfAny(['\'', '\\']) >= 0 + ? throw new FormatException($"Unexpected timeout setting value '{timeout}'") + : timeout; } } diff --git a/src/DistributedLock.Postgres/packages.lock.json b/src/DistributedLock.Postgres/packages.lock.json index 0cd0e4f3..e2227d30 100644 --- a/src/DistributedLock.Postgres/packages.lock.json +++ b/src/DistributedLock.Postgres/packages.lock.json @@ -509,9 +509,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.26, )", + "resolved": "8.0.26", + "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs index 6be0e764..e8802b8b 100644 --- a/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs +++ b/src/DistributedLock.Tests/Tests/Postgres/PostgresDistributedLockTest.cs @@ -78,7 +78,8 @@ public async Task TestWorksWithInternalTransaction() } [Test] - public async Task TestWorksWithAmbientTransaction() + public async Task TestWorksWithAmbientTransaction( + [Values("1010ms", "1d", "5min", "20h", "3s")] string timeout) { using var connection = new NpgsqlConnection(TestingPostgresDb.DefaultConnectionString); await connection.OpenAsync(); @@ -92,24 +93,24 @@ public async Task TestWorksWithAmbientTransaction() using var transactionCommand = connection.CreateCommand(); transactionCommand.Transaction = transaction; - transactionCommand.CommandText = "SET LOCAL statement_timeout = 1010"; + transactionCommand.CommandText = $"SET LOCAL statement_timeout = '{timeout}'"; await transactionCommand.ExecuteNonQueryAsync(); using (var timedOutHandle = await connectionLock.TryAcquireAsync(TimeSpan.FromSeconds(.2))) { - (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual(timeout); Assert.That(timedOutHandle, Is.Null); } - (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual(timeout); var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(.3)); var task = connectionLock.AcquireAsync(cancellationToken: cancellationTokenSource.Token).AsTask(); task.ContinueWith(_ => { }).Wait(TimeSpan.FromSeconds(5)).ShouldEqual(true); task.Status.ShouldEqual(TaskStatus.Canceled); - (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual("1010ms"); + (await GetTimeoutAsync("statement_timeout", transactionCommand)).ShouldEqual(timeout); } using var connectionCommand = connection.CreateCommand(); diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index 4de3adc4..c25b8477 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -499,10 +499,10 @@ "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", + "DistributedLock.Oracle": "[1.0.5, )", "DistributedLock.Postgres": "[1.3.0, )", "DistributedLock.Redis": "[1.1.1, )", - "DistributedLock.SqlServer": "[1.0.6, )", + "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -701,7 +701,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - ".NETFramework,Version=v4.7.2/win7-x86": { + ".NETFramework,Version=v4.7.2/win-x86": { "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -816,9 +816,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.4, )", - "resolved": "8.0.4", - "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw==" + "requested": "[8.0.26, )", + "resolved": "8.0.26", + "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" }, "Azure.Core": { "type": "Transitive", @@ -1167,10 +1167,10 @@ "DistributedLock.FileSystem": "[1.0.3, )", "DistributedLock.MongoDB": "[1.0.0, )", "DistributedLock.MySql": "[1.0.2, )", - "DistributedLock.Oracle": "[1.0.4, )", + "DistributedLock.Oracle": "[1.0.5, )", "DistributedLock.Postgres": "[1.3.0, )", "DistributedLock.Redis": "[1.1.1, )", - "DistributedLock.SqlServer": "[1.0.6, )", + "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", "DistributedLock.ZooKeeper": "[1.0.0, )" } @@ -1333,7 +1333,7 @@ "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" } }, - "net8.0/win7-x86": { + "net8.0/win-x86": { "Microsoft.Data.SqlClient.SNI.runtime": { "type": "Transitive", "resolved": "6.0.2", From 3b7dd79b651b33fd80086fdfc363ee5d6ccb0844 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 9 Jun 2026 19:21:17 -0400 Subject: [PATCH 393/399] Simplify postgres get settings commands --- .../PostgresAdvisoryLock.cs | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs index fbe623a4..c5093bf6 100644 --- a/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs +++ b/src/DistributedLock.Postgres/PostgresAdvisoryLock.cs @@ -205,21 +205,13 @@ private DatabaseCommand CreateAcquireCommand(DatabaseConnection connection, Post // Return null in case we won't try to acquire an externally-owned transaction-scoped lock. if (!shouldCaptureTimeoutSettings) { return null; } - var statementTimeout = await GetCurrentSetting("statement_timeout", connection, cancellationToken).ConfigureAwait(false); - var lockTimeout = await GetCurrentSetting("lock_timeout", connection, cancellationToken).ConfigureAwait(false); - - CapturedTimeoutSettings capturedTimeoutSettings = new(statementTimeout!, lockTimeout!); - - return capturedTimeoutSettings; - - async ValueTask GetCurrentSetting(string settingName, DatabaseConnection connection, CancellationToken cancellationToken) - { - using var getCurrentSettingCommand = connection.CreateCommand(); - - getCurrentSettingCommand.SetCommandText($"SELECT current_setting('{settingName}', 'true') AS {settingName};"); - - return (string?)await getCurrentSettingCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false); - } + using var getCurrentSettingCommand = connection.CreateCommand(); + getCurrentSettingCommand.SetCommandText("SELECT current_setting('statement_timeout') || '|' || current_setting('lock_timeout') AS timeouts"); + var timeouts = ((string)(await getCurrentSettingCommand.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false))!) + .Split('|'); + return timeouts.Length == 2 + ? new CapturedTimeoutSettings(statementTimeout: timeouts[0], lockTimeout: timeouts[1]) + : throw new InvalidOperationException($"Unexpected statement_timeout|lock_timeout value '{string.Join("|", timeouts)}'"); } private static async ValueTask ShouldDefineSavePoint(DatabaseConnection connection) From c05b9d31763a80822826170c07549bebfa03dc96 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 9 Jun 2026 20:42:06 -0400 Subject: [PATCH 394/399] Save a couple more mongo allocations --- src/DistributedLock.Core/packages.lock.json | 24 + .../MongoDistributedLock.cs | 5 +- src/DistributedLock.Tests/packages.lock.json | 760 ++++++++++++++++++ 3 files changed, 787 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.Core/packages.lock.json b/src/DistributedLock.Core/packages.lock.json index 166e8221..1c23272c 100644 --- a/src/DistributedLock.Core/packages.lock.json +++ b/src/DistributedLock.Core/packages.lock.json @@ -11,6 +11,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.3, )", @@ -61,6 +67,12 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[10.0.201, )", @@ -143,6 +155,12 @@ } }, ".NETStandard,Version=v2.1": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[10.0.201, )", @@ -188,6 +206,12 @@ } }, "net8.0": { + "Microsoft.CodeAnalysis.PublicApiAnalyzers": { + "type": "Direct", + "requested": "[3.3.4, )", + "resolved": "3.3.4", + "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" + }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", "requested": "[8.0.26, )", diff --git a/src/DistributedLock.MongoDB/MongoDistributedLock.cs b/src/DistributedLock.MongoDB/MongoDistributedLock.cs index 0061e305..154de6f8 100644 --- a/src/DistributedLock.MongoDB/MongoDistributedLock.cs +++ b/src/DistributedLock.MongoDB/MongoDistributedLock.cs @@ -28,6 +28,7 @@ public sealed partial class MongoDistributedLock : IInternalDistributedLock CreateAcquireUpdate(string lockId) new BsonDocument { { "startDate", NowRef }, - { "unit", "millisecond" }, + { "unit", MillisecondRef }, { "amount", this._options.Expiry.InMilliseconds } } ); @@ -237,7 +238,7 @@ private async ValueTask ReleaseLockAsync() new BsonDocument { { "startDate", NowRef }, - { "unit", "millisecond" }, + { "unit", MillisecondRef }, { "amount", this._lock._options.Expiry.InMilliseconds } } ))) diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index 137d691a..cf2f97d4 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -1,6 +1,766 @@ { "version": 2, "dependencies": { + ".NETFramework,Version=v4.7.2": { + "MedallionShell.StrongName": { + "type": "Direct", + "requested": "[1.6.2, )", + "resolved": "1.6.2", + "contentHash": "x7kIh8HiLHQrm5tcLEwNXhYfIHjQoK8ZS9MPx/LcCgNubtfFVJZm8Kk5/FSOalHjlXizcLAm6733L691l8cr/Q==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.9.0, )", + "resolved": "17.9.0", + "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", + "dependencies": { + "Microsoft.CodeCoverage": "17.9.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[3.14.0, )", + "resolved": "3.14.0", + "contentHash": "R7iPwD7kbOaP3o2zldWJbWeMQAvDKD0uld27QvA3PAALl1unl7x0v2J7eGiJOYjimV/BuGT4VJmr45RjS7z4LA==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "Odd1RusSMnfswIiCPbokAqmlcCCXjQ20poaXWrw+CWDnBY1vQ/x6ZGqgyJXpebPq5Uf8uEBe5iOAySsCdSrWdQ==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.5.0, )", + "resolved": "4.5.0", + "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A==" + }, + "System.Data.SqlClient": { + "type": "Direct", + "requested": "[4.8.6, )", + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Numerics.Vectors": "4.5.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.6", + "System.Threading.Tasks.Extensions": "4.6.0" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0", + "System.Memory": "4.6.3" + } + }, + "Azure.Storage.Common": { + "type": "Transitive", + "resolved": "12.18.1", + "contentHash": "ohCslqP9yDKIn+DVjBEOBuieB1QwsUCz+BwHYNaJ3lcIsTSiI4Evnq81HcKe8CqM8qvdModbipVQKpnxpbdWqA==", + "dependencies": { + "Azure.Core": "1.36.0", + "System.IO.Hashing": "6.0.0" + } + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==" + }, + "DnsClient": { + "type": "Transitive", + "resolved": "1.6.1", + "contentHash": "4H/f2uYJOZ+YObZjpY9ABrKZI+JNw3uizp6oMzTXwDw6F+2qIPhpRl/1t68O/6e98+vqNiYGu+lswmwdYUy3gg==", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0", + "System.Buffers": "4.5.1" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Bcl.HashCode": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.9.0", + "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" + }, + "Microsoft.Data.SqlClient.SNI": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "p3Pm/+7oPSn4At6vKrttRpUOVdrcer3oZln0XeYZ94DTTQirUVzQy5QmHjdMmbyIaTaYb6BYf+8N7ob5t1ctQA==" + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "HFDnhYLccngrzyGgHkjEDU5FMLn4MpOsr5ElgsBMC4yx6lJh4jeWO7fHS8+TXPq+dgxCmUa/Trl8svObmwW4QA==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.80.0", + "contentHash": "nmg+q17mKdNafWvaX7Of5Xh8sxc4acsD6xOOczp7kgjAzR7bpseYGZzg38XPoS/vW7k92sGKCWgHSogB0K62KQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", + "dependencies": { + "Microsoft.Identity.Client": "4.78.0", + "System.IO.FileSystem.AccessControl": "5.0.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Text.Json": "8.0.4" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "7.7.1", + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.4" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MongoDB.Bson": { + "type": "Transitive", + "resolved": "3.7.1", + "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "Pipelines.Sockets.Unofficial": { + "type": "Transitive", + "resolved": "2.2.8", + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", + "dependencies": { + "System.IO.Pipelines": "5.0.1" + } + }, + "SharpCompress": { + "type": "Transitive", + "resolved": "0.30.1", + "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Text.Encoding.CodePages": "5.0.0" + } + }, + "Snappier": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "4.7.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Memory.Data": "8.0.1", + "System.Text.Json": "8.0.6" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Data.Common": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "lm6E3T5u7BOuEH0u18JpbJHxBfOJPuCyl4Kg1RH10ktYLp5uEEE1xKrHW56/We4SnZpGAuCc9N0MJpSDhTHZGQ==" + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.ValueTuple": "4.5.0" + } + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==" + }, + "System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==" + }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "SxHB3nuNrpptVk+vZ/F+7OHEpoHUIKKMl02bUmYHQr1r+glbZQxs7pRtsf4ENO29TVm2TH3AEeep2fJcy92oYw==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.IO.Hashing": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.6.3", + "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "dependencies": { + "System.Buffers": "4.6.1", + "System.Numerics.Vectors": "4.6.1", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Text.Json": "8.0.5" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "System.Security.Cryptography.X509Certificates": "4.3.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.6.1", + "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==" + }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q==" + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encoding.CodePages": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.6", + "contentHash": "BvSpVBsVN9b+Y+wONbvJOHd1HjXQf33+XiC28ZMOwRsYb42mz3Q8YHnpTSwpwJLqYCMqM+0UUVC3V+pi25XfkQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "8.0.0", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Text.RegularExpressions": { + "type": "Transitive", + "resolved": "4.3.1", + "contentHash": "N0kNRrWe4+nXOWlpLT4LAY5brb8caNFlUuIRpraCVMDLYutKkol1aV079rQjLuSxKMJT2SpBQsYX9xbcTMmzwg==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.6.0", + "contentHash": "I5G6Y8jb0xRtGUC9Lahy7FUvlYlnGMMkbuKAQBy8Jb7Y6Yn8OlBEiUOY0PqZ0hy6Ua8poVA1ui1tAIiXNxGdsg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.1.0" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "ZstdSharp.Port": { + "type": "Transitive", + "resolved": "0.7.3", + "contentHash": "U9Ix4l4cl58Kzz1rJzj5hoVTjmbx1qGMwzAcbv1j/d3NzrFaESIurQyg+ow4mivCgkE3S413y+U9k4WdnEIkRA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Memory": "4.5.5" + } + }, + "distributedlock": { + "type": "Project", + "dependencies": { + "DistributedLock.Azure": "[1.0.2, )", + "DistributedLock.FileSystem": "[1.0.3, )", + "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MySql": "[1.0.2, )", + "DistributedLock.Oracle": "[1.0.5, )", + "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Redis": "[1.1.1, )", + "DistributedLock.SqlServer": "[1.0.7, )", + "DistributedLock.WaitHandles": "[1.0.1, )", + "DistributedLock.ZooKeeper": "[1.0.0, )" + } + }, + "distributedlock.azure": { + "type": "Project", + "dependencies": { + "Azure.Storage.Blobs": "[12.19.1, )", + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.core": { + "type": "Project", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "System.ValueTuple": "[4.5.0, )" + } + }, + "distributedlock.filesystem": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.mongodb": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MongoDB.Driver": "[3.7.1, )", + "System.Diagnostics.DiagnosticSource": "[10.0.5, )" + } + }, + "distributedlock.mysql": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "MySqlConnector": "[2.3.5, )" + } + }, + "distributedlock.oracle": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Oracle.ManagedDataAccess": "[23.6.1, )" + } + }, + "distributedlock.postgres": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Npgsql": "[8.0.6, )" + } + }, + "distributedlock.redis": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "StackExchange.Redis": "[2.7.33, )" + } + }, + "distributedlock.sqlserver": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "Microsoft.Data.SqlClient": "[6.1.4, )" + } + }, + "distributedlock.waithandles": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )" + } + }, + "distributedlock.zookeeper": { + "type": "Project", + "dependencies": { + "DistributedLock.Core": "[1.0.9, )", + "ZooKeeperNetEx": "[3.4.12.4, )" + } + }, + "Azure.Storage.Blobs": { + "type": "CentralTransitive", + "requested": "[12.19.1, )", + "resolved": "12.19.1", + "contentHash": "x43hWFJ4sPQ23TD4piCwT+KlQpZT8pNDAzqj6yUCqh+WJ2qcQa17e1gh6ZOeT2QNFQTTDSuR56fm2bIV7i11/w==", + "dependencies": { + "Azure.Storage.Common": "12.18.1", + "System.Text.Json": "4.7.2" + } + }, + "Microsoft.Data.SqlClient": { + "type": "CentralTransitive", + "requested": "[6.1.4, )", + "resolved": "6.1.4", + "contentHash": "lQcSog5LLImg4yNEuuG6ccvdzXnCvER8Rms9Ngk9zB4Q8na4f+S7/abSoC7gnEltBg4e5xTnLAWmMLIOtLg4pg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.80.0", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "System.Buffers": "4.6.1", + "System.Data.Common": "4.3.0", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Memory": "4.6.3", + "System.Security.Cryptography.Pkcs": "8.0.1", + "System.Text.Json": "8.0.6", + "System.Text.RegularExpressions": "4.3.1" + } + }, + "MongoDB.Driver": { + "type": "CentralTransitive", + "requested": "[3.7.1, )", + "resolved": "3.7.1", + "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "dependencies": { + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "3.7.1", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "ZstdSharp.Port": "0.7.3" + } + }, + "MySqlConnector": { + "type": "CentralTransitive", + "requested": "[2.3.5, )", + "resolved": "2.3.5", + "contentHash": "AmEfUPkFl+Ev6jJ8Dhns3CYHBfD12RHzGYWuLt6DfG6/af6YvOMyPz74ZPPjBYQGRJkumD2Z48Kqm8s5DJuhLA==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "7.0.1", + "System.Diagnostics.DiagnosticSource": "7.0.2", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Npgsql": { + "type": "CentralTransitive", + "requested": "[8.0.6, )", + "resolved": "8.0.6", + "contentHash": "KaS6CY5kY2Sd0P00MSeFcOI3t2DiQ4UWG8AuRpVOUeDWITOKfoEEG91DP3cmT6aerixPkjwKgXxnpDxIkDpO6g==", + "dependencies": { + "Microsoft.Bcl.HashCode": "1.1.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "System.Collections.Immutable": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Json": "8.0.5", + "System.Threading.Channels": "8.0.0" + } + }, + "Oracle.ManagedDataAccess": { + "type": "CentralTransitive", + "requested": "[23.6.1, )", + "resolved": "23.6.1", + "contentHash": "EZi+mahzUwQFWs9Is8ed94eTzWOlfCLMd+DDWukf/h/brTz1wB9Qk3fsxBrjw9+fEXrxDgx4uXNiPHNPRS3BeQ==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "6.0.1", + "System.Formats.Asn1": "8.0.1", + "System.Text.Json": "8.0.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "StackExchange.Redis": { + "type": "CentralTransitive", + "requested": "[2.7.33, )", + "resolved": "2.7.33", + "contentHash": "2kCX5fvhEE824a4Ab5Imyi8DRuGuTxyklXV01kegkRpsWJcPmO6+GAQ+HegKxvXAxlXZ8yaRspvWJ8t3mMClfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.0", + "Pipelines.Sockets.Unofficial": "2.2.8", + "System.IO.Compression": "4.3.0", + "System.Threading.Channels": "5.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[10.0.5, )", + "resolved": "10.0.5", + "contentHash": "CCbzHQ26L3jskdwHh+4bxxW84lUMIrAAmeSlpO69AlrQV0DKbj1/I+feLaLSuZeqXPr9UlSy0OcgZoXOk2a6/g==", + "dependencies": { + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" + } + }, + "ZooKeeperNetEx": { + "type": "CentralTransitive", + "requested": "[3.4.12.4, )", + "resolved": "3.4.12.4", + "contentHash": "YECtByVSH7TRjQKplwOWiKyanCqYE5eEkGk5YtHJgsnbZ6+p1o0Gvs5RIsZLotiAVa6Niez1BJyKY/RDY/L6zg==" + } + }, "net8.0": { "MedallionShell.StrongName": { "type": "Direct", From 429cc01e452bc7ddac2e1a02a68268ca9591e887 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 9 Jun 2026 20:47:01 -0400 Subject: [PATCH 395/399] Version bumps --- src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj | 2 +- src/DistributedLock.Postgres/DistributedLock.Postgres.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 8447f194..6d2b5399 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -11,7 +11,7 @@ - 1.0.0 + 1.0.1 1.0.0.0 Michael Adelson, joesdu Provides a distributed lock implementation based on MongoDB diff --git a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj index 07f3307a..1100aeec 100644 --- a/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj +++ b/src/DistributedLock.Postgres/DistributedLock.Postgres.csproj @@ -11,7 +11,7 @@ - 1.3.0 + 1.3.1 1.0.0.0 Michael Adelson Provides a distributed lock implementation based on Postgresql From 79e03fa3d643c1bfa8a5580d9d5c3fe653d351e5 Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 9 Jun 2026 20:58:30 -0400 Subject: [PATCH 396/399] Update readme --- README.md | 3 +++ src/DistributedLock/DistributedLock.csproj | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d0594268..51e876fb 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,9 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes +- 2.8.2 + - Fix support for Postgres instances with timeout settings using units other than millisecond ([#277](https://github.com/madelson/DistributedLock/issues/277), DistributedLock.Postgres 1.3.1) + - Reduce allocations in MongoDB locks ([#276](https://github.com/madelson/DistributedLock/pull/276)). Thanks [@joesdu](https://github.com/joesdu) for implementing! - 2.8.1 - Fix connection monitoring query on Oracle. Thanks [@matthew-marston](https://github.com/matthew-marston) for implementing! ([#271](https://github.com/madelson/DistributedLock/issues/271), DistributedLock.Oracle 1.0.5) - Bump Microsoft.Data.SqlClient version ([#273](https://github.com/madelson/DistributedLock/issues/273), DistributedLock.SqlServer 1.0.7) diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 7782a09e..482cd53c 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.8.1 + 2.8.2 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. From 5e9d9d34a1ebe31c22a34ddb010daedaf31ac2fd Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 9 Jun 2026 21:00:36 -0400 Subject: [PATCH 397/399] Update release notes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51e876fb..9568ab4b 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Setup steps for working with the repository locally are documented [here](docs/D - 2.8.2 - Fix support for Postgres instances with timeout settings using units other than millisecond ([#277](https://github.com/madelson/DistributedLock/issues/277), DistributedLock.Postgres 1.3.1) - - Reduce allocations in MongoDB locks ([#276](https://github.com/madelson/DistributedLock/pull/276)). Thanks [@joesdu](https://github.com/joesdu) for implementing! + - Reduce allocations in MongoDB locks ([#276](https://github.com/madelson/DistributedLock/pull/276), DistributedLock.MongoDB 1.0.1). Thanks [@joesdu](https://github.com/joesdu) for implementing! - 2.8.1 - Fix connection monitoring query on Oracle. Thanks [@matthew-marston](https://github.com/matthew-marston) for implementing! ([#271](https://github.com/madelson/DistributedLock/issues/271), DistributedLock.Oracle 1.0.5) - Bump Microsoft.Data.SqlClient version ([#273](https://github.com/madelson/DistributedLock/issues/273), DistributedLock.SqlServer 1.0.7) From 0dea0de1ca98c5e4c223d8ff7a29a23141eab4c2 Mon Sep 17 00:00:00 2001 From: Steve Dougherty Date: Mon, 29 Jun 2026 11:29:20 -0400 Subject: [PATCH 398/399] Upgrade MongoDB.Driver to 3.9.0 to fix Snappier and SharpCompress vulnerabilities See https://github.com/mongodb/mongo-csharp-driver/releases/tag/v3.8.1 and https://github.com/mongodb/mongo-csharp-driver/releases/tag/v3.9.0 This commit was generated by running dotnet package update MongoDB.Driver@3.9.0 --project src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj The vulnerabilities in question are https://github.com/advisories/GHSA-pggp-6c3x-2xmx and https://github.com/advisories/GHSA-6c8g-7p36-r338 Here is an example of building with Nuget auditing and `TreatWarningsAsErrors` enabled, which causes `dotnet restore` to fail: error NU1903: Warning As Error: Package 'Snappier' 1.0.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-pggp-6c3x-2xmx --- src/Directory.Packages.props | 2 +- .../packages.lock.json | 135 ++++++++++-------- 2 files changed, 79 insertions(+), 58 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 9158afbd..f598ff88 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -7,7 +7,7 @@ - + diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index ca2ec63d..df8442e0 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -8,6 +8,15 @@ "resolved": "3.3.4", "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[10.0.201, )", @@ -21,16 +30,16 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Net.Http": "4.3.4", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", @@ -77,6 +86,11 @@ "resolved": "2.0.0", "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net472": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "10.0.201", @@ -93,8 +107,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -102,21 +116,19 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory": "4.6.3" } }, "System.Buffers": { @@ -221,10 +233,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Threading.Tasks.Extensions": { @@ -277,16 +290,16 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "ZstdSharp.Port": "0.7.3" } @@ -309,6 +322,11 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "10.0.201", @@ -340,8 +358,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -349,18 +367,20 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.1" + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Buffers": { @@ -402,10 +422,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "ZstdSharp.Port": { @@ -429,9 +450,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.26, )", - "resolved": "8.0.26", - "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" + "requested": "[8.0.28, )", + "resolved": "8.0.28", + "contentHash": "XMqgVjlLxLqWmEh3c49haXLQwsMNtvo6YscUaqfvEGfg1iA8hnYgkUVq3i9Zu9gKeNKMWiiZKVwZExc/qyEAsQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -446,16 +467,16 @@ }, "MongoDB.Driver": { "type": "Direct", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "ZstdSharp.Port": "0.7.3" } }, @@ -501,8 +522,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -510,18 +531,18 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==" }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.IO.Hashing": { "type": "Transitive", From dc101d7d3fe58c50e745bf2c3b9b2bbd2cd0d33f Mon Sep 17 00:00:00 2001 From: madelson <1269046+madelson@users.noreply.github.com> Date: Tue, 14 Jul 2026 19:34:34 -0400 Subject: [PATCH 399/399] Version bump --- README.md | 2 + .../DistributedLock.MongoDB.csproj | 2 +- .../packages.lock.json | 20 +--- src/DistributedLock.Tests/packages.lock.json | 83 +++++++++-------- src/DistributedLock/DistributedLock.csproj | 2 +- src/DistributedLock/packages.lock.json | 84 ++++++++--------- src/DistributedLockTaker/packages.lock.json | 91 +++++++++---------- 7 files changed, 132 insertions(+), 152 deletions(-) diff --git a/README.md b/README.md index 9568ab4b..f2c511f3 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,8 @@ Setup steps for working with the repository locally are documented [here](docs/D ## Release notes +- 2.8.3 + - Bump MongoDB.Driver to avoid pulling in vulnerable packages ([#281](https://github.com/madelson/DistributedLock/pull/281), DistributedLock.MongoDB 1.0.2). Thanks [@Thynix](https://github.com/Thynix) for implementing! - 2.8.2 - Fix support for Postgres instances with timeout settings using units other than millisecond ([#277](https://github.com/madelson/DistributedLock/issues/277), DistributedLock.Postgres 1.3.1) - Reduce allocations in MongoDB locks ([#276](https://github.com/madelson/DistributedLock/pull/276), DistributedLock.MongoDB 1.0.1). Thanks [@joesdu](https://github.com/joesdu) for implementing! diff --git a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj index 6d2b5399..47e1939d 100644 --- a/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj +++ b/src/DistributedLock.MongoDB/DistributedLock.MongoDB.csproj @@ -11,7 +11,7 @@ - 1.0.1 + 1.0.2 1.0.0.0 Michael Adelson, joesdu Provides a distributed lock implementation based on MongoDB diff --git a/src/DistributedLock.MongoDB/packages.lock.json b/src/DistributedLock.MongoDB/packages.lock.json index df8442e0..0e54b358 100644 --- a/src/DistributedLock.MongoDB/packages.lock.json +++ b/src/DistributedLock.MongoDB/packages.lock.json @@ -8,15 +8,6 @@ "resolved": "3.3.4", "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[10.0.201, )", @@ -86,11 +77,6 @@ "resolved": "2.0.0", "contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net472": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "10.0.201", @@ -450,9 +436,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.28, )", - "resolved": "8.0.28", - "contentHash": "XMqgVjlLxLqWmEh3c49haXLQwsMNtvo6YscUaqfvEGfg1iA8hnYgkUVq3i9Zu9gKeNKMWiiZKVwZExc/qyEAsQ==" + "requested": "[8.0.26, )", + "resolved": "8.0.26", + "contentHash": "o7/yVssM2r9Wyln2s9edBd5ANZXqdSdBI+g7JqXkyJmXrhs2WsJp25K5yPnYrTgdKBCjKB8bg+O2oew4sgzFaA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/DistributedLock.Tests/packages.lock.json b/src/DistributedLock.Tests/packages.lock.json index cf2f97d4..fffd48a0 100644 --- a/src/DistributedLock.Tests/packages.lock.json +++ b/src/DistributedLock.Tests/packages.lock.json @@ -263,8 +263,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -280,21 +280,19 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory": "4.6.3" } }, "System.Buffers": { @@ -486,10 +484,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -556,10 +555,10 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MongoDB": "[1.0.1, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.5, )", - "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Postgres": "[1.3.1, )", "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", @@ -590,7 +589,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )", + "MongoDB.Driver": "[3.9.0, )", "System.Diagnostics.DiagnosticSource": "[10.0.5, )" } }, @@ -677,16 +676,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Net.Http": "4.3.4", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", @@ -1029,8 +1028,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -1095,18 +1094,18 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==" }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -1237,10 +1236,10 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MongoDB": "[1.0.1, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.5, )", - "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Postgres": "[1.3.1, )", "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", @@ -1267,7 +1266,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )" + "MongoDB.Driver": "[3.9.0, )" } }, "distributedlock.mysql": { @@ -1351,16 +1350,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "ZstdSharp.Port": "0.7.3" } }, diff --git a/src/DistributedLock/DistributedLock.csproj b/src/DistributedLock/DistributedLock.csproj index 482cd53c..48d488db 100644 --- a/src/DistributedLock/DistributedLock.csproj +++ b/src/DistributedLock/DistributedLock.csproj @@ -10,7 +10,7 @@ - 2.8.2 + 2.8.3 2.0.0.0 Michael Adelson Provides easy-to-use mutexes, reader-writer locks, and semaphores that can synchronize across processes and machines. This is an umbrella package that brings in the entire family of DistributedLock.* packages (e. g. DistributedLock.SqlServer) as references. Those packages can also be installed individually. diff --git a/src/DistributedLock/packages.lock.json b/src/DistributedLock/packages.lock.json index 2d59d1a1..0913e314 100644 --- a/src/DistributedLock/packages.lock.json +++ b/src/DistributedLock/packages.lock.json @@ -792,8 +792,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -809,21 +809,19 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory": "4.6.3" } }, "System.Buffers": { @@ -1015,10 +1013,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -1104,7 +1103,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )", + "MongoDB.Driver": "[3.9.0, )", "System.Diagnostics.DiagnosticSource": "[10.0.5, )" } }, @@ -1191,16 +1190,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Net.Http": "4.3.4", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", @@ -2108,8 +2107,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -2125,18 +2124,20 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.7.1" + "System.Memory": "4.6.3", + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "System.Buffers": { @@ -2299,10 +2300,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -2374,7 +2376,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )", + "MongoDB.Driver": "[3.9.0, )", "System.Diagnostics.DiagnosticSource": "[10.0.5, )" } }, @@ -2460,16 +2462,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "ZstdSharp.Port": "0.7.3" } diff --git a/src/DistributedLockTaker/packages.lock.json b/src/DistributedLockTaker/packages.lock.json index e5e98eed..98f233a4 100644 --- a/src/DistributedLockTaker/packages.lock.json +++ b/src/DistributedLockTaker/packages.lock.json @@ -204,8 +204,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -221,21 +221,19 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==", + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==", "dependencies": { - "System.Memory": "4.5.4", - "System.Text.Encoding.CodePages": "5.0.0" + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.Text.Encoding.CodePages": "8.0.0" } }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==", + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==", "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory": "4.6.3" } }, "System.Buffers": { @@ -427,10 +425,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", + "resolved": "8.0.0", + "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Text.Encodings.Web": { @@ -497,10 +496,10 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MongoDB": "[1.0.1, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.5, )", - "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Postgres": "[1.3.1, )", "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", @@ -531,7 +530,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )", + "MongoDB.Driver": "[3.9.0, )", "System.Diagnostics.DiagnosticSource": "[10.0.5, )" } }, @@ -618,16 +617,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "System.Diagnostics.DiagnosticSource": "6.0.1", "System.Net.Http": "4.3.4", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", @@ -782,14 +781,6 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[6.1.4, )", @@ -1001,8 +992,8 @@ }, "MongoDB.Bson": { "type": "Transitive", - "resolved": "3.7.1", - "contentHash": "ZhCFCN64iZNaV6TDVNpjQ6p8M8tQvLda6ABbfrqd6XEZ3qn0pwwDJi6+DZ3xySadUwGzKR0CV3IzmHEWe/wI4Q==", + "resolved": "3.9.0", + "contentHash": "J6vB61zKwMSfxbkN+/amGvj1qVMDKrKjV3kmoOWttMcv8JJScLDCFh89FyL3f2lDUyJrnfgZCR6/KX+07e99eg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "5.0.0" @@ -1029,18 +1020,18 @@ }, "SharpCompress": { "type": "Transitive", - "resolved": "0.30.1", - "contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw==" + "resolved": "0.48.1", + "contentHash": "SqGaVniGG943Gph/gHhUQUiZPyC7y0tXZyMf0/B2oGsMav9dqs7JJOuUA+xOkwKYaWM2TM7aZQjNK91f4bX71A==" }, "Snappier": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA==" + "resolved": "1.3.1", + "contentHash": "DOdDQiO8YZ5rBtVLY+6CmR1yp9WYoJRgEEktPBrR0tEj9QO2djA/zv0O3DX0OZpEAfosbY8pytQ9tQUogwQsEA==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "4.6.1", + "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" }, "System.ClientModel": { "type": "Transitive", @@ -1166,10 +1157,10 @@ "dependencies": { "DistributedLock.Azure": "[1.0.2, )", "DistributedLock.FileSystem": "[1.0.3, )", - "DistributedLock.MongoDB": "[1.0.0, )", + "DistributedLock.MongoDB": "[1.0.1, )", "DistributedLock.MySql": "[1.0.2, )", "DistributedLock.Oracle": "[1.0.5, )", - "DistributedLock.Postgres": "[1.3.0, )", + "DistributedLock.Postgres": "[1.3.1, )", "DistributedLock.Redis": "[1.1.1, )", "DistributedLock.SqlServer": "[1.0.7, )", "DistributedLock.WaitHandles": "[1.0.1, )", @@ -1196,7 +1187,7 @@ "type": "Project", "dependencies": { "DistributedLock.Core": "[1.0.9, )", - "MongoDB.Driver": "[3.7.1, )" + "MongoDB.Driver": "[3.9.0, )" } }, "distributedlock.mysql": { @@ -1280,16 +1271,16 @@ }, "MongoDB.Driver": { "type": "CentralTransitive", - "requested": "[3.7.1, )", - "resolved": "3.7.1", - "contentHash": "p1Od3F5/lQUiYKF+o7+ommuVwK/71gbw5tu28toO1mID91cMPmdCL6EhX0K0+HwpytmMSfciI8j4688K//QcQA==", + "requested": "[3.9.0, )", + "resolved": "3.9.0", + "contentHash": "XKUa+y5RtNH1iInfxj3Y7c1FN1BQ16/7hFxoqU6fzc3+BKM1D3mGa+pB/yBbAk8jNxf7+JWEnCfuQOyCo7dQLg==", "dependencies": { "DnsClient": "1.6.1", "Microsoft.Extensions.Logging.Abstractions": "2.0.0", - "MongoDB.Bson": "3.7.1", - "SharpCompress": "0.30.1", - "Snappier": "1.0.0", - "System.Buffers": "4.5.1", + "MongoDB.Bson": "3.9.0", + "SharpCompress": "0.48.1", + "Snappier": "1.3.1", + "System.Buffers": "4.6.1", "ZstdSharp.Port": "0.7.3" } },