Skip to content

Commit fa0dc44

Browse files
committed
Apply suggestions
1 parent f3d31ed commit fa0dc44

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ public void renameTable(String namespace, String oldTableName, String newTableNa
939939
String renameTableStatement = rdbEngine.renameTableSql(namespace, oldTableName, newTableName);
940940
try (Connection connection = dataSource.getConnection()) {
941941
execute(connection, renameTableStatement);
942-
execute(connection, getDeleteTableMetadataStatement(namespace, oldTableName));
942+
deleteTableMetadata(connection, namespace, oldTableName);
943943
for (String indexedColumnName : tableMetadata.getSecondaryIndexNames()) {
944944
String oldIndexName = getIndexName(namespace, oldTableName, indexedColumnName);
945945
String newIndexName = getIndexName(namespace, newTableName, indexedColumnName);

core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,6 @@ public void renameTable(String namespace, String oldTableName, String newTableNa
282282
throws ExecutionException {
283283
checkNamespace(namespace);
284284

285-
TableMetadata tableMetadata = getTableMetadata(namespace, oldTableName);
286-
if (tableMetadata == null) {
287-
throw new IllegalArgumentException(
288-
CoreError.TABLE_NOT_FOUND.buildMessage(
289-
ScalarDbUtils.getFullTableName(namespace, oldTableName)));
290-
}
291285
admin.renameTable(namespace, oldTableName, newTableName);
292286
}
293287

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,8 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC
13831383
assertThat(admin.tableExists(namespace1, getTable4())).isFalse();
13841384
assertThat(admin.tableExists(namespace1, newTableName)).isTrue();
13851385
assertThat(admin.getTableMetadata(namespace1, newTableName)).isEqualTo(tableMetadata);
1386+
assertThat(admin.indexExists(namespace1, getTable4(), getColumnName2())).isFalse();
1387+
assertThat(admin.indexExists(namespace1, getTable4(), getColumnName3())).isFalse();
13861388
assertThat(admin.indexExists(namespace1, newTableName, getColumnName2())).isTrue();
13871389
assertThat(admin.indexExists(namespace1, newTableName, getColumnName3())).isTrue();
13881390
assertThatCode(() -> admin.dropIndex(namespace1, newTableName, getColumnName2()))

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public void renameTable_WithSufficientPermission_ShouldSucceed() throws Executio
353353
// Arrange
354354
createNamespaceByRoot();
355355
createTableByRoot();
356-
String newTableName = TABLE + "_new";
356+
String newTableName = "new_" + TABLE;
357357

358358
// Act Assert
359359
assertThatCode(() -> adminForNormalUser.renameTable(NAMESPACE, TABLE, newTableName))

0 commit comments

Comments
 (0)