From b8ac41ac0dd76e8d681e7e15cd0d7093387f9ee7 Mon Sep 17 00:00:00 2001 From: evasques Date: Wed, 7 Sep 2022 10:10:25 +0100 Subject: [PATCH] Revert "ACS-1600 : Error when running propTablesCleanupJob on an env with 100 million records in alf_prop_value (#473)" (#1358) This reverts commit 00b0b21668d013f06d5765eb84f2dc49a766f85f. --- .../repo/domain/schema/script/DeleteNotExistsExecutor.java | 2 +- .../repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java index 26ee58e370..46e3ff2942 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java +++ b/repository/src/main/java/org/alfresco/repo/domain/schema/script/DeleteNotExistsExecutor.java @@ -220,6 +220,7 @@ public class DeleteNotExistsExecutor implements StatementExecutor { // Process batch primaryId = processPrimaryTableResultSet(primaryPrepStmt, secondaryPrepStmts, deletePrepStmt, deleteIds, primaryTableName, primaryColumnName, tableColumn); + connection.commit(); if (primaryId == null) { @@ -298,7 +299,6 @@ public class DeleteNotExistsExecutor implements StatementExecutor if (deleteIds.size() == deleteBatchSize) { deleteFromPrimaryTable(deletePrepStmt, deleteIds, primaryTableName); - connection.commit(); } if (!resultSet.next()) diff --git a/repository/src/main/java/org/alfresco/repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java b/repository/src/main/java/org/alfresco/repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java index bbe1920d1a..ce85b2794a 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java +++ b/repository/src/main/java/org/alfresco/repo/domain/schema/script/MySQLDeleteNotExistsExecutor.java @@ -117,6 +117,7 @@ public class MySQLDeleteNotExistsExecutor extends DeleteNotExistsExecutor { // Process batch primaryId = processPrimaryTableResultSet(primaryPrepStmt, secondaryPrepStmts, deletePrepStmt, deleteIds, primaryTableName, primaryColumnName, tableColumn); + connection.commit(); if (primaryId == null) {