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 37c0ef9de2..2045d48daa 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 @@ -149,7 +149,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) @@ -161,16 +161,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) @@ -183,12 +180,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)) @@ -207,12 +203,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); } @@ -238,13 +232,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 = @@ -260,11 +251,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 @@ -284,14 +273,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) @@ -303,14 +290,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 71dad0d7a7..9c983ad1c7 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 @@ -156,7 +156,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) @@ -168,14 +168,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() @@ -190,11 +187,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(); @@ -239,18 +234,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); } @@ -264,7 +257,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) @@ -276,16 +269,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()) @@ -298,12 +288,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 @@ -347,20 +336,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) @@ -372,14 +359,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 7bddc4a058..aef7b4c00f 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 @@ -157,7 +157,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) @@ -169,14 +169,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() @@ -191,11 +188,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(); @@ -240,18 +235,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); } @@ -265,7 +258,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) @@ -277,16 +270,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()) @@ -299,12 +289,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 @@ -348,20 +337,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) @@ -373,14 +360,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 859fe2a57b..84ff64b846 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; @@ -150,7 +149,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) @@ -162,16 +161,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) @@ -184,12 +180,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)) @@ -208,12 +203,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); } @@ -224,8 +217,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 = @@ -240,13 +232,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 = @@ -262,12 +251,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)) @@ -286,14 +273,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) @@ -305,14 +290,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 7ed7fe9e1f..b7bc6fe55a 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 @@ -222,7 +222,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) @@ -234,16 +234,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) @@ -256,12 +253,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)) @@ -280,12 +276,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); } @@ -296,8 +290,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 = @@ -312,13 +305,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 = @@ -334,11 +324,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 @@ -358,14 +346,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) @@ -377,14 +363,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 8820049603..cc40db8d85 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 @@ -1012,12 +1012,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); @@ -1031,8 +1030,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()); } @@ -1046,11 +1045,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); @@ -1134,12 +1132,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); @@ -1156,10 +1153,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()); @@ -1172,8 +1169,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); } @@ -1190,12 +1187,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 6a1cb8febe..e72933170e 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 @@ -934,12 +934,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); @@ -953,8 +952,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"); } @@ -1200,12 +1199,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); @@ -1222,10 +1220,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()); @@ -1238,8 +1236,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); } @@ -1256,12 +1254,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);