Fix

KodaiD · KodaiD · commit c68cf2a2f901 · 2025-10-29T09:14:41.000+09:00
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java
@@ -83,6 +83,12 @@ private boolean isWideningColumnTypeConversionNotFullySupported() {
     return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine);
   }
 
+  @Test
+  @Override
+  @DisabledIf("isSqlite")
+  public void
+      dropNamespace_ForNamespaceWithNonScalarDBManagedTables_ShouldThrowIllegalArgumentException() {}
+
   @Test
   @Override
   @DisabledIf("isDb2")
diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java
@@ -84,6 +84,12 @@ private boolean isWideningColumnTypeConversionNotFullySupported() {
     return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine);
   }
 
+  @Test
+  @Override
+  @DisabledIf("isSqlite")
+  public void
+      dropNamespace_ForNamespaceWithNonScalarDBManagedTables_ShouldThrowIllegalArgumentException() {}
+
   @Test
   @Override
   @DisabledIf("isDb2")
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
@@ -71,10 +71,13 @@ public void deleteMetadata(String namespace, String table) throws Exception {
             + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
             + " WHERE "
             + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
-            + " = '"
-            + getFullTableName(namespace, table)
-            + "'";
-    execute(deleteMetadataStatement);
+            + " = ?";
+    try (Connection connection = dataSource.getConnection();
+        PreparedStatement preparedStatement =
+            connection.prepareStatement(deleteMetadataStatement)) {
+      preparedStatement.setString(1, getFullTableName(namespace, table));
+      preparedStatement.executeUpdate();
+    }
   }
 
   private void execute(String sql) throws SQLException {
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
@@ -126,10 +126,13 @@ public void deleteMetadata(String namespace, String table) throws Exception {
             + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
             + " WHERE "
             + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
-            + " = '"
-            + getFullTableName(namespace, table)
-            + "'";
-    execute(deleteMetadataStatement);
+            + " = ?";
+    try (Connection connection = dataSource.getConnection();
+        PreparedStatement preparedStatement =
+            connection.prepareStatement(deleteMetadataStatement)) {
+      preparedStatement.setString(1, getFullTableName(namespace, table));
+      preparedStatement.executeUpdate();
+    }
   }
 
   @Override
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
@@ -354,6 +354,8 @@ public void dropNamespace(String namespace) throws ExecutionException {
       getNamespacesContainer()
           .deleteItem(new CosmosNamespace(namespace), new CosmosItemRequestOptions());
       deleteMetadataDatabaseIfEmpty();
+    } catch (IllegalArgumentException e) {
+      throw e;
     } catch (RuntimeException e) {
       throw new ExecutionException(String.format("Deleting the %s database failed", namespace), e);
     }
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
@@ -712,6 +712,9 @@ public Set<String> getNamespaceTableNames(String namespace) throws ExecutionExce
   private Set<String> getNamespaceTableNamesInternal(Connection connection, String namespace)
       throws SQLException {
     String sql = rdbEngine.getTableNamesInNamespaceSql();
+    if (Strings.isNullOrEmpty(sql)) {
+      return Collections.emptySet();
+    }
     Set<String> tableNames = new HashSet<>();
     try (PreparedStatement statement = connection.prepareStatement(sql)) {
       statement.setString(1, namespace);
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
@@ -370,6 +370,7 @@ public void setConnectionToReadOnly(Connection connection, boolean readOnly) {
 
   @Override
   public String getTableNamesInNamespaceSql() {
-    return "SELECT name FROM sqlite_master WHERE type='table' AND name LIKE ?";
+    // Do nothing. Namespace is just a table prefix in the SQLite implementation.
+    return null;
   }
 }
diff --git a/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTest.java b/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTest.java
@@ -587,7 +587,8 @@ public void dropTable_WithMetadataLeft_ShouldDropContainerAndOnlyDeleteMetadata(
     // Arrange
     String namespace = "ns";
     CosmosDatabase metadataDatabase = mock(CosmosDatabase.class);
-    when(client.getDatabase(any())).thenReturn(database, metadataDatabase);
+    when(client.getDatabase(namespace)).thenReturn(database);
+    when(client.getDatabase(METADATA_DATABASE)).thenReturn(metadataDatabase);
     CosmosContainer namespacesContainer = mock(CosmosContainer.class);
     when(metadataDatabase.getContainer(anyString())).thenReturn(namespacesContainer);
 
@@ -597,6 +598,12 @@ public void dropTable_WithMetadataLeft_ShouldDropContainerAndOnlyDeleteMetadata(
         .thenReturn(pagedIterable);
     when(pagedIterable.stream()).thenReturn(Stream.of(new CosmosNamespace(METADATA_DATABASE)));
 
+    @SuppressWarnings("unchecked")
+    CosmosPagedIterable<CosmosContainerProperties> emptyContainerPagedIterable =
+        mock(CosmosPagedIterable.class);
+    when(emptyContainerPagedIterable.stream()).thenReturn(Stream.empty());
+    when(database.readAllContainers()).thenReturn(emptyContainerPagedIterable);
+
     @SuppressWarnings("unchecked")
     CosmosPagedIterable<CosmosContainerProperties> containerPagedIterable =
         mock(CosmosPagedIterable.class);
@@ -613,7 +620,7 @@ public void dropTable_WithMetadataLeft_ShouldDropContainerAndOnlyDeleteMetadata(
     admin.dropNamespace(namespace);
 
     // Assert
-    verify(client).getDatabase(namespace);
+    verify(client, times(2)).getDatabase(namespace);
     verify(database).delete();
     verify(client, times(3)).getDatabase(METADATA_DATABASE);
     verify(metadataDatabase, times(2)).getContainer(CosmosAdmin.NAMESPACES_CONTAINER);
@@ -628,10 +635,17 @@ public void dropNamespace_WithExistingDatabaseAndSomeNamespacesLeft_ShouldDropDa
     // Arrange
     String namespace = "ns";
     CosmosDatabase metadataDatabase = mock(CosmosDatabase.class);
-    when(client.getDatabase(any())).thenReturn(database, metadataDatabase);
+    when(client.getDatabase(namespace)).thenReturn(database);
+    when(client.getDatabase(METADATA_DATABASE)).thenReturn(metadataDatabase);
     CosmosContainer namespacesContainer = mock(CosmosContainer.class);
     when(metadataDatabase.getContainer(anyString())).thenReturn(namespacesContainer);
 
+    @SuppressWarnings("unchecked")
+    CosmosPagedIterable<CosmosContainerProperties> emptyContainerPagedIterable =
+        mock(CosmosPagedIterable.class);
+    when(emptyContainerPagedIterable.stream()).thenReturn(Stream.empty());
+    when(database.readAllContainers()).thenReturn(emptyContainerPagedIterable);
+
     @SuppressWarnings("unchecked")
     CosmosPagedIterable<Object> pagedIterable = mock(CosmosPagedIterable.class);
     when(namespacesContainer.queryItems(anyString(), any(), any())).thenReturn(pagedIterable);
@@ -642,7 +656,7 @@ public void dropNamespace_WithExistingDatabaseAndSomeNamespacesLeft_ShouldDropDa
     admin.dropNamespace(namespace);
 
     // Assert
-    verify(client).getDatabase(namespace);
+    verify(client, times(2)).getDatabase(namespace);
     verify(database).delete();
     verify(client, times(2)).getDatabase(METADATA_DATABASE);
     verify(metadataDatabase, times(2)).getContainer(CosmosAdmin.NAMESPACES_CONTAINER);
diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java
@@ -1957,7 +1957,6 @@ public void dropNamespace_forSqlite_shouldDropNamespace() throws Exception {
     JdbcAdmin admin = createJdbcAdminFor(RdbEngine.SQLITE);
 
     Connection connection = mock(Connection.class);
-    PreparedStatement getTableNamesPrepStmt = mock(PreparedStatement.class);
     PreparedStatement deleteFromNamespaceTablePrepStmt = mock(PreparedStatement.class);
     Statement selectAllFromNamespaceTablePrepStmt = mock(Statement.class);
     Statement selectAllFromMetadataTablePrepStmt = mock(Statement.class);
@@ -1968,13 +1967,7 @@ public void dropNamespace_forSqlite_shouldDropNamespace() throws Exception {
             selectAllFromNamespaceTablePrepStmt,
             selectAllFromMetadataTablePrepStmt,
             dropNamespaceTableStmt);
-    // Mock for getNamespaceTableNamesInternal() check - returns empty ResultSet (namespace is
-    // empty)
-    ResultSet emptyResultSet = mock(ResultSet.class);
-    when(emptyResultSet.next()).thenReturn(false);
-    when(getTableNamesPrepStmt.executeQuery()).thenReturn(emptyResultSet);
-    when(connection.prepareStatement(anyString()))
-        .thenReturn(getTableNamesPrepStmt, deleteFromNamespaceTablePrepStmt);
+    when(connection.prepareStatement(anyString())).thenReturn(deleteFromNamespaceTablePrepStmt);
     when(dataSource.getConnection()).thenReturn(connection);
     // Only the metadata schema is left
     ResultSet resultSet1 =
@@ -2129,21 +2122,21 @@ private void dropNamespace_WithOtherNamespaceLeftForX_shouldOnlyDropNamespace(
 
     Connection connection = mock(Connection.class);
     Statement dropNamespaceStatementMock = mock(Statement.class);
-    PreparedStatement isNamespaceEmptyStatementMock = mock(PreparedStatement.class);
     PreparedStatement deleteFromNamespaceTableMock = mock(PreparedStatement.class);
     Statement selectNamespaceStatementMock = mock(Statement.class);
     if (rdbEngine != RdbEngine.SQLITE) {
+      PreparedStatement getTableNamesPrepStmt = mock(PreparedStatement.class);
       when(connection.createStatement())
           .thenReturn(dropNamespaceStatementMock, selectNamespaceStatementMock);
+      ResultSet emptyResultSet = mock(ResultSet.class);
+      when(emptyResultSet.next()).thenReturn(false);
+      when(getTableNamesPrepStmt.executeQuery()).thenReturn(emptyResultSet);
+      when(connection.prepareStatement(anyString()))
+          .thenReturn(getTableNamesPrepStmt, deleteFromNamespaceTableMock);
     } else {
       when(connection.createStatement()).thenReturn(selectNamespaceStatementMock);
+      when(connection.prepareStatement(anyString())).thenReturn(deleteFromNamespaceTableMock);
     }
-    // Mock for isNamespaceEmpty() check - returns empty ResultSet (namespace is empty)
-    ResultSet emptyResultSet = mock(ResultSet.class);
-    when(emptyResultSet.next()).thenReturn(false);
-    when(isNamespaceEmptyStatementMock.executeQuery()).thenReturn(emptyResultSet);
-    when(connection.prepareStatement(anyString()))
-        .thenReturn(isNamespaceEmptyStatementMock, deleteFromNamespaceTableMock);
     when(dataSource.getConnection()).thenReturn(connection);
     // Namespaces table contains other namespaces
     ResultSet resultSet =

Original file line number	Diff line number	Diff line change
`@@ -354,6 +354,8 @@ public void dropNamespace(String namespace) throws ExecutionException {`
`354`	`354`	`getNamespacesContainer()`
`355`	`355`	`.deleteItem(new CosmosNamespace(namespace), new CosmosItemRequestOptions());`
`356`	`356`	`deleteMetadataDatabaseIfEmpty();`
	`357`	`+ } catch (IllegalArgumentException e) {`
	`358`	`+ throw e;`
`357`	`359`	`} catch (RuntimeException e) {`
`358`	`360`	`throw new ExecutionException(String.format("Deleting the %s database failed", namespace), e);`
`359`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ public void setConnectionToReadOnly(Connection connection, boolean readOnly) {`
`370`	`370`
`371`	`371`	`@Override`
`372`	`372`	`public String getTableNamesInNamespaceSql() {`
`373`		`- return "SELECT name FROM sqlite_master WHERE type='table' AND name LIKE ?";`
	`373`	`+ // Do nothing. Namespace is just a table prefix in the SQLite implementation.`
	`374`	`+ return null;`
`374`	`375`	`}`
`375`	`376`	`}`