yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V10: Fix build warnings umbraco.persistence (#12502)

Browse Source 
* Run code cleanup

* Run dotnet format

* Manual cleanup

* Fix [..] to substring

* Fix after merge

* Update src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerBulkSqlInsertProvider.cs

Co-authored-by: Paul Johnson <pmj@umbraco.com>

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Paul Johnson <pmj@umbraco.com>
This commit is contained in:
Nikolaj Geisle
2022-06-20 08:07:08 +02:00
committed by GitHub
parent 60a5b19dc9
commit df5993bca8
35 changed files with 2434 additions and 2377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerDistributedLockingMechanism.cs
View File

@@ -13,17 +13,17 @@ using Umbraco.Extensions;
namespace Umbraco.Cms.Persistence.SqlServer.Services;
/// <summary>
/// SQL Server implementation of <see cref="IDistributedLockingMechanism"/>.
/// SQL Server implementation of <see cref="IDistributedLockingMechanism" />.
/// </summary>
public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
{
private readonly IOptionsMonitor<ConnectionStrings> _connectionStrings;
private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
private readonly ILogger<SqlServerDistributedLockingMechanism> _logger;
private readonly Lazy<IScopeAccessor> _scopeAccessor; // Hooray it's a circular dependency.
private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
private readonly IOptionsMonitor<ConnectionStrings> _connectionStrings;
/// <summary>
/// Initializes a new instance of the <see cref="SqlServerDistributedLockingMechanism"/> class.
/// Initializes a new instance of the <see cref="SqlServerDistributedLockingMechanism" /> class.
/// </summary>
public SqlServerDistributedLockingMechanism(
ILogger<SqlServerDistributedLockingMechanism> logger,
@@ -104,11 +104,9 @@ public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
public DistributedLockType LockType { get; }
public void Dispose()
{
public void Dispose() =>
// Mostly no op, cleaned up by completing transaction in scope.
_parent._logger.LogDebug("Dropped {lockType} for id {id}", LockType, LockId);
}
public override string ToString()
=> $"SqlServerDistributedLock({LockId}, {LockType}";
@@ -124,19 +122,21 @@ public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
if (!db.InTransaction)
{
throw new InvalidOperationException("SqlServerDistributedLockingMechanism requires a transaction to function.");
throw new InvalidOperationException(
"SqlServerDistributedLockingMechanism requires a transaction to function.");
}
if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
{
throw new InvalidOperationException("A transaction with minimum ReadCommitted isolation level is required.");
throw new InvalidOperationException(
"A transaction with minimum ReadCommitted isolation level is required.");
}
const string query = "SELECT value FROM umbracoLock WITH (REPEATABLEREAD) WHERE id=@id";
db.Execute("SET LOCK_TIMEOUT " + _timeout.TotalMilliseconds + ";");
var i = db.ExecuteScalar<int?>(query, new {id = LockId});
var i = db.ExecuteScalar<int?>(query, new { id = LockId });
if (i == null)
{
@@ -156,19 +156,22 @@ public class SqlServerDistributedLockingMechanism : IDistributedLockingMechanism
if (!db.InTransaction)
{
throw new InvalidOperationException("SqlServerDistributedLockingMechanism requires a transaction to function.");
throw new InvalidOperationException(
"SqlServerDistributedLockingMechanism requires a transaction to function.");
}
if (db.Transaction.IsolationLevel < IsolationLevel.ReadCommitted)
{
throw new InvalidOperationException("A transaction with minimum ReadCommitted isolation level is required.");
throw new InvalidOperationException(
"A transaction with minimum ReadCommitted isolation level is required.");
}
const string query = @"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id";
const string query =
@"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id";
db.Execute("SET LOCK_TIMEOUT " + _timeout.TotalMilliseconds + ";");
var i = db.Execute(query, new {id = LockId});
var i = db.Execute(query, new { id = LockId });
if (i == 0)
{