#16277 Adding pagination to batch delete to avoid deadlocks in MySQL

dotCMS · Apr 23, 2019 · ff1000b · ff1000b
1 parent 47e4ded
commit ff1000b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexQueueFactory.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexQueueFactory.java
@@ -180,11 +180,15 @@ protected void deleteReindexEntry(final List<ReindexEntry> recordsToDelete) thro
 
         final int batchSize = REINDEX_RECORDS_TO_FETCH / 5;
         int from = 0;
-        while(from <= recordsToDelete.size()){
-            dotConnect.executeBatch("DELETE FROM dist_reindex_journal where id = ?",
+        while (from <= recordsToDelete.size()) {
+            dotConnect.executeBatch(
+                    "DELETE FROM dist_reindex_journal where " + (DbConnectionFactory.isMySql()
+                            ? "id = ?" : "ident_to_index = ?"),
                     recordsToDelete
                             .subList(from, Math.min(recordsToDelete.size(), batchSize + from))
-                            .stream().map(entry -> new Params(entry.getId())).collect(
+                            .stream().map(entry -> new Params(
+                            DbConnectionFactory.isMySql() ? entry.getId()
+                                    : entry.getIdentToIndex())).collect(
                             Collectors.toList()));
 
             from += batchSize;