diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java index 0c61ed4ae3..13d22b1757 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java @@ -72,4 +72,20 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() admin.dropTable(getNamespace1(), getTable4(), true); } } + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java index 40177d9526..e6faa01f56 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java @@ -71,4 +71,20 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() admin.dropTable(getNamespace1(), getTable4(), true); } } + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java index c98376f192..b6c1f3960e 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java @@ -153,4 +153,9 @@ public void renameColumn_WithSufficientPermission_ShouldSucceed() throws Executi assertThatCode(() -> adminForNormalUser.renameColumn(NAMESPACE, TABLE, COL_NAME1, NEW_COL_NAME)) .doesNotThrowAnyException(); } + + @Test + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_WithSufficientPermission_ShouldSucceed() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java index bfed48ebe1..82913a5f2d 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java @@ -89,4 +89,20 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() admin.dropTable(namespace1, TABLE4, true); } } + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java b/core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java index f340fa19e0..cb83c26e36 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java @@ -76,4 +76,20 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() admin.dropTable(namespace1, TABLE4, true); } } + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cassandra does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java index 81ac023f55..fdba66d5ea 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java @@ -84,4 +84,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminCaseSensitivityIntegrationTest.java index 4419a51cc5..9d234b8d1f 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminCaseSensitivityIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminCaseSensitivityIntegrationTest.java @@ -69,4 +69,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java index 0681e9dbc2..b5374e0b4f 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java @@ -68,4 +68,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/SingleCrudOperationTransactionAdminIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/SingleCrudOperationTransactionAdminIntegrationTestWithCosmos.java index be0b8a4e81..45e73ea947 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/SingleCrudOperationTransactionAdminIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/SingleCrudOperationTransactionAdminIntegrationTestWithCosmos.java @@ -69,4 +69,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/ConsensusCommitAdminIntegrationTestWithDynamo.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/ConsensusCommitAdminIntegrationTestWithDynamo.java index 3c283a5e56..5a6811f46f 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/dynamo/ConsensusCommitAdminIntegrationTestWithDynamo.java +++ b/core/src/integration-test/java/com/scalar/db/storage/dynamo/ConsensusCommitAdminIntegrationTestWithDynamo.java @@ -138,4 +138,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminCaseSensitivityIntegrationTest.java index d54eb020c5..c50517c424 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminCaseSensitivityIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminCaseSensitivityIntegrationTest.java @@ -123,4 +123,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminIntegrationTest.java index cb744539cf..1088acf7f3 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminIntegrationTest.java @@ -122,4 +122,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminPermissionIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminPermissionIntegrationTest.java index 456cf6b5e4..b99fadca3a 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminPermissionIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoAdminPermissionIntegrationTest.java @@ -69,4 +69,9 @@ public void dropColumnFromTable_WithSufficientPermission_ShouldSucceed() {} @Override @Disabled("DynamoDB does not support renaming columns") public void renameColumn_WithSufficientPermission_ShouldSucceed() {} + + @Test + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_WithSufficientPermission_ShouldSucceed() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/dynamo/SingleCrudOperationTransactionAdminIntegrationTestWithDynamo.java b/core/src/integration-test/java/com/scalar/db/storage/dynamo/SingleCrudOperationTransactionAdminIntegrationTestWithDynamo.java index fee2a7029e..2c0aab94cb 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/dynamo/SingleCrudOperationTransactionAdminIntegrationTestWithDynamo.java +++ b/core/src/integration-test/java/com/scalar/db/storage/dynamo/SingleCrudOperationTransactionAdminIntegrationTestWithDynamo.java @@ -123,4 +123,20 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Override @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming tables") + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() {} } diff --git a/core/src/main/java/com/scalar/db/api/Admin.java b/core/src/main/java/com/scalar/db/api/Admin.java index 080264af7f..336b49c69a 100644 --- a/core/src/main/java/com/scalar/db/api/Admin.java +++ b/core/src/main/java/com/scalar/db/api/Admin.java @@ -520,6 +520,19 @@ default void dropColumnFromTable( void renameColumn(String namespace, String table, String oldColumnName, String newColumnName) throws ExecutionException; + /** + * Renames an existing table. + * + * @param namespace the table namespace + * @param oldTableName the current name of the table to rename + * @param newTableName the new name of the table + * @throws IllegalArgumentException if the table to rename does not exist or the table with the + * new name already exists + * @throws ExecutionException if the operation fails + */ + void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException; + /** * Imports an existing table that is not managed by ScalarDB. * diff --git a/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java index 8ef43e47ff..67daadc8d8 100644 --- a/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java @@ -353,6 +353,33 @@ public void renameColumn( } } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + TableMetadata tableMetadata = getTableMetadata(namespace, oldTableName); + if (tableMetadata == null) { + throw new IllegalArgumentException( + CoreError.TABLE_NOT_FOUND.buildMessage( + ScalarDbUtils.getFullTableName(namespace, oldTableName))); + } + + if (tableExists(namespace, newTableName)) { + throw new IllegalArgumentException( + CoreError.TABLE_ALREADY_EXISTS.buildMessage( + ScalarDbUtils.getFullTableName(namespace, newTableName))); + } + + try { + admin.renameTable(namespace, oldTableName, newTableName); + } catch (ExecutionException e) { + throw new ExecutionException( + CoreError.RENAMING_TABLE_FAILED.buildMessage( + ScalarDbUtils.getFullTableName(namespace, oldTableName), + ScalarDbUtils.getFullTableName(namespace, newTableName)), + e); + } + } + @Override public TableMetadata getImportTableMetadata( String namespace, String table, Map overrideColumnsType) diff --git a/core/src/main/java/com/scalar/db/common/CoreError.java b/core/src/main/java/com/scalar/db/common/CoreError.java index 0e1eca1b55..dea31ab60a 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -754,6 +754,12 @@ public enum CoreError implements ScalarDbError { "With Db2, setting an ordering on a BLOB column when using a cross partition scan operation is not supported. Ordering: %s", "", ""), + CASSANDRA_RENAME_TABLE_NOT_SUPPORTED( + Category.USER_ERROR, "0230", "Renaming tables is not supported in Cassandra", "", ""), + COSMOS_RENAME_TABLE_NOT_SUPPORTED( + Category.USER_ERROR, "0231", "Renaming tables is not supported in Cosmos DB", "", ""), + DYNAMO_RENAME_TABLE_NOT_SUPPORTED( + Category.USER_ERROR, "0232", "Renaming tables is not supported in DynamoDB", "", ""), // // Errors for the concurrency error category @@ -1048,6 +1054,12 @@ public enum CoreError implements ScalarDbError { "Renaming a column failed. Table: %s; Old column name: %s; New column name: %s", "", ""), + RENAMING_TABLE_FAILED( + Category.INTERNAL_ERROR, + "0061", + "Renaming a table failed. Old table name: %s; New table name: %s", + "", + ""), // // Errors for the unknown transaction status error category diff --git a/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java b/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java index 2907859bd2..8db9dc44e2 100644 --- a/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java @@ -222,6 +222,12 @@ public void renameColumn( distributedTransactionAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + distributedTransactionAdmin.renameTable(namespace, oldTableName, newTableName); + } + @Override public void importTable(String namespace, String table, Map options) throws ExecutionException { diff --git a/core/src/main/java/com/scalar/db/service/AdminService.java b/core/src/main/java/com/scalar/db/service/AdminService.java index 46a7bd1ba3..60242f3f2b 100644 --- a/core/src/main/java/com/scalar/db/service/AdminService.java +++ b/core/src/main/java/com/scalar/db/service/AdminService.java @@ -107,6 +107,12 @@ public void renameColumn( admin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + admin.renameTable(namespace, oldTableName, newTableName); + } + @Override public TableMetadata getImportTableMetadata( String namespace, String table, Map overrideColumnsType) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java b/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java index 83df3d74d1..3debc6759d 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java @@ -400,6 +400,13 @@ oldColumnName, newColumnName, getFullTableName(namespace, table)), } } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.CASSANDRA_RENAME_TABLE_NOT_SUPPORTED.buildMessage()); + } + @Override public Set getNamespaceNames() throws ExecutionException { try { 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 index e78804a7ac..acdf4b3174 100644 --- a/core/src/main/java/com/scalar/db/storage/cosmos/CosmosAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/cosmos/CosmosAdmin.java @@ -590,6 +590,13 @@ public void renameColumn( CoreError.COSMOS_RENAME_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.COSMOS_RENAME_TABLE_NOT_SUPPORTED.buildMessage()); + } + @Override public TableMetadata getImportTableMetadata( String namespace, String table, Map overrideColumnsType) { diff --git a/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java b/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java index 7415af3516..54087ac362 100644 --- a/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java @@ -1250,6 +1250,13 @@ public void renameColumn( CoreError.DYNAMO_RENAME_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.DYNAMO_RENAME_TABLE_NOT_SUPPORTED.buildMessage()); + } + @Override public TableMetadata getImportTableMetadata( String namespace, String table, Map overrideColumnsType) { 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 index 2200722251..3b7618d06a 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java @@ -841,7 +841,10 @@ public void renameColumn( try (Connection connection = dataSource.getConnection()) { execute(connection, renameColumnStatement); if (currentTableMetadata.getSecondaryIndexNames().contains(oldColumnName)) { - renameIndex(connection, namespace, table, oldColumnName, newColumnName); + String oldIndexName = getIndexName(namespace, table, oldColumnName); + String newIndexName = getIndexName(namespace, table, newColumnName); + renameIndexInternal( + connection, namespace, table, newColumnName, oldIndexName, newIndexName); } execute(connection, getDeleteTableMetadataStatement(namespace, table)); addTableMetadata(connection, namespace, table, updatedTableMetadata, false); @@ -855,6 +858,33 @@ oldColumnName, newColumnName, getFullTableName(namespace, table)), } } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + try { + TableMetadata tableMetadata = getTableMetadata(namespace, oldTableName); + assert tableMetadata != null; + String renameTableStatement = rdbEngine.renameTableSql(namespace, oldTableName, newTableName); + try (Connection connection = dataSource.getConnection()) { + execute(connection, renameTableStatement); + deleteTableMetadata(connection, namespace, oldTableName); + for (String indexedColumnName : tableMetadata.getSecondaryIndexNames()) { + String oldIndexName = getIndexName(namespace, oldTableName, indexedColumnName); + String newIndexName = getIndexName(namespace, newTableName, indexedColumnName); + renameIndexInternal( + connection, namespace, newTableName, indexedColumnName, oldIndexName, newIndexName); + } + addTableMetadata(connection, namespace, newTableName, tableMetadata, false); + } + } catch (SQLException e) { + throw new ExecutionException( + String.format( + "Renaming the %s table to %s failed", + getFullTableName(namespace, oldTableName), getFullTableName(namespace, newTableName)), + e); + } + } + @Override public void addRawColumnToTable( String namespace, String table, String columnName, DataType columnType) @@ -928,17 +958,15 @@ private void dropIndex(Connection connection, String schema, String table, Strin execute(connection, sql); } - private void renameIndex( + private void renameIndexInternal( Connection connection, String schema, String table, - String oldIndexedColumn, - String newIndexedColumn) + String column, + String oldIndexName, + String newIndexName) throws SQLException { - String oldIndexName = getIndexName(schema, table, oldIndexedColumn); - String newIndexName = getIndexName(schema, table, newIndexedColumn); - String[] sqls = - rdbEngine.renameIndexSqls(schema, table, oldIndexName, newIndexName, newIndexedColumn); + String[] sqls = rdbEngine.renameIndexSqls(schema, table, column, oldIndexName, newIndexName); for (String sql : sqls) { execute(connection, sql); } 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 index b050a6a63b..85d4996356 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java @@ -255,6 +255,14 @@ public String[] dropColumnSql(String namespace, String table, String columnName) }; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "RENAME " + + encloseFullTableName(namespace, oldTableName) + + " TO " + + enclose(newTableName); + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -292,11 +300,7 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { return new String[] { "RENAME INDEX " + enclose(schema) 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 index 887077abe6..224aa05328 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineMysql.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineMysql.java @@ -136,6 +136,14 @@ public String renameColumnSql( + columnType; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "ALTER TABLE " + + encloseFullTableName(namespace, oldTableName) + + " RENAME TO " + + encloseFullTableName(namespace, newTableName); + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -159,11 +167,7 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { return new String[] { "ALTER TABLE " + encloseFullTableName(schema, table) 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 index b8566e8f1e..1be1348ca7 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java @@ -131,6 +131,14 @@ public String namespaceExistsStatement() { return "SELECT 1 FROM " + enclose("ALL_USERS") + " WHERE " + enclose("USERNAME") + " = ?"; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "ALTER TABLE " + + encloseFullTableName(namespace, oldTableName) + + " RENAME TO " + + enclose(newTableName); + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -169,11 +177,7 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { return new String[] { "ALTER INDEX " + enclose(schema) 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 index aed0dfc5ca..6078488f7c 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java @@ -115,6 +115,14 @@ public String namespaceExistsStatement() { + " = ?"; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "ALTER TABLE " + + encloseFullTableName(namespace, oldTableName) + + " RENAME TO " + + enclose(newTableName); + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -138,11 +146,7 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { return new String[] { "ALTER INDEX " + enclose(schema) 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 index cc4233337a..c55091e821 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java @@ -122,6 +122,15 @@ public String renameColumnSql( + "', 'COLUMN'"; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "EXEC sp_rename '" + + encloseFullTableName(namespace, oldTableName) + + "', '" + + newTableName + + "'"; + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -141,11 +150,7 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { return new String[] { "EXEC sp_rename '" + encloseFullTableName(schema, table) 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 index 51cc740213..b82d95417a 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java @@ -253,6 +253,14 @@ public String namespaceExistsPlaceholder(String namespace) { return namespace + NAMESPACE_SEPARATOR + "%"; } + @Override + public String renameTableSql(String namespace, String oldTableName, String newTableName) { + return "ALTER TABLE " + + encloseFullTableName(namespace, oldTableName) + + " RENAME TO " + + encloseFullTableName(namespace, newTableName); + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -272,15 +280,10 @@ public String dropIndexSql(String schema, String table, String indexName) { @Override public String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn) { + String schema, String table, String column, String oldIndexName, String newIndexName) { // SQLite does not support renaming an index return new String[] { - dropIndexSql(schema, table, oldIndexName), - createIndexSql(schema, table, newIndexName, newIndexedColumn) + dropIndexSql(schema, table, oldIndexName), createIndexSql(schema, table, newIndexName, column) }; } 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 index 490dd20f0e..7a702d8b55 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java @@ -124,6 +124,8 @@ default String renameColumnSql( + enclose(newColumnName); } + String renameTableSql(String namespace, String oldTableName, String newTableName); + String alterColumnTypeSql(String namespace, String table, String columnName, String columnType); String tableExistsInternalTableCheckSql(String fullTableName); @@ -142,11 +144,7 @@ default String createIndexSql( String dropIndexSql(String schema, String table, String indexName); String[] renameIndexSqls( - String schema, - String table, - String oldIndexName, - String newIndexName, - String newIndexedColumn); + String schema, String table, String column, String oldIndexName, String newIndexName); /** * Enclose the target (schema, table or column) to use reserved words and special characters. diff --git a/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java b/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java index dd412f8076..9ccc8e61fd 100644 --- a/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java @@ -204,6 +204,12 @@ public void renameColumn( getAdmin(namespace, table).renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + getAdmin(namespace, oldTableName).renameTable(namespace, oldTableName, newTableName); + } + @Override public TableMetadata getImportTableMetadata( String namespace, String table, Map overrideColumnsType) diff --git a/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java b/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java index 70f7dfa6a8..1e6c474ca4 100644 --- a/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java @@ -270,6 +270,14 @@ public void renameColumn( } } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + checkNamespace(namespace); + + admin.renameTable(namespace, oldTableName, newTableName); + } + @Override public void importTable( String namespace, diff --git a/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java b/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java index 1c520cfe6a..2025e203e3 100644 --- a/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java @@ -178,6 +178,12 @@ public void renameColumn( jdbcAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + jdbcAdmin.renameTable(namespace, oldTableName, newTableName); + } + @Override public Set getNamespaceNames() throws ExecutionException { return jdbcAdmin.getNamespaceNames(); diff --git a/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java b/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java index 3fe8428082..e9b5b55ab1 100644 --- a/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java @@ -122,6 +122,12 @@ public void renameColumn( distributedStorageAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void renameTable(String namespace, String oldTableName, String newTableName) + throws ExecutionException { + distributedStorageAdmin.renameTable(namespace, oldTableName, newTableName); + } + @Override public Set getNamespaceNames() throws ExecutionException { return distributedStorageAdmin.getNamespaceNames(); diff --git a/core/src/test/java/com/scalar/db/storage/cassandra/CassandraAdminTest.java b/core/src/test/java/com/scalar/db/storage/cassandra/CassandraAdminTest.java index 9db16112b6..ea8f69b86f 100644 --- a/core/src/test/java/com/scalar/db/storage/cassandra/CassandraAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/cassandra/CassandraAdminTest.java @@ -700,11 +700,14 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { () -> cassandraAdmin.importTable( namespace, table, Collections.emptyMap(), Collections.emptyMap())); + Throwable thrown4 = + catchThrowable(() -> cassandraAdmin.renameTable(namespace, table, "new_table")); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown2).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown3).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); } @ParameterizedTest diff --git a/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java b/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java index 9b6f9106b8..36bf1b75ba 100644 --- a/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java +++ b/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java @@ -906,6 +906,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { Throwable thrown4 = catchThrowable(() -> admin.dropColumnFromTable(namespace, table, column)); Throwable thrown5 = catchThrowable(() -> admin.renameColumn(namespace, table, column, "newCol")); + Throwable thrown6 = catchThrowable(() -> admin.renameTable(namespace, table, "newTable")); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); @@ -913,6 +914,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { assertThat(thrown3).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown5).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown6).isInstanceOf(UnsupportedOperationException.class); } @Test diff --git a/core/src/test/java/com/scalar/db/storage/dynamo/DynamoAdminTestBase.java b/core/src/test/java/com/scalar/db/storage/dynamo/DynamoAdminTestBase.java index 080c56804c..81d94ee7fb 100644 --- a/core/src/test/java/com/scalar/db/storage/dynamo/DynamoAdminTestBase.java +++ b/core/src/test/java/com/scalar/db/storage/dynamo/DynamoAdminTestBase.java @@ -1267,6 +1267,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { NAMESPACE, TABLE, Collections.emptyMap(), Collections.emptyMap())); Throwable thrown4 = catchThrowable(() -> admin.dropColumnFromTable(NAMESPACE, TABLE, "c1")); Throwable thrown5 = catchThrowable(() -> admin.renameColumn(NAMESPACE, TABLE, "c1", "c2")); + Throwable thrown6 = catchThrowable(() -> admin.renameTable(NAMESPACE, TABLE, "new_table")); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); @@ -1274,6 +1275,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { assertThat(thrown3).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown5).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown6).isInstanceOf(UnsupportedOperationException.class); } @Test diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java index fb665084f5..4ded27746a 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java @@ -3095,6 +3095,180 @@ private void renameColumn_ForX_ShouldWorkProperly( } } + @Test + public void renameTable_ForMysql_ShouldWorkProperly() throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.MYSQL, + "SELECT `column_name`,`data_type`,`key_type`,`clustering_order`,`indexed` FROM `" + + tableMetadataSchemaName + + "`.`metadata` WHERE `full_table_name`=? ORDER BY `ordinal_position` ASC", + "ALTER TABLE `ns`.`table` RENAME TO `ns`.`table_new`", + "DELETE FROM `" + + tableMetadataSchemaName + + "`.`metadata` WHERE `full_table_name` = 'ns.table'", + "SELECT DISTINCT `full_table_name` FROM `" + tableMetadataSchemaName + "`.`metadata`", + "INSERT INTO `" + + tableMetadataSchemaName + + "`.`metadata` VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO `" + + tableMetadataSchemaName + + "`.`metadata` VALUES ('ns.table_new','c2','INT',NULL,NULL,false,2)"); + } + + @Test + public void renameTable_ForOracle_ShouldWorkProperly() throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.ORACLE, + "SELECT \"column_name\",\"data_type\",\"key_type\",\"clustering_order\",\"indexed\" FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns\".\"table\" RENAME TO \"table_new\"", + "DELETE FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + tableMetadataSchemaName + "\".\"metadata\"", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c2','INT',NULL,NULL,0,2)"); + } + + @Test + public void renameTable_ForPostgresql_ShouldWorkProperly() + throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.POSTGRESQL, + "SELECT \"column_name\",\"data_type\",\"key_type\",\"clustering_order\",\"indexed\" FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns\".\"table\" RENAME TO \"table_new\"", + "DELETE FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + tableMetadataSchemaName + "\".\"metadata\"", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c2','INT',NULL,NULL,false,2)"); + } + + @Test + public void renameTable_ForSqlServer_ShouldWorkProperly() + throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.SQL_SERVER, + "SELECT [column_name],[data_type],[key_type],[clustering_order],[indexed] FROM [" + + tableMetadataSchemaName + + "].[metadata] WHERE [full_table_name]=? ORDER BY [ordinal_position] ASC", + "EXEC sp_rename '[ns].[table]', 'table_new'", + "DELETE FROM [" + + tableMetadataSchemaName + + "].[metadata] WHERE [full_table_name] = 'ns.table'", + "SELECT DISTINCT [full_table_name] FROM [" + tableMetadataSchemaName + "].[metadata]", + "INSERT INTO [" + + tableMetadataSchemaName + + "].[metadata] VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO [" + + tableMetadataSchemaName + + "].[metadata] VALUES ('ns.table_new','c2','INT',NULL,NULL,0,2)"); + } + + @Test + public void renameTable_ForSqlite_ShouldWorkProperly() throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.SQLITE, + "SELECT \"column_name\",\"data_type\",\"key_type\",\"clustering_order\",\"indexed\" FROM \"" + + tableMetadataSchemaName + + "$metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns$table\" RENAME TO \"ns$table_new\"", + "DELETE FROM \"" + + tableMetadataSchemaName + + "$metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + tableMetadataSchemaName + "$metadata\"", + "INSERT INTO \"" + + tableMetadataSchemaName + + "$metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,FALSE,1)", + "INSERT INTO \"" + + tableMetadataSchemaName + + "$metadata\" VALUES ('ns.table_new','c2','INT',NULL,NULL,FALSE,2)"); + } + + @Test + public void renameTable_ForDb2_ShouldWorkProperly() throws SQLException, ExecutionException { + renameTable_ForX_ShouldWorkProperly( + RdbEngine.DB2, + "SELECT \"column_name\",\"data_type\",\"key_type\",\"clustering_order\",\"indexed\" FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "RENAME \"ns\".\"table\" TO \"table_new\"", + "DELETE FROM \"" + + tableMetadataSchemaName + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + tableMetadataSchemaName + "\".\"metadata\"", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + tableMetadataSchemaName + + "\".\"metadata\" VALUES ('ns.table_new','c2','INT',NULL,NULL,false,2)"); + } + + private void renameTable_ForX_ShouldWorkProperly( + RdbEngine rdbEngine, String expectedGetMetadataStatement, String... expectedSqlStatements) + throws SQLException, ExecutionException { + // Arrange + String namespace = "ns"; + String table = "table"; + String column1 = "c1"; + String column2 = "c2"; + + PreparedStatement checkStatement = prepareStatementForNamespaceCheck(); + PreparedStatement selectStatement = mock(PreparedStatement.class); + ResultSet resultSet1 = + mockResultSet( + Arrays.asList( + new Row(column1, DataType.TEXT.toString(), "PARTITION", null, false), + new Row(column2, DataType.INT.toString(), null, null, false))); + when(selectStatement.executeQuery()).thenReturn(resultSet1); + + when(connection.prepareStatement(any())).thenReturn(checkStatement).thenReturn(selectStatement); + List expectedStatements = new ArrayList<>(); + for (String expectedSqlStatement : expectedSqlStatements) { + Statement mock = mock(Statement.class); + expectedStatements.add(mock); + if (expectedSqlStatement.startsWith("SELECT DISTINCT ")) { + ResultSet resultSet2 = mock(ResultSet.class); + when(resultSet2.next()).thenReturn(true); + when(mock.executeQuery(any())).thenReturn(resultSet2); + } + } + when(connection.createStatement()) + .thenReturn( + expectedStatements.get(0), + expectedStatements.subList(1, expectedStatements.size()).toArray(new Statement[0])); + + when(dataSource.getConnection()).thenReturn(connection); + JdbcAdmin admin = createJdbcAdminFor(rdbEngine); + + // Act + admin.renameTable(namespace, table, "table_new"); + + // Assert + verify(selectStatement).setString(1, getFullTableName(namespace, table)); + verify(connection).prepareStatement(expectedGetMetadataStatement); + for (int i = 0; i < expectedSqlStatements.length; i++) { + if (expectedSqlStatements[i].startsWith("SELECT DISTINCT ")) { + verify(expectedStatements.get(i)).executeQuery(expectedSqlStatements[i]); + } else { + verify(expectedStatements.get(i)).execute(expectedSqlStatements[i]); + } + } + } + @ParameterizedTest @EnumSource(RdbEngine.class) public void getImportTableMetadata_ForX_ShouldWorkProperly(RdbEngine rdbEngine) diff --git a/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java b/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java index b4ac29fa2d..182a2b1513 100644 --- a/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java @@ -624,6 +624,66 @@ public void renameColumn_ForTable1InNamespace2_ShouldCallRenameColumnOfAdmin2() verify(admin2).renameColumn(namespace, table, column1, column2); } + @Test + public void renameTable_ForTable1InNamespace1_ShouldCallRenameTableOfAdmin1() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String oldTableName = TABLE1; + String newTableName = "new_" + TABLE1; + + // Act + multiStorageAdmin.renameTable(namespace, oldTableName, newTableName); + + // Assert + verify(admin1).renameTable(namespace, oldTableName, newTableName); + } + + @Test + public void renameTable_ForTable2InNamespace1_ShouldShouldCallRenameTableOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String oldTableName = TABLE2; + String newTableName = "new_" + TABLE2; + + // Act + multiStorageAdmin.renameTable(namespace, oldTableName, newTableName); + + // Assert + verify(admin2).renameTable(namespace, oldTableName, newTableName); + } + + @Test + public void renameTable_ForTable3InNamespace1_ShouldCallRenameTableOfDefaultAdmin() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String oldTableName = TABLE3; + String newTableName = "new_" + TABLE3; + + // Act + multiStorageAdmin.renameTable(namespace, oldTableName, newTableName); + + // Assert + verify(admin3).renameTable(namespace, oldTableName, newTableName); + } + + @Test + public void renameTable_ForTable1InNamespace2_ShouldCallRenameTableOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE2; + String oldTableName = TABLE1; + String newTableName = "new_" + TABLE1; + + // Act + multiStorageAdmin.renameTable(namespace, oldTableName, newTableName); + + // Assert + verify(admin2).renameTable(namespace, oldTableName, newTableName); + } + @Test public void getNamespaceNames_WithExistingNamespacesNotInMapping_ShouldReturnExistingNamespacesInMappingAndFromDefaultAdmin() diff --git a/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java b/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java index 9d51f8a2ef..f41aac4363 100644 --- a/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java +++ b/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java @@ -728,6 +728,19 @@ public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException Attribute.BEFORE_PREFIX + newColumnName); } + @Test + public void renameTable_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String existingTableName = "tbl1"; + String newTableName = "tbl2"; + + // Act + admin.renameTable(NAMESPACE, existingTableName, newTableName); + + // Assert + verify(distributedStorageAdmin).renameTable(NAMESPACE, existingTableName, newTableName); + } + @Test public void importTable_ShouldCallStorageAdminProperly() throws ExecutionException { // Arrange diff --git a/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java b/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java index fd05bdbaf9..b314a6cc31 100644 --- a/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java +++ b/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java @@ -257,6 +257,20 @@ public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException verify(jdbcAdmin).renameColumn(namespace, table, columnName1, columnName2); } + @Test + public void renameTable_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String namespace = "ns"; + String tableName1 = "tbl1"; + String tableName2 = "tbl2"; + + // Act + admin.renameTable(namespace, tableName1, tableName2); + + // Assert + verify(jdbcAdmin).renameTable(namespace, tableName1, tableName2); + } + @Test public void importTable_ShouldCallJdbcAdminProperly() throws ExecutionException { // Arrange diff --git a/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java b/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java index 1d51e08674..6b0079803c 100644 --- a/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java +++ b/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java @@ -263,6 +263,20 @@ public void renameColumn_ShouldCallDistributedStorageAdminProperly() throws Exec verify(distributedStorageAdmin).renameColumn(namespace, table, columnName1, columnName2); } + @Test + public void renameTable_ShouldCallDistributedStorageAdminProperly() throws ExecutionException { + // Arrange + String namespace = "ns"; + String oldTableName = "old_tbl"; + String newTableName = "new_tbl"; + + // Act + admin.renameTable(namespace, oldTableName, newTableName); + + // Assert + verify(distributedStorageAdmin).renameTable(namespace, oldTableName, newTableName); + } + @Test public void importTable_ShouldCallDistributedStorageAdminProperly() throws ExecutionException { // Arrange 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 index 47cdb9477a..141dcf568a 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java @@ -1071,6 +1071,33 @@ public void renameColumn_ShouldRenameColumnCorrectly() throws ExecutionException } } + @Test + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws ExecutionException { + String newTableName = "new" + getTable4(); + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addPartitionKey(getColumnName1()) + .build(); + admin.createTable(namespace1, getTable4(), tableMetadata, options); + + // Act + admin.renameTable(namespace1, getTable4(), newTableName); + + // Assert + assertThat(admin.tableExists(namespace1, getTable4())).isFalse(); + assertThat(admin.tableExists(namespace1, newTableName)).isTrue(); + assertThat(admin.getTableMetadata(namespace1, newTableName)).isEqualTo(tableMetadata); + } finally { + admin.dropTable(namespace1, getTable4(), true); + admin.dropTable(namespace1, newTableName, true); + } + } + @Test public void addNewColumnToTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() { // Arrange @@ -1286,6 +1313,79 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Test + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy(() -> admin.renameTable(namespace1, getTable4(), "newTableName")) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() + throws ExecutionException { + String newTableName = "new" + getTable4(); + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addPartitionKey(getColumnName1()) + .build(); + admin.createTable(namespace1, getTable4(), tableMetadata, options); + admin.createTable(namespace1, newTableName, tableMetadata, options); + + // Act Assert + assertThatThrownBy(() -> admin.renameTable(namespace1, getTable4(), newTableName)) + .isInstanceOf(IllegalArgumentException.class); + } finally { + admin.dropTable(namespace1, getTable4(), true); + admin.dropTable(namespace1, newTableName, true); + } + } + + @Test + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() + throws ExecutionException { + String newTableName = "new" + getTable4(); + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addPartitionKey(getColumnName1()) + .addSecondaryIndex(getColumnName2()) + .addSecondaryIndex(getColumnName3()) + .build(); + admin.createTable(namespace1, getTable4(), tableMetadata, options); + + // Act + admin.renameTable(namespace1, getTable4(), newTableName); + + // Assert + assertThat(admin.tableExists(namespace1, getTable4())).isFalse(); + assertThat(admin.tableExists(namespace1, newTableName)).isTrue(); + assertThat(admin.getTableMetadata(namespace1, newTableName)).isEqualTo(tableMetadata); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName2())).isFalse(); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName3())).isFalse(); + assertThat(admin.indexExists(namespace1, newTableName, getColumnName2())).isTrue(); + assertThat(admin.indexExists(namespace1, newTableName, getColumnName3())).isTrue(); + assertThatCode(() -> admin.dropIndex(namespace1, newTableName, getColumnName2())) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.dropIndex(namespace1, newTableName, getColumnName3())) + .doesNotThrowAnyException(); + } finally { + admin.dropTable(namespace1, getTable4(), true); + admin.dropTable(namespace1, newTableName, true); + } + } + @Test public void getNamespaceNames_ShouldReturnCreatedNamespaces() throws ExecutionException { // Arrange diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java index b3c3ae461d..fd249b78a7 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java @@ -331,6 +331,18 @@ public void renameColumn_WithSufficientPermission_ShouldSucceed() throws Executi .doesNotThrowAnyException(); } + @Test + public void renameTable_WithSufficientPermission_ShouldSucceed() throws ExecutionException { + // Arrange + createNamespaceByRoot(); + createTableByRoot(); + String newTableName = "new_" + TABLE; + + // Act Assert + assertThatCode(() -> adminForNormalUser.renameTable(NAMESPACE, TABLE, newTableName)) + .doesNotThrowAnyException(); + } + @Test public void importTable_WithSufficientPermission_ShouldSucceed() throws Exception { // Arrange diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java index a057b615ae..4661444f4a 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java @@ -1193,6 +1193,104 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Test + public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws ExecutionException { + String newTableName = "new" + TABLE4; + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addPartitionKey("c1") + .build(); + admin.createTable(namespace1, TABLE4, tableMetadata, options); + + // Act + admin.renameTable(namespace1, TABLE4, newTableName); + + // Assert + assertThat(admin.tableExists(namespace1, TABLE4)).isFalse(); + assertThat(admin.tableExists(namespace1, newTableName)).isTrue(); + assertThat(admin.getTableMetadata(namespace1, newTableName)).isEqualTo(tableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + admin.dropTable(namespace1, newTableName, true); + } + } + + @Test + public void renameTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy(() -> admin.renameTable(namespace1, TABLE4, "newTableName")) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameTable_IfNewTableNameAlreadyExists_ShouldThrowIllegalArgumentException() + throws ExecutionException { + String newTableName = "new" + TABLE4; + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addPartitionKey("c1") + .build(); + admin.createTable(namespace1, TABLE4, tableMetadata, options); + admin.createTable(namespace1, newTableName, tableMetadata, options); + + // Act Assert + assertThatThrownBy(() -> admin.renameTable(namespace1, TABLE4, newTableName)) + .isInstanceOf(IllegalArgumentException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + admin.dropTable(namespace1, newTableName, true); + } + } + + @Test + public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesCorrectly() + throws ExecutionException { + String newTableName = "new" + TABLE4; + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .addSecondaryIndex("c2") + .addSecondaryIndex("c3") + .build(); + admin.createTable(namespace1, TABLE4, tableMetadata, options); + + // Act + admin.renameTable(namespace1, TABLE4, newTableName); + + // Assert + assertThat(admin.tableExists(namespace1, TABLE4)).isFalse(); + assertThat(admin.tableExists(namespace1, newTableName)).isTrue(); + assertThat(admin.getTableMetadata(namespace1, newTableName)).isEqualTo(tableMetadata); + assertThat(admin.indexExists(namespace1, newTableName, "c2")).isTrue(); + assertThat(admin.indexExists(namespace1, newTableName, "c3")).isTrue(); + assertThatCode(() -> admin.dropIndex(namespace1, newTableName, "c2")) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.dropIndex(namespace1, newTableName, "c3")) + .doesNotThrowAnyException(); + } finally { + admin.dropTable(namespace1, TABLE4, true); + admin.dropTable(namespace1, newTableName, true); + } + } + @Test public void createCoordinatorTables_ShouldCreateCoordinatorTablesCorrectly() throws ExecutionException {