change SqlStorageSupplier to support multi statements on save

HSGamer · HSGamer · commit ccd3b36d69d4 · 2025-01-04T10:18:20.000+07:00
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/MySqlStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/MySqlStorageSupplier.java
@@ -7,6 +7,8 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
 import java.util.function.Consumer;
 
 public class MySqlStorageSupplier extends SqlStorageSupplier {
@@ -33,7 +35,7 @@ protected void flushConnection(Connection connection) {
     }
 
     @Override
-    protected String toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
+    protected List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
         StringBuilder statement = new StringBuilder("INSERT INTO `")
                 .append(name)
                 .append("` (");
@@ -64,14 +66,14 @@ protected String toSaveStatement(String name, String[] keyColumns, String[] valu
             }
         }
         statement.append(";");
-        return statement.toString();
+        return Collections.singletonList(statement.toString());
     }
 
     @Override
-    protected Object[] toSaveValues(Object[] keys, Object[] values) {
+    protected List<Object[]> toSaveValues(Object[] keys, Object[] values) {
         Object[] queryValues = new Object[keys.length + values.length];
         System.arraycopy(keys, 0, queryValues, 0, keys.length);
         System.arraycopy(values, 0, queryValues, keys.length, values.length);
-        return queryValues;
+        return Collections.singletonList(queryValues);
     }
 }
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/NewSqliteStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/NewSqliteStorageSupplier.java
@@ -3,6 +3,8 @@
 import me.hsgamer.hscore.database.Setting;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.List;
 import java.util.function.Consumer;
 
 public class NewSqliteStorageSupplier extends SqliteStorageSupplier {
@@ -11,7 +13,7 @@ public NewSqliteStorageSupplier(Consumer<Setting> databaseSettingConsumer, File
     }
 
     @Override
-    protected String toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
+    protected List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
         StringBuilder statement = new StringBuilder("INSERT INTO `")
                 .append(name)
                 .append("` (");
@@ -52,6 +54,6 @@ protected String toSaveStatement(String name, String[] keyColumns, String[] valu
             }
         }
         statement.append(";");
-        return statement.toString();
+        return Collections.singletonList(statement.toString());
     }
 }
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java
@@ -8,7 +8,6 @@
 import me.hsgamer.topper.storage.core.DataStorage;
 import me.hsgamer.topper.storage.simple.converter.SqlEntryConverter;
 import me.hsgamer.topper.storage.simple.setting.DataStorageSetting;
-import org.intellij.lang.annotations.Language;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -24,10 +23,9 @@ public abstract class SqlStorageSupplier implements DataStorageSupplier {
 
     protected abstract void flushConnection(Connection connection);
 
-    @Language("SQL")
-    protected abstract String toSaveStatement(String name, String[] keyColumns, String[] valueColumns);
+    protected abstract List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns);
 
-    protected abstract Object[] toSaveValues(Object[] keys, Object[] values);
+    protected abstract List<Object[]> toSaveValues(Object[] keys, Object[] values);
 
     @Override
     public <K, V> DataStorage<K, V> getStorage(String name, DataStorageSetting<K, V> setting) {
@@ -63,16 +61,22 @@ public CompletableFuture<Void> save(Map<K, V> map, boolean urgent) {
                         String[] keyColumns = converter.getKeyColumns();
                         String[] valueColumns = converter.getValueColumns();
 
-                        @Language("SQL") String statement = toSaveStatement(name, keyColumns, valueColumns);
+                        List<String> statement = toSaveStatement(name, keyColumns, valueColumns);
+                        List<List<Object[]>> values = new ArrayList<>();
 
-                        BatchBuilder batchBuilder = BatchBuilder.create(connection, statement);
                         map.forEach((key, value) -> {
-                            Object[] keyQueryValues = converter.toKeyQueryValues(key);
-                            Object[] valueQueryValues = converter.toValueQueryValues(value);
-                            Object[] queryValues = toSaveValues(keyQueryValues, valueQueryValues);
-                            batchBuilder.addValues(queryValues);
+                            Object[] keyValues = converter.toKeyQueryValues(key);
+                            Object[] valueValues = converter.toValueQueryValues(value);
+                            values.add(toSaveValues(keyValues, valueValues));
                         });
-                        batchBuilder.execute();
+
+                        for (int i = 0; i < statement.size(); i++) {
+                            BatchBuilder batchBuilder = BatchBuilder.create(connection, statement.get(i));
+                            for (List<Object[]> value : values) {
+                                batchBuilder.addValues(value.get(i));
+                            }
+                            batchBuilder.execute();
+                        }
                     } catch (SQLException e) {
                         logger.log(LogLevel.ERROR, "Failed to save top holder", e);
                     } finally {
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqliteStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqliteStorageSupplier.java
@@ -7,6 +7,8 @@
 
 import java.io.File;
 import java.sql.Connection;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
@@ -42,7 +44,7 @@ protected void flushConnection(Connection connection) {
     }
 
     @Override
-    protected String toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
+    protected List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {
         StringBuilder statement = new StringBuilder("INSERT OR REPLACE INTO `")
                 .append(name)
                 .append("` (");
@@ -62,15 +64,15 @@ protected String toSaveStatement(String name, String[] keyColumns, String[] valu
             }
         }
         statement.append(");");
-        return statement.toString();
+        return Collections.singletonList(statement.toString());
     }
 
     @Override
-    protected Object[] toSaveValues(Object[] keys, Object[] values) {
+    protected List<Object[]> toSaveValues(Object[] keys, Object[] values) {
         Object[] queryValues = new Object[keys.length + values.length];
         System.arraycopy(keys, 0, queryValues, 0, keys.length);
         System.arraycopy(values, 0, queryValues, keys.length, values.length);
-        return queryValues;
+        return Collections.singletonList(queryValues);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`import java.sql.Connection;`
`9`	`9`	`import java.sql.SQLException;`
	`10`	`+import java.util.Collections;`
	`11`	`+import java.util.List;`
`10`	`12`	`import java.util.function.Consumer;`
`11`	`13`
`12`	`14`	`public class MySqlStorageSupplier extends SqlStorageSupplier {`
`@@ -33,7 +35,7 @@ protected void flushConnection(Connection connection) {`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`@Override`
`36`		`- protected String toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {`
	`38`	`+ protected List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {`
`37`	`39`	StringBuilder statement = new StringBuilder("INSERT INTO `")
`38`	`40`	`.append(name)`
`39`	`41`	.append("` (");
`@@ -64,14 +66,14 @@ protected String toSaveStatement(String name, String[] keyColumns, String[] valu`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`	`statement.append(";");`
`67`		`- return statement.toString();`
	`69`	`+ return Collections.singletonList(statement.toString());`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`@Override`
`71`		`- protected Object[] toSaveValues(Object[] keys, Object[] values) {`
	`73`	`+ protected List<Object[]> toSaveValues(Object[] keys, Object[] values) {`
`72`	`74`	`Object[] queryValues = new Object[keys.length + values.length];`
`73`	`75`	`System.arraycopy(keys, 0, queryValues, 0, keys.length);`
`74`	`76`	`System.arraycopy(values, 0, queryValues, keys.length, values.length);`
`75`		`- return queryValues;`
	`77`	`+ return Collections.singletonList(queryValues);`
`76`	`78`	`}`
`77`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`import me.hsgamer.hscore.database.Setting;`
`4`	`4`
`5`	`5`	`import java.io.File;`
	`6`	`+import java.util.Collections;`
	`7`	`+import java.util.List;`
`6`	`8`	`import java.util.function.Consumer;`
`7`	`9`
`8`	`10`	`public class NewSqliteStorageSupplier extends SqliteStorageSupplier {`
`@@ -11,7 +13,7 @@ public NewSqliteStorageSupplier(Consumer<Setting> databaseSettingConsumer, File`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`@Override`
`14`		`- protected String toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {`
	`16`	`+ protected List<String> toSaveStatement(String name, String[] keyColumns, String[] valueColumns) {`
`15`	`17`	StringBuilder statement = new StringBuilder("INSERT INTO `")
`16`	`18`	`.append(name)`
`17`	`19`	.append("` (");
`@@ -52,6 +54,6 @@ protected String toSaveStatement(String name, String[] keyColumns, String[] valu`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`	`statement.append(";");`
`55`		`- return statement.toString();`
	`57`	`+ return Collections.singletonList(statement.toString());`
`56`	`58`	`}`
`57`	`59`	`}`