Merge pull request #24425 from abpframework/LocalAbpDistributedLock

Remove `AsyncKeyedLock` dependency from `LocalAbpDistributedLock`.

Directory.Packages.props

@@ -7,7 +7,6 @@
     <PackageVersion Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
     <PackageVersion Include="aliyun-net-sdk-sts" Version="3.1.3" />
     <PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-    <PackageVersion Include="AsyncKeyedLock" Version="7.1.6" />
     <PackageVersion Include="Autofac" Version="8.4.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />

framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj

@@ -18,7 +18,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
-        <PackageReference Include="AsyncKeyedLock" />
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     </ItemGroup>
 

framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs

@@ -1,19 +1,14 @@
 using System;
-using System.Runtime.CompilerServices;
+using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using AsyncKeyedLock;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.DistributedLocking;
 
 public class LocalAbpDistributedLock : IAbpDistributedLock, ISingletonDependency
 {
-    private readonly AsyncKeyedLocker<string> _localSyncObjects = new(o =>
-    {
-        o.PoolSize = 20;
-        o.PoolInitialFill = 1;
-    });
+    private readonly ConcurrentDictionary<string, SemaphoreSlim> _localSyncObjects = new();
     protected IDistributedLockKeyNormalizer DistributedLockKeyNormalizer { get; }
 
     public LocalAbpDistributedLock(IDistributedLockKeyNormalizer distributedLockKeyNormalizer)
@@ -21,7 +16,6 @@ public class LocalAbpDistributedLock : IAbpDistributedLock, ISingletonDependency
         DistributedLockKeyNormalizer = distributedLockKeyNormalizer;
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public async Task<IAbpDistributedLockHandle?> TryAcquireAsync(
         string name,
         TimeSpan timeout = default,
@@ -30,11 +24,8 @@ public class LocalAbpDistributedLock : IAbpDistributedLock, ISingletonDependency
         Check.NotNullOrWhiteSpace(name, nameof(name));
         var key = DistributedLockKeyNormalizer.NormalizeKey(name);
 
-        var timeoutReleaser = await _localSyncObjects.LockOrNullAsync(key, timeout, cancellationToken);
-        if (timeoutReleaser is not null)
-        {
-            return new LocalAbpDistributedLockHandle(timeoutReleaser);
-        }
-        return null;
+        var semaphore = _localSyncObjects.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+        var acquired = await semaphore.WaitAsync(timeout, cancellationToken);
+        return acquired ? new LocalAbpDistributedLockHandle(semaphore) : null;
     }
 }

framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLockHandle.cs

@@ -1,20 +1,21 @@
-using System;
+using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.DistributedLocking;
-
-public class LocalAbpDistributedLockHandle : IAbpDistributedLockHandle
+namespace Volo.Abp.DistributedLocking
 {
-    private readonly IDisposable _disposable;
-
-    public LocalAbpDistributedLockHandle(IDisposable disposable)
+    public class LocalAbpDistributedLockHandle : IAbpDistributedLockHandle
     {
-        _disposable = disposable;
-    }
+        private readonly SemaphoreSlim _semaphore;
 
-    public ValueTask DisposeAsync()
-    {
-        _disposable.Dispose();
-        return default;
+        public LocalAbpDistributedLockHandle(SemaphoreSlim semaphore)
+        {
+            _semaphore = semaphore;
+        }
+
+        public ValueTask DisposeAsync()
+        {
+            _semaphore.Release();
+            return default;
+        }
     }
 }