Merge remote-tracking branch 'origin/master' into add-blob-admin

Author: KodaiD

.github/workflows/ci.yaml

@@ -1967,7 +1967,7 @@ jobs:
 
       - name: Upload Gradle test reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: tidb_6_5_integration_test_reports_${{ matrix.mode.label }}
           path: core/build/reports/tests/integrationTestJdbc
@@ -2042,7 +2042,7 @@ jobs:
 
       - name: Upload Gradle test reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: tidb_7_5_integration_test_reports_${{ matrix.mode.label }}
           path: core/build/reports/tests/integrationTestJdbc
@@ -2117,7 +2117,7 @@ jobs:
 
       - name: Upload Gradle test reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: tidb_8_5_integration_test_reports_${{ matrix.mode.label }}
           path: core/build/reports/tests/integrationTestJdbc

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "com.diffplug.spotless" version "6.13.0"
-    id "org.jreleaser" version "1.20.0"
+    id "org.jreleaser" version "1.21.0"
 }
 
 ext {
@@ -30,11 +30,11 @@ subprojects {
         azureCosmosVersion = '4.75.0'
         azureBlobStorageVersion = '12.31.3'
         jooqVersion = '3.14.16'
-        awssdkVersion = '2.36.2'
+        awssdkVersion = '2.37.3'
         commonsDbcp2Version = '2.13.0'
         mysqlDriverVersion = '8.4.0'
         postgresqlDriverVersion = '42.7.8'
-        oracleDriverVersion = '23.9.0.25.07'
+        oracleDriverVersion = '23.26.0.0.0'
         sqlserverDriverVersion = '12.8.2.jre8'
         sqliteDriverVersion = '3.50.3.0'
         yugabyteDriverVersion = '42.7.3-yb-4'
@@ -43,7 +43,7 @@ subprojects {
         alloyDbJdbcConnectorVersion = '1.2.7'
         picocliVersion = '4.7.7'
         commonsTextVersion = '1.14.0'
-        junitVersion = '5.14.0'
+        junitVersion = '5.14.1'
         commonsLangVersion = '3.19.0'
         assertjVersion = '3.27.6'
         mockitoVersion = '4.11.0'

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java

@@ -126,16 +126,6 @@ protected void waitForTableDeletion() {
     }
   }
 
-  @Test
-  @Override
-  @Disabled("Import-related functionality is not supported in Cassandra")
-  public void getImportTableMetadata_WithSufficientPermission_ShouldSucceed() {}
-
-  @Test
-  @Override
-  @Disabled("Import-related functionality is not supported in Cassandra")
-  public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed() {}
-
   @Test
   @Override
   @Disabled("Import-related functionality is not supported in Cassandra")

core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminPermissionIntegrationTest.java

@@ -45,16 +45,6 @@ protected void sleepBetweenTests() {
     Uninterruptibles.sleepUninterruptibly(SLEEP_BETWEEN_TESTS_SECONDS, TimeUnit.SECONDS);
   }
 
-  @Test
-  @Override
-  @Disabled("Import-related functionality is not supported in DynamoDB")
-  public void getImportTableMetadata_WithSufficientPermission_ShouldSucceed() {}
-
-  @Test
-  @Override
-  @Disabled("Import-related functionality is not supported in DynamoDB")
-  public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed() {}
-
   @Test
   @Override
   @Disabled("Import-related functionality is not supported in DynamoDB")

core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcSchemaLoaderImportIntegrationTest.java

@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.slf4j.Logger;
@@ -191,6 +192,7 @@ public void importTables_ImportableTablesAndNonRelatedSameNameTableGiven_ShouldI
     super.importTables_ImportableTablesAndNonRelatedSameNameTableGiven_ShouldImportProperly();
   }
 
+  @AfterAll
   @Override
   public void afterAll() {
     try {

core/src/main/java/com/scalar/db/api/DistributedStorageAdmin.java

@@ -1,9 +1,6 @@
 package com.scalar.db.api;
 
 import com.scalar.db.exception.storage.ExecutionException;
-import com.scalar.db.io.DataType;
-import java.util.Collections;
-import java.util.Map;
 
 /**
  * An administrative interface for distributed storage implementations. The user can execute
@@ -44,50 +41,6 @@
  */
 public interface DistributedStorageAdmin extends Admin, AutoCloseable {
 
-  /**
-   * Get import table metadata in the ScalarDB format.
-   *
-   * @param namespace namespace name of import table
-   * @param table import table name
-   * @throws IllegalArgumentException if the table does not exist
-   * @throws IllegalStateException if the table does not meet the requirement of ScalarDB table
-   * @throws ExecutionException if the operation fails
-   * @return import table metadata in the ScalarDB format
-   */
-  default TableMetadata getImportTableMetadata(String namespace, String table)
-      throws ExecutionException {
-    return getImportTableMetadata(namespace, table, Collections.emptyMap());
-  }
-
-  /**
-   * Get import table metadata in the ScalarDB format.
-   *
-   * @param namespace namespace name of import table
-   * @param table import table name
-   * @param overrideColumnsType a map of column data type by column name. Only set the column for
-   *     which you want to override the default data type mapping.
-   * @throws IllegalArgumentException if the table does not exist
-   * @throws IllegalStateException if the table does not meet the requirement of ScalarDB table
-   * @throws ExecutionException if the operation fails
-   * @return import table metadata in the ScalarDB format
-   */
-  TableMetadata getImportTableMetadata(
-      String namespace, String table, Map<String, DataType> overrideColumnsType)
-      throws ExecutionException;
-
-  /**
-   * Add a column in the table without updating the metadata table in ScalarDB.
-   *
-   * @param namespace namespace name of import table
-   * @param table import table name
-   * @param columnName name of the column to be added
-   * @param columnType type of the column to be added
-   * @throws IllegalArgumentException if the table does not exist
-   * @throws ExecutionException if the operation fails
-   */
-  void addRawColumnToTable(String namespace, String table, String columnName, DataType columnType)
-      throws ExecutionException;
-
   /**
    * Returns the storage information.
    *

core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java

@@ -451,20 +451,6 @@ public Set<String> getNamespaceNames() throws ExecutionException {
     }
   }
 
-  @Override
-  public TableMetadata getImportTableMetadata(
-      String namespace, String table, Map<String, DataType> overrideColumnsType)
-      throws ExecutionException {
-    try {
-      return admin.getImportTableMetadata(namespace, table, overrideColumnsType);
-    } catch (ExecutionException e) {
-      throw new ExecutionException(
-          CoreError.GETTING_IMPORT_TABLE_METADATA_FAILED.buildMessage(
-              ScalarDbUtils.getFullTableName(namespace, table)),
-          e);
-    }
-  }
-
   @Override
   public void importTable(
       String namespace,
@@ -489,20 +475,6 @@ public void importTable(
     }
   }
 
-  @Override
-  public void addRawColumnToTable(
-      String namespace, String table, String columnName, DataType columnType)
-      throws ExecutionException {
-    try {
-      admin.addRawColumnToTable(namespace, table, columnName, columnType);
-    } catch (ExecutionException e) {
-      throw new ExecutionException(
-          CoreError.ADDING_RAW_COLUMN_TO_TABLE_FAILED.buildMessage(
-              ScalarDbUtils.getFullTableName(namespace, table), columnName, columnType),
-          e);
-    }
-  }
-
   @Override
   public void upgrade(Map<String, String> options) throws ExecutionException {
     try {

core/src/main/java/com/scalar/db/common/CoreError.java

@@ -377,16 +377,16 @@ public enum CoreError implements ScalarDbError {
       ""),
   MULTI_STORAGE_STORAGE_NOT_FOUND(
       Category.USER_ERROR, "0084", "Storage not found. Storage: %s", "", ""),
-  JDBC_NAMESPACE_NAME_NOT_ACCEPTABLE(
-      Category.USER_ERROR, "0085", "The namespace name is not acceptable. Namespace: %s", "", ""),
-  JDBC_TABLE_NAME_NOT_ACCEPTABLE(
-      Category.USER_ERROR, "0086", "The table name is not acceptable. Table: %s", "", ""),
-  JDBC_IMPORT_NOT_SUPPORTED(
+  JDBC_SQLITE_NAMESPACE_NAME_NOT_ACCEPTABLE(
       Category.USER_ERROR,
-      "0087",
-      "Importing tables is not allowed in the RDB engine. RDB engine: %s",
+      "0085",
+      "The namespace name is not acceptable in SQLite. Namespace: %s",
       "",
       ""),
+  JDBC_SQLITE_TABLE_NAME_NOT_ACCEPTABLE(
+      Category.USER_ERROR, "0086", "The table name is not acceptable in SQLite. Table: %s", "", ""),
+  JDBC_SQLITE_IMPORT_NOT_SUPPORTED(
+      Category.USER_ERROR, "0087", "Importing tables is not allowed in SQLite", "", ""),
   JDBC_IMPORT_TABLE_WITHOUT_PRIMARY_KEY(
       Category.USER_ERROR, "0088", "The %s table must have a primary key", "", ""),
   JDBC_RDB_ENGINE_NOT_SUPPORTED(

core/src/main/java/com/scalar/db/service/AdminService.java

@@ -120,20 +120,6 @@ public void renameTable(String namespace, String oldTableName, String newTableNa
     admin.renameTable(namespace, oldTableName, newTableName);
   }
 
-  @Override
-  public TableMetadata getImportTableMetadata(
-      String namespace, String table, Map<String, DataType> overrideColumnsType)
-      throws ExecutionException {
-    return admin.getImportTableMetadata(namespace, table, overrideColumnsType);
-  }
-
-  @Override
-  public void addRawColumnToTable(
-      String namespace, String table, String columnName, DataType columnType)
-      throws ExecutionException {
-    admin.addRawColumnToTable(namespace, table, columnName, columnType);
-  }
-
   @Override
   public void importTable(
       String namespace,

core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java

@@ -285,20 +285,6 @@ private TableMetadata createTableMetadata(com.datastax.driver.core.TableMetadata
     return builder.build();
   }
 
-  @Override
-  public TableMetadata getImportTableMetadata(
-      String namespace, String table, Map<String, DataType> overrideColumnsType) {
-    throw new UnsupportedOperationException(
-        CoreError.CASSANDRA_IMPORT_NOT_SUPPORTED.buildMessage());
-  }
-
-  @Override
-  public void addRawColumnToTable(
-      String namespace, String table, String columnName, DataType columnType) {
-    throw new UnsupportedOperationException(
-        CoreError.CASSANDRA_IMPORT_NOT_SUPPORTED.buildMessage());
-  }
-
   @Override
   public void importTable(
       String namespace,