Add an integration test case for all storages

KodaiD · KodaiD · commit 96b13d3aa747 · 2025-10-28T17:54:21.000+09:00
diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminTestUtils.java
@@ -57,6 +57,11 @@ public void corruptMetadata(String namespace, String table) {
     // Do nothing
   }
 
+  @Override
+  public void deleteMetadata(String namespace, String table) throws Exception {
+    // Do nothing
+  }
+
   @Override
   public void dropNamespace(String namespace) {
     String dropKeyspaceQuery =
diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminTestUtils.java
@@ -86,6 +86,15 @@ public void corruptMetadata(String namespace, String table) {
     container.upsertItem(corruptedMetadata);
   }
 
+  @Override
+  public void deleteMetadata(String namespace, String table) {
+    String fullTableName = getFullTableName(namespace, table);
+    CosmosContainer container =
+        client.getDatabase(metadataDatabase).getContainer(CosmosAdmin.TABLE_METADATA_CONTAINER);
+    container.deleteItem(
+        fullTableName, new PartitionKey(fullTableName), new CosmosItemRequestOptions());
+  }
+
   /**
    * Retrieve the stored procedure for the given table
    *
diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminTestUtils.java
@@ -171,6 +171,20 @@ public void corruptMetadata(String namespace, String table) {
             .build());
   }
 
+  @Override
+  public void deleteMetadata(String namespace, String table) {
+    String fullTableName =
+        getFullTableName(Namespace.of(namespacePrefix, namespace).prefixed(), table);
+    Map<String, AttributeValue> keyToDelete = new HashMap<>();
+    keyToDelete.put("table", AttributeValue.builder().s(fullTableName).build());
+
+    client.deleteItem(
+        DeleteItemRequest.builder()
+            .tableName(getFullTableName(metadataNamespace, DynamoAdmin.METADATA_TABLE))
+            .key(keyToDelete)
+            .build());
+  }
+
   @Override
   public void dropTable(String nonPrefixedNamespace, String table) {
     String namespace = Namespace.of(namespacePrefix, nonPrefixedNamespace).prefixed();
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminImportTableIntegrationTestWithJdbcDatabase.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminImportTableIntegrationTestWithJdbcDatabase.java
@@ -3,7 +3,6 @@
 import com.scalar.db.api.DistributedStorageAdminImportTableIntegrationTestBase.TestData;
 import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminImportTableIntegrationTestBase;
-import com.scalar.db.util.AdminTestUtils;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
@@ -54,11 +53,6 @@ protected void dropNonImportableTable(String table) throws SQLException {
     testUtils.dropTable(getNamespace(), table);
   }
 
-  @Override
-  protected AdminTestUtils getAdminTestUtils(String testName) {
-    return new JdbcAdminTestUtils(getProperties(testName));
-  }
-
   @SuppressWarnings("unused")
   private boolean isSqlite() {
     return JdbcEnv.isSqlite();
@@ -78,9 +72,4 @@ public void importTable_ForUnsupportedDatabase_ShouldThrowUnsupportedOperationEx
       throws ExecutionException {
     super.importTable_ForUnsupportedDatabase_ShouldThrowUnsupportedOperationException();
   }
-
-  @Test
-  @Override
-  @DisabledIf("isSqlite")
-  public void dropNamespace_ShouldNotDropNonScalarDBTables() {}
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminTestUtils.java
@@ -64,6 +64,19 @@ public void corruptMetadata(String namespace, String table) throws Exception {
     execute(insertCorruptedMetadataStatement);
   }
 
+  @Override
+  public void deleteMetadata(String namespace, String table) throws Exception {
+    String deleteMetadataStatement =
+        "DELETE FROM "
+            + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
+            + " WHERE "
+            + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
+            + " = '"
+            + getFullTableName(namespace, table)
+            + "'";
+    execute(deleteMetadataStatement);
+  }
+
   private void execute(String sql) throws SQLException {
     try (Connection connection = dataSource.getConnection()) {
       JdbcAdmin.execute(connection, sql);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTestUtils.java b/core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTestUtils.java
@@ -116,6 +116,22 @@ public void corruptMetadata(String namespace, String table) throws Exception {
     execute(insertCorruptedMetadataStatement);
   }
 
+  @Override
+  public void deleteMetadata(String namespace, String table) throws Exception {
+    // Do nothing for Cassandra
+
+    // for JDBC
+    String deleteMetadataStatement =
+        "DELETE FROM "
+            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
+            + " WHERE "
+            + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
+            + " = '"
+            + getFullTableName(namespace, table)
+            + "'";
+    execute(deleteMetadataStatement);
+  }
+
   @Override
   public void dropNamespace(String namespace) throws SQLException {
     boolean existsOnCassandra = namespaceExistsOnCassandra(namespace);
diff --git a/core/src/main/java/com/scalar/db/common/CoreError.java b/core/src/main/java/com/scalar/db/common/CoreError.java
@@ -808,6 +808,12 @@ public enum CoreError implements ScalarDbError {
       "Db2 does not support column type conversion from %s to %s",
       "",
       ""),
+  NAMESPACE_WITH_NON_SCALARDB_TABLES_CANNOT_BE_DROPPED(
+      Category.USER_ERROR,
+      "0241",
+      "The namespace has non-ScalarDB tables and cannot be dropped. Namespace: %s; Tables in the namespace: %s",
+      "",
+      ""),
 
   //
   // Errors for the concurrency error category
diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/CosmosAdmin.java b/core/src/main/java/com/scalar/db/storage/cosmos/CosmosAdmin.java
@@ -344,6 +344,12 @@ private void deleteTableMetadata(String namespace, String table) throws Executio
   @Override
   public void dropNamespace(String namespace) throws ExecutionException {
     try {
+      Set<String> remainingTables = getNamespaceTableNamesInternal(namespace);
+      if (!remainingTables.isEmpty()) {
+        throw new IllegalArgumentException(
+            CoreError.NAMESPACE_WITH_NON_SCALARDB_TABLES_CANNOT_BE_DROPPED.buildMessage(
+                namespace, remainingTables));
+      }
       client.getDatabase(namespace).delete();
       getNamespacesContainer()
           .deleteItem(new CosmosNamespace(namespace), new CosmosItemRequestOptions());
@@ -785,4 +791,10 @@ private boolean containerExists(String databaseId, String containerId) throws Co
   public StorageInfo getStorageInfo(String namespace) {
     return STORAGE_INFO;
   }
+
+  private Set<String> getNamespaceTableNamesInternal(String namespace) {
+    return client.getDatabase(namespace).readAllContainers().stream()
+        .map(CosmosContainerProperties::getId)
+        .collect(Collectors.toSet());
+  }
 }
diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java
@@ -45,7 +45,7 @@
 public class JdbcAdmin implements DistributedStorageAdmin {
   public static final String METADATA_TABLE = "metadata";
   public static final String NAMESPACES_TABLE = "namespaces";
-  @VisibleForTesting static final String METADATA_COL_FULL_TABLE_NAME = "full_table_name";
+  @VisibleForTesting public static final String METADATA_COL_FULL_TABLE_NAME = "full_table_name";
   @VisibleForTesting static final String METADATA_COL_COLUMN_NAME = "column_name";
   @VisibleForTesting static final String METADATA_COL_DATA_TYPE = "data_type";
   @VisibleForTesting static final String METADATA_COL_KEY_TYPE = "key_type";
@@ -483,8 +483,9 @@ public void dropNamespace(String namespace) throws ExecutionException {
     try (Connection connection = dataSource.getConnection()) {
       Set<String> remainingTables = getNamespaceTableNamesInternal(connection, namespace);
       if (!remainingTables.isEmpty()) {
-        throw new IllegalStateException(
-            CoreError.NAMESPACE_NOT_EMPTY.buildMessage(namespace, remainingTables));
+        throw new IllegalArgumentException(
+            CoreError.NAMESPACE_WITH_NON_SCALARDB_TABLES_CANNOT_BE_DROPPED.buildMessage(
+                namespace, remainingTables));
       }
       execute(connection, rdbEngine.dropNamespaceSql(namespace));
       deleteFromNamespacesTable(connection, namespace);
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java
@@ -423,6 +423,29 @@ public void dropNamespace_ForNonEmptyNamespace_ShouldThrowIllegalArgumentExcepti
     }
   }
 
+  @Test
+  public void
+      dropNamespace_ForNamespaceWithNonScalarDBManagedTables_ShouldThrowIllegalArgumentException()
+          throws Exception {
+    AdminTestUtils adminTestUtils = getAdminTestUtils(getTestName());
+    String nonManagedTable = "non_managed_table";
+    try {
+      // Arrange
+      admin.createNamespace(namespace3, getCreationOptions());
+      admin.createTable(namespace3, nonManagedTable, getTableMetadata(), getCreationOptions());
+      adminTestUtils.deleteMetadata(namespace3, nonManagedTable);
+
+      // Act Assert
+      assertThatThrownBy(() -> admin.dropNamespace(namespace3))
+          .isInstanceOf(IllegalArgumentException.class);
+    } finally {
+      adminTestUtils.dropTable(namespace3, nonManagedTable);
+      admin.dropNamespace(namespace3, true);
+
+      adminTestUtils.close();
+    }
+  }
+
   @Test
   public void dropNamespace_IfExists_ForNonExistingNamespace_ShouldNotThrowAnyException() {
     // Arrange
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminImportTableIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminImportTableIntegrationTestBase.java
@@ -1,7 +1,6 @@
 package com.scalar.db.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.scalar.db.api.DistributedStorageAdminImportTableIntegrationTestBase.TestData;
@@ -10,7 +9,6 @@
 import com.scalar.db.io.Column;
 import com.scalar.db.io.DataType;
 import com.scalar.db.service.TransactionFactory;
-import com.scalar.db.util.AdminTestUtils;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -106,8 +104,6 @@ protected void afterAll() throws Exception {}
 
   protected abstract void dropNonImportableTable(String table) throws Exception;
 
-  protected abstract AdminTestUtils getAdminTestUtils(String testName);
-
   @Test
   public void importTable_ShouldWorkProperly() throws Exception {
     // Arrange
@@ -138,43 +134,6 @@ public void importTable_ForUnsupportedDatabase_ShouldThrowUnsupportedOperationEx
         .isInstanceOf(UnsupportedOperationException.class);
   }
 
-  @Test
-  public void dropNamespace_ShouldNotDropNonScalarDBTables() throws Exception {
-    AdminTestUtils adminTestUtils = getAdminTestUtils(TEST_NAME);
-    try {
-      // Arrange
-      testDataList.addAll(createExistingDatabaseWithAllDataTypes());
-      for (TestData testData : testDataList) {
-        if (testData.isImportableTable()) {
-          admin.importTable(
-              getNamespace(),
-              testData.getTableName(),
-              Collections.emptyMap(),
-              testData.getOverrideColumnsType());
-        }
-      }
-      for (TestData testData : testDataList) {
-        if (testData.isImportableTable()) {
-          admin.dropTable(getNamespace(), testData.getTableName());
-        }
-      }
-
-      // Act
-      assertThatCode(() -> admin.dropNamespace(getNamespace()))
-          .isInstanceOf(IllegalStateException.class);
-
-      // Assert
-      assertThat(admin.namespaceExists(getNamespace())).isTrue();
-      for (TestData testData : testDataList) {
-        if (!testData.isImportableTable()) {
-          assertThat(adminTestUtils.tableExists(getNamespace(), testData.getTableName())).isTrue();
-        }
-      }
-    } finally {
-      adminTestUtils.close();
-    }
-  }
-
   private void importTable_ForImportableTable_ShouldImportProperly(
       String table, Map<String, DataType> overrideColumnsType, TableMetadata metadata)
       throws ExecutionException {
diff --git a/integration-test/src/main/java/com/scalar/db/util/AdminTestUtils.java b/integration-test/src/main/java/com/scalar/db/util/AdminTestUtils.java
@@ -56,6 +56,15 @@ public AdminTestUtils(Properties coordinatorStorageProperties) {
    */
   public abstract void corruptMetadata(String namespace, String table) throws Exception;
 
+  /**
+   * Deletes the metadata for the specified table.
+   *
+   * @param namespace the namespace
+   * @param table the table name
+   * @throws Exception if an error occurs
+   */
+  public abstract void deleteMetadata(String namespace, String table) throws Exception;
+
   /**
    * Returns whether the table and the table metadata for the coordinator tables are present or not.
    *
