Skip to content

Backport to branch(3) : Add more waits for cache expiry #3054

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 15, 2025
Merged

Backport to branch(3) : Add more waits for cache expiry #3054

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
17 changes: 7 additions & 10 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 @@ -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;
Expand Down Expand Up @@ -233,8 +232,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
public void
alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager transactionManager =
transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand Down Expand Up @@ -276,7 +274,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
insert.timestampTZValue("c12", Instant.now());
}
transactionalInsert(transactionManager, insert.build());
transactionalInsert(insert.build());

// Act Assert
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT))
Expand Down Expand Up @@ -311,8 +309,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
public void
alterColumnType_Db2_AlterColumnTypeFromEachExistingDataTypeToText_ShouldAlterColumnTypesCorrectlyIfSupported()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager transactionManager =
transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand Down Expand Up @@ -354,7 +351,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
insert.timestampTZValue("c12", Instant.now());
}
transactionalInsert(transactionManager, insert.build());
transactionalInsert(insert.build());

// Act Assert
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT))
Expand Down Expand Up @@ -418,7 +415,7 @@ public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly()
@EnabledIf("isOracle")
public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand All @@ -442,7 +439,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.clusteringKey(Key.ofInt("c2", 2))
.intValue("c3", expectedColumn3Value)
.floatValue("c4", expectedColumn4Value);
transactionalInsert(manager, insert.build());
transactionalInsert(insert.build());

// Act
admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT);
Expand Down Expand Up @@ -471,7 +468,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.table(TABLE4)
.partitionKey(Key.ofInt("c1", 1))
.build();
List<Result> results = transactionalScan(manager, scan);
List<Result> results = transactionalScan(scan);
assertThat(results).hasSize(1);
Result result = results.get(0);
assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value);
Expand Down
11 changes: 5 additions & 6 deletions ...r/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
public void
alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager transactionManager =
transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand Down Expand Up @@ -260,7 +259,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
insert.timestampTZValue("c12", Instant.now());
}
transactionalInsert(transactionManager, insert.build());
transactionalInsert(insert.build());

// Act Assert
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT))
Expand Down Expand Up @@ -402,7 +401,7 @@ public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly()
@EnabledIf("isOracle")
public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand All @@ -426,7 +425,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.clusteringKey(Key.ofInt("c2", 2))
.intValue("c3", expectedColumn3Value)
.floatValue("c4", expectedColumn4Value);
transactionalInsert(manager, insert.build());
transactionalInsert(insert.build());

// Act
admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT);
Expand Down Expand Up @@ -455,7 +454,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.table(TABLE4)
.partitionKey(Key.ofInt("c1", 1))
.build();
List<Result> results = transactionalScan(manager, scan);
List<Result> results = transactionalScan(scan);
assertThat(results).hasSize(1);
Result result = results.get(0);
assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value);
Expand Down
43 changes: 25 additions & 18 deletions ...gration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
public void
alterColumnType_Oracle_AlterColumnTypeFromEachExistingDataTypeToText_ShouldThrowUnsupportedOperationException()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager transactionManager =
transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand Down Expand Up @@ -328,7 +327,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
insert.timestampTZValue("c12", Instant.now());
}
transactionalInsert(transactionManager, insert.build());
transactionalInsert(insert.build());

// Act Assert
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT))
Expand Down Expand Up @@ -406,7 +405,7 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
insert.timestampTZValue("c12", Instant.now());
}
transactionalInsert(transactionManager, insert.build());
transactionalInsert(insert.build());

// Act Assert
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c3", DataType.TEXT))
Expand Down Expand Up @@ -470,7 +469,7 @@ public void alterColumnType_WideningConversion_ShouldAlterColumnTypesCorrectly()
@EnabledIf("isOracle")
public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorrectly()
throws ExecutionException, TransactionException {
try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) {
try {
// Arrange
Map<String, String> options = getCreationOptions();
TableMetadata.Builder currentTableMetadataBuilder =
Expand All @@ -494,7 +493,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.clusteringKey(Key.ofInt("c2", 2))
.intValue("c3", expectedColumn3Value)
.floatValue("c4", expectedColumn4Value);
transactionalInsert(manager, insert.build());
transactionalInsert(insert.build());

// Act
admin.alterColumnType(namespace1, TABLE4, "c3", DataType.BIGINT);
Expand Down Expand Up @@ -523,7 +522,7 @@ public void alterColumnType_Oracle_WideningConversion_ShouldAlterColumnTypesCorr
.table(TABLE4)
.partitionKey(Key.ofInt("c1", 1))
.build();
List<Result> results = transactionalScan(manager, scan);
List<Result> results = transactionalScan(scan);
assertThat(results).hasSize(1);
Result result = results.get(0);
assertThat(result.getBigInt("c3")).isEqualTo(expectedColumn3Value);
Expand Down Expand Up @@ -563,19 +562,27 @@ protected boolean isIndexOnBlobColumnSupported() {
}

@Override
protected void transactionalInsert(DistributedTransactionManager manager, Insert insert)
throws TransactionException {
DistributedTransaction transaction = manager.start();
transaction.insert(insert);
transaction.commit();
protected void transactionalInsert(Insert insert) throws TransactionException {
// Wait for cache expiry
Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);

try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) {
DistributedTransaction transaction = manager.start();
transaction.insert(insert);
transaction.commit();
}
}

@Override
protected List<Result> transactionalScan(DistributedTransactionManager manager, Scan scan)
throws TransactionException {
DistributedTransaction transaction = manager.start();
List<Result> results = transaction.scan(scan);
transaction.commit();
return results;
protected List<Result> transactionalScan(Scan scan) throws TransactionException {
// Wait for cache expiry
Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);

try (DistributedTransactionManager manager = transactionFactory.getTransactionManager()) {
DistributedTransaction transaction = manager.start();
List<Result> results = transaction.scan(scan);
transaction.commit();
return results;
}
}
}
Loading