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 f11acfa1a3..a42f5d5cb0 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 @@ -235,7 +235,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -247,16 +247,13 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) .addPartitionKey("c1") - .addClusteringKey("c2", Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn("c11", DataType.TIMESTAMP) - .addColumn("c12", DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .addColumn("c12", DataType.TIMESTAMP) + .build(); admin.createTable(namespace1, TABLE4, currentTableMetadata, options); - InsertBuilder.Buildable insert = + Insert insert = Insert.newBuilder() .namespace(namespace1) .table(TABLE4) @@ -269,12 +266,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(insert.build()); + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)) + .build(); + transactionalInsert(insert); // Act Assert assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) @@ -293,12 +289,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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); - } + 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); } @@ -324,13 +318,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) + .addColumn("c12", DataType.TIMESTAMP) .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 = @@ -346,11 +337,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); - } + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)); transactionalInsert(insert.build()); // Act Assert @@ -370,14 +359,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(); - } + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); - TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata expectedTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -389,14 +376,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.TEXT) .addColumn("c10", DataType.TEXT) + .addColumn("c11", DataType.TEXT) + .addColumn("c12", 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(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .build(); assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); } finally { admin.dropTable(namespace1, TABLE4, true); diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java index e51c2bc48d..bf59840355 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 @@ -226,7 +226,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try (DistributedStorage storage = storageFactory.getStorage()) { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -238,14 +238,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) + .addColumn(getColumnName12(), DataType.TIMESTAMP) .addPartitionKey(getColumnName1()) - .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .build(); admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); PutBuilder.Buildable put = Put.newBuilder() @@ -260,11 +257,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); - } + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue(getColumnName11(), Instant.now()) + .timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC)); storage.put(put.build()); storage.close(); @@ -309,18 +304,16 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp 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); - } + 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); } @@ -334,7 +327,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try (DistributedStorage storage = storageFactory.getStorage()) { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -346,16 +339,13 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) + .addColumn(getColumnName12(), DataType.TIMESTAMP) .addPartitionKey(getColumnName1()) - .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .build(); admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); - PutBuilder.Buildable put = + Put put = Put.newBuilder() .namespace(getNamespace1()) .table(getTable4()) @@ -368,12 +358,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue(getColumnName11(), Instant.now()) + .timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC)) + .build(); + storage.put(put); storage.close(); // Act Assert @@ -417,20 +406,18 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp 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(); - } + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .doesNotThrowAnyException(); - TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata expectedTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -442,14 +429,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.TEXT) .addColumn(getColumnName10(), DataType.TEXT) + .addColumn(getColumnName11(), 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(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .addColumn(getColumnName12(), DataType.TEXT) + .build(); assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) .isEqualTo(expectedTableMetadata); } finally { 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 b496ed82d8..2987e92e38 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 @@ -227,7 +227,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try (DistributedStorage storage = storageFactory.getStorage()) { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -239,14 +239,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) + .addColumn(getColumnName12(), DataType.TIMESTAMP) .addPartitionKey(getColumnName1()) - .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .build(); admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); PutBuilder.Buildable put = Put.newBuilder() @@ -261,11 +258,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); - } + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue(getColumnName11(), Instant.now()) + .timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC)); storage.put(put.build()); storage.close(); @@ -310,18 +305,16 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp 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); - } + 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); } @@ -335,7 +328,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try (DistributedStorage storage = storageFactory.getStorage()) { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -347,16 +340,13 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) + .addColumn(getColumnName12(), DataType.TIMESTAMP) .addPartitionKey(getColumnName1()) - .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .build(); admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options); - PutBuilder.Buildable put = + Put put = Put.newBuilder() .namespace(getNamespace1()) .table(getTable4()) @@ -369,12 +359,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue(getColumnName11(), Instant.now()) + .timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC)) + .build(); + storage.put(put); storage.close(); // Act Assert @@ -418,20 +407,18 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp 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(); - } + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode( + () -> + admin.alterColumnType( + getNamespace1(), getTable4(), getColumnName12(), DataType.TEXT)) + .doesNotThrowAnyException(); - TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata expectedTableMetadata = TableMetadata.newBuilder() .addColumn(getColumnName1(), DataType.INT) .addColumn(getColumnName2(), DataType.INT) @@ -443,14 +430,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.TEXT) .addColumn(getColumnName10(), DataType.TEXT) + .addColumn(getColumnName11(), 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(); + .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC) + .addColumn(getColumnName12(), DataType.TEXT) + .build(); assertThat(admin.getTableMetadata(getNamespace1(), getTable4())) .isEqualTo(expectedTableMetadata); } finally { 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 ed7a4fa429..e521b4b143 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 @@ -5,7 +5,6 @@ import static org.assertj.core.api.Assertions.catchThrowable; import com.google.common.util.concurrent.Uninterruptibles; -import com.scalar.db.api.DistributedTransactionManager; import com.scalar.db.api.Insert; import com.scalar.db.api.InsertBuilder; import com.scalar.db.api.Result; @@ -220,7 +219,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -232,16 +231,13 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) .addPartitionKey("c1") - .addClusteringKey("c2", Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn("c11", DataType.TIMESTAMP) - .addColumn("c12", DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .addColumn("c12", DataType.TIMESTAMP) + .build(); admin.createTable(namespace1, TABLE4, currentTableMetadata, options); - InsertBuilder.Buildable insert = + Insert insert = Insert.newBuilder() .namespace(namespace1) .table(TABLE4) @@ -254,12 +250,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(insert.build()); + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)) + .build(); + transactionalInsert(insert); // Act Assert assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) @@ -278,12 +273,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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); - } + 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); } @@ -294,8 +287,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp public void alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() throws ExecutionException, TransactionException { - try (DistributedTransactionManager transactionManager = - transactionFactory.getTransactionManager()) { + try { // Arrange Map options = getCreationOptions(); TableMetadata.Builder currentTableMetadataBuilder = @@ -310,13 +302,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) + .addColumn("c12", DataType.TIMESTAMP) .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 = @@ -332,12 +321,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)); + transactionalInsert(insert.build()); // Act Assert assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) @@ -356,14 +343,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(); - } + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); - TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata expectedTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -375,14 +360,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.TEXT) .addColumn("c10", DataType.TEXT) + .addColumn("c11", DataType.TEXT) + .addColumn("c12", 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(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .build(); assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); } finally { admin.dropTable(namespace1, TABLE4, true); diff --git a/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java index cb5f5c6bba..2e136869bc 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 @@ -288,7 +288,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp try { // Arrange Map options = getCreationOptions(); - TableMetadata.Builder currentTableMetadataBuilder = + TableMetadata currentTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -300,16 +300,13 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) .addPartitionKey("c1") - .addClusteringKey("c2", Scan.Ordering.Order.ASC); - if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn("c11", DataType.TIMESTAMP) - .addColumn("c12", DataType.TIMESTAMPTZ); - } - TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .addColumn("c12", DataType.TIMESTAMP) + .build(); admin.createTable(namespace1, TABLE4, currentTableMetadata, options); - InsertBuilder.Buildable insert = + Insert insert = Insert.newBuilder() .namespace(namespace1) .table(TABLE4) @@ -322,12 +319,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(insert.build()); + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)) + .build(); + transactionalInsert(insert); // Act Assert assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT)) @@ -346,12 +342,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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); - } + 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); } @@ -362,8 +356,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp public void alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported() throws ExecutionException, TransactionException { - try (DistributedTransactionManager transactionManager = - transactionFactory.getTransactionManager()) { + try { // Arrange Map options = getCreationOptions(); TableMetadata.Builder currentTableMetadataBuilder = @@ -378,13 +371,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) + .addColumn("c12", DataType.TIMESTAMP) .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 = @@ -400,11 +390,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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()); - } + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()) + .timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)); transactionalInsert(insert.build()); // Act Assert @@ -424,14 +412,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .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(); - } + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT)) + .doesNotThrowAnyException(); + assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT)) + .doesNotThrowAnyException(); - TableMetadata.Builder expectedTableMetadataBuilder = + TableMetadata expectedTableMetadata = TableMetadata.newBuilder() .addColumn("c1", DataType.INT) .addColumn("c2", DataType.INT) @@ -443,14 +429,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.TEXT) .addColumn("c10", DataType.TEXT) + .addColumn("c11", DataType.TEXT) + .addColumn("c12", 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(); + .addClusteringKey("c2", Scan.Ordering.Order.ASC) + .build(); assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata); } finally { admin.dropTable(namespace1, TABLE4, true); 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 8a89950ce5..4d3bd5a859 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 @@ -1000,12 +1000,11 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) .addPartitionKey(getColumnName1()) .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP); } TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); admin.createTable(namespace1, getTable4(), currentTableMetadata, options); @@ -1019,8 +1018,8 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu admin.dropColumnFromTable(namespace1, getTable4(), getColumnName8()); admin.dropColumnFromTable(namespace1, getTable4(), getColumnName9()); admin.dropColumnFromTable(namespace1, getTable4(), getColumnName10()); + admin.dropColumnFromTable(namespace1, getTable4(), getColumnName11()); if (isTimestampTypeSupported()) { - admin.dropColumnFromTable(namespace1, getTable4(), getColumnName11()); admin.dropColumnFromTable(namespace1, getTable4(), getColumnName12()); } @@ -1034,11 +1033,10 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu .removeColumn(getColumnName7()) .removeColumn(getColumnName8()) .removeColumn(getColumnName9()) - .removeColumn(getColumnName10()); + .removeColumn(getColumnName10()) + .removeColumn(getColumnName11()); if (isTimestampTypeSupported()) { - expectedTableMetadataBuilder - .removeColumn(getColumnName11()) - .removeColumn(getColumnName12()); + expectedTableMetadataBuilder.removeColumn(getColumnName12()); } TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); @@ -1122,12 +1120,11 @@ public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws Exe .addColumn(getColumnName8(), DataType.BLOB) .addColumn(getColumnName9(), DataType.DATE) .addColumn(getColumnName10(), DataType.TIME) + .addColumn(getColumnName11(), DataType.TIMESTAMPTZ) .addPartitionKey(getColumnName1()) .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TIMESTAMP) - .addColumn(getColumnName12(), DataType.TIMESTAMPTZ); + currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP); } TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); admin.createTable(namespace1, getTable4(), currentTableMetadata, options); @@ -1144,10 +1141,10 @@ public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws Exe .textValue(getColumnName7(), "5") .blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8)) .dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC"))) - .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))); + .timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue(getColumnName11(), Instant.now()); if (isTimestampTypeSupported()) { - put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC)); - put.timestampTZValue(getColumnName12(), Instant.now()); + put.timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC)); } storage.put(put.build()); @@ -1160,8 +1157,8 @@ public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws Exe admin.alterColumnType(namespace1, getTable4(), getColumnName8(), DataType.TEXT); admin.alterColumnType(namespace1, getTable4(), getColumnName9(), DataType.TEXT); admin.alterColumnType(namespace1, getTable4(), getColumnName10(), DataType.TEXT); + admin.alterColumnType(namespace1, getTable4(), getColumnName11(), DataType.TEXT); if (isTimestampTypeSupported()) { - admin.alterColumnType(namespace1, getTable4(), getColumnName11(), DataType.TEXT); admin.alterColumnType(namespace1, getTable4(), getColumnName12(), DataType.TEXT); } @@ -1178,12 +1175,11 @@ public void renameTable_ForExistingTable_ShouldRenameTableCorrectly() throws Exe .addColumn(getColumnName8(), DataType.TEXT) .addColumn(getColumnName9(), DataType.TEXT) .addColumn(getColumnName10(), DataType.TEXT) + .addColumn(getColumnName11(), DataType.TEXT) .addPartitionKey(getColumnName1()) .addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - expectedTableMetadataBuilder - .addColumn(getColumnName11(), DataType.TEXT) - .addColumn(getColumnName12(), DataType.TEXT); + expectedTableMetadataBuilder.addColumn(getColumnName12(), DataType.TEXT); } TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); assertThat(admin.getTableMetadata(namespace1, getTable4())).isEqualTo(expectedTableMetadata); 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 e19600aa3a..e9169b7c74 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 @@ -955,12 +955,11 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) .addPartitionKey("c1") .addClusteringKey("c2", Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn("c11", DataType.TIMESTAMP) - .addColumn("c12", DataType.TIMESTAMPTZ); + currentTableMetadataBuilder.addColumn("c12", DataType.TIMESTAMP); } TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); admin.createTable(namespace1, TABLE4, currentTableMetadata, options); @@ -974,8 +973,8 @@ public void dropColumnFromTable_DropColumnForEachExistingDataType_ShouldDropColu admin.dropColumnFromTable(namespace1, TABLE4, "c8"); admin.dropColumnFromTable(namespace1, TABLE4, "c9"); admin.dropColumnFromTable(namespace1, TABLE4, "c10"); + admin.dropColumnFromTable(namespace1, TABLE4, "c11"); if (isTimestampTypeSupported()) { - admin.dropColumnFromTable(namespace1, TABLE4, "c11"); admin.dropColumnFromTable(namespace1, TABLE4, "c12"); } @@ -1221,12 +1220,11 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() .addColumn("c8", DataType.BLOB) .addColumn("c9", DataType.DATE) .addColumn("c10", DataType.TIME) + .addColumn("c11", DataType.TIMESTAMPTZ) .addPartitionKey("c1") .addClusteringKey("c2", Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - currentTableMetadataBuilder - .addColumn("c11", DataType.TIMESTAMP) - .addColumn("c12", DataType.TIMESTAMPTZ); + currentTableMetadataBuilder.addColumn("c12", DataType.TIMESTAMP); } TableMetadata currentTableMetadata = currentTableMetadataBuilder.build(); admin.createTable(namespace1, table, currentTableMetadata, options); @@ -1243,10 +1241,10 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() .textValue("c7", "5") .blobValue("c8", "6".getBytes(StandardCharsets.UTF_8)) .dateValue("c9", LocalDate.now(ZoneId.of("UTC"))) - .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))); + .timeValue("c10", LocalTime.now(ZoneId.of("UTC"))) + .timestampTZValue("c11", Instant.now()); if (isTimestampTypeSupported()) { - insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC)); - insert.timestampTZValue("c12", Instant.now()); + insert.timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC)); } transactionalInsert(insert.build()); @@ -1259,8 +1257,8 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() admin.alterColumnType(namespace1, table, "c8", DataType.TEXT); admin.alterColumnType(namespace1, table, "c9", DataType.TEXT); admin.alterColumnType(namespace1, table, "c10", DataType.TEXT); + admin.alterColumnType(namespace1, table, "c11", DataType.TEXT); if (isTimestampTypeSupported()) { - admin.alterColumnType(namespace1, table, "c11", DataType.TEXT); admin.alterColumnType(namespace1, table, "c12", DataType.TEXT); } @@ -1277,12 +1275,11 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() .addColumn("c8", DataType.TEXT) .addColumn("c9", DataType.TEXT) .addColumn("c10", DataType.TEXT) + .addColumn("c11", DataType.TEXT) .addPartitionKey("c1") .addClusteringKey("c2", Scan.Ordering.Order.ASC); if (isTimestampTypeSupported()) { - expectedTableMetadataBuilder - .addColumn("c11", DataType.TEXT) - .addColumn("c12", DataType.TEXT); + expectedTableMetadataBuilder.addColumn("c12", DataType.TEXT); } TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build(); assertThat(admin.getTableMetadata(namespace1, table)).isEqualTo(expectedTableMetadata);