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 d27e057274..c596f503bd 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 @@ -1,10 +1,16 @@ package com.scalar.db.storage.cassandra; +import static org.assertj.core.api.Assertions.assertThat; + import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase; +import com.scalar.db.api.TableMetadata; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.util.AdminTestUtils; import java.util.Collections; import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Disabled; public class CassandraAdminCaseSensitivityIntegrationTest extends DistributedStorageAdminCaseSensitivityIntegrationTestBase { @@ -27,4 +33,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { protected boolean isTimestampTypeSupported() { return false; } + + @Override + @Disabled("Renaming non-primary key columns is not supported in Cassandra") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName1()) + .build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act + admin.renameColumn(getNamespace1(), getTable4(), getColumnName1(), getColumnName4()); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName4(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName4()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName4()) + .build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(getNamespace1(), getTable4(), getColumnName1())).isFalse(); + assertThat(admin.indexExists(getNamespace1(), getTable4(), getColumnName4())).isTrue(); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } } 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 119b2ca2a3..6c0ffc90a2 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 @@ -1,10 +1,16 @@ package com.scalar.db.storage.cassandra; +import static org.assertj.core.api.Assertions.assertThat; + import com.scalar.db.api.DistributedStorageAdminIntegrationTestBase; +import com.scalar.db.api.TableMetadata; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.util.AdminTestUtils; import java.util.Collections; import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Disabled; public class CassandraAdminIntegrationTest extends DistributedStorageAdminIntegrationTestBase { @Override @@ -26,4 +32,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { protected boolean isTimestampTypeSupported() { return false; } + + @Override + @Disabled("Renaming non-primary key columns is not supported in Cassandra") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName1()) + .build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act + admin.renameColumn(getNamespace1(), getTable4(), getColumnName1(), getColumnName4()); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName4(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName4()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName4()) + .build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(getNamespace1(), getTable4(), getColumnName1())).isFalse(); + assertThat(admin.indexExists(getNamespace1(), getTable4(), getColumnName4())).isTrue(); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } } 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 e54ad7052a..c98376f192 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 @@ -2,9 +2,11 @@ import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.MAX_RETRY_COUNT; import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.SLEEP_BETWEEN_RETRIES_SECONDS; +import static org.assertj.core.api.Assertions.assertThatCode; import com.google.common.util.concurrent.Uninterruptibles; import com.scalar.db.api.DistributedStorageAdminPermissionIntegrationTestBase; +import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.util.AdminTestUtils; import com.scalar.db.util.PermissionTestUtils; import java.util.Collections; @@ -138,4 +140,17 @@ public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed() {} @Override @Disabled("Import-related functionality is not supported in Cassandra") public void importTable_WithSufficientPermission_ShouldSucceed() {} + + @Test + @Override + public void renameColumn_WithSufficientPermission_ShouldSucceed() throws ExecutionException { + // Arrange + createNamespaceByRoot(); + createTableByRoot(); + + // Act Assert + // Cassandra does not support renaming non-primary key columns + assertThatCode(() -> adminForNormalUser.renameColumn(NAMESPACE, TABLE, COL_NAME1, NEW_COL_NAME)) + .doesNotThrowAnyException(); + } } 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 b0eb1c4bab..b4b0cdf60f 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 @@ -1,10 +1,16 @@ package com.scalar.db.storage.cassandra; +import static org.assertj.core.api.Assertions.assertThat; + +import com.scalar.db.api.TableMetadata; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; import java.util.Collections; import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Disabled; public class ConsensusCommitAdminIntegrationTestWithCassandra extends ConsensusCommitAdminIntegrationTestBase { @@ -27,4 +33,46 @@ protected AdminTestUtils getAdminTestUtils(String testName) { protected boolean isTimestampTypeSupported() { return false; } + + @Override + @Disabled("Renaming non-primary key columns is not supported in Cassandra") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2") + .addSecondaryIndex("c1") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, TABLE4, "c1", "c4"); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn("c4", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addPartitionKey("c4") + .addClusteringKey("c2") + .addSecondaryIndex("c4") + .build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(namespace1, TABLE4, "c1")).isFalse(); + assertThat(admin.indexExists(namespace1, TABLE4, "c4")).isTrue(); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } } 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 4669045a58..89c268425e 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 @@ -1,9 +1,15 @@ package com.scalar.db.storage.cassandra; +import static org.assertj.core.api.Assertions.assertThat; + +import com.scalar.db.api.TableMetadata; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.transaction.singlecrudoperation.SingleCrudOperationTransactionAdminIntegrationTestBase; import java.util.Collections; import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Disabled; public class SingleCrudOperationTransactionAdminIntegrationTestWithCassandra extends SingleCrudOperationTransactionAdminIntegrationTestBase { @@ -22,4 +28,46 @@ protected Map getCreationOptions() { protected boolean isTimestampTypeSupported() { return false; } + + @Override + @Disabled("Renaming non-primary key columns is not supported in Cassandra") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2") + .addSecondaryIndex("c1") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, TABLE4, "c1", "c4"); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn("c4", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addPartitionKey("c4") + .addClusteringKey("c2") + .addSecondaryIndex("c4") + .build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(namespace1, TABLE4, "c1")).isFalse(); + assertThat(admin.indexExists(namespace1, TABLE4, "c4")).isTrue(); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } } 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 20d061d508..c164a406c5 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 @@ -40,11 +40,31 @@ public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentE @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} @Override @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_IfNotExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 e26cd4295e..f0b4f67010 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 @@ -24,27 +24,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { return new CosmosAdminTestUtils(getProperties(testName)); } - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColumnsCorrectly() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_IfExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 6c3aaf948c..1b44f8a619 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 @@ -23,27 +23,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { return new CosmosAdminTestUtils(getProperties(testName)); } - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColumnsCorrectly() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_IfExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 96deded7bf..e8c66ac747 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 @@ -34,11 +34,31 @@ public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentE @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("Cosmos DB does not support dropping columns") @Override + @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} @Override @Disabled("Cosmos DB does not support dropping columns") public void dropColumnFromTable_IfNotExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 b6163a00e1..f9e91e6f48 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 @@ -45,11 +45,31 @@ public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentE @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} @Override @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_IfNotExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 12d673135d..d04d2eb196 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 @@ -29,27 +29,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { return new DynamoAdminTestUtils(getProperties(testName)); } - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColumnsCorrectly() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_IfExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 c86fd33073..ec8c49b585 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 @@ -28,27 +28,47 @@ protected AdminTestUtils getAdminTestUtils(String testName) { return new DynamoAdminTestUtils(getProperties(testName)); } - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColumnsCorrectly() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_IfExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } 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 2879b2e5ee..456cf6b5e4 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 @@ -64,4 +64,9 @@ public void importTable_WithSufficientPermission_ShouldSucceed() {} @Override @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_WithSufficientPermission_ShouldSucceed() {} + + @Test + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_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 83dc86eef4..e92a5e1888 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 @@ -39,11 +39,31 @@ public void dropColumnFromTable_ForNonExistingColumn_ShouldThrowIllegalArgumentE @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForPrimaryKeyColumn_ShouldThrowIllegalArgumentException() {} - @Disabled("DynamoDB does not support dropping columns") @Override + @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_ForIndexedColumn_ShouldDropColumnAndIndexCorrectly() {} @Override @Disabled("DynamoDB does not support dropping columns") public void dropColumnFromTable_IfNotExists_ForNonExistingColumn_ShouldNotThrowAnyException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} + + @Override + @Disabled("DynamoDB does not support renaming columns") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java index 7078581c2e..f9a1db19ba 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java @@ -1,9 +1,18 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThatCode; + +import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; +import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.EnabledIf; public class ConsensusCommitAdminIntegrationTestWithJdbcDatabase extends ConsensusCommitAdminIntegrationTestBase { @@ -29,4 +38,55 @@ protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @SuppressWarnings("unused") + private boolean isDb2() { + return JdbcEnv.isDb2(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + super.renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + super.renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly(); + } + + @Test + @EnabledIf("isDb2") + public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(COL_NAME1, DataType.INT) + .addColumn(COL_NAME2, DataType.INT) + .addColumn(COL_NAME3, DataType.TEXT) + .addPartitionKey(COL_NAME1) + .addClusteringKey(COL_NAME2) + .addSecondaryIndex(COL_NAME3) + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME1, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME2, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME3, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java index 34d20d1906..66708e09ea 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java @@ -1,9 +1,18 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThatCode; + import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase; +import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.util.AdminTestUtils; +import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.EnabledIf; public class JdbcAdminCaseSensitivityIntegrationTest extends DistributedStorageAdminCaseSensitivityIntegrationTestBase { @@ -28,4 +37,64 @@ protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { // So we disable these tests until the issue is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @SuppressWarnings("unused") + private boolean isDb2() { + return JdbcEnv.isDb2(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + super.renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + super.renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly(); + } + + @Test + @EnabledIf("isDb2") + public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName3()) + .build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act Assert + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName1(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName2(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName3(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java index dffdbddf5a..ed757ba490 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java @@ -1,9 +1,18 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThatCode; + import com.scalar.db.api.DistributedStorageAdminIntegrationTestBase; +import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.util.AdminTestUtils; +import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.EnabledIf; public class JdbcAdminIntegrationTest extends DistributedStorageAdminIntegrationTestBase { private RdbEngineStrategy rdbEngine; @@ -27,4 +36,64 @@ protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { // So we disable these tests until the issue is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @SuppressWarnings("unused") + private boolean isDb2() { + return JdbcEnv.isDb2(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + super.renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + super.renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly(); + } + + @Test + @EnabledIf("isDb2") + public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName3()) + .build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act Assert + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName1(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName2(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.renameColumn( + getNamespace1(), getTable4(), getColumnName3(), getColumnName4())) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java index 3c7ab0eeed..a977a2346c 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcEnv.java @@ -54,4 +54,8 @@ public static Properties getPropertiesForNormalUser(String testName) { public static boolean isSqlite() { return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:sqlite:"); } + + public static boolean isDb2() { + return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:db2:"); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java index 78385ebd68..bbadccc670 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java @@ -1,9 +1,18 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThatCode; + +import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; +import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.transaction.singlecrudoperation.SingleCrudOperationTransactionAdminIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; +import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.EnabledIf; public class SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase extends SingleCrudOperationTransactionAdminIntegrationTestBase { @@ -29,4 +38,55 @@ protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @SuppressWarnings("unused") + private boolean isDb2() { + return JdbcEnv.isDb2(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + super.renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + super.renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly(); + } + + @Test + @EnabledIf("isDb2") + public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(COL_NAME1, DataType.INT) + .addColumn(COL_NAME2, DataType.INT) + .addColumn(COL_NAME3, DataType.TEXT) + .addPartitionKey(COL_NAME1) + .addClusteringKey(COL_NAME2) + .addSecondaryIndex(COL_NAME3) + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME1, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME2, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME3, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } } diff --git a/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java index 1a73a8d28a..2a85669b85 100644 --- a/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java @@ -1,17 +1,24 @@ package com.scalar.db.transaction.jdbc; +import static org.assertj.core.api.Assertions.assertThatCode; + import com.scalar.db.api.DistributedTransactionAdminIntegrationTestBase; +import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.io.DataType; import com.scalar.db.storage.jdbc.JdbcConfig; import com.scalar.db.storage.jdbc.JdbcEnv; import com.scalar.db.storage.jdbc.JdbcTestUtils; import com.scalar.db.storage.jdbc.RdbEngineFactory; import com.scalar.db.storage.jdbc.RdbEngineStrategy; import com.scalar.db.util.AdminTestUtils; +import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.EnabledIf; public class JdbcTransactionAdminIntegrationTest extends DistributedTransactionAdminIntegrationTestBase { @@ -102,4 +109,55 @@ protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @SuppressWarnings("unused") + private boolean isDb2() { + return JdbcEnv.isDb2(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + super.renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly(); + } + + @Test + @Override + @DisabledIf("isDb2") + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + super.renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly(); + } + + @Test + @EnabledIf("isDb2") + public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(COL_NAME1, DataType.INT) + .addColumn(COL_NAME2, DataType.INT) + .addColumn(COL_NAME3, DataType.TEXT) + .addPartitionKey(COL_NAME1) + .addClusteringKey(COL_NAME2) + .addSecondaryIndex(COL_NAME3) + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME1, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME2, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.renameColumn(namespace1, TABLE4, COL_NAME3, COL_NAME4)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } } 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 b309c2ec38..729853d06a 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,20 @@ default void dropColumnFromTable( dropColumnFromTable(namespace, table, columnName); } + /** + * Renames an existing column of an existing table. + * + * @param namespace the table namespace + * @param table the table name + * @param oldColumnName the current name of the column to rename + * @param newColumnName the new name of the column + * @throws IllegalArgumentException if the table or the old column does not exist or the new + * column already exists + * @throws ExecutionException if the operation fails + */ + void renameColumn(String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException; + /** * Imports an existing table that is not managed by ScalarDB. * diff --git a/core/src/main/java/com/scalar/db/api/TableMetadata.java b/core/src/main/java/com/scalar/db/api/TableMetadata.java index b243f87d6c..f1dae0a509 100644 --- a/core/src/main/java/com/scalar/db/api/TableMetadata.java +++ b/core/src/main/java/com/scalar/db/api/TableMetadata.java @@ -251,6 +251,33 @@ public Builder removeColumn(String name) { return this; } + /** + * Renames a column from {@code oldName} to {@code newName}. + * + * @param oldName a column name to be renamed + * @param newName a new column name + * @return a builder instance + */ + public Builder renameColumn(String oldName, String newName) { + if (columns.containsKey(oldName)) { + LinkedHashMap newColumns = new LinkedHashMap<>(); + for (Map.Entry entry : columns.entrySet()) { + if (entry.getKey().equals(oldName)) { + newColumns.put(newName, entry.getValue()); + } else { + newColumns.put(entry.getKey(), entry.getValue()); + } + } + columns.clear(); + columns.putAll(newColumns); + } + if (encryptedColumnNames.contains(oldName)) { + encryptedColumnNames.remove(oldName); + encryptedColumnNames.add(newName); + } + return this; + } + /** * Adds a partition-key column with the specified name. * @@ -273,6 +300,29 @@ public Builder removePartitionKey(String name) { return this; } + /** + * Renames a partition-key column from {@code oldName} to {@code newName}. + * + * @param oldName a column name to be renamed + * @param newName a new column name + * @return a builder instance + */ + public Builder renamePartitionKey(String oldName, String newName) { + if (partitionKeyNames.contains(oldName)) { + LinkedHashSet newPartitionKeyNames = new LinkedHashSet<>(); + for (String name : partitionKeyNames) { + if (name.equals(oldName)) { + newPartitionKeyNames.add(newName); + } else { + newPartitionKeyNames.add(name); + } + } + partitionKeyNames.clear(); + partitionKeyNames.addAll(newPartitionKeyNames); + } + return this; + } + /** * Adds a clustering-key column with the specified name and the default order (ASC). * @@ -309,6 +359,34 @@ public Builder removeClusteringKey(String name) { return this; } + /** + * Renames a clustering-key column from {@code oldName} to {@code newName}. + * + * @param oldName a column name to be renamed + * @param newName a new column name + * @return a builder instance + */ + public Builder renameClusteringKey(String oldName, String newName) { + if (clusteringKeyNames.contains(oldName)) { + LinkedHashSet newClusteringKeyNames = new LinkedHashSet<>(); + LinkedHashMap newClusteringOrders = new LinkedHashMap<>(); + for (String name : clusteringKeyNames) { + if (name.equals(oldName)) { + newClusteringKeyNames.add(newName); + newClusteringOrders.put(newName, clusteringOrders.get(oldName)); + } else { + newClusteringKeyNames.add(name); + newClusteringOrders.put(name, clusteringOrders.get(name)); + } + } + clusteringKeyNames.clear(); + clusteringOrders.clear(); + clusteringKeyNames.addAll(newClusteringKeyNames); + clusteringOrders.putAll(newClusteringOrders); + } + return this; + } + /** * Adds a secondary-index column with the specified name. * @@ -331,6 +409,21 @@ public Builder removeSecondaryIndex(String name) { return this; } + /** + * Renames a secondary-index column from {@code oldName} to {@code newName}. + * + * @param oldName a column name to be renamed + * @param newName a new column name + * @return a builder instance + */ + public Builder renameSecondaryIndex(String oldName, String newName) { + if (secondaryIndexNames.contains(oldName)) { + secondaryIndexNames.remove(oldName); + secondaryIndexNames.add(newName); + } + return this; + } + /** * Builds a TableMetadata instance. * diff --git a/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java b/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java index afc4592b64..299ee77fc3 100644 --- a/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java @@ -331,6 +331,38 @@ public void dropColumnFromTable(String namespace, String table, String columnNam } } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + TableMetadata tableMetadata = getTableMetadata(namespace, table); + if (tableMetadata == null) { + throw new IllegalArgumentException( + CoreError.TABLE_NOT_FOUND.buildMessage(ScalarDbUtils.getFullTableName(namespace, table))); + } + + if (!tableMetadata.getColumnNames().contains(oldColumnName)) { + throw new IllegalArgumentException( + CoreError.COLUMN_NOT_FOUND2.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), oldColumnName)); + } + + if (tableMetadata.getColumnNames().contains(newColumnName)) { + throw new IllegalArgumentException( + CoreError.COLUMN_ALREADY_EXISTS.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), newColumnName)); + } + + try { + admin.renameColumn(namespace, table, oldColumnName, newColumnName); + } catch (ExecutionException e) { + throw new ExecutionException( + CoreError.RENAMING_COLUMN_FAILED.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), oldColumnName, newColumnName), + 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 c187941fd7..e683f5ea6d 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -692,6 +692,26 @@ public enum CoreError implements ScalarDbError { ""), DYNAMO_DROP_COLUMN_NOT_SUPPORTED( Category.USER_ERROR, "0218", "DynamoDB does not support the dropping column feature", "", ""), + COSMOS_RENAME_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, + "0219", + "Cosmos DB does not support the renaming column feature", + "", + ""), + DYNAMO_RENAME_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, "0220", "DynamoDB does not support the renaming column feature", "", ""), + CASSANDRA_RENAME_NON_PRIMARY_KEY_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, + "0221", + "Cassandra does not support renaming non-primary key columns", + "", + ""), + JDBC_DB2_RENAME_PRIMARY_OR_INDEX_KEY_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, + "0222", + "Db2 does not support renaming primary key or index key columns", + "", + ""), // // Errors for the concurrency error category @@ -980,6 +1000,12 @@ public enum CoreError implements ScalarDbError { "Dropping a column from the table failed. Table: %s; Column: %s", "", ""), + RENAMING_COLUMN_FAILED( + Category.INTERNAL_ERROR, + "0060", + "Renaming a column failed. Table: %s; Old column name: %s; New column 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 9b3a8e1053..e8954c002b 100644 --- a/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java @@ -221,6 +221,13 @@ public void dropColumnFromTable( distributedTransactionAdmin.dropColumnFromTable(namespace, table, columnName, ifExists); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + distributedTransactionAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); + } + @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 f9edfbfa94..9f198dde3b 100644 --- a/core/src/main/java/com/scalar/db/service/AdminService.java +++ b/core/src/main/java/com/scalar/db/service/AdminService.java @@ -100,6 +100,13 @@ public void dropColumnFromTable(String namespace, String table, String columnNam admin.dropColumnFromTable(namespace, table, columnName); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + admin.renameColumn(namespace, table, oldColumnName, newColumnName); + } + @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 1e9d90e86d..63f7383fbf 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 @@ -436,6 +436,41 @@ columnName, getFullTableName(namespace, table)), } } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + try { + TableMetadata tableMetadata = getTableMetadata(namespace, table); + assert tableMetadata != null; + if (!tableMetadata.getPartitionKeyNames().contains(oldColumnName) + && !tableMetadata.getClusteringKeyNames().contains(oldColumnName)) { + throw new IllegalArgumentException( + CoreError.CASSANDRA_RENAME_NON_PRIMARY_KEY_COLUMN_NOT_SUPPORTED.buildMessage()); + } + String alterTableQuery = + SchemaBuilder.alterTable(quoteIfNecessary(namespace), quoteIfNecessary(table)) + .renameColumn(quoteIfNecessary(oldColumnName)) + .to(quoteIfNecessary(newColumnName)) + .getQueryString(); + + clusterManager.getSession().execute(alterTableQuery); + if (tableMetadata.getSecondaryIndexNames().contains(oldColumnName)) { + // Cassandra does not support renaming indexes + dropIndex(namespace, table, oldColumnName); + createIndex(namespace, table, newColumnName, Collections.emptyMap()); + } + } catch (IllegalArgumentException e) { + throw e; + } catch (RuntimeException e) { + throw new ExecutionException( + String.format( + "Renaming the %s column to %s in the %s table failed", + oldColumnName, newColumnName, getFullTableName(namespace, table)), + e); + } + } + @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 c7be4cd074..9efa458369 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 @@ -651,6 +651,13 @@ public void dropColumnFromTable(String namespace, String table, String columnNam CoreError.COSMOS_DROP_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) { + throw new UnsupportedOperationException( + CoreError.COSMOS_RENAME_COLUMN_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 74ab81da02..9f86cdd457 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 @@ -1448,6 +1448,14 @@ public void dropColumnFromTable(String nonPrefixedNamespace, String table, Strin CoreError.DYNAMO_DROP_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.DYNAMO_RENAME_COLUMN_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 0af4e6cbbd..dda73607e7 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 @@ -884,6 +884,49 @@ columnName, getFullTableName(namespace, table)), } } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + try { + TableMetadata currentTableMetadata = getTableMetadata(namespace, table); + assert currentTableMetadata != null; + rdbEngine.throwIfRenameColumnNotSupported(oldColumnName, currentTableMetadata); + TableMetadata.Builder tableMetadataBuilder = + TableMetadata.newBuilder(currentTableMetadata).renameColumn(oldColumnName, newColumnName); + if (currentTableMetadata.getPartitionKeyNames().contains(oldColumnName)) { + tableMetadataBuilder.renamePartitionKey(oldColumnName, newColumnName); + } + if (currentTableMetadata.getClusteringKeyNames().contains(oldColumnName)) { + tableMetadataBuilder.renameClusteringKey(oldColumnName, newColumnName); + } + if (currentTableMetadata.getSecondaryIndexNames().contains(oldColumnName)) { + tableMetadataBuilder.renameSecondaryIndex(oldColumnName, newColumnName); + } + TableMetadata updatedTableMetadata = tableMetadataBuilder.build(); + String renameColumnStatement = + rdbEngine.renameColumnSql( + namespace, + table, + oldColumnName, + newColumnName, + getVendorDbColumnType(updatedTableMetadata, newColumnName)); + try (Connection connection = dataSource.getConnection()) { + execute(connection, renameColumnStatement); + if (currentTableMetadata.getSecondaryIndexNames().contains(oldColumnName)) { + renameIndex(connection, namespace, table, oldColumnName, newColumnName); + } + addTableMetadata(connection, namespace, table, updatedTableMetadata, false, true); + } + } catch (SQLException e) { + throw new ExecutionException( + String.format( + "Renaming the %s column to %s in the %s table failed", + oldColumnName, newColumnName, getFullTableName(namespace, table)), + e); + } + } + @Override public void addRawColumnToTable( String namespace, String table, String columnName, DataType columnType) @@ -941,6 +984,22 @@ private void dropIndex(Connection connection, String schema, String table, Strin execute(connection, sql); } + private void renameIndex( + Connection connection, + String schema, + String table, + String oldIndexedColumn, + String newIndexedColumn) + throws SQLException { + String oldIndexName = getIndexName(schema, table, oldIndexedColumn); + String newIndexName = getIndexName(schema, table, newIndexedColumn); + String[] sqls = + rdbEngine.renameIndexSqls(schema, table, oldIndexName, newIndexName, newIndexedColumn); + for (String sql : sqls) { + execute(connection, sql); + } + } + private String getIndexName(String schema, String table, String indexedColumn) { return String.join("_", INDEX_NAME_PREFIX, schema, table, indexedColumn); } 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 b68a3fad61..882400cab3 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 @@ -292,6 +292,23 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(schema) + "." + enclose(indexName); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + return new String[] { + "RENAME INDEX " + + enclose(schema) + + "." + + enclose(oldIndexName) + + " TO " + + enclose(newIndexName) + }; + } + @Override public boolean isDuplicateIndexError(SQLException e) { // Even though the "create index if exists ..." syntax does not exist, @@ -510,6 +527,16 @@ public String getProjectionsSqlForSelectQuery( .collect(Collectors.joining(",")); } + @Override + public void throwIfRenameColumnNotSupported(String columnName, TableMetadata tableMetadata) { + if (tableMetadata.getPartitionKeyNames().contains(columnName) + || tableMetadata.getClusteringKeyNames().contains(columnName) + || tableMetadata.getSecondaryIndexNames().contains(columnName)) { + throw new UnsupportedOperationException( + CoreError.JDBC_DB2_RENAME_PRIMARY_OR_INDEX_KEY_COLUMN_NOT_SUPPORTED.buildMessage()); + } + } + private String getProjection(String columnName, DataType dataType) { if (dataType == DataType.DATE) { // Selecting a DATE column requires special handling. We need to cast the DATE column values 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 930fa5eaa2..a8c35b5f57 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 @@ -114,6 +114,23 @@ public void dropNamespaceTranslateSQLException(SQLException e, String namespace) throw new ExecutionException("Dropping the schema failed: " + namespace, e); } + @Override + public String renameColumnSql( + String namespace, + String table, + String oldColumnName, + String newColumnName, + String columnType) { + return "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " CHANGE COLUMN " + + enclose(oldColumnName) + + " " + + enclose(newColumnName) + + " " + + columnType; + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -135,6 +152,23 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(indexName) + " ON " + encloseFullTableName(schema, table); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + return new String[] { + "ALTER TABLE " + + encloseFullTableName(schema, table) + + " RENAME INDEX " + + enclose(oldIndexName) + + " TO " + + enclose(newIndexName) + }; + } + @Override public String enclose(String name) { return "`" + name + "`"; 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 8b90648992..6b16df9684 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 @@ -163,6 +163,23 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(schema) + "." + enclose(indexName); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + return new String[] { + "ALTER INDEX " + + enclose(schema) + + "." + + enclose(oldIndexName) + + " RENAME TO " + + enclose(newIndexName) + }; + } + @Override public String enclose(String name) { return "\"" + name + "\""; 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 8b015a0da0..fb76b2d48f 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 @@ -132,6 +132,23 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(schema) + "." + enclose(indexName); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + return new String[] { + "ALTER INDEX " + + enclose(schema) + + "." + + enclose(oldIndexName) + + " RENAME TO " + + enclose(newIndexName) + }; + } + @Override public boolean isDuplicateTableError(SQLException e) { if (e.getSQLState() == null) { 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 948e3b30d5..6bec004bba 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 @@ -101,6 +101,22 @@ public void dropNamespaceTranslateSQLException(SQLException e, String namespace) throw new ExecutionException("Dropping the schema failed: " + namespace, e); } + @Override + public String renameColumnSql( + String namespace, + String table, + String oldColumnName, + String newColumnName, + String columnType) { + return "EXEC sp_rename '" + + encloseFullTableName(namespace, table) + + "." + + enclose(oldColumnName) + + "', '" + + newColumnName + + "', 'COLUMN'"; + } + @Override public String alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { @@ -118,6 +134,24 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(indexName) + " ON " + encloseFullTableName(schema, table); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + return new String[] { + "EXEC sp_rename '" + + encloseFullTableName(schema, table) + + "." + + enclose(oldIndexName) + + "', '" + + newIndexName + + "', 'INDEX'" + }; + } + @Override public boolean isDuplicateTableError(SQLException e) { // 2714: There is already an object named '%.*ls' in the database. 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 90dea3d78d..4d04335b74 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 @@ -266,6 +266,20 @@ public String dropIndexSql(String schema, String table, String indexName) { return "DROP INDEX " + enclose(indexName); } + @Override + public String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn) { + // SQLite does not support renaming an index + return new String[] { + dropIndexSql(schema, table, oldIndexName), + createIndexSql(schema, table, newIndexName, newIndexedColumn) + }; + } + @Override public String enclose(String name) { return "\"" + name + "\""; 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 d5992cfea4..b0826ceeb0 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 @@ -107,6 +107,20 @@ default String[] dropColumnSql(String namespace, String table, String columnName }; } + default String renameColumnSql( + String namespace, + String table, + String oldColumnName, + String newColumnName, + String columnType) { + return "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " RENAME COLUMN " + + enclose(oldColumnName) + + " TO " + + enclose(newColumnName); + } + String alterColumnTypeSql(String namespace, String table, String columnName, String columnType); String tableExistsInternalTableCheckSql(String fullTableName); @@ -124,6 +138,13 @@ default String createIndexSql( String dropIndexSql(String schema, String table, String indexName); + String[] renameIndexSqls( + String schema, + String table, + String oldIndexName, + String newIndexName, + String newIndexedColumn); + /** * Enclose the target (schema, table or column) to use reserved words and special characters. * @@ -251,6 +272,15 @@ default void throwIfDuplicatedIndexWarning(SQLWarning warning) throws SQLExcepti // Do nothing } + /** + * Throws an exception if renaming the column is not supported in the underlying database. + * + * @param columnName the current name of the column to rename + * @param tableMetadata the current table metadata + * @throws UnsupportedOperationException if renaming the column is not supported + */ + default void throwIfRenameColumnNotSupported(String columnName, TableMetadata tableMetadata) {} + default void setConnectionToReadOnly(Connection connection, boolean readOnly) throws SQLException { connection.setReadOnly(readOnly); 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 b4d4c5de65..d04a58a6ea 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 @@ -211,6 +211,13 @@ public void dropColumnFromTable(String namespace, String table, String columnNam getAdmin(namespace, table).dropColumnFromTable(namespace, table, columnName); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + getAdmin(namespace, table).renameColumn(namespace, table, oldColumnName, newColumnName); + } + @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 da479d6ce9..e25ec4eb97 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 @@ -254,6 +254,29 @@ public void dropColumnFromTable(String namespace, String table, String columnNam admin.dropColumnFromTable(namespace, table, beforeColumnName); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + checkNamespace(namespace); + + TableMetadata tableMetadata = getTableMetadata(namespace, table); + if (tableMetadata == null) { + throw new IllegalArgumentException( + CoreError.TABLE_NOT_FOUND.buildMessage(ScalarDbUtils.getFullTableName(namespace, table))); + } + if (tableMetadata.getPartitionKeyNames().contains(oldColumnName) + || tableMetadata.getClusteringKeyNames().contains(oldColumnName)) { + admin.renameColumn(namespace, table, oldColumnName, newColumnName); + } else { + String oldBeforeColumnName = getBeforeImageColumnName(oldColumnName, tableMetadata); + String newBeforeColumnName = getBeforeImageColumnName(newColumnName, tableMetadata); + + admin.renameColumn(namespace, table, oldColumnName, newColumnName); + admin.renameColumn(namespace, table, oldBeforeColumnName, newBeforeColumnName); + } + } + @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 2b99bc1094..d0151272bf 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 @@ -166,6 +166,13 @@ public void dropColumnFromTable(String namespace, String table, String columnNam jdbcAdmin.dropColumnFromTable(namespace, table, columnName); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + jdbcAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); + } + @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 161870d154..64d3e520aa 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 @@ -115,6 +115,13 @@ public void dropColumnFromTable(String namespace, String table, String columnNam distributedStorageAdmin.dropColumnFromTable(namespace, table, columnName); } + @Override + public void renameColumn( + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { + distributedStorageAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); + } + @Override public Set getNamespaceNames() throws ExecutionException { return distributedStorageAdmin.getNamespaceNames(); diff --git a/core/src/test/java/com/scalar/db/api/TableMetadataTest.java b/core/src/test/java/com/scalar/db/api/TableMetadataTest.java index c931b309db..d03eaaade9 100644 --- a/core/src/test/java/com/scalar/db/api/TableMetadataTest.java +++ b/core/src/test/java/com/scalar/db/api/TableMetadataTest.java @@ -263,4 +263,80 @@ public void builder_basedOnAnotherTableMetadata_ShouldReturnProperTableMetadata( assertThat(tableMetadata.getEncryptedColumnNames()).containsOnly(COL_NAME10); } + + @Test + public void builder_RenameColumns_ShouldRenameColumnsInTableMetadataCorrectly() { + // Arrange + TableMetadata.Builder builder = + TableMetadata.newBuilder() + .addColumn(COL_NAME1, DataType.INT) + .addColumn(COL_NAME2, DataType.TEXT) + .addColumn(COL_NAME3, DataType.TEXT) + .addColumn(COL_NAME4, DataType.INT) + .addColumn(COL_NAME5, DataType.INT) + .addColumn(COL_NAME6, DataType.TEXT) + .addColumn(COL_NAME7, DataType.BIGINT) + .addColumn(COL_NAME8, DataType.FLOAT) + .addColumn(COL_NAME9, DataType.DOUBLE) + .addColumn(COL_NAME10, DataType.BOOLEAN, true) + .addColumn(COL_NAME11, DataType.BLOB, true) + .addPartitionKey(COL_NAME2) + .addPartitionKey(COL_NAME1) + .addClusteringKey(COL_NAME4, Order.ASC) + .addClusteringKey(COL_NAME3, Order.DESC); + + // Act + TableMetadata tableMetadata = + builder + .renameColumn(COL_NAME2, "new_" + COL_NAME2) + .renameColumn(COL_NAME4, "new_" + COL_NAME4) + .renameColumn(COL_NAME10, "new_" + COL_NAME10) + .renamePartitionKey(COL_NAME2, "new_" + COL_NAME2) + .renameClusteringKey(COL_NAME4, "new_" + COL_NAME4) + .build(); + + // Assert + assertThat(tableMetadata.getColumnNames().size()).isEqualTo(11); + assertThat(tableMetadata.getColumnNames().contains(COL_NAME2)).isFalse(); + assertThat(tableMetadata.getColumnNames().contains("new_" + COL_NAME2)).isTrue(); + assertThat(tableMetadata.getColumnNames().contains(COL_NAME4)).isFalse(); + assertThat(tableMetadata.getColumnNames().contains("new_" + COL_NAME4)).isTrue(); + assertThat(tableMetadata.getColumnNames().contains(COL_NAME10)).isFalse(); + assertThat(tableMetadata.getColumnNames().contains("new_" + COL_NAME10)).isTrue(); + assertThat(tableMetadata.getPartitionKeyNames().contains(COL_NAME2)).isFalse(); + assertThat(tableMetadata.getPartitionKeyNames().contains("new_" + COL_NAME2)).isTrue(); + assertThat(tableMetadata.getClusteringKeyNames().contains(COL_NAME4)).isFalse(); + assertThat(tableMetadata.getClusteringKeyNames().contains("new_" + COL_NAME4)).isTrue(); + assertThat(tableMetadata.getEncryptedColumnNames().contains(COL_NAME10)).isFalse(); + assertThat(tableMetadata.getEncryptedColumnNames().contains("new_" + COL_NAME10)).isTrue(); + } + + @Test + public void builder_RenameSecondaryIndex_ShouldRenameSecondaryIndexInTableMetadataCorrectly() { + // Arrange + TableMetadata.Builder builder = + TableMetadata.newBuilder() + .addColumn(COL_NAME1, DataType.INT) + .addColumn(COL_NAME2, DataType.TEXT) + .addColumn(COL_NAME3, DataType.TEXT) + .addColumn(COL_NAME4, DataType.INT) + .addColumn(COL_NAME5, DataType.INT) + .addColumn(COL_NAME6, DataType.TEXT) + .addPartitionKey(COL_NAME2) + .addPartitionKey(COL_NAME1) + .addClusteringKey(COL_NAME4, Order.ASC) + .addClusteringKey(COL_NAME3, Order.DESC) + .addSecondaryIndex(COL_NAME5) + .addSecondaryIndex(COL_NAME6); + + // Act + TableMetadata tableMetadata = + builder.renameSecondaryIndex(COL_NAME5, "new_" + COL_NAME5).build(); + + // Assert + assertThat(tableMetadata.getSecondaryIndexNames().size()).isEqualTo(2); + assertThat(tableMetadata.getSecondaryIndexNames().contains(COL_NAME5)).isFalse(); + assertThat(tableMetadata.getSecondaryIndexNames().contains("new_" + COL_NAME5)).isTrue(); + assertThat(tableMetadata.getSecondaryIndexNames().contains(COL_NAME6)).isTrue(); + } } 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 b7446f7976..b1fdca6eff 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 @@ -892,6 +892,36 @@ public void dropColumnFromTable_ShouldWorkProperly() throws ExecutionException { verify(cassandraSession).execute(alterTableQuery); } + @Test + public void renameColumn_ShouldWorkProperly() throws ExecutionException { + // Arrange + String namespace = "sample_ns"; + String table = "tbl"; + String oldColumnName = "c1"; + String newColumnName = "c2"; + com.datastax.driver.core.TableMetadata tableMetadata = + mock(com.datastax.driver.core.TableMetadata.class); + ColumnMetadata c1 = mock(ColumnMetadata.class); + when(c1.getName()).thenReturn(oldColumnName); + when(c1.getType()).thenReturn(com.datastax.driver.core.DataType.text()); + when(tableMetadata.getPartitionKey()).thenReturn(Collections.singletonList(c1)); + when(tableMetadata.getClusteringColumns()).thenReturn(Collections.emptyList()); + when(tableMetadata.getIndexes()).thenReturn(Collections.emptyList()); + when(tableMetadata.getColumns()).thenReturn(Collections.singletonList(c1)); + when(clusterManager.getMetadata(any(), any())).thenReturn(tableMetadata); + + // Act + cassandraAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); + + // Assert + String alterTableQuery = + SchemaBuilder.alterTable(namespace, table) + .renameColumn(oldColumnName) + .to(newColumnName) + .getQueryString(); + verify(cassandraSession).execute(alterTableQuery); + } + @Test public void getNamespacesNames_WithNonExistingKeyspaces_ShouldReturnEmptySet() throws ExecutionException { 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 8e8e39b52a..c45f99fb1e 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 @@ -1150,12 +1150,15 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { admin.importTable( namespace, table, Collections.emptyMap(), Collections.emptyMap())); Throwable thrown4 = catchThrowable(() -> admin.dropColumnFromTable(namespace, table, column)); + Throwable thrown5 = + catchThrowable(() -> admin.renameColumn(namespace, table, column, "newCol")); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown2).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown3).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown5).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 1f971cd82c..9f48489cb8 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 @@ -1718,12 +1718,14 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { admin.importTable( NAMESPACE, TABLE, Collections.emptyMap(), Collections.emptyMap())); Throwable thrown4 = catchThrowable(() -> admin.dropColumnFromTable(NAMESPACE, TABLE, "c1")); + Throwable thrown5 = catchThrowable(() -> admin.renameColumn(NAMESPACE, TABLE, "c1", "c2")); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown2).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown3).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown5).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 7cd83297fc..ab22b91d7a 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 @@ -3079,6 +3079,160 @@ private void dropColumnFromTable_ForX_ShouldWorkProperly( } } + @Test + public void renameColumn_ForMysql_ShouldWorkProperly() throws SQLException, ExecutionException { + renameColumn_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` CHANGE COLUMN `c2` `c3` INT", + "DELETE FROM `" + METADATA_SCHEMA + "`.`metadata` WHERE `full_table_name` = 'ns.table'", + "INSERT INTO `" + + METADATA_SCHEMA + + "`.`metadata` VALUES ('ns.table','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO `" + + METADATA_SCHEMA + + "`.`metadata` VALUES ('ns.table','c3','INT',NULL,NULL,false,2)"); + } + + @Test + public void renameColumn_ForOracle_ShouldWorkProperly() throws SQLException, ExecutionException { + renameColumn_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 COLUMN \"c2\" TO \"c3\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c3','INT',NULL,NULL,0,2)"); + } + + @Test + public void renameColumn_ForPostgresql_ShouldWorkProperly() + throws SQLException, ExecutionException { + renameColumn_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 COLUMN \"c2\" TO \"c3\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c3','INT',NULL,NULL,false,2)"); + } + + @Test + public void renameColumn_ForSqlServer_ShouldWorkProperly() + throws SQLException, ExecutionException { + renameColumn_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].[c2]', 'c3', 'COLUMN'", + "DELETE FROM [" + METADATA_SCHEMA + "].[metadata] WHERE [full_table_name] = 'ns.table'", + "INSERT INTO [" + + METADATA_SCHEMA + + "].[metadata] VALUES ('ns.table','c1','TEXT','PARTITION',NULL,0,1)", + "INSERT INTO [" + + METADATA_SCHEMA + + "].[metadata] VALUES ('ns.table','c3','INT',NULL,NULL,0,2)"); + } + + @Test + public void renameColumn_ForSqlite_ShouldWorkProperly() throws SQLException, ExecutionException { + renameColumn_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 COLUMN \"c2\" TO \"c3\"", + "DELETE FROM \"" + METADATA_SCHEMA + "$metadata\" WHERE \"full_table_name\" = 'ns.table'", + "INSERT INTO \"" + + METADATA_SCHEMA + + "$metadata\" VALUES ('ns.table','c1','TEXT','PARTITION',NULL,FALSE,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "$metadata\" VALUES ('ns.table','c3','INT',NULL,NULL,FALSE,2)"); + } + + @Test + public void renameColumn_ForDb2_ShouldWorkProperly() throws SQLException, ExecutionException { + renameColumn_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", + "ALTER TABLE \"ns\".\"table\" RENAME COLUMN \"c2\" TO \"c3\"", + "DELETE FROM \"" + + METADATA_SCHEMA + + "\".\"metadata\" WHERE \"full_table_name\" = 'ns.table'", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c1','TEXT','PARTITION',NULL,false,1)", + "INSERT INTO \"" + + METADATA_SCHEMA + + "\".\"metadata\" VALUES ('ns.table','c3','INT',NULL,NULL,false,2)"); + } + + private void renameColumn_ForX_ShouldWorkProperly( + RdbEngine rdbEngine, String expectedGetMetadataStatement, String... expectedSqlStatements) + throws SQLException, ExecutionException { + // Arrange + String namespace = "ns"; + String table = "table"; + String columnName1 = "c1"; + String columnName2 = "c2"; + String columnName3 = "c3"; + + PreparedStatement selectStatement = mock(PreparedStatement.class); + ResultSet resultSet = + 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(resultSet); + + when(connection.prepareStatement(any())).thenReturn(selectStatement); + List expectedStatements = new ArrayList<>(); + for (int i = 0; i < expectedSqlStatements.length; i++) { + Statement expectedStatement = mock(Statement.class); + expectedStatements.add(expectedStatement); + } + 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.renameColumn(namespace, table, columnName2, columnName3); + + // Assert + verify(selectStatement).setString(1, getFullTableName(namespace, table)); + verify(connection).prepareStatement(expectedGetMetadataStatement); + for (int i = 0; i < expectedSqlStatements.length; i++) { + 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 3e0cae38a5..d084a0bafc 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 @@ -561,6 +561,70 @@ public void dropColumnFromTable_ForTable1InNamespace2_ShouldCallDropColumnFromTa verify(admin2).dropColumnFromTable(namespace, table, column); } + @Test + public void renameColumn_ForTable1InNamespace1_ShouldCallRenameColumnOfAdmin1() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE1; + String column1 = "c1"; + String column2 = "c2"; + + // Act + multiStorageAdmin.renameColumn(namespace, table, column1, column2); + + // Assert + verify(admin1).renameColumn(namespace, table, column1, column2); + } + + @Test + public void renameColumn_ForTable2InNamespace1_ShouldShouldCallRenameColumnOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE2; + String column1 = "c1"; + String column2 = "c2"; + + // Act + multiStorageAdmin.renameColumn(namespace, table, column1, column2); + + // Assert + verify(admin2).renameColumn(namespace, table, column1, column2); + } + + @Test + public void renameColumn_ForTable3InNamespace1_ShouldCallRenameColumnOfDefaultAdmin() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE3; + String column1 = "c1"; + String column2 = "c2"; + + // Act + multiStorageAdmin.renameColumn(namespace, table, column1, column2); + + // Assert + verify(admin3).renameColumn(namespace, table, column1, column2); + } + + @Test + public void renameColumn_ForTable1InNamespace2_ShouldCallRenameColumnOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE2; + String table = TABLE1; + String column1 = "c1"; + String column2 = "c2"; + + // Act + multiStorageAdmin.renameColumn(namespace, table, column1, column2); + + // Assert + verify(admin2).renameColumn(namespace, table, column1, column2); + } + @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 789124919f..670186c9d2 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 @@ -625,6 +625,35 @@ public void dropColumnFromTable_ShouldCallJdbcAdminProperly() throws ExecutionEx .dropColumnFromTable(NAMESPACE, TABLE, Attribute.BEFORE_PREFIX + targetColumn); } + @Test + public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String existingColumnName = "col2"; + String newColumnName = "col3"; + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn("col1", DataType.INT) + .addColumn(existingColumnName, DataType.INT) + .addPartitionKey("col1") + .build(); + when(distributedStorageAdmin.getTableMetadata(any(), any())) + .thenReturn(ConsensusCommitUtils.buildTransactionTableMetadata(tableMetadata)); + + // Act + admin.renameColumn(NAMESPACE, TABLE, existingColumnName, newColumnName); + + // Assert + verify(distributedStorageAdmin).getTableMetadata(NAMESPACE, TABLE); + verify(distributedStorageAdmin) + .renameColumn(NAMESPACE, TABLE, existingColumnName, newColumnName); + verify(distributedStorageAdmin) + .renameColumn( + NAMESPACE, + TABLE, + Attribute.BEFORE_PREFIX + existingColumnName, + Attribute.BEFORE_PREFIX + newColumnName); + } + @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 b88fdebe67..fd05bdbaf9 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 @@ -242,6 +242,21 @@ public void dropColumnFromTable_ShouldCallJdbcAdminProperly() throws ExecutionEx verify(jdbcAdmin).dropColumnFromTable(namespace, table, column); } + @Test + public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String namespace = "ns"; + String table = "tbl"; + String columnName1 = "c1"; + String columnName2 = "c2"; + + // Act + admin.renameColumn(namespace, table, columnName1, columnName2); + + // Assert + verify(jdbcAdmin).renameColumn(namespace, table, columnName1, columnName2); + } + @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 f463ad7063..c01ff28d4a 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 @@ -248,6 +248,21 @@ public void dropColumnFromTable_ShouldCallDistributedStorageAdminProperly() verify(distributedStorageAdmin).dropColumnFromTable(namespace, table, column); } + @Test + public void renameColumn_ShouldCallDistributedStorageAdminProperly() throws ExecutionException { + // Arrange + String namespace = "ns"; + String table = "tbl"; + String columnName1 = "c1"; + String columnName2 = "c2"; + + // Act + admin.renameColumn(namespace, table, columnName1, columnName2); + + // Assert + verify(distributedStorageAdmin).renameColumn(namespace, table, columnName1, columnName2); + } + @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 952e70b9b3..a4b3ac9284 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 @@ -59,7 +59,7 @@ public abstract class DistributedStorageAdminIntegrationTestBase { private static final String COL_NAME14 = "c14"; private static final String COL_NAME15 = "c15"; private StorageFactory storageFactory; - private DistributedStorageAdmin admin; + protected DistributedStorageAdmin admin; private String namespace1; private String namespace2; private String namespace3; @@ -1042,6 +1042,35 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu } } + @Test + public void renameColumn_ShouldRenameColumnCorrectly() throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addPartitionKey(getColumnName1()) + .build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, getTable4(), getColumnName2(), getColumnName3()); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addPartitionKey(getColumnName1()) + .build(); + assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } + } + @Test public void getNamespaceNames_ShouldReturnCreatedNamespaces() throws ExecutionException { // Arrange @@ -1075,6 +1104,19 @@ public void addNewColumnToTable_ForAlreadyExistingColumn_ShouldThrowIllegalArgum .isInstanceOf(IllegalArgumentException.class); } + @Test + public void + addNewColumnToTable_IfNotExists_ForAlreadyExistingColumn_ShouldNotThrowAnyException() { + // Arrange + + // Act Assert + assertThatCode( + () -> + admin.addNewColumnToTable( + namespace1, getTable1(), getColumnName7(), DataType.TEXT, false, true)) + .doesNotThrowAnyException(); + } + @Test public void dropColumnFromTable_ForNonExistingTable_ShouldThrowIllegalArgumentException() { // Arrange @@ -1149,16 +1191,110 @@ public void dropColumnFromTable_IfExists_ForNonExistingColumn_ShouldNotThrowAnyE } @Test - public void - addNewColumnToTable_IfNotExists_ForAlreadyExistingColumn_ShouldNotThrowAnyException() { + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() { // Arrange // Act Assert - assertThatCode( + assertThatThrownBy( + () -> admin.renameColumn(namespace1, getTable4(), getColumnName2(), getColumnName3())) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy( () -> - admin.addNewColumnToTable( - namespace1, getTable1(), getColumnName7(), DataType.TEXT, false, true)) - .doesNotThrowAnyException(); + admin.renameColumn(namespace1, getTable1(), "nonExistingColumn", getColumnName3())) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addColumn(getColumnName4(), DataType.INT) + .addColumn(getColumnName5(), DataType.INT) + .addPartitionKey(getColumnName1()) + .addPartitionKey(getColumnName2()) + .addClusteringKey(getColumnName3()) + .addClusteringKey(getColumnName4()) + .build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, getTable4(), getColumnName1(), getColumnName6()); + admin.renameColumn(namespace1, getTable4(), getColumnName3(), getColumnName7()); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName6(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName4(), DataType.INT) + .addColumn(getColumnName5(), DataType.INT) + .addPartitionKey(getColumnName6()) + .addPartitionKey(getColumnName2()) + .addClusteringKey(getColumnName7()) + .addClusteringKey(getColumnName4()) + .build(); + assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } + } + + @Test + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName1()) + .addSecondaryIndex(getColumnName3()) + .build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, getTable4(), getColumnName1(), getColumnName5()); + admin.renameColumn(namespace1, getTable4(), getColumnName3(), getColumnName4()); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName5(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName4(), DataType.TEXT) + .addPartitionKey(getColumnName5()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName4()) + .addSecondaryIndex(getColumnName5()) + .build(); + assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName1())).isFalse(); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName5())).isTrue(); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName3())).isFalse(); + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName4())).isTrue(); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } } @Test 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 7d4b2b8ad4..8b83527dd5 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 @@ -28,13 +28,13 @@ public abstract class DistributedStorageAdminPermissionIntegrationTestBase { private static final Logger logger = LoggerFactory.getLogger(DistributedStorageAdminPermissionIntegrationTestBase.class); - private static final String COL_NAME1 = "c1"; - private static final String COL_NAME2 = "c2"; - private static final String COL_NAME3 = "c3"; - private static final String COL_NAME4 = "c4"; - private static final String RAW_COL_NAME = "raw_col"; - private static final String NEW_COL_NAME = "new_col"; - private static final TableMetadata TABLE_METADATA = + protected static final String COL_NAME1 = "c1"; + protected static final String COL_NAME2 = "c2"; + protected static final String COL_NAME3 = "c3"; + protected static final String COL_NAME4 = "c4"; + protected static final String RAW_COL_NAME = "raw_col"; + protected static final String NEW_COL_NAME = "new_col"; + protected static final TableMetadata TABLE_METADATA = TableMetadata.newBuilder() .addColumn(COL_NAME1, DataType.INT) .addColumn(COL_NAME2, DataType.TEXT) @@ -45,8 +45,8 @@ public abstract class DistributedStorageAdminPermissionIntegrationTestBase { .addSecondaryIndex(COL_NAME4) .build(); - private DistributedStorageAdmin adminForRootUser; - private DistributedStorageAdmin adminForNormalUser; + protected DistributedStorageAdmin adminForRootUser; + protected DistributedStorageAdmin adminForNormalUser; private String normalUserName; private String normalUserPassword; @@ -337,6 +337,17 @@ public void dropColumnFromTable_WithSufficientPermission_ShouldSucceed() .doesNotThrowAnyException(); } + @Test + public void renameColumn_WithSufficientPermission_ShouldSucceed() throws ExecutionException { + // Arrange + createNamespaceByRoot(); + createTableByRoot(); + + // Act Assert + assertThatCode(() -> adminForNormalUser.renameColumn(NAMESPACE, TABLE, COL_NAME3, NEW_COL_NAME)) + .doesNotThrowAnyException(); + } + @Test public void importTable_WithSufficientPermission_ShouldSucceed() throws Exception { // Arrange @@ -413,12 +424,12 @@ protected void sleepBetweenTests() { // Default do nothing } - private void createNamespaceByRoot() throws ExecutionException { + protected void createNamespaceByRoot() throws ExecutionException { adminForRootUser.createNamespace(NAMESPACE, getCreationOptions()); waitForNamespaceCreation(); } - private void createTableByRoot() throws ExecutionException { + protected void createTableByRoot() throws ExecutionException { adminForRootUser.createTable(NAMESPACE, TABLE, TABLE_METADATA, getCreationOptions()); waitForTableCreation(); } 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 3c39d3dfaf..a5877044ba 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 @@ -1032,6 +1032,134 @@ public void dropColumnFromTable_IfNotExists_ForNonExistingColumn_ShouldNotThrowA .doesNotThrowAnyException(); } + @Test + public void renameColumn_ShouldRenameColumnCorrectly() throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addPartitionKey("c1") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, TABLE4, "c2", "c3"); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + public void renameColumn_ForNonExistingTable_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy(() -> admin.renameColumn(namespace1, TABLE4, "c2", "c3")) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameColumn_ForNonExistingColumn_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy(() -> admin.renameColumn(namespace1, TABLE1, "nonExistingColumn", "c3")) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addColumn("c4", DataType.INT) + .addColumn("c5", DataType.INT) + .addPartitionKey("c1") + .addPartitionKey("c2") + .addClusteringKey("c3") + .addClusteringKey("c4") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, TABLE4, "c1", "c6"); + admin.renameColumn(namespace1, TABLE4, "c3", "c7"); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn("c6", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c7", DataType.TEXT) + .addColumn("c4", DataType.INT) + .addColumn("c5", DataType.INT) + .addPartitionKey("c6") + .addPartitionKey("c2") + .addClusteringKey("c7") + .addClusteringKey("c4") + .build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2") + .addSecondaryIndex("c3") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act + admin.renameColumn(namespace1, TABLE4, "c3", "c4"); + + // Assert + TableMetadata expectedTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c4", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2") + .addSecondaryIndex("c4") + .build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + assertThat(admin.indexExists(namespace1, TABLE4, "c3")).isFalse(); + assertThat(admin.indexExists(namespace1, TABLE4, "c4")).isTrue(); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + @Test public void createCoordinatorTables_ShouldCreateCoordinatorTablesCorrectly() throws ExecutionException {