Use CommitAsync() instead od Commit() (#14622)

OrchardCMS · Nov 1, 2023 · 2057046 · 2057046
1 parent 4703bb5
commit 2057046
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs b/src/OrchardCore.Modules/OrchardCore.Indexing/IndexingTaskManager.cs
@@ -117,6 +117,11 @@ private async Task FlushAsync(ShellScope scope, IEnumerable<IndexingTask> tasks)
             var ids = localQueue.Select(x => x.ContentItemId).ToArray();
             var table = $"{session.Store.Configuration.TablePrefix}{nameof(IndexingTask)}";
 
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                logger.LogDebug("Updating indexing tasks: {ContentItemIds}", string.Join(", ", tasks.Select(x => x.ContentItemId)));
+            }
+
             using var connection = dbConnectionAccessor.CreateConnection();
             await connection.OpenAsync();
 
@@ -125,11 +130,6 @@ private async Task FlushAsync(ShellScope scope, IEnumerable<IndexingTask> tasks)
 
             try
             {
-                if (logger.IsEnabled(LogLevel.Debug))
-                {
-                    logger.LogDebug("Updating indexing tasks: {ContentItemIds}", string.Join(", ", tasks.Select(x => x.ContentItemId)));
-                }
-
                 // Page delete statements to prevent the limits from IN sql statements.
                 var pageSize = 100;
 
@@ -139,21 +139,21 @@ private async Task FlushAsync(ShellScope scope, IEnumerable<IndexingTask> tasks)
                 {
                     var pageOfIds = ids.Take(pageSize).ToArray();
 
-                    if (pageOfIds.Any())
+                    if (pageOfIds.Length > 0)
                     {
                         await transaction.Connection.ExecuteAsync(deleteCmd, new { Ids = pageOfIds }, transaction);
                         ids = ids.Skip(pageSize).ToArray();
                     }
-                } while (ids.Any());
+                } while (ids.Length > 0);
 
                 var insertCmd = $"insert into {dialect.QuoteForTableName(table, _store.Configuration.Schema)} ({dialect.QuoteForColumnName("CreatedUtc")}, {dialect.QuoteForColumnName("ContentItemId")}, {dialect.QuoteForColumnName("Type")}) values (@CreatedUtc, @ContentItemId, @Type);";
                 await transaction.Connection.ExecuteAsync(insertCmd, localQueue, transaction);
 
-                transaction.Commit();
+                await transaction.CommitAsync();
             }
             catch (Exception e)
             {
-                transaction.Rollback();
+                await transaction.RollbackAsync();
                 logger.LogError(e, "An error occurred while updating indexing tasks");
 
                 throw;

diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Migrations.cs
@@ -197,11 +197,11 @@ public int Create()
 
                     await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    transaction.Commit();
+                    await transaction.CommitAsync();
                 }
                 catch (Exception e)
                 {
-                    transaction.Rollback();
+                    await transaction.RollbackAsync();
                     logger.LogError(e, "An error occurred while updating Lucene indices settings and queries");
 
                     throw;

diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.Users/Migrations.cs
@@ -255,16 +255,15 @@ public int UpdateFrom12()
                 var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
                 var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
 
+                logger.LogDebug("Updating User Settings");
+
                 using var connection = dbConnectionAccessor.CreateConnection();
                 await connection.OpenAsync();
-
                 using var transaction = connection.BeginTransaction(session.Store.Configuration.IsolationLevel);
                 var dialect = session.Store.Configuration.SqlDialect;
 
                 try
                 {
-                    logger.LogDebug("Updating User Settings");
-
                     var quotedTableName = dialect.QuoteForTableName(table, session.Store.Configuration.Schema);
                     var quotedContentColumnName = dialect.QuoteForColumnName("Content");
                     var quotedTypeColumnName = dialect.QuoteForColumnName("Type");
@@ -273,11 +272,11 @@ public int UpdateFrom12()
 
                     await transaction.Connection.ExecuteAsync(updateCmd, null, transaction);
 
-                    transaction.Commit();
+                    await transaction.CommitAsync();
                 }
                 catch (Exception e)
                 {
-                    transaction.Rollback();
+                    await transaction.RollbackAsync();
                     logger.LogError(e, "An error occurred while updating User Settings");
 
                     throw;

diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/Removing/ShellDbTablesRemovingHandler.cs b/src/OrchardCore/OrchardCore.Data.YesSql/Removing/ShellDbTablesRemovingHandler.cs
@@ -87,12 +87,19 @@ public async Task RemovingAsync(ShellRemovingContext context)
             {
                 await connection.OpenAsync();
                 using var transaction = connection.BeginTransaction(store.Configuration.IsolationLevel);
+                try
+                {
+                    // Remove all tables of this tenant.
+                    shellDbTablesInfo.Configure(transaction, _logger, throwOnError: false);
+                    shellDbTablesInfo.RemoveAllTables();
 
-                // Remove all tables of this tenant.
-                shellDbTablesInfo.Configure(transaction, _logger, throwOnError: false);
-                shellDbTablesInfo.RemoveAllTables();
-
-                transaction.Commit();
+                    await transaction.CommitAsync();
+                }
+                catch
+                {
+                    await transaction.RollbackAsync();
+                    throw;
+                }
             }
         }
         catch (Exception ex)