Refactor JDBC adapter related code

brfrn169 · brfrn169 · commit ab8e65943a41 · 2025-07-26T13:22:42.000+09:00
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java
@@ -37,10 +37,6 @@ public static Properties getProperties(String testName) {
   }
 
   public static boolean isSqlite() {
-    Properties properties = new Properties();
-    properties.setProperty(
-        DatabaseConfig.CONTACT_POINTS, System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL));
-    properties.setProperty(DatabaseConfig.STORAGE, "jdbc");
-    return JdbcUtils.isSqlite(new JdbcConfig(new DatabaseConfig(properties)));
+    return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:sqlite:");
   }
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcSchemaLoaderImportIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcSchemaLoaderImportIntegrationTest.java
@@ -26,8 +26,7 @@ public class JdbcSchemaLoaderImportIntegrationTest extends SchemaLoaderImportInt
 
   @Override
   protected Properties getProperties(String testName) {
-    Properties properties = new Properties();
-    properties.putAll(JdbcEnv.getProperties(testName));
+    Properties properties = JdbcEnv.getProperties(testName);
     JdbcConfig config = new JdbcConfig(new DatabaseConfig(properties));
     rdbEngine = RdbEngineFactory.create(config);
     testUtils = new JdbcAdminImportTestUtils(properties);
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcUtils.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcUtils.java
@@ -130,10 +130,6 @@ public static BasicDataSource initDataSourceForAdmin(
     return dataSource;
   }
 
-  public static boolean isSqlite(JdbcConfig config) {
-    return config.getJdbcUrl().startsWith("jdbc:sqlite:");
-  }
-
   /**
    * Get {@code JDBCType} of the specified {@code sqlType}.
    *
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java
@@ -14,7 +14,7 @@
 import com.scalar.db.io.TimeColumn;
 import com.scalar.db.io.TimestampColumn;
 import com.scalar.db.io.TimestampTZColumn;
-import com.scalar.db.storage.jdbc.query.MergeIntoQuery;
+import com.scalar.db.storage.jdbc.query.MergeQuery;
 import com.scalar.db.storage.jdbc.query.SelectQuery;
 import com.scalar.db.storage.jdbc.query.SelectWithLimitQuery;
 import com.scalar.db.storage.jdbc.query.UpsertQuery;
@@ -297,13 +297,13 @@ public String tryAddIfNotExistsToCreateIndexSql(String createIndexSql) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithLimitQuery(builder, limit);
   }
 
   @Override
   public UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder) {
-    return MergeIntoQuery.createForDb2(builder);
+    return new MergeQuery(builder, "SYSIBM.DUAL");
   }
 
   @Override
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineMysql.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineMysql.java
@@ -141,7 +141,7 @@ public String enclose(String name) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithLimitQuery(builder, limit);
   }
 
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java
@@ -8,7 +8,7 @@
 import com.scalar.db.common.CoreError;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.io.DataType;
-import com.scalar.db.storage.jdbc.query.MergeIntoQuery;
+import com.scalar.db.storage.jdbc.query.MergeQuery;
 import com.scalar.db.storage.jdbc.query.SelectQuery;
 import com.scalar.db.storage.jdbc.query.SelectWithFetchFirstNRowsOnly;
 import com.scalar.db.storage.jdbc.query.UpsertQuery;
@@ -169,13 +169,13 @@ public String enclose(String name) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithFetchFirstNRowsOnly(builder, limit);
   }
 
   @Override
   public UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder) {
-    return MergeIntoQuery.createForOracle(builder);
+    return new MergeQuery(builder, "DUAL");
   }
 
   @Override
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java
@@ -181,7 +181,7 @@ public String enclose(String name) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithLimitQuery(builder, limit);
   }
 
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java
@@ -161,13 +161,13 @@ public String enclose(String name) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithTop(builder, limit);
   }
 
   @Override
   public UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder) {
-    return new MergeQuery(builder);
+    return new MergeQuery(builder, null, true);
   }
 
   @Override
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java
@@ -277,7 +277,7 @@ public String encloseFullTableName(String schema, String table) {
   }
 
   @Override
-  public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {
+  public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {
     return new SelectWithLimitQuery(builder, limit);
   }
 
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java
@@ -127,7 +127,7 @@ default String encloseFullTableName(String schema, String table) {
     return enclose(schema) + "." + enclose(table);
   }
 
-  SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit);
+  SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit);
 
   UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder);
 
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/query/MergeIntoQuery.java b/core/src/main/java/com/scalar/db/storage/jdbc/query/MergeIntoQuery.java
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/query/MergeQuery.java b/core/src/main/java/com/scalar/db/storage/jdbc/query/MergeQuery.java
@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
@@ -24,16 +25,25 @@ public class MergeQuery implements UpsertQuery {
   private final Key partitionKey;
   private final Optional<Key> clusteringKey;
   private final Map<String, Column<?>> columns;
+  @Nullable private final String dualTableName;
+  private final boolean semicolonAdded;
 
   @SuppressFBWarnings("EI_EXPOSE_REP2")
-  public MergeQuery(Builder builder) {
+  public MergeQuery(Builder builder, @Nullable String dualTableName) {
+    this(builder, dualTableName, false);
+  }
+
+  @SuppressFBWarnings("EI_EXPOSE_REP2")
+  public MergeQuery(Builder builder, @Nullable String dualTableName, boolean semicolonAdded) {
     rdbEngine = builder.rdbEngine;
     schema = builder.schema;
     table = builder.table;
     tableMetadata = builder.tableMetadata;
     partitionKey = builder.partitionKey;
     clusteringKey = builder.clusteringKey;
     columns = builder.columns;
+    this.dualTableName = dualTableName;
+    this.semicolonAdded = semicolonAdded;
   }
 
   @Override
@@ -47,20 +57,23 @@ public String sql() {
         columns.keySet().stream().map(rdbEngine::enclose).collect(Collectors.toList());
 
     StringBuilder sql = new StringBuilder();
-    sql.append("MERGE ")
+    sql.append("MERGE INTO ")
         .append(rdbEngine.encloseFullTableName(schema, table))
         .append(" t1 USING (SELECT ")
-        .append(makeUsingSelectSqlString(enclosedKeyNames))
-        .append(") t2 ON (")
-        .append(makePrimaryKeyConditionsSqlString(enclosedKeyNames))
-        .append(")");
+        .append(makeUsingSelectSqlString(enclosedKeyNames));
+    if (dualTableName != null) {
+      sql.append(" FROM ").append(dualTableName);
+    }
+    sql.append(") t2 ON (").append(makePrimaryKeyConditionsSqlString(enclosedKeyNames)).append(")");
     if (!columns.isEmpty()) {
       sql.append(" WHEN MATCHED THEN UPDATE SET ")
           .append(makeUpdateSetSqlString(enclosedValueNames));
     }
     sql.append(" WHEN NOT MATCHED THEN INSERT ")
-        .append(makeInsertSqlString(enclosedKeyNames, enclosedValueNames))
-        .append(";");
+        .append(makeInsertSqlString(enclosedKeyNames, enclosedValueNames));
+    if (semicolonAdded) {
+      sql.append(";");
+    }
     return sql.toString();
   }
 
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/query/SelectQuery.java b/core/src/main/java/com/scalar/db/storage/jdbc/query/SelectQuery.java
@@ -152,7 +152,7 @@ public Builder limit(int limit) {
 
     public SelectQuery build() {
       if (limit > 0) {
-        return rdbEngine.buildSelectQuery(this, limit);
+        return rdbEngine.buildSelectWithLimitQuery(this, limit);
       }
       return new SimpleSelectQuery(this);
     }
diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/query/QueryBuilderTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/query/QueryBuilderTest.java

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,6 @@ public static Properties getProperties(String testName) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public static boolean isSqlite() {`
`40`		`- Properties properties = new Properties();`
`41`		`- properties.setProperty(`
`42`		`- DatabaseConfig.CONTACT_POINTS, System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL));`
`43`		`- properties.setProperty(DatabaseConfig.STORAGE, "jdbc");`
`44`		`- return JdbcUtils.isSqlite(new JdbcConfig(new DatabaseConfig(properties)));`
	`40`	`+ return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:sqlite:");`
`45`	`41`	`}`
`46`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,6 @@ public static BasicDataSource initDataSourceForAdmin(`
`130`	`130`	`return dataSource;`
`131`	`131`	`}`
`132`	`132`
`133`		`- public static boolean isSqlite(JdbcConfig config) {`
`134`		`- return config.getJdbcUrl().startsWith("jdbc:sqlite:");`
`135`		`- }`
`136`		`-`
`137`	`133`	`/**`
`138`	`134`	`* Get {@code JDBCType} of the specified {@code sqlType}.`
`139`	`135`	`*`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public String enclose(String name) {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Override`
`144`		`- public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {`
	`144`	`+ public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {`
`145`	`145`	`return new SelectWithLimitQuery(builder, limit);`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public String enclose(String name) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`@Override`
`184`		`- public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {`
	`184`	`+ public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {`
`185`	`185`	`return new SelectWithLimitQuery(builder, limit);`
`186`	`186`	`}`
`187`	`187`
Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,13 @@ public String enclose(String name) {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`@Override`
`164`		`- public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {`
	`164`	`+ public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {`
`165`	`165`	`return new SelectWithTop(builder, limit);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Override`
`169`	`169`	`public UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder) {`
`170`		`- return new MergeQuery(builder);`
	`170`	`+ return new MergeQuery(builder, null, true);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ public String encloseFullTableName(String schema, String table) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`@Override`
`280`		`- public SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit) {`
	`280`	`+ public SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit) {`
`281`	`281`	`return new SelectWithLimitQuery(builder, limit);`
`282`	`282`	`}`
`283`	`283`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ default String encloseFullTableName(String schema, String table) {`
`127`	`127`	`return enclose(schema) + "." + enclose(table);`
`128`	`128`	`}`
`129`	`129`
`130`		`- SelectQuery buildSelectQuery(SelectQuery.Builder builder, int limit);`
	`130`	`+ SelectQuery buildSelectWithLimitQuery(SelectQuery.Builder builder, int limit);`
`131`	`131`
`132`	`132`	`UpsertQuery buildUpsertQuery(UpsertQuery.Builder builder);`
`133`	`133`