Move loop invariants out of loops inside batch storage statements

AuroraLS3 · AuroraLS3 · commit ab01e75e5c83 · 2026-02-20T17:47:01.000+02:00
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerTableResultTransaction.java
@@ -132,9 +132,9 @@ private void insertNewRows(Integer tableID, Integer afterRow, List<Object[]> row
             public void prepare(PreparedStatement statement) throws SQLException {
                 int maxColumnSize = Math.min(table.getMaxColumnSize(), 4); // Limit to maximum 4 columns, or how many column names there are.
 
+                statement.setInt(1, tableID);
                 for (int rowNumber = afterRow; rowNumber < rows.size(); rowNumber++) {
                     Object[] row = rows.get(rowNumber);
-                    statement.setInt(1, tableID);
                     statement.setString(2, playerUUID.toString());
                     for (int i = 0; i < maxColumnSize; i++) {
                         Object value = row[i];
@@ -167,6 +167,7 @@ private void updateRows(Integer tableID, Integer untilRow, List<Object[]> rows)
             public void prepare(PreparedStatement statement) throws SQLException {
                 int maxColumnSize = Math.min(table.getMaxColumnSize(), 4); // Limit to maximum 4 columns, or how many column names there are.
 
+                statement.setInt(5, tableID);
                 for (int rowNumber = 0; rowNumber < untilRow; rowNumber++) {
                     Object[] row = rows.get(rowNumber);
 
@@ -179,7 +180,6 @@ public void prepare(PreparedStatement statement) throws SQLException {
                         statement.setNull(1 + valueIndex, Types.VARCHAR);
                     }
 
-                    statement.setInt(5, tableID);
                     statement.setString(6, playerUUID.toString());
                     statement.setInt(7, rowNumber);
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerTableResultTransaction.java
@@ -130,9 +130,9 @@ private void insertNewRows(Integer tableID, Integer afterRow, List<Object[]> row
             public void prepare(PreparedStatement statement) throws SQLException {
                 int maxColumnSize = Math.min(table.getMaxColumnSize(), 5); // Limit to maximum 5 columns, or how many column names there are.
 
+                statement.setInt(1, tableID);
                 for (int rowNumber = afterRow; rowNumber < rows.size(); rowNumber++) {
                     Object[] row = rows.get(rowNumber);
-                    statement.setInt(1, tableID);
                     statement.setString(2, serverUUID.toString());
                     for (int i = 0; i < maxColumnSize; i++) {
                         Object value = row[i];
@@ -166,6 +166,7 @@ private void updateRows(Integer tableID, Integer untilRow, List<Object[]> rows)
             public void prepare(PreparedStatement statement) throws SQLException {
                 int maxColumnSize = Math.min(table.getMaxColumnSize(), 5); // Limit to maximum 5 columns, or how many column names there are.
 
+                statement.setInt(6, tableID);
                 for (int rowNumber = 0; rowNumber < untilRow; rowNumber++) {
                     Object[] row = rows.get(rowNumber);
 
@@ -178,7 +179,6 @@ public void prepare(PreparedStatement statement) throws SQLException {
                         statement.setNull(1 + valueIndex, Types.VARCHAR);
                     }
 
-                    statement.setInt(6, tableID);
                     statement.setString(7, serverUUID.toString());
                     statement.setInt(8, rowNumber);
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/LargeStoreQueries.java
@@ -157,6 +157,7 @@ public static Executable storeAllPlanServerInformation(Collection<Server> server
         return new ExecBatchStatement(ServerTable.INSERT_STATEMENT) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setBoolean(4, true);
                 for (Server server : servers) {
                     ServerUUID serverUUID = server.getUuid();
                     if (serverUUID == null) {
@@ -166,7 +167,6 @@ public void prepare(PreparedStatement statement) throws SQLException {
                     statement.setString(1, serverUUID.toString());
                     statement.setString(2, server.getName());
                     statement.setString(3, server.getWebAddress());
-                    statement.setBoolean(4, true);
                     statement.setBoolean(5, server.isProxy());
                     statement.setString(6, server.getPlanVersion());
                     statement.addBatch();
@@ -478,8 +478,8 @@ public static Executable storeGroupPermissionRelations(Map<String, List<String>>
             public void prepare(PreparedStatement statement) throws SQLException {
                 for (var permissionsOfGroup : groupPermissions.entrySet()) {
                     String group = permissionsOfGroup.getKey();
+                    statement.setString(1, group);
                     for (String permission : permissionsOfGroup.getValue()) {
-                        statement.setString(1, group);
                         statement.setString(2, permission);
                         statement.addBatch();
                     }
@@ -501,8 +501,8 @@ public static Executable storeGroupPermissionIdRelations(Map<Integer, List<Integ
             public void prepare(PreparedStatement statement) throws SQLException {
                 for (var permissionsOfGroup : groupPermissions.entrySet()) {
                     Integer groupId = permissionsOfGroup.getKey();
+                    statement.setInt(1, groupId);
                     for (Integer permissionId : permissionsOfGroup.getValue()) {
-                        statement.setInt(1, groupId);
                         statement.setInt(2, permissionId);
                         statement.addBatch();
                     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/BatchBanStatusTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/BatchBanStatusTransaction.java
@@ -61,14 +61,14 @@ private Executable updateBanStatus() {
         return new ExecBatchStatement(sql) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setBoolean(1, true);
                 for (UUID bannedPlayerUUID : bannedPlayerUUIDs) {
-                    statement.setBoolean(1, true);
                     statement.setString(2, bannedPlayerUUID.toString());
                     statement.setString(3, serverUUID.toString());
                     statement.addBatch();
                 }
+                statement.setBoolean(1, false);
                 for (UUID unbannedPlayerUUID : unbannedPlayerUUIDs) {
-                    statement.setBoolean(1, false);
                     statement.setString(2, unbannedPlayerUUID.toString());
                     statement.setString(3, serverUUID.toString());
                     statement.addBatch();
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/StorePluginVersionsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/StorePluginVersionsTransaction.java
@@ -50,6 +50,7 @@ protected void performOperations() {
         execute(new ExecBatchStatement(PluginVersionTable.INSERT_STATEMENT) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setLong(4, time);
                 for (PluginMetadata plugin : changeList) {
                     statement.setString(1, serverUUID.toString());
                     statement.setString(2, StringUtils.truncate(plugin.getName(), PluginVersionTable.MAX_NAME_LENGTH));
@@ -58,7 +59,6 @@ public void prepare(PreparedStatement statement) throws SQLException {
                     } else {
                         statement.setString(3, StringUtils.truncate(plugin.getVersion(), PluginVersionTable.MAX_VERSION_LENGTH));
                     }
-                    statement.setLong(4, time);
                     statement.addBatch();
                 }
             }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveOldExtensionsTransaction.java
@@ -66,12 +66,7 @@ private void removeValues(int providerID) {
                 ExtensionServerValueTable.TABLE_NAME,
                 ExtensionGroupsTable.TABLE_NAME
         }) {
-            execute(new ExecStatement(DELETE_FROM + table + WHERE + "provider_id=?") {
-                @Override
-                public void prepare(PreparedStatement statement) throws SQLException {
-                    statement.setInt(1, providerID);
-                }
-            });
+            execute(DELETE_FROM + table + WHERE + "provider_id=" + providerID);
         }
     }
 
@@ -80,12 +75,7 @@ private void removeTableValues(Integer providerID) {
                 ExtensionPlayerTableValueTable.TABLE_NAME,
                 ExtensionServerTableValueTable.TABLE_NAME
         }) {
-            execute(new ExecStatement(DELETE_FROM + table + WHERE + "table_id=?") {
-                @Override
-                public void prepare(PreparedStatement statement) throws SQLException {
-                    statement.setInt(1, providerID);
-                }
-            });
+            execute(DELETE_FROM + table + WHERE + "table_id=" + providerID);
         }
     }
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/NicknameLastSeenPatch.java
@@ -131,11 +131,11 @@ public void prepare(PreparedStatement statement) throws SQLException {
                 for (Map.Entry<Integer, Set<Nickname>> entry : nicknames.entrySet()) {
                     Integer userId = entry.getKey();
                     Set<Nickname> nicks = entry.getValue();
+                    statement.setInt(3, userId);
                     for (Nickname nick : nicks) {
                         Integer serverID = serverIDsByUUID.get(nick.getServerUUID());
                         statement.setLong(1, nick.getDate());
                         statement.setString(2, nick.getName());
-                        statement.setInt(3, userId);
                         statement.setInt(4, serverID);
                         statement.addBatch();
                     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/GrantWebPermissionToGroupsWithPermissionTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/GrantWebPermissionToGroupsWithPermissionTransaction.java
@@ -62,9 +62,9 @@ protected void performOperations() {
         execute(new ExecBatchStatement(sql) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setInt(2, permissionId);
                 for (Integer groupId : groupIds) {
                     statement.setInt(1, groupId);
-                    statement.setInt(2, permissionId);
                     statement.addBatch();
                 }
             }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebGroupTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreWebGroupTransaction.java
@@ -86,8 +86,8 @@ private void insertPermissionIdsOfGroup(int id, List<Integer> permissionIds) {
         execute(new ExecBatchStatement(WebGroupToPermissionTable.INSERT_STATEMENT) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
                 for (Integer permissionId : permissionIds) {
-                    statement.setInt(1, id);
                     statement.setInt(2, permissionId);
                     statement.addBatch();
                 }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected void performOperations() {`
`50`	`50`	`execute(new ExecBatchStatement(PluginVersionTable.INSERT_STATEMENT) {`
`51`	`51`	`@Override`
`52`	`52`	`public void prepare(PreparedStatement statement) throws SQLException {`
	`53`	`+ statement.setLong(4, time);`
`53`	`54`	`for (PluginMetadata plugin : changeList) {`
`54`	`55`	`statement.setString(1, serverUUID.toString());`
`55`	`56`	`statement.setString(2, StringUtils.truncate(plugin.getName(), PluginVersionTable.MAX_NAME_LENGTH));`
`@@ -58,7 +59,6 @@ public void prepare(PreparedStatement statement) throws SQLException {`
`58`	`59`	`} else {`
`59`	`60`	`statement.setString(3, StringUtils.truncate(plugin.getVersion(), PluginVersionTable.MAX_VERSION_LENGTH));`
`60`	`61`	`}`
`61`		`- statement.setLong(4, time);`
`62`	`62`	`statement.addBatch();`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ protected void performOperations() {`
`62`	`62`	`execute(new ExecBatchStatement(sql) {`
`63`	`63`	`@Override`
`64`	`64`	`public void prepare(PreparedStatement statement) throws SQLException {`
	`65`	`+ statement.setInt(2, permissionId);`
`65`	`66`	`for (Integer groupId : groupIds) {`
`66`	`67`	`statement.setInt(1, groupId);`
`67`		`- statement.setInt(2, permissionId);`
`68`	`68`	`statement.addBatch();`
`69`	`69`	`}`
`70`	`70`	`}`