From 0294c80bccc542339a2d4e029c11ceb95374a626 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 15 Dec 2025 16:50:45 +0800
Subject: [PATCH] Remove AsyncKeyedLock dependency and refactor locking

---
 Directory.Packages.props                      |  1 -
 ...Abp.DistributedLocking.Abstractions.csproj |  1 -
 .../LocalAbpDistributedLock.cs                | 19 +++++--------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9a1fcbb674..ef813ad076 100644
--- a/Directory.Packages.props
+++ b/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" />
diff --git a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj b/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj
index 83f8f0076b..773c954051 100644
--- a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo.Abp.DistributedLocking.Abstractions.csproj
+++ b/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>
 
diff --git a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs b/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs
index 15956b159e..d8d8eb9d09 100644
--- a/framework/src/Volo.Abp.DistributedLocking.Abstractions/Volo/Abp/DistributedLocking/LocalAbpDistributedLock.cs
+++ b/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;
     }
 }