Skip to content

Backport to branch(3) : Fix to enable tests for TIMESTAMPTZ #3081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

Backport to branch(3) : Fix to enable tests for TIMESTAMPTZ #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 29 additions & 45 deletions .../java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
TableMetadata currentTableMetadata =
TableMetadata.newBuilder()
.addColumn("c1", DataType.INT)
.addColumn("c2", DataType.INT)
Expand All @@ -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)
Expand All @@ -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))
Expand All @@ -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);
}
Expand All @@ -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 =
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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);
Expand Down
104 changes: 44 additions & 60 deletions ...gration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
try (DistributedStorage storage = storageFactory.getStorage()) {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
TableMetadata currentTableMetadata =
TableMetadata.newBuilder()
.addColumn(getColumnName1(), DataType.INT)
.addColumn(getColumnName2(), DataType.INT)
Expand All @@ -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()
Expand All @@ -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();

Expand Down Expand Up @@ -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);
}
Expand All @@ -334,7 +327,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
try (DistributedStorage storage = storageFactory.getStorage()) {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
TableMetadata currentTableMetadata =
TableMetadata.newBuilder()
.addColumn(getColumnName1(), DataType.INT)
.addColumn(getColumnName2(), DataType.INT)
Expand All @@ -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())
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
Loading