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 0d3e242592..75e3fe3d1d 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 @@ -77,6 +77,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Override + @Disabled("Cassandra does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cassandra does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 1b7b8b93a2..7dc8c37482 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 @@ -76,6 +76,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Override + @Disabled("Cassandra does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cassandra does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 b6c1f3960e..46ab9e6108 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 @@ -154,6 +154,11 @@ public void renameColumn_WithSufficientPermission_ShouldSucceed() throws Executi .doesNotThrowAnyException(); } + @Test + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_WithSufficientPermission_ShouldSucceed() {} + @Test @Override @Disabled("Cassandra does not support renaming tables") 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 46f5571e32..ec839164ce 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 @@ -76,6 +76,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Override + @Disabled("Cassandra does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cassandra does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 6099945a44..95b484b38d 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 @@ -71,6 +71,19 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Override + @Disabled("Cassandra does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cassandra does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cassandra does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 eff9d9ea7d..864253b4fc 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 @@ -68,6 +68,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("Cosmos DB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cosmos DB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 ec8559fb0a..2bedab906f 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 @@ -68,6 +68,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("Cosmos DB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cosmos DB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 b16c14e2b6..e7f33d6ccc 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 @@ -67,6 +67,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("Cosmos DB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cosmos DB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 ede5138583..9369098416 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 @@ -62,6 +62,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("Cosmos DB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("Cosmos DB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("Cosmos DB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("Cosmos DB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 732ac6d315..a885ee2574 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 @@ -73,6 +73,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("DynamoDB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("DynamoDB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 75d528738b..b1fb8fcde9 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 @@ -73,6 +73,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("DynamoDB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("DynamoDB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 e03fd1dd8f..33f8dfeb41 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 @@ -72,6 +72,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("DynamoDB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("DynamoDB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 b99fadca3a..c79c8afdb5 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 @@ -70,6 +70,11 @@ public void dropColumnFromTable_WithSufficientPermission_ShouldSucceed() {} @Disabled("DynamoDB does not support renaming columns") public void renameColumn_WithSufficientPermission_ShouldSucceed() {} + @Test + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_WithSufficientPermission_ShouldSucceed() {} + @Test @Override @Disabled("DynamoDB does not support renaming tables") 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 c2c2a3294d..c971f6e29c 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 @@ -67,6 +67,19 @@ public void renameColumn_ForPrimaryKeyColumn_ShouldRenameColumnCorrectly() {} @Disabled("DynamoDB does not support renaming columns") public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {} + @Override + @Disabled("DynamoDB does not support altering column types") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() {} + + @Override + @Disabled("DynamoDB does not support altering column types") + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() {} + @Override @Disabled("DynamoDB does not support renaming tables") public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() {} 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 1975fd8f60..e1599f0d6d 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,13 +1,31 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.catchThrowable; +import com.scalar.db.api.DistributedTransactionManager; +import com.scalar.db.api.Insert; +import com.scalar.db.api.InsertBuilder; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.exception.transaction.TransactionException; import com.scalar.db.io.DataType; +import com.scalar.db.io.Key; import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,11 +57,33 @@ protected boolean isCreateIndexOnTextColumnEnabled() { return !JdbcTestUtils.isDb2(rdbEngine); } + @SuppressWarnings("unused") + private boolean isOracle() { + return JdbcEnv.isOracle(); + } + @SuppressWarnings("unused") private boolean isDb2() { return JdbcEnv.isDb2(); } + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @SuppressWarnings("unused") + private boolean isColumnTypeConversionToTextNotFullySupported() { + return JdbcTestUtils.isDb2(rdbEngine) + || JdbcTestUtils.isOracle(rdbEngine) + || JdbcTestUtils.isSqlite(rdbEngine); + } + + @SuppressWarnings("unused") + private boolean isWideningColumnTypeConversionNotFullySupported() { + return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine); + } + @Test @Override @DisabledIf("isDb2") @@ -90,6 +130,294 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp } } + @Test + @Override + @DisabledIf("isColumnTypeConversionToTextNotFullySupported") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super + .alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void + alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isDb2") + public void + alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .doesNotThrowAnyException(); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); + } + + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addColumn("c4", DataType.TEXT) + .addColumn("c5", DataType.TEXT) + .addColumn("c6", DataType.TEXT) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.TEXT) + .addColumn("c10", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn("c11", DataType.TEXT) + .addColumn("c12", DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @Override + @DisabledIf("isWideningColumnTypeConversionNotFullySupported") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super.alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", expectedColumn3Value) + .floatValue("c4", expectedColumn4Value); + transactionalInsert(manager, insert.build()); + } + + // Act + admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT); + Throwable exception = + catchThrowable(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.DOUBLE)); + + // Assert + assertThat(exception).isInstanceOf(UnsupportedOperationException.class); + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.BIGINT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + Scan scan = + Scan.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .build(); + List results = transactionalScan(manager, scan); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isSqlite") + public void alterColumnType_Sqlite_AlterColumnType_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + @Override protected boolean isIndexOnBlobColumnSupported() { return !JdbcTestUtils.isDb2(rdbEngine); 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 9349a58ede..71dad0d7a7 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,13 +1,31 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.catchThrowable; +import com.scalar.db.api.DistributedStorage; import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase; +import com.scalar.db.api.Put; +import com.scalar.db.api.PutBuilder; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; +import com.scalar.db.api.Scanner; 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.io.Key; import com.scalar.db.util.AdminTestUtils; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -38,11 +56,33 @@ protected boolean isCreateIndexOnTextColumnEnabled() { return !JdbcTestUtils.isDb2(rdbEngine); } + @SuppressWarnings("unused") + private boolean isOracle() { + return JdbcEnv.isOracle(); + } + @SuppressWarnings("unused") private boolean isDb2() { return JdbcEnv.isDb2(); } + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @SuppressWarnings("unused") + private boolean isColumnTypeConversionToTextNotFullySupported() { + return JdbcTestUtils.isDb2(rdbEngine) + || JdbcTestUtils.isOracle(rdbEngine) + || JdbcTestUtils.isSqlite(rdbEngine); + } + + @SuppressWarnings("unused") + private boolean isWideningColumnTypeConversionNotFullySupported() { + return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine); + } + @Test @Override @DisabledIf("isDb2") @@ -98,6 +138,364 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp } } + @Test + @Override + @DisabledIf("isColumnTypeConversionToTextNotFullySupported") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + super + .alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void + alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try (DistributedStorage storage = storageFactory.getStorage()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.BIGINT) + .addColumn(getColumnName5(), DataType.FLOAT) + .addColumn(getColumnName6(), DataType.DOUBLE) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.DATE) + .addColumn(getColumnName10(), DataType.TIME) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TIMESTAMP) + .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), 1) + .bigIntValue(getColumnName4(), 2L) + .floatValue(getColumnName5(), 3.0f) + .doubleValue(getColumnName6(), 4.0d) + .textValue(getColumnName7(), "5") + .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) + .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); + put.timestampTZValue(getColumnName12(), Instant.now()); + } + storage.put(put.build()); + storage.close(); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName5(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName6(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName7(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName8(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName9(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + if (isTimestampTypeSupported()) { + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @EnabledIf("isDb2") + public void + alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() + throws ExecutionException { + try (DistributedStorage storage = storageFactory.getStorage()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.BIGINT) + .addColumn(getColumnName5(), DataType.FLOAT) + .addColumn(getColumnName6(), DataType.DOUBLE) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.DATE) + .addColumn(getColumnName10(), DataType.TIME) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TIMESTAMP) + .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), 1) + .bigIntValue(getColumnName4(), 2L) + .floatValue(getColumnName5(), 3.0f) + .doubleValue(getColumnName6(), 4.0d) + .textValue(getColumnName7(), "5") + .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) + .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); + put.timestampTZValue(getColumnName12(), Instant.now()); + } + storage.put(put.build()); + storage.close(); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName5(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName6(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName7(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName8(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName9(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT)) + .doesNotThrowAnyException(); + if (isTimestampTypeSupported()) { + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .doesNotThrowAnyException(); + } + + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addColumn(getColumnName4(), DataType.TEXT) + .addColumn(getColumnName5(), DataType.TEXT) + .addColumn(getColumnName6(), DataType.TEXT) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.TEXT) + .addColumn(getColumnName10(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TEXT) + .addColumn(getColumnName12(), DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @Override + @DisabledIf("isWideningColumnTypeConversionNotFullySupported") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + super.alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.FLOAT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + try (DistributedStorage storage = storageFactory.getStorage()) { + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), expectedColumn3Value) + .floatValue(getColumnName4(), expectedColumn4Value); + storage.put(put.build()); + } + + // Act + admin.alterColumnType(getNamespace1(), getTable4(), getColumnName3(), DataType.BIGINT); + Throwable exception = + catchThrowable( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.DOUBLE)); + + // Assert + assertThat(exception).isInstanceOf(UnsupportedOperationException.class); + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.BIGINT) + .addColumn(getColumnName4(), DataType.FLOAT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + + try (DistributedStorage storage = storageFactory.getStorage()) { + Scan scan = + Scan.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .build(); + try (Scanner scanner = storage.scan(scan)) { + List results = scanner.all(); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt(getColumnName3())).isEqualTo(expectedColumn3Value); + } + } + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @EnabledIf("isSqlite") + public void alterColumnType_Sqlite_AlterColumnType_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + @Override protected boolean isIndexOnBlobColumnSupported() { return !JdbcTestUtils.isDb2(rdbEngine); 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 677ce2881d..4e6e2a8b17 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,13 +1,31 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.catchThrowable; +import com.scalar.db.api.DistributedStorage; import com.scalar.db.api.DistributedStorageAdminIntegrationTestBase; +import com.scalar.db.api.Put; +import com.scalar.db.api.PutBuilder; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; +import com.scalar.db.api.Scanner; 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.io.Key; import com.scalar.db.util.AdminTestUtils; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -37,11 +55,33 @@ protected boolean isCreateIndexOnTextColumnEnabled() { return !JdbcTestUtils.isDb2(rdbEngine); } + @SuppressWarnings("unused") + private boolean isOracle() { + return JdbcEnv.isOracle(); + } + @SuppressWarnings("unused") private boolean isDb2() { return JdbcEnv.isDb2(); } + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @SuppressWarnings("unused") + private boolean isColumnTypeConversionToTextNotFullySupported() { + return JdbcTestUtils.isDb2(rdbEngine) + || JdbcTestUtils.isOracle(rdbEngine) + || JdbcTestUtils.isSqlite(rdbEngine); + } + + @SuppressWarnings("unused") + private boolean isWideningColumnTypeConversionNotFullySupported() { + return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine); + } + @Test @Override @DisabledIf("isDb2") @@ -97,6 +137,364 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp } } + @Test + @Override + @DisabledIf("isColumnTypeConversionToTextNotFullySupported") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + super + .alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void + alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try (DistributedStorage storage = storageFactory.getStorage()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.BIGINT) + .addColumn(getColumnName5(), DataType.FLOAT) + .addColumn(getColumnName6(), DataType.DOUBLE) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.DATE) + .addColumn(getColumnName10(), DataType.TIME) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TIMESTAMP) + .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), 1) + .bigIntValue(getColumnName4(), 2L) + .floatValue(getColumnName5(), 3.0f) + .doubleValue(getColumnName6(), 4.0d) + .textValue(getColumnName7(), "5") + .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) + .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); + put.timestampTZValue(getColumnName12(), Instant.now()); + } + storage.put(put.build()); + storage.close(); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName5(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName6(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName7(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName8(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName9(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + if (isTimestampTypeSupported()) { + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @EnabledIf("isDb2") + public void + alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() + throws ExecutionException { + try (DistributedStorage storage = storageFactory.getStorage()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.BIGINT) + .addColumn(getColumnName5(), DataType.FLOAT) + .addColumn(getColumnName6(), DataType.DOUBLE) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.DATE) + .addColumn(getColumnName10(), DataType.TIME) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TIMESTAMP) + .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), 1) + .bigIntValue(getColumnName4(), 2L) + .floatValue(getColumnName5(), 3.0f) + .doubleValue(getColumnName6(), 4.0d) + .textValue(getColumnName7(), "5") + .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) + .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); + put.timestampTZValue(getColumnName12(), Instant.now()); + } + storage.put(put.build()); + storage.close(); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName5(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName6(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName7(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName8(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName9(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT)) + .doesNotThrowAnyException(); + if (isTimestampTypeSupported()) { + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .doesNotThrowAnyException(); + } + + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addColumn(getColumnName4(), DataType.TEXT) + .addColumn(getColumnName5(), DataType.TEXT) + .addColumn(getColumnName6(), DataType.TEXT) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.TEXT) + .addColumn(getColumnName10(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TEXT) + .addColumn(getColumnName12(), DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @Override + @DisabledIf("isWideningColumnTypeConversionNotFullySupported") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + super.alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.FLOAT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + try (DistributedStorage storage = storageFactory.getStorage()) { + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), expectedColumn3Value) + .floatValue(getColumnName4(), expectedColumn4Value); + storage.put(put.build()); + } + + // Act + admin.alterColumnType(getNamespace1(), getTable4(), getColumnName3(), DataType.BIGINT); + Throwable exception = + catchThrowable( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName4(), DataType.DOUBLE)); + + // Assert + assertThat(exception).isInstanceOf(UnsupportedOperationException.class); + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.BIGINT) + .addColumn(getColumnName4(), DataType.FLOAT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) + .isEqualTo(expectedTableMetadata); + + try (DistributedStorage storage = storageFactory.getStorage()) { + Scan scan = + Scan.newBuilder() + .namespace(getNamespace1()) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .build(); + try (Scanner scanner = storage.scan(scan)) { + List results = scanner.all(); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt(getColumnName3())).isEqualTo(expectedColumn3Value); + } + } + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + + @Test + @EnabledIf("isSqlite") + public void alterColumnType_Sqlite_AlterColumnType_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); + + // Act Assert + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName3(), DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(getNamespace1(), getTable4(), true); + } + } + @Override protected boolean isIndexOnBlobColumnSupported() { return !JdbcTestUtils.isDb2(rdbEngine); diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminPermissionIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminPermissionIntegrationTest.java index a57e2f8dfa..a75eb3d5ac 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminPermissionIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminPermissionIntegrationTest.java @@ -5,10 +5,13 @@ import com.google.common.util.concurrent.Uninterruptibles; import com.scalar.db.api.DistributedStorageAdminPermissionIntegrationTestBase; import com.scalar.db.config.DatabaseConfig; +import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.util.AdminTestUtils; import com.scalar.db.util.PermissionTestUtils; import java.util.Properties; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; public class JdbcAdminPermissionIntegrationTest extends DistributedStorageAdminPermissionIntegrationTestBase { @@ -68,4 +71,16 @@ private void waitForDdlCompletion() { Uninterruptibles.sleepUninterruptibly(DDL_WAIT_SECONDS, TimeUnit.SECONDS); } } + + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @Test + @Override + @DisabledIf("isSqlite") + public void alterColumnType_WithSufficientPermission_ShouldSucceed() throws ExecutionException { + super.alterColumnType_WithSufficientPermission_ShouldSucceed(); + } } 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 a977a2346c..c88398250b 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 @@ -51,6 +51,10 @@ public static Properties getPropertiesForNormalUser(String testName) { return properties; } + public static boolean isOracle() { + return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:oracle:"); + } + public static boolean isSqlite() { return System.getProperty(PROP_JDBC_URL, DEFAULT_JDBC_URL).startsWith("jdbc:sqlite:"); } 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 da5833d5fa..e6a541aadf 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,13 +1,31 @@ package com.scalar.db.storage.jdbc; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.catchThrowable; +import com.scalar.db.api.DistributedTransactionManager; +import com.scalar.db.api.Insert; +import com.scalar.db.api.InsertBuilder; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.exception.transaction.TransactionException; import com.scalar.db.io.DataType; +import com.scalar.db.io.Key; import com.scalar.db.transaction.singlecrudoperation.SingleCrudOperationTransactionAdminIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -39,11 +57,33 @@ protected boolean isCreateIndexOnTextColumnEnabled() { return !JdbcTestUtils.isDb2(rdbEngine); } + @SuppressWarnings("unused") + private boolean isOracle() { + return JdbcEnv.isOracle(); + } + @SuppressWarnings("unused") private boolean isDb2() { return JdbcEnv.isDb2(); } + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @SuppressWarnings("unused") + private boolean isColumnTypeConversionToTextNotFullySupported() { + return JdbcTestUtils.isDb2(rdbEngine) + || JdbcTestUtils.isOracle(rdbEngine) + || JdbcTestUtils.isSqlite(rdbEngine); + } + + @SuppressWarnings("unused") + private boolean isWideningColumnTypeConversionNotFullySupported() { + return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine); + } + @Test @Override @DisabledIf("isDb2") @@ -90,6 +130,294 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp } } + @Test + @Override + @DisabledIf("isColumnTypeConversionToTextNotFullySupported") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super + .alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void + alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isDb2") + public void + alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionManager.insert(insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .doesNotThrowAnyException(); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); + } + + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addColumn("c4", DataType.TEXT) + .addColumn("c5", DataType.TEXT) + .addColumn("c6", DataType.TEXT) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.TEXT) + .addColumn("c10", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn("c11", DataType.TEXT) + .addColumn("c12", DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @Override + @DisabledIf("isWideningColumnTypeConversionNotFullySupported") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super.alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", expectedColumn3Value) + .floatValue("c4", expectedColumn4Value); + transactionalInsert(manager, insert.build()); + } + + // Act + admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT); + Throwable exception = + catchThrowable(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.DOUBLE)); + + // Assert + assertThat(exception).isInstanceOf(UnsupportedOperationException.class); + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.BIGINT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + Scan scan = + Scan.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .build(); + List results = transactionalScan(manager, scan); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isSqlite") + public void alterColumnType_Sqlite_AlterColumnType_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + @Override protected boolean isIndexOnBlobColumnSupported() { return !JdbcTestUtils.isDb2(rdbEngine); 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 7dd9a519b9..df3af3d8f9 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,18 +1,37 @@ package com.scalar.db.transaction.jdbc; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.catchThrowable; +import com.scalar.db.api.DistributedTransaction; import com.scalar.db.api.DistributedTransactionAdminIntegrationTestBase; +import com.scalar.db.api.DistributedTransactionManager; +import com.scalar.db.api.Insert; +import com.scalar.db.api.InsertBuilder; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; import com.scalar.db.api.TableMetadata; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.exception.transaction.TransactionException; import com.scalar.db.io.DataType; +import com.scalar.db.io.Key; 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.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; import java.util.Map; import java.util.Properties; import org.junit.jupiter.api.Disabled; @@ -110,11 +129,33 @@ protected boolean isCreateIndexOnTextColumnEnabled() { return !JdbcTestUtils.isDb2(rdbEngine); } + @SuppressWarnings("unused") + private boolean isOracle() { + return JdbcEnv.isOracle(); + } + @SuppressWarnings("unused") private boolean isDb2() { return JdbcEnv.isDb2(); } + @SuppressWarnings("unused") + private boolean isSqlite() { + return JdbcEnv.isSqlite(); + } + + @SuppressWarnings("unused") + private boolean isColumnTypeConversionToTextNotFullySupported() { + return JdbcTestUtils.isDb2(rdbEngine) + || JdbcTestUtils.isOracle(rdbEngine) + || JdbcTestUtils.isSqlite(rdbEngine); + } + + @SuppressWarnings("unused") + private boolean isWideningColumnTypeConversionNotFullySupported() { + return JdbcTestUtils.isOracle(rdbEngine) || JdbcTestUtils.isSqlite(rdbEngine); + } + @Test @Override @DisabledIf("isDb2") @@ -161,8 +202,313 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp } } + @Test + @Override + @DisabledIf("isColumnTypeConversionToTextNotFullySupported") + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super + .alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void + alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isDb2") + public void + alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() + throws ExecutionException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT)) + .doesNotThrowAnyException(); + if (isTimestampTypeSupported()) { + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); + } + + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addColumn("c4", DataType.TEXT) + .addColumn("c5", DataType.TEXT) + .addColumn("c6", DataType.TEXT) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.TEXT) + .addColumn("c10", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn("c11", DataType.TEXT) + .addColumn("c12", DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @Override + @DisabledIf("isWideningColumnTypeConversionNotFullySupported") + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + super.alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly(); + } + + @Test + @EnabledIf("isOracle") + public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", expectedColumn3Value) + .floatValue("c4", expectedColumn4Value); + transactionalInsert(manager, insert.build()); + } + + // Act + admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT); + Throwable exception = + catchThrowable(() -> admin.alterColumnType(namespace1, TABLE4, "c4", DataType.DOUBLE)); + + // Assert + assertThat(exception).isInstanceOf(UnsupportedOperationException.class); + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.BIGINT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + + try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) { + Scan scan = + Scan.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .build(); + List results = transactionalScan(manager, scan); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value); + } + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + @EnabledIf("isSqlite") + public void alterColumnType_Sqlite_AlterColumnType_ShouldThrowUnsupportedOperationException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(UnsupportedOperationException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + @Override protected boolean isIndexOnBlobColumnSupported() { return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected void transactionalInsert(DistributedTransactionManager manager, Insert insert) + throws TransactionException { + DistributedTransaction transaction = manager.start(); + transaction.insert(insert); + transaction.commit(); + } + + @Override + protected List transactionalScan(DistributedTransactionManager manager, Scan scan) + throws TransactionException { + DistributedTransaction transaction = manager.start(); + List results = transaction.scan(scan); + transaction.commit(); + return results; + } } 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 e4a0e810b7..c1cb0bcb4d 100644 --- a/core/src/main/java/com/scalar/db/api/Admin.java +++ b/core/src/main/java/com/scalar/db/api/Admin.java @@ -534,6 +534,20 @@ default void dropColumnFromTable( void renameColumn(String namespace, String table, String oldColumnName, String newColumnName) throws ExecutionException; + /** + * Alters the data type of existing column of an existing table. + * + * @param namespace the table namespace + * @param table the table name + * @param columnName the name of the column to alter + * @param newColumnType the new data type of the column + * @throws IllegalArgumentException if the table or the column does not exist, if the column is a + * primary key column or the index key column, or if the data type conversion is not supported + * @throws ExecutionException if the operation fails + */ + void alterColumnType(String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException; + /** * Renames an existing table. * diff --git a/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java index 73dc9a4c35..bfaeed741c 100644 --- a/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java @@ -363,6 +363,50 @@ public void renameColumn( } } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + 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(columnName)) { + throw new IllegalArgumentException( + CoreError.COLUMN_NOT_FOUND2.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), columnName)); + } + + if (tableMetadata.getPartitionKeyNames().contains(columnName) + || tableMetadata.getClusteringKeyNames().contains(columnName) + || tableMetadata.getSecondaryIndexNames().contains(columnName)) { + throw new IllegalArgumentException( + CoreError.ALTER_PRIMARY_OR_INDEX_KEY_COLUMN_TYPE_NOT_SUPPORTED.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), columnName)); + } + + DataType currentColumnType = tableMetadata.getColumnDataType(columnName); + if (currentColumnType == newColumnType) { + return; + } + if (!isTypeConversionValid(currentColumnType, newColumnType)) { + throw new IllegalArgumentException( + CoreError.INVALID_COLUMN_TYPE_CONVERSION.buildMessage( + currentColumnType, newColumnType, columnName)); + } + + try { + admin.alterColumnType(namespace, table, columnName, newColumnType); + } catch (ExecutionException e) { + throw new ExecutionException( + CoreError.ALTERING_COLUMN_TYPE_FAILED.buildMessage( + ScalarDbUtils.getFullTableName(namespace, table), columnName, newColumnType), + e); + } + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { @@ -486,4 +530,29 @@ public StorageInfo getStorageInfo(String namespace) throws ExecutionException { public void close() { admin.close(); } + + private boolean isTypeConversionValid(DataType from, DataType to) { + if (from == to) { + return true; + } + switch (from) { + case BOOLEAN: + case BIGINT: + case DOUBLE: + case BLOB: + case DATE: + case TIME: + case TIMESTAMP: + case TIMESTAMPTZ: + return to == DataType.TEXT; + case INT: + return to == DataType.BIGINT || to == DataType.TEXT; + case FLOAT: + return to == DataType.DOUBLE || to == DataType.TEXT; + case TEXT: + return false; + default: + throw new AssertionError("Unknown data type: " + from); + } + } } 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 dea31ab60a..b5f70cbb6e 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -760,6 +760,54 @@ public enum CoreError implements ScalarDbError { Category.USER_ERROR, "0231", "Renaming tables is not supported in Cosmos DB", "", ""), DYNAMO_RENAME_TABLE_NOT_SUPPORTED( Category.USER_ERROR, "0232", "Renaming tables is not supported in DynamoDB", "", ""), + ALTER_PRIMARY_OR_INDEX_KEY_COLUMN_TYPE_NOT_SUPPORTED( + Category.USER_ERROR, + "0233", + "Altering primary key or index key column types is not supported. Table: %s; Column: %s", + "", + ""), + INVALID_COLUMN_TYPE_CONVERSION( + Category.USER_ERROR, + "0234", + "Invalid column type conversion from %s to %s. Column: %s", + "", + ""), + CASSANDRA_ALTER_COLUMN_TYPE_NOT_SUPPORTED( + Category.USER_ERROR, + "0235", + "Cassandra does not support the altering column type feature", + "", + ""), + COSMOS_ALTER_COLUMN_TYPE_NOT_SUPPORTED( + Category.USER_ERROR, + "0236", + "Cosmos DB does not support the altering column type feature", + "", + ""), + DYNAMO_ALTER_COLUMN_TYPE_NOT_SUPPORTED( + Category.USER_ERROR, + "0237", + "DynamoDB does not support the altering column type feature", + "", + ""), + JDBC_SQLITE_ALTER_COLUMN_TYPE_NOT_SUPPORTED( + Category.USER_ERROR, + "0238", + "SQLite does not support the altering column type feature", + "", + ""), + JDBC_ORACLE_UNSUPPORTED_COLUMN_TYPE_CONVERSION( + Category.USER_ERROR, + "0239", + "Oracle does not support column type conversion from %s to %s", + "", + ""), + JDBC_DB2_UNSUPPORTED_COLUMN_TYPE_CONVERSION( + Category.USER_ERROR, + "0240", + "Db2 does not support column type conversion from %s to %s", + "", + ""), // // Errors for the concurrency error category @@ -1060,6 +1108,12 @@ public enum CoreError implements ScalarDbError { "Renaming a table failed. Old table name: %s; New table name: %s", "", ""), + ALTERING_COLUMN_TYPE_FAILED( + Category.INTERNAL_ERROR, + "0062", + "Altering a column type failed. Table: %s; Column: %s; New column type: %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 e0206f6c83..1447810cd5 100644 --- a/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/common/DecoratedDistributedTransactionAdmin.java @@ -228,6 +228,13 @@ public void renameColumn( distributedTransactionAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + distributedTransactionAdmin.alterColumnType(namespace, table, columnName, newColumnType); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) 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 863a73606f..459ebec308 100644 --- a/core/src/main/java/com/scalar/db/service/AdminService.java +++ b/core/src/main/java/com/scalar/db/service/AdminService.java @@ -107,6 +107,13 @@ public void renameColumn( admin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + admin.alterColumnType(namespace, table, columnName, newColumnType); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 5dbc4a148c..2484f7c6d6 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java @@ -471,6 +471,14 @@ oldColumnName, newColumnName, getFullTableName(namespace, table)), } } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.CASSANDRA_ALTER_COLUMN_TYPE_NOT_SUPPORTED.buildMessage()); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 c2d733e593..98554dad02 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 @@ -653,11 +653,20 @@ public void dropColumnFromTable(String namespace, String table, String columnNam @Override public void renameColumn( - String namespace, String table, String oldColumnName, String newColumnName) { + String namespace, String table, String oldColumnName, String newColumnName) + throws ExecutionException { throw new UnsupportedOperationException( CoreError.COSMOS_RENAME_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.COSMOS_ALTER_COLUMN_TYPE_NOT_SUPPORTED.buildMessage()); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 67b736c30e..17959faf5e 100644 --- a/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/dynamo/DynamoAdmin.java @@ -1451,6 +1451,14 @@ public void renameColumn( CoreError.DYNAMO_RENAME_COLUMN_NOT_SUPPORTED.buildMessage()); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + throw new UnsupportedOperationException( + CoreError.DYNAMO_ALTER_COLUMN_TYPE_NOT_SUPPORTED.buildMessage()); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 0e10dff779..23cfd6a209 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 @@ -44,7 +44,7 @@ @ThreadSafe public class JdbcAdmin implements DistributedStorageAdmin { public static final String METADATA_TABLE = "metadata"; - + public static final String NAMESPACES_TABLE = "namespaces"; @VisibleForTesting static final String METADATA_COL_FULL_TABLE_NAME = "full_table_name"; @VisibleForTesting static final String METADATA_COL_COLUMN_NAME = "column_name"; @VisibleForTesting static final String METADATA_COL_DATA_TYPE = "data_type"; @@ -57,7 +57,6 @@ public class JdbcAdmin implements DistributedStorageAdmin { @VisibleForTesting static final String JDBC_COL_TYPE_NAME = "TYPE_NAME"; @VisibleForTesting static final String JDBC_COL_COLUMN_SIZE = "COLUMN_SIZE"; @VisibleForTesting static final String JDBC_COL_DECIMAL_DIGITS = "DECIMAL_DIGITS"; - public static final String NAMESPACES_TABLE = "namespaces"; @VisibleForTesting static final String NAMESPACE_COL_NAMESPACE_NAME = "namespace_name"; private static final Logger logger = LoggerFactory.getLogger(JdbcAdmin.class); private static final String INDEX_NAME_PREFIX = "index"; @@ -87,6 +86,64 @@ public JdbcAdmin(BasicDataSource dataSource, JdbcConfig config) { metadataSchema = config.getMetadataSchema(); } + private static boolean hasDescClusteringOrder(TableMetadata metadata) { + return metadata.getClusteringKeyNames().stream() + .anyMatch(c -> metadata.getClusteringOrder(c) == Order.DESC); + } + + @VisibleForTesting + static boolean hasDifferentClusteringOrders(TableMetadata metadata) { + boolean hasAscOrder = false; + boolean hasDescOrder = false; + for (Order order : metadata.getClusteringOrders().values()) { + if (order == Order.ASC) { + hasAscOrder = true; + } else { + hasDescOrder = true; + } + } + return hasAscOrder && hasDescOrder; + } + + static void execute(Connection connection, String sql) throws SQLException { + execute(connection, sql, null); + } + + static void execute(Connection connection, String sql, @Nullable SqlWarningHandler handler) + throws SQLException { + if (Strings.isNullOrEmpty(sql)) { + return; + } + try (Statement stmt = connection.createStatement()) { + stmt.execute(sql); + throwSqlWarningIfNeeded(handler, stmt); + } + } + + private static void throwSqlWarningIfNeeded(SqlWarningHandler handler, Statement stmt) + throws SQLException { + if (handler == null) { + return; + } + SQLWarning warning = stmt.getWarnings(); + while (warning != null) { + handler.throwSqlWarningIfNeeded(warning); + warning = warning.getNextWarning(); + } + } + + static void execute(Connection connection, String[] sqls) throws SQLException { + execute(connection, sqls, null); + } + + static void execute( + Connection connection, String[] sqls, @Nullable SqlWarningHandler warningHandler) + throws SQLException { + for (String sql : sqls) { + execute(connection, sql, warningHandler); + } + } + @Override public void createNamespace(String namespace, Map options) throws ExecutionException { @@ -702,25 +759,6 @@ private String getVendorDbColumnType(TableMetadata metadata, String columnName) } } - private static boolean hasDescClusteringOrder(TableMetadata metadata) { - return metadata.getClusteringKeyNames().stream() - .anyMatch(c -> metadata.getClusteringOrder(c) == Order.DESC); - } - - @VisibleForTesting - static boolean hasDifferentClusteringOrders(TableMetadata metadata) { - boolean hasAscOrder = false; - boolean hasDescOrder = false; - for (Order order : metadata.getClusteringOrders().values()) { - if (order == Order.ASC) { - hasAscOrder = true; - } else { - hasDescOrder = true; - } - } - return hasAscOrder && hasDescOrder; - } - @Override public void createIndex( String namespace, String table, String columnName, Map options) @@ -748,8 +786,10 @@ private void alterToIndexColumnTypeIfNecessary( return; } - String sql = rdbEngine.alterColumnTypeSql(namespace, table, columnName, columnTypeForKey); - execute(connection, sql); + String[] sqls = rdbEngine.alterColumnTypeSql(namespace, table, columnName, columnTypeForKey); + for (String sql : sqls) { + execute(connection, sql); + } } private void alterToRegularColumnTypeIfNecessary( @@ -764,8 +804,10 @@ private void alterToRegularColumnTypeIfNecessary( } String columnType = rdbEngine.getDataTypeForEngine(indexType); - String sql = rdbEngine.alterColumnTypeSql(namespace, table, columnName, columnType); - execute(connection, sql); + String[] sqls = rdbEngine.alterColumnTypeSql(namespace, table, columnName, columnType); + for (String sql : sqls) { + execute(connection, sql); + } } @Override @@ -930,6 +972,40 @@ oldColumnName, newColumnName, getFullTableName(namespace, table)), } } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + try { + TableMetadata currentTableMetadata = getTableMetadata(namespace, table); + assert currentTableMetadata != null; + DataType currentColumnType = currentTableMetadata.getColumnDataType(columnName); + rdbEngine.throwIfAlterColumnTypeNotSupported(currentColumnType, newColumnType); + + TableMetadata updatedTableMetadata = + TableMetadata.newBuilder(currentTableMetadata) + .removeColumn(columnName) + .addColumn(columnName, newColumnType) + .build(); + String newStorageColumnType = getVendorDbColumnType(updatedTableMetadata, columnName); + String[] alterColumnTypeStatements = + rdbEngine.alterColumnTypeSql(namespace, table, columnName, newStorageColumnType); + + try (Connection connection = dataSource.getConnection()) { + for (String alterColumnTypeStatement : alterColumnTypeStatements) { + execute(connection, alterColumnTypeStatement); + } + addTableMetadata(connection, namespace, table, updatedTableMetadata, false, true); + } + } catch (SQLException e) { + throw new ExecutionException( + String.format( + "Altering the %s column type to %s in the %s table failed", + columnName, newColumnType, getFullTableName(namespace, table)), + e); + } + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { @@ -1054,45 +1130,6 @@ private void updateTableMetadata( execute(connection, updateStatement); } - static void execute(Connection connection, String sql) throws SQLException { - execute(connection, sql, null); - } - - static void execute(Connection connection, String sql, @Nullable SqlWarningHandler handler) - throws SQLException { - if (Strings.isNullOrEmpty(sql)) { - return; - } - try (Statement stmt = connection.createStatement()) { - stmt.execute(sql); - throwSqlWarningIfNeeded(handler, stmt); - } - } - - private static void throwSqlWarningIfNeeded(SqlWarningHandler handler, Statement stmt) - throws SQLException { - if (handler == null) { - return; - } - SQLWarning warning = stmt.getWarnings(); - while (warning != null) { - handler.throwSqlWarningIfNeeded(warning); - warning = warning.getNextWarning(); - } - } - - static void execute(Connection connection, String[] sqls) throws SQLException { - execute(connection, sqls, null); - } - - static void execute( - Connection connection, String[] sqls, @Nullable SqlWarningHandler warningHandler) - throws SQLException { - for (String sql : sqls) { - execute(connection, sql, warningHandler); - } - } - private String enclose(String name) { return rdbEngine.enclose(name); } 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 895d204907..8d0ec467eb 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 @@ -269,14 +269,17 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { - return "ALTER TABLE " - + encloseFullTableName(namespace, table) - + " ALTER COLUMN " - + enclose(columnName) - + " SET DATA TYPE " - + columnType; + return new String[] { + "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " ALTER COLUMN " + + enclose(columnName) + + " SET DATA TYPE " + + columnType, + "CALL SYSPROC.ADMIN_CMD('REORG TABLE " + encloseFullTableName(namespace, table) + "')" + }; } @Override @@ -546,6 +549,15 @@ public void throwIfRenameColumnNotSupported(String columnName, TableMetadata tab } } + @Override + public void throwIfAlterColumnTypeNotSupported(DataType from, DataType to) { + if (from == DataType.BLOB && to == DataType.TEXT) { + throw new UnsupportedOperationException( + CoreError.JDBC_DB2_UNSUPPORTED_COLUMN_TYPE_CONVERSION.buildMessage( + from.toString(), to.toString())); + } + } + 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 2d5b3a6f08..fed20d8a81 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 @@ -140,14 +140,16 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { - return "ALTER TABLE " - + encloseFullTableName(namespace, table) - + " MODIFY" - + enclose(columnName) - + " " - + columnType; + return new String[] { + "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " MODIFY " + + enclose(columnName) + + " " + + columnType + }; } @Override 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 44b8028eb5..4bf9bcb5a6 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 @@ -136,15 +136,17 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { - return "ALTER TABLE " - + encloseFullTableName(namespace, table) - + " MODIFY ( " - + enclose(columnName) - + " " - + columnType - + " )"; + return new String[] { + "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " MODIFY ( " + + enclose(columnName) + + " " + + columnType + + " )" + }; } @Override @@ -440,4 +442,13 @@ public String tryAddIfNotExistsToCreateIndexSql(String createIndexSql) { getTimeTypeStrategy() { return timeTypeEngine; } + + @Override + public void throwIfAlterColumnTypeNotSupported(DataType from, DataType to) { + if (!(from == DataType.INT && to == DataType.BIGINT)) { + throw new UnsupportedOperationException( + CoreError.JDBC_ORACLE_UNSUPPORTED_COLUMN_TYPE_CONVERSION.buildMessage( + from.toString(), to.toString())); + } + } } 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 c8a097eaed..c7339c8451 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 @@ -120,14 +120,16 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { - return "ALTER TABLE " - + encloseFullTableName(namespace, table) - + " ALTER COLUMN" - + enclose(columnName) - + " TYPE " - + columnType; + return new String[] { + "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " ALTER COLUMN " + + enclose(columnName) + + " TYPE " + + columnType + }; } @Override 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 b91e0d24aa..9b489090e3 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 @@ -127,10 +127,16 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { - // SQLServer does not require changes in column data types when making indices. - throw new AssertionError(); + return new String[] { + "ALTER TABLE " + + encloseFullTableName(namespace, table) + + " ALTER COLUMN " + + enclose(columnName) + + " " + + columnType + }; } @Override 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 e2e3ac8066..df6d895417 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 @@ -2,6 +2,7 @@ import com.scalar.db.api.LikeExpression; import com.scalar.db.api.TableMetadata; +import com.scalar.db.common.CoreError; import com.scalar.db.io.DataType; import com.scalar.db.io.DateColumn; import com.scalar.db.io.TimeColumn; @@ -258,7 +259,7 @@ public String renameTableSql(String namespace, String oldTableName, String newTa } @Override - public String alterColumnTypeSql( + public String[] alterColumnTypeSql( String namespace, String table, String columnName, String columnType) { throw new AssertionError( "SQLite does not require changes in column data types when making indices"); @@ -356,6 +357,13 @@ public RdbEngineTimeTypeStrategy getTimeTypeStrategy( return timeTypeEngine; } + @Override + public void throwIfAlterColumnTypeNotSupported(DataType from, DataType to) { + throw new UnsupportedOperationException( + CoreError.JDBC_SQLITE_ALTER_COLUMN_TYPE_NOT_SUPPORTED.buildMessage( + from.toString(), to.toString())); + } + @Override public void setConnectionToReadOnly(Connection connection, boolean readOnly) { // Do nothing. SQLite does not support read-only mode. 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 43023d1b4c..55ebc1937b 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java @@ -124,7 +124,7 @@ default String renameColumnSql( String renameTableSql(String namespace, String oldTableName, String newTableName); - String alterColumnTypeSql(String namespace, String table, String columnName, String columnType); + String[] alterColumnTypeSql(String namespace, String table, String columnName, String columnType); String tableExistsInternalTableCheckSql(String fullTableName); @@ -280,6 +280,15 @@ default void throwIfDuplicatedIndexWarning(SQLWarning warning) throws SQLExcepti */ default void throwIfRenameColumnNotSupported(String columnName, TableMetadata tableMetadata) {} + /** + * Throws an exception if altering the column type is not supported in the underlying database. + * + * @param from the source data type + * @param to the target data type + * @throws UnsupportedOperationException if altering the column type is not supported + */ + default void throwIfAlterColumnTypeNotSupported(DataType from, DataType to) {} + 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 b5175dbc36..6c27396e48 100644 --- a/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java +++ b/core/src/main/java/com/scalar/db/storage/multistorage/MultiStorageAdmin.java @@ -218,6 +218,13 @@ public void renameColumn( getAdmin(namespace, table).renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + getAdmin(namespace, table).alterColumnType(namespace, table, columnName, newColumnType); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 b0abfb652c..7af3b5a109 100644 --- a/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java @@ -277,6 +277,28 @@ public void renameColumn( } } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + 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(columnName) + || tableMetadata.getClusteringKeyNames().contains(columnName)) { + admin.alterColumnType(namespace, table, columnName, newColumnType); + } else { + String beforeColumnName = getBeforeImageColumnName(columnName, tableMetadata); + + admin.alterColumnType(namespace, table, columnName, newColumnType); + admin.alterColumnType(namespace, table, beforeColumnName, newColumnType); + } + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 b5b3fa6799..9e3b5c69eb 100644 --- a/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java @@ -173,6 +173,13 @@ public void renameColumn( jdbcAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + jdbcAdmin.alterColumnType(namespace, table, columnName, newColumnType); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 70c9b21507..f0f74db9b5 100644 --- a/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java +++ b/core/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdmin.java @@ -122,6 +122,13 @@ public void renameColumn( distributedStorageAdmin.renameColumn(namespace, table, oldColumnName, newColumnName); } + @Override + public void alterColumnType( + String namespace, String table, String columnName, DataType newColumnType) + throws ExecutionException { + distributedStorageAdmin.alterColumnType(namespace, table, columnName, newColumnType); + } + @Override public void renameTable(String namespace, String oldTableName, String newTableName) throws ExecutionException { 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 abd5eef2cf..f7cc7546b1 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 @@ -986,12 +986,16 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { namespace, table, Collections.emptyMap(), Collections.emptyMap())); Throwable thrown4 = catchThrowable(() -> cassandraAdmin.renameTable(namespace, table, "new_table")); + Throwable thrown5 = + catchThrowable( + () -> cassandraAdmin.alterColumnType(namespace, table, column, DataType.INT)); // 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/cosmos/CosmosAdminTest.java b/core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTest.java index 682e5c5a6c..0e1477c2a6 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 @@ -1153,6 +1153,8 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { Throwable thrown5 = catchThrowable(() -> admin.renameColumn(namespace, table, column, "newCol")); Throwable thrown6 = catchThrowable(() -> admin.renameTable(namespace, table, "newTable")); + Throwable thrown7 = + catchThrowable(() -> admin.alterColumnType(namespace, table, column, DataType.INT)); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); @@ -1161,6 +1163,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown5).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown6).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown7).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 50a221ff2b..d86a4d9262 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 @@ -1720,6 +1720,8 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { Throwable thrown4 = catchThrowable(() -> admin.dropColumnFromTable(NAMESPACE, TABLE, "c1")); Throwable thrown5 = catchThrowable(() -> admin.renameColumn(NAMESPACE, TABLE, "c1", "c2")); Throwable thrown6 = catchThrowable(() -> admin.renameTable(NAMESPACE, TABLE, "new_table")); + Throwable thrown7 = + catchThrowable(() -> admin.alterColumnType(NAMESPACE, TABLE, "c1", DataType.INT)); // Assert assertThat(thrown1).isInstanceOf(UnsupportedOperationException.class); @@ -1728,6 +1730,7 @@ public void unsupportedOperations_ShouldThrowUnsupportedException() { assertThat(thrown4).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown5).isInstanceOf(UnsupportedOperationException.class); assertThat(thrown6).isInstanceOf(UnsupportedOperationException.class); + assertThat(thrown7).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 a68c295823..c8636162e2 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 @@ -35,6 +35,7 @@ import com.mysql.cj.jdbc.exceptions.CommunicationsException; import com.scalar.db.api.Scan.Ordering.Order; import com.scalar.db.api.TableMetadata; +import com.scalar.db.common.CoreError; import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.io.DataType; import java.sql.Connection; @@ -2447,7 +2448,7 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate "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 `my_ns`.`my_tbl` MODIFY`my_column` VARCHAR(128)", + new String[] {"ALTER TABLE `my_ns`.`my_tbl` MODIFY `my_column` VARCHAR(128)"}, "CREATE INDEX `index_my_ns_my_tbl_my_column` ON `my_ns`.`my_tbl` (`my_column`)", "UPDATE `" + METADATA_SCHEMA @@ -2463,7 +2464,9 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate "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 \"my_ns\".\"my_tbl\" ALTER COLUMN\"my_column\" TYPE VARCHAR(10485760)", + new String[] { + "ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" TYPE VARCHAR(10485760)" + }, "CREATE INDEX \"index_my_ns_my_tbl_my_column\" ON \"my_ns\".\"my_tbl\" (\"my_column\")", "UPDATE \"" + METADATA_SCHEMA @@ -2479,7 +2482,7 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate "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 \"my_ns\".\"my_tbl\" MODIFY ( \"my_column\" VARCHAR2(128) )", + new String[] {"ALTER TABLE \"my_ns\".\"my_tbl\" MODIFY ( \"my_column\" VARCHAR2(128) )"}, "CREATE INDEX \"my_ns\".\"index_my_ns_my_tbl_my_column\" ON \"my_ns\".\"my_tbl\" (\"my_column\")", "UPDATE \"" + METADATA_SCHEMA @@ -2501,7 +2504,10 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate "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 \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" SET DATA TYPE VARCHAR(128)", + new String[] { + "ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" SET DATA TYPE VARCHAR(128)", + "CALL SYSPROC.ADMIN_CMD('REORG TABLE \"my_ns\".\"my_tbl\"')" + }, "CREATE INDEX \"my_ns\".\"index_my_ns_my_tbl_my_column\" ON \"my_ns\".\"my_tbl\" (\"my_column\")", "UPDATE \"" + METADATA_SCHEMA @@ -2512,7 +2518,7 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate createIndex_forColumnTypeWithRequiredAlterationForX_ShouldAlterColumnAndCreateIndexProperly( RdbEngine rdbEngine, String expectedGetTableMetadataStatement, - String expectedAlterColumnTypeStatement, + String[] expectedAlterColumnTypeStatements, String expectedCreateIndexStatement, String expectedUpdateTableMetadataStatement) throws SQLException, ExecutionException { @@ -2544,12 +2550,17 @@ private void createIndex_ForColumnTypeWithoutRequiredAlterationForX_ShouldCreate verify(connection).prepareStatement(expectedGetTableMetadataStatement); verify(selectStatement).setString(1, getFullTableName(namespace, table)); - verify(connection, times(3)).createStatement(); + verify(connection, times(2 + expectedAlterColumnTypeStatements.length)).createStatement(); ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); - verify(statement, times(3)).execute(captor.capture()); - assertThat(captor.getAllValues().get(0)).isEqualTo(expectedAlterColumnTypeStatement); - assertThat(captor.getAllValues().get(1)).isEqualTo(expectedCreateIndexStatement); - assertThat(captor.getAllValues().get(2)).isEqualTo(expectedUpdateTableMetadataStatement); + verify(statement, times(2 + expectedAlterColumnTypeStatements.length)) + .execute(captor.capture()); + for (int i = 0; i < expectedAlterColumnTypeStatements.length; i++) { + assertThat(captor.getAllValues().get(i)).isEqualTo(expectedAlterColumnTypeStatements[i]); + } + assertThat(captor.getAllValues().get(expectedAlterColumnTypeStatements.length)) + .isEqualTo(expectedCreateIndexStatement); + assertThat(captor.getAllValues().get(expectedAlterColumnTypeStatements.length + 1)) + .isEqualTo(expectedUpdateTableMetadataStatement); } @Test @@ -2686,7 +2697,7 @@ public void dropIndex_forColumnTypeWithRequiredAlterationForMysql_ShouldDropInde + METADATA_SCHEMA + "`.`metadata` WHERE `full_table_name`=? ORDER BY `ordinal_position` ASC", "DROP INDEX `index_my_ns_my_tbl_my_column` ON `my_ns`.`my_tbl`", - "ALTER TABLE `my_ns`.`my_tbl` MODIFY`my_column` LONGTEXT", + new String[] {"ALTER TABLE `my_ns`.`my_tbl` MODIFY `my_column` LONGTEXT"}, "UPDATE `" + METADATA_SCHEMA + "`.`metadata` SET `indexed`=false WHERE `full_table_name`='my_ns.my_tbl' AND `column_name`='my_column'"); @@ -2701,7 +2712,7 @@ public void dropIndex_forColumnTypeWithRequiredAlterationForPostgresql_ShouldDro + METADATA_SCHEMA + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", "DROP INDEX \"my_ns\".\"index_my_ns_my_tbl_my_column\"", - "ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN\"my_column\" TYPE TEXT", + new String[] {"ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" TYPE TEXT"}, "UPDATE \"" + METADATA_SCHEMA + "\".\"metadata\" SET \"indexed\"=false WHERE \"full_table_name\"='my_ns.my_tbl' AND \"column_name\"='my_column'"); @@ -2716,7 +2727,7 @@ public void dropIndex_forColumnTypeWithRequiredAlterationForOracle_ShouldDropInd + METADATA_SCHEMA + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", "DROP INDEX \"my_ns\".\"index_my_ns_my_tbl_my_column\"", - "ALTER TABLE \"my_ns\".\"my_tbl\" MODIFY ( \"my_column\" VARCHAR2(4000) )", + new String[] {"ALTER TABLE \"my_ns\".\"my_tbl\" MODIFY ( \"my_column\" VARCHAR2(4000) )"}, "UPDATE \"" + METADATA_SCHEMA + "\".\"metadata\" SET \"indexed\"=0 WHERE \"full_table_name\"='my_ns.my_tbl' AND \"column_name\"='my_column'"); @@ -2736,7 +2747,10 @@ public void dropIndex_forColumnTypeWithRequiredAlterationForDb2_ShouldDropIndexP + METADATA_SCHEMA + "\".\"metadata\" WHERE \"full_table_name\"=? ORDER BY \"ordinal_position\" ASC", "DROP INDEX \"my_ns\".\"index_my_ns_my_tbl_my_column\"", - "ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" SET DATA TYPE VARCHAR(32672)", + new String[] { + "ALTER TABLE \"my_ns\".\"my_tbl\" ALTER COLUMN \"my_column\" SET DATA TYPE VARCHAR(32672)", + "CALL SYSPROC.ADMIN_CMD('REORG TABLE \"my_ns\".\"my_tbl\"')" + }, "UPDATE \"" + METADATA_SCHEMA + "\".\"metadata\" SET \"indexed\"=false WHERE \"full_table_name\"='my_ns.my_tbl' AND \"column_name\"='my_column'"); @@ -2746,7 +2760,7 @@ private void dropIndex_forColumnTypeWithRequiredAlterationForX_ShouldDropIndexPr RdbEngine rdbEngine, String expectedGetTableMetadataStatement, String expectedDropIndexStatement, - String expectedAlterColumnStatement, + String[] expectedAlterColumnStatements, String expectedUpdateTableMetadataStatement) throws SQLException, ExecutionException { // Arrange @@ -2776,12 +2790,15 @@ private void dropIndex_forColumnTypeWithRequiredAlterationForX_ShouldDropIndexPr verify(connection).prepareStatement(expectedGetTableMetadataStatement); verify(selectStatement).setString(1, getFullTableName(namespace, table)); - verify(connection, times(3)).createStatement(); + verify(connection, times(2 + expectedAlterColumnStatements.length)).createStatement(); ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); - verify(statement, times(3)).execute(captor.capture()); + verify(statement, times(2 + expectedAlterColumnStatements.length)).execute(captor.capture()); assertThat(captor.getAllValues().get(0)).isEqualTo(expectedDropIndexStatement); - assertThat(captor.getAllValues().get(1)).isEqualTo(expectedAlterColumnStatement); - assertThat(captor.getAllValues().get(2)).isEqualTo(expectedUpdateTableMetadataStatement); + for (int i = 0; i < expectedAlterColumnStatements.length; i++) { + assertThat(captor.getAllValues().get(i + 1)).isEqualTo(expectedAlterColumnStatements[i]); + } + assertThat(captor.getAllValues().get(expectedAlterColumnStatements.length + 1)) + .isEqualTo(expectedUpdateTableMetadataStatement); } @Test @@ -3233,6 +3250,172 @@ private void renameColumn_ForX_ShouldWorkProperly( } } + @Test + public void alterColumnType_ForMysql_ShouldWorkProperly() + throws SQLException, ExecutionException { + alterColumnType_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` MODIFY `c2` BIGINT", + "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','c2','BIGINT',NULL,NULL,false,2)"); + } + + @Test + public void alterColumnType_ForOracle_ShouldWorkProperly() + throws SQLException, ExecutionException { + alterColumnType_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\" MODIFY ( \"c2\" NUMBER(16) )", + "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','c2','BIGINT',NULL,NULL,0,2)"); + } + + @Test + public void alterColumnType_ForPostgresql_ShouldWorkProperly() + throws SQLException, ExecutionException { + alterColumnType_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\" ALTER COLUMN \"c2\" TYPE BIGINT", + "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','c2','BIGINT',NULL,NULL,false,2)"); + } + + @Test + public void alterColumnType_ForSqlServer_ShouldWorkProperly() + throws SQLException, ExecutionException { + alterColumnType_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", + "ALTER TABLE [ns].[table] ALTER COLUMN [c2] BIGINT", + "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','c2','BIGINT',NULL,NULL,0,2)"); + } + + @Test + public void alterColumnType_ForSqlite_ShouldThrowUnsupportedOperationException() + throws SQLException { + // Arrange + String namespace = "ns"; + String table = "table"; + String columnName1 = "c1"; + String columnName2 = "c2"; + + 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); + when(dataSource.getConnection()).thenReturn(connection); + JdbcAdmin admin = createJdbcAdminFor(RdbEngine.SQLITE); + + // Act Assert + assertThatThrownBy(() -> admin.alterColumnType(namespace, table, columnName1, DataType.BIGINT)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessage(CoreError.JDBC_SQLITE_ALTER_COLUMN_TYPE_NOT_SUPPORTED.buildMessage()); + } + + @Test + public void alterColumnType_ForDb2_ShouldWorkProperly() throws SQLException, ExecutionException { + alterColumnType_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\" ALTER COLUMN \"c2\" SET DATA TYPE BIGINT", + "CALL SYSPROC.ADMIN_CMD('REORG TABLE \"ns\".\"table\"')", + "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','c2','BIGINT',NULL,NULL,false,2)"); + } + + private void alterColumnType_ForX_ShouldWorkProperly( + RdbEngine rdbEngine, String expectedGetMetadataStatement, String... expectedSqlStatements) + throws SQLException, ExecutionException { + // Arrange + String namespace = "ns"; + String table = "table"; + String columnName1 = "c1"; + String columnName2 = "c2"; + + PreparedStatement selectStatement = mock(PreparedStatement.class); + ResultSet 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.alterColumnType(namespace, table, columnName2, DataType.BIGINT); + + // 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 renameTable_ForMysql_ShouldWorkProperly() throws SQLException, ExecutionException { renameTable_ForX_ShouldWorkProperly( 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 50461baeee..681d91f730 100644 --- a/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java @@ -625,6 +625,70 @@ public void renameColumn_ForTable1InNamespace2_ShouldCallRenameColumnOfAdmin2() verify(admin2).renameColumn(namespace, table, column1, column2); } + @Test + public void alterColumnType_ForTable1InNamespace1_ShouldCallAlterColumnTypeOfAdmin1() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE1; + String columnName = "column"; + DataType columnType = DataType.BIGINT; + + // Act + multiStorageAdmin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(admin1).alterColumnType(namespace, table, columnName, columnType); + } + + @Test + public void alterColumnType_ForTable2InNamespace1_ShouldShouldCallAlterColumnTypeOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE2; + String columnName = "column"; + DataType columnType = DataType.BIGINT; + + // Act + multiStorageAdmin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(admin2).alterColumnType(namespace, table, columnName, columnType); + } + + @Test + public void alterColumnType_ForTable3InNamespace1_ShouldCallAlterColumnTypeOfDefaultAdmin() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE1; + String table = TABLE3; + String columnName = "column"; + DataType columnType = DataType.BIGINT; + + // Act + multiStorageAdmin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(admin3).alterColumnType(namespace, table, columnName, columnType); + } + + @Test + public void alterColumnType_ForTable1InNamespace2_ShouldCallAlterColumnTypeOfAdmin2() + throws ExecutionException { + // Arrange + String namespace = NAMESPACE2; + String table = TABLE1; + String columnName = "col"; + DataType columnType = DataType.BIGINT; + + // Act + multiStorageAdmin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(admin2).alterColumnType(namespace, table, columnName, columnType); + } + @Test public void renameTable_ForTable1InNamespace1_ShouldCallRenameTableOfAdmin1() throws ExecutionException { 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 7bcec40e74..6f0fbe9d2c 100644 --- a/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java +++ b/core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminTestBase.java @@ -654,6 +654,30 @@ public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException Attribute.BEFORE_PREFIX + newColumnName); } + @Test + public void alterColumnType_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String columnName = "col2"; + DataType columnType = DataType.BIGINT; + TableMetadata tableMetadata = + TableMetadata.newBuilder() + .addColumn("col1", DataType.INT) + .addColumn(columnName, DataType.INT) + .addPartitionKey("col1") + .build(); + when(distributedStorageAdmin.getTableMetadata(any(), any())) + .thenReturn(ConsensusCommitUtils.buildTransactionTableMetadata(tableMetadata)); + + // Act + admin.alterColumnType(NAMESPACE, TABLE, columnName, columnType); + + // Assert + verify(distributedStorageAdmin).getTableMetadata(NAMESPACE, TABLE); + verify(distributedStorageAdmin).alterColumnType(NAMESPACE, TABLE, columnName, columnType); + verify(distributedStorageAdmin) + .alterColumnType(NAMESPACE, TABLE, Attribute.BEFORE_PREFIX + columnName, columnType); + } + @Test public void renameTable_ShouldCallJdbcAdminProperly() 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 b314a6cc31..6d14323ee9 100644 --- a/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java +++ b/core/src/test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminTest.java @@ -257,6 +257,21 @@ public void renameColumn_ShouldCallJdbcAdminProperly() throws ExecutionException verify(jdbcAdmin).renameColumn(namespace, table, columnName1, columnName2); } + @Test + public void alterColumnType_ShouldCallJdbcAdminProperly() throws ExecutionException { + // Arrange + String namespace = "ns"; + String table = "tbl"; + String columnName = "col"; + DataType columnType = DataType.BIGINT; + + // Act + admin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(jdbcAdmin).alterColumnType(namespace, table, columnName, columnType); + } + @Test public void renameTable_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 b3fe834914..4b664717bc 100644 --- a/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java +++ b/core/src/test/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminTest.java @@ -263,6 +263,22 @@ public void renameColumn_ShouldCallDistributedStorageAdminProperly() throws Exec verify(distributedStorageAdmin).renameColumn(namespace, table, columnName1, columnName2); } + @Test + public void alterColumnType_ShouldCallDistributedStorageAdminProperly() + throws ExecutionException { + // Arrange + String namespace = "ns"; + String table = "tbl"; + String columnName = "col"; + DataType columnType = DataType.BIGINT; + + // Act + admin.alterColumnType(namespace, table, columnName, columnType); + + // Assert + verify(distributedStorageAdmin).alterColumnType(namespace, table, columnName, columnType); + } + @Test public void renameTable_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 db57dd67a5..bb55e887e8 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 @@ -12,14 +12,17 @@ import com.scalar.db.util.AdminTestUtils; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.time.ZoneId; import java.time.ZoneOffset; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -58,7 +61,7 @@ public abstract class DistributedStorageAdminIntegrationTestBase { private static final String COL_NAME13 = "c13"; private static final String COL_NAME14 = "c14"; private static final String COL_NAME15 = "c15"; - private StorageFactory storageFactory; + protected StorageFactory storageFactory; protected DistributedStorageAdmin admin; private String namespace1; private String namespace2; @@ -1110,6 +1113,161 @@ public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws Exe } } + @Test + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + try (DistributedStorage storage = storageFactory.getStorage()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.BIGINT) + .addColumn(getColumnName5(), DataType.FLOAT) + .addColumn(getColumnName6(), DataType.DOUBLE) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.BLOB) + .addColumn(getColumnName9(), DataType.DATE) + .addColumn(getColumnName10(), DataType.TIME) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TIMESTAMP) + .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(namespace1) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), 1) + .bigIntValue(getColumnName4(), 2L) + .floatValue(getColumnName5(), 3.0f) + .doubleValue(getColumnName6(), 4.0d) + .textValue(getColumnName7(), "5") + .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) + .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); + put.timestampTZValue(getColumnName12(), Instant.now()); + } + storage.put(put.build()); + + // Act + admin.alterColumnType(namespace1, getTable4(), getColumnName3(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName4(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName5(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName6(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName7(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName8(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName9(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName10(), DataType.TEXT); + if (isTimestampTypeSupported()) { + admin.alterColumnType(namespace1, getTable4(), getColumnName11(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName12(), DataType.TEXT); + } + + // Assert + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.TEXT) + .addColumn(getColumnName4(), DataType.TEXT) + .addColumn(getColumnName5(), DataType.TEXT) + .addColumn(getColumnName6(), DataType.TEXT) + .addColumn(getColumnName7(), DataType.TEXT) + .addColumn(getColumnName8(), DataType.TEXT) + .addColumn(getColumnName9(), DataType.TEXT) + .addColumn(getColumnName10(), DataType.TEXT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn(getColumnName11(), DataType.TEXT) + .addColumn(getColumnName12(), DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } + } + + @Test + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addColumn(getColumnName4(), DataType.FLOAT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + DistributedStorage storage = storageFactory.getStorage(); + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + + PutBuilder.Buildable put = + Put.newBuilder() + .namespace(namespace1) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .clusteringKey(Key.ofInt(getColumnName2(), 2)) + .intValue(getColumnName3(), expectedColumn3Value) + .floatValue(getColumnName4(), expectedColumn4Value); + storage.put(put.build()); + storage.close(); + + // Act + admin.alterColumnType(namespace1, getTable4(), getColumnName3(), DataType.BIGINT); + admin.alterColumnType(namespace1, getTable4(), getColumnName4(), DataType.DOUBLE); + + // Assert + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.BIGINT) + .addColumn(getColumnName4(), DataType.DOUBLE) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); + storage = storageFactory.getStorage(); + Scan scan = + Scan.newBuilder() + .namespace(namespace1) + .table(getTable4()) + .partitionKey(Key.ofInt(getColumnName1(), 1)) + .build(); + try (Scanner scanner = storage.scan(scan)) { + List results = scanner.all(); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt(getColumnName3())).isEqualTo(expectedColumn3Value); + assertThat(result.getDouble(getColumnName4())).isEqualTo(expectedColumn4Value); + } + storage.close(); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } + } + @Test public void getNamespaceNames_ShouldReturnCreatedNamespaces() throws ExecutionException { // Arrange @@ -1409,6 +1567,61 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC } } + @Test + public void alterColumnType_ForNonExistingTable_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy( + () -> + admin.alterColumnType( + namespace1, "nonExistingTable", getColumnName2(), DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void alterColumnType_ForNonExistingColumn_ShouldThrowIllegalArgumentException() { + // Arrange + + // Act Assert + assertThatThrownBy( + () -> + admin.alterColumnType(namespace1, getTable1(), "nonExistingColumn", DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn(getColumnName1(), DataType.INT) + .addColumn(getColumnName2(), DataType.INT) + .addColumn(getColumnName3(), DataType.INT) + .addPartitionKey(getColumnName1()) + .addClusteringKey(getColumnName2()) + .addSecondaryIndex(getColumnName3()) + .build(); + admin.createTable(namespace1, getTable4(), currentTableMetadata, options); + + // Act Assert + assertThatThrownBy( + () -> admin.alterColumnType(namespace1, getTable4(), getColumnName1(), DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy( + () -> admin.alterColumnType(namespace1, getTable4(), getColumnName2(), DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy( + () -> admin.alterColumnType(namespace1, getTable4(), getColumnName3(), DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + } finally { + admin.dropTable(namespace1, getTable4(), true); + } + } + @Test public void upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java index 97cc3087e2..c2b145f4c2 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java @@ -348,6 +348,18 @@ public void renameColumn_WithSufficientPermission_ShouldSucceed() throws Executi .doesNotThrowAnyException(); } + @Test + public void alterColumnType_WithSufficientPermission_ShouldSucceed() throws ExecutionException { + // Arrange + createNamespaceByRoot(); + createTableByRoot(); + + // Act Assert + assertThatCode( + () -> adminForNormalUser.alterColumnType(NAMESPACE, TABLE, COL_NAME3, DataType.BIGINT)) + .doesNotThrowAnyException(); + } + @Test public void renameTable_WithSufficientPermission_ShouldSucceed() throws ExecutionException { // Arrange diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java index 11cb1f5689..e6423ad6fa 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 @@ -11,10 +11,13 @@ import com.scalar.db.io.Key; import com.scalar.db.service.TransactionFactory; import com.scalar.db.util.AdminTestUtils; +import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.time.ZoneId; import java.time.ZoneOffset; import java.util.Arrays; import java.util.Collections; @@ -1172,6 +1175,189 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() } } + @Test + public void + alterColumnType_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + try (DistributedTransactionManager transactionManager = + transactionFactory.getTransactionManager()) { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.BIGINT) + .addColumn("c5", DataType.FLOAT) + .addColumn("c6", DataType.DOUBLE) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.BLOB) + .addColumn("c9", DataType.DATE) + .addColumn("c10", DataType.TIME) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + currentTableMetadataBuilder + .addColumn("c11", DataType.TIMESTAMP) + .addColumn("c12", DataType.TIMESTAMPTZ); + } + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", 1) + .bigIntValue("c4", 2L) + .floatValue("c5", 3.0f) + .doubleValue("c6", 4.0d) + .textValue("c7", "5") + .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) + .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + if (isTimestampTypeSupported()) { + insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); + insert.timestampTZValue("c12", Instant.now()); + } + transactionalInsert(transactionManager, insert.build()); + + // Act + admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c4", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c5", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c6", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c7", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c8", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c9", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT); + if (isTimestampTypeSupported()) { + admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT); + admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT); + } + + // Assert + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.TEXT) + .addColumn("c4", DataType.TEXT) + .addColumn("c5", DataType.TEXT) + .addColumn("c6", DataType.TEXT) + .addColumn("c7", DataType.TEXT) + .addColumn("c8", DataType.TEXT) + .addColumn("c9", DataType.TEXT) + .addColumn("c10", DataType.TEXT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + if (isTimestampTypeSupported()) { + expectedTableMetadataBuilder + .addColumn("c11", DataType.TEXT) + .addColumn("c12", DataType.TEXT); + } + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly() + throws ExecutionException, IOException, TransactionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addColumn("c4", DataType.FLOAT) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + DistributedTransactionManager transactionManager = transactionFactory.getTransactionManager(); + int expectedColumn3Value = 1; + float expectedColumn4Value = 4.0f; + + InsertBuilder.Buildable insert = + Insert.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .clusteringKey(Key.ofInt("c2", 2)) + .intValue("c3", expectedColumn3Value) + .floatValue("c4", expectedColumn4Value); + transactionalInsert(transactionManager, insert.build()); + transactionManager.close(); + + // Act + admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT); + admin.alterColumnType(namespace1, TABLE4, "c4", DataType.DOUBLE); + + // Assert + TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.BIGINT) + .addColumn("c4", DataType.DOUBLE) + .addPartitionKey("c1") + .addClusteringKey("c2", Scan.Ordering.Order.ASC); + TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); + assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); + Scan scan = + Scan.newBuilder() + .namespace(namespace1) + .table(TABLE4) + .partitionKey(Key.ofInt("c1", 1)) + .build(); + transactionManager = transactionFactory.getTransactionManager(); + List results = transactionalScan(transactionManager, scan); + assertThat(results).hasSize(1); + Result result = results.get(0); + assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value); + assertThat(result.getDouble("c4")).isEqualTo(expectedColumn4Value); + transactionManager.close(); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + + @Test + public void alterColumnType_ForPrimaryKeyOrIndexKeyColumn_ShouldThrowIllegalArgumentException() + throws ExecutionException { + try { + // Arrange + Map options = getCreationOptions(); + TableMetadata currentTableMetadata = + TableMetadata.newBuilder() + .addColumn("c1", DataType.INT) + .addColumn("c2", DataType.INT) + .addColumn("c3", DataType.INT) + .addPartitionKey("c1") + .addClusteringKey("c2") + .addSecondaryIndex("c3") + .build(); + admin.createTable(namespace1, TABLE4, currentTableMetadata, options); + + // Act Assert + assertThatThrownBy(() -> admin.alterColumnType(namespace1, TABLE4, "c1", DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> admin.alterColumnType(namespace1, TABLE4, "c2", DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) + .isInstanceOf(IllegalArgumentException.class); + } finally { + admin.dropTable(namespace1, TABLE4, true); + } + } + @Test public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws ExecutionException { String newTableName = "new" + TABLE4; @@ -1395,4 +1581,10 @@ protected boolean isTimestampTypeSupported() { protected boolean isCreateIndexOnTextColumnEnabled() { return true; } + + protected abstract void transactionalInsert(DistributedTransactionManager manager, Insert insert) + throws TransactionException; + + protected abstract List transactionalScan( + DistributedTransactionManager manager, Scan scan) throws TransactionException; } diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java index 4b535150dc..133141e476 100644 --- a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdminIntegrationTestBase.java @@ -1,6 +1,13 @@ package com.scalar.db.transaction.consensuscommit; +import com.scalar.db.api.DistributedTransaction; import com.scalar.db.api.DistributedTransactionAdminIntegrationTestBase; +import com.scalar.db.api.DistributedTransactionManager; +import com.scalar.db.api.Insert; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; +import com.scalar.db.exception.transaction.TransactionException; +import java.util.List; import java.util.Properties; public abstract class ConsensusCommitAdminIntegrationTestBase @@ -23,4 +30,21 @@ protected final Properties getProperties(String testName) { } protected abstract Properties getProps(String testName); + + @Override + protected void transactionalInsert(DistributedTransactionManager manager, Insert insert) + throws TransactionException { + DistributedTransaction transaction = manager.start(); + transaction.insert(insert); + transaction.commit(); + } + + @Override + protected List transactionalScan(DistributedTransactionManager manager, Scan scan) + throws TransactionException { + DistributedTransaction transaction = manager.start(); + List results = transaction.scan(scan); + transaction.commit(); + return results; + } } diff --git a/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminIntegrationTestBase.java index d2d26b9da2..80e3c2f66b 100644 --- a/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionAdminIntegrationTestBase.java @@ -1,9 +1,15 @@ package com.scalar.db.transaction.singlecrudoperation; import com.scalar.db.api.DistributedTransactionAdminIntegrationTestBase; +import com.scalar.db.api.DistributedTransactionManager; +import com.scalar.db.api.Insert; +import com.scalar.db.api.Result; +import com.scalar.db.api.Scan; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; +import com.scalar.db.exception.transaction.TransactionException; import com.scalar.db.util.AdminTestUtils; +import java.util.List; import java.util.Properties; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -91,4 +97,16 @@ public void dropCoordinatorTables_IfExist_CoordinatorTablesDoNotExist_ShouldNotT protected AdminTestUtils getAdminTestUtils(String testName) { throw new UnsupportedOperationException(); } + + @Override + protected void transactionalInsert(DistributedTransactionManager manager, Insert insert) + throws TransactionException { + manager.insert(insert); + } + + @Override + protected List transactionalScan(DistributedTransactionManager manager, Scan scan) + throws TransactionException { + return manager.scan(scan); + } }