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 c596f503bd..0d3e242592 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 @@ -76,4 +76,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 6c0ffc90a2..1b7b8b93a2 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 @@ -75,4 +75,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 b4b0cdf60f..46f5571e32 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 @@ -75,4 +75,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 89c268425e..6099945a44 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 @@ -70,4 +70,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 c164a406c5..eff9d9ea7d 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 @@ -67,4 +67,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 f0b4f67010..ec8559fb0a 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 @@ -67,4 +67,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 1b44f8a619..b16c14e2b6 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 @@ -66,4 +66,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 e8c66ac747..ede5138583 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 @@ -61,4 +61,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 f9e91e6f48..732ac6d315 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 @@ -72,4 +72,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 d04d2eb196..75d528738b 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 @@ -72,4 +72,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 ec8c49b585..e03fd1dd8f 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 @@ -71,4 +71,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 e92a5e1888..c2c2a3294d 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 @@ -66,4 +66,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 729853d06a..e4a0e810b7 100644 --- a/core/src/main/java/com/scalar/db/api/Admin.java +++ b/core/src/main/java/com/scalar/db/api/Admin.java @@ -534,6 +534,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 1758c297ae..73dc9a4c35 100644 --- a/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java @@ -363,6 +363,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 Set getNamespaceNames() throws ExecutionException { try { 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 e8954c002b..e0206f6c83 100644 --- a/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java @@ -228,6 +228,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 9f198dde3b..863a73606f 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 04d268b86c..5dbc4a148c 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 @@ -471,6 +471,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 9efa458369..c2d733e593 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 @@ -658,6 +658,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 b1415dda82..67b736c30e 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 @@ -1451,6 +1451,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 dda73607e7..0e10dff779 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 @@ -914,7 +914,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); } addTableMetadata(connection, namespace, table, updatedTableMetadata, false, true); } @@ -927,6 +930,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, 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) @@ -984,17 +1014,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 aed243dc89..895d204907 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 @@ -260,6 +260,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) { @@ -297,11 +305,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 a8c35b5f57..2d5b3a6f08 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 @@ -131,6 +131,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) { @@ -154,11 +162,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 6b16df9684..44b8028eb5 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 @@ -127,6 +127,14 @@ public void dropNamespaceTranslateSQLException(SQLException e, String namespace) throw new ExecutionException("Dropping the user failed: " + namespace, e); } + @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) { @@ -165,11 +173,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 fb76b2d48f..c8a097eaed 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 @@ -111,6 +111,14 @@ public void dropNamespaceTranslateSQLException(SQLException e, String namespace) throw new ExecutionException("Dropping the schema failed: " + namespace, e); } + @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) { @@ -134,11 +142,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 6bec004bba..b91e0d24aa 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 @@ -117,6 +117,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) { @@ -136,11 +145,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 4d04335b74..e2e3ac8066 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 @@ -249,6 +249,14 @@ public void dropNamespaceTranslateSQLException(SQLException e, String namespace) throw new AssertionError("DropNamespace never happen in SQLite implementation"); } + @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) { @@ -268,15 +276,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 52fc0b7153..43023d1b4c 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 @@ -122,6 +122,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); @@ -140,11 +142,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 d04a58a6ea..b5175dbc36 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 @@ -218,6 +218,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 e25ec4eb97..b0abfb652c 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 @@ -277,6 +277,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 Set getNamespaceNames() throws ExecutionException { return admin.getNamespaceNames().stream() 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 ed9d9f5150..b5b3fa6799 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 @@ -173,6 +173,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 64d3e520aa..70c9b21507 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 b1fdca6eff..abd5eef2cf 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 @@ -984,11 +984,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); } @Test 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 index c45f99fb1e..682e5c5a6c 100644 --- a/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTest.java @@ -1152,6 +1152,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); @@ -1159,6 +1160,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 9f48489cb8..50a221ff2b 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 @@ -1719,6 +1719,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); @@ -1726,6 +1727,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/JdbcAdminTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java index ec62a3892b..a68c295823 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java @@ -3233,6 +3233,173 @@ 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 `" + + METADATA_SCHEMA + + "`.`metadata` WHERE `full_table_name`=? ORDER BY `ordinal_position` ASC", + "ALTER TABLE `ns`.`table` RENAME TO `ns`.`table_new`", + "DELETE FROM `" + METADATA_SCHEMA + "`.`metadata` WHERE `full_table_name` = 'ns.table'", + "SELECT DISTINCT `full_table_name` FROM `" + METADATA_SCHEMA + "`.`metadata`", + "INSERT INTO `" + + METADATA_SCHEMA + + "`.`metadata` VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO `" + + METADATA_SCHEMA + + "`.`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 \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns\".\"table\" RENAME TO \"table_new\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + METADATA_SCHEMA + "\".\"metadata\"", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"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 \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns\".\"table\" RENAME TO \"table_new\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + METADATA_SCHEMA + "\".\"metadata\"", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"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 [" + + METADATA_SCHEMA + + "].[metadata] WHERE [full_table_name]=? ORDER BY [ordinal_position] ASC", + "EXEC sp_rename '[ns].[table]', 'table_new'", + "DELETE FROM [" + METADATA_SCHEMA + "].[metadata] WHERE [full_table_name] = 'ns.table'", + "SELECT DISTINCT [full_table_name] FROM [" + METADATA_SCHEMA + "].[metadata]", + "INSERT INTO [" + + METADATA_SCHEMA + + "].[metadata] VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO [" + + METADATA_SCHEMA + + "].[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 \"" + + METADATA_SCHEMA + + "$metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "ALTER TABLE \"ns$table\" RENAME TO \"ns$table_new\"", + "DELETE FROM \"" + METADATA_SCHEMA + "$metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + METADATA_SCHEMA + "$metadata\"", + "INSERT INTO \"" + + METADATA_SCHEMA + + "$metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,FALSE,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "$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 \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", + "RENAME \"ns\".\"table\" TO \"table_new\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "SELECT DISTINCT \"full_table_name\" FROM \"" + METADATA_SCHEMA + "\".\"metadata\"", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table_new','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"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 columnName1 = "c1"; + String columnName2 = "c2"; + + PreparedStatement selectStatement = mock(PreparedStatement.class); + ResultSet resultSet1 = + mockResultSet( + new SelectAllFromMetadataTableResultSetMocker.Row( + columnName1, DataType.TEXT.toString(), "PARTITION", null, false), + new SelectAllFromMetadataTableResultSetMocker.Row( + columnName2, DataType.INT.toString(), null, null, false)); + when(selectStatement.executeQuery()).thenReturn(resultSet1); + when(connection.prepareStatement(any())).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]); + } + } + } + @Test public void getNamespaceNames_forMysql_ShouldReturnNamespaceNames() throws Exception { getNamespaceNames_forX_ShouldReturnNamespaceNames( 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 d084a0bafc..50461baeee 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 @@ -625,6 +625,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 670186c9d2..7bcec40e74 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 @@ -654,6 +654,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 c01ff28d4a..b3fe834914 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 daece134b9..db57dd67a5 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 @@ -1083,6 +1083,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 getNamespaceNames_ShouldReturnCreatedNamespaces() throws ExecutionException { // Arrange @@ -1309,6 +1336,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 upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() 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 8b83527dd5..97cc3087e2 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 @@ -348,6 +348,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 499ab6a278..11cb1f5689 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 @@ -1172,6 +1172,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 {