From 61f0282596ac574a48ab854bff0dc1d8775ea812 Mon Sep 17 00:00:00 2001
From: Antti Koponen <koponen942@outlook.com>
Date: Wed, 14 Oct 2026 21:38:14 +0300
Subject: [PATCH] Fix ClickHouse queue stalling from per-entity UUID lookups
 (#1038)

* Reload entity spawn lookups in bulk after each database commit

* Trim consumed prefixes after successful commit
---
 .../coreprotect/consumer/process/Process.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/coreprotect/consumer/process/Process.java b/src/main/java/net/coreprotect/consumer/process/Process.java
index 2d48c472..8f656c0d 100755
--- a/src/main/java/net/coreprotect/consumer/process/Process.java
+++ b/src/main/java/net/coreprotect/consumer/process/Process.java
@@ -193,6 +193,7 @@ public class Process {
             boolean hasEntityContainerTransactions = false;
             boolean hasEntityInteractions = false;
             List<EntitySpawnData> entitySpawnUpdateData = new ArrayList<>();
+            List<Integer> entitySpawnUpdateIndexes = new ArrayList<>();
             Set<UUID> entityIdentityUuids = new HashSet<>();
             Set<Integer> entityIdentityRowIds = new HashSet<>();
             for (int index = 0; index < consumerDataSize; index++) {
@@ -236,6 +237,7 @@ public class Process {
                         continue;
                     }
                     entitySpawnUpdateData.add(spawnData);
+                    entitySpawnUpdateIndexes.add(index);
                     if (spawnData.getPreviousUuid() != null) {
                         entityIdentityUuids.add(spawnData.getPreviousUuid());
                     }
@@ -268,7 +270,6 @@ public class Process {
             entitySpawnUpdates = hasEntitySpawnUpdates ? writeBatch.entitySpawnUpdates() : null;
             if (entitySpawnUpdates != null) {
                 entitySpawnUpdates.prefetch(entitySpawnUpdateData);
-                entitySpawnUpdateData.clear();
             }
             processingStarted = true;
             for (int i = 0; i < consumerDataSize; i++) {
@@ -556,6 +557,19 @@ public class Process {
                                     retryConsumerBatch(processId, consumerData, users, consumerObject, processedThrough);
                                     return;
                                 }
+                                if (entitySpawnUpdates != null) {
+                                    int firstRemaining = 0;
+                                    while (firstRemaining < entitySpawnUpdateIndexes.size() && entitySpawnUpdateIndexes.get(firstRemaining) <= i) {
+                                        firstRemaining++;
+                                    }
+                                    if (firstRemaining > 0) {
+                                        entitySpawnUpdateIndexes.subList(0, firstRemaining).clear();
+                                        entitySpawnUpdateData.subList(0, firstRemaining).clear();
+                                    }
+                                    if (!entitySpawnUpdateData.isEmpty()) {
+                                        entitySpawnUpdates.prefetch(entitySpawnUpdateData);
+                                    }
+                                }
                             }
                         }
                         catch (Exception e) {