Merge pull request #274 from madelson/release-2.8.1

Release 2.8.1

Author: madelson

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)

src/Directory.Packages.props

@@ -15,7 +15,7 @@
     <PackageVersion Include="Oracle.ManagedDataAccess" Version="23.6.1" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageVersion Include="Npgsql" Version="8.0.6" />
     <PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.4" />
     <PackageVersion Include="nunit" Version="3.14.0" />
     <PackageVersion Include="nunit3testadapter" Version="4.5.0" />
     <PackageVersion Include="Microsoft.NET.Test.SDK" Version="17.9.0" />

src/DistributedLock.Oracle/DistributedLock.Oracle.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <Authors>Michael Adelson</Authors>
     <Description>Provides a distributed lock implementation based on Oracle Database</Description>

src/DistributedLock.Oracle/OracleDatabaseConnection.cs

@@ -36,15 +36,15 @@ 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);
 
     public override async Task SleepAsync(TimeSpan sleepTime, CancellationToken cancellationToken, Func<DatabaseCommand, CancellationToken, ValueTask<int>> 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

src/DistributedLock.SqlServer/DistributedLock.SqlServer.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.0.6</Version>
+    <Version>1.0.7</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <Authors>Michael Adelson</Authors>
     <Description>Provides a distributed lock implementation based on SQL Server</Description>

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