Skip to content

refactor: decouple ConsistencyRequest from TableAdminRequestContext #2887

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
jinseopkim0 merged 9 commits into from
Apr 22, 2026
Merged

refactor: decouple ConsistencyRequest from TableAdminRequestContext #2887

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b68d628
refactor: decouple ConsistencyRequest from TableAdminRequestContext
jinseopkim0 Apr 15, 2026
6e39723
chore: generate libraries at Wed Apr 15 18:37:03 UTC 2026
cloud-java-bot Apr 15, 2026
59addc0
PR feedback
jinseopkim0 Apr 21, 2026
35e797a
chore: generate libraries at Tue Apr 21 19:06:09 UTC 2026
cloud-java-bot Apr 21, 2026
7bed5b9
Merge branch 'main' into refactor-consistency-request
jinseopkim0 Apr 21, 2026
bb2a0a9
chore: generate libraries at Tue Apr 21 19:11:56 UTC 2026
cloud-java-bot Apr 21, 2026
fd863ae
PR feedback
jinseopkim0 Apr 22, 2026
30198ce
Merge branch 'main' into refactor-consistency-request
jinseopkim0 Apr 22, 2026
bb54630
chore: generate libraries at Wed Apr 22 18:08:03 UTC 2026
cloud-java-bot Apr 22, 2026
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
60 changes: 57 additions & 3 deletions ...-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ConsistencyRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ public abstract class ConsistencyRequest {
@Nullable
public abstract String getConsistencyToken();

protected abstract boolean isFullyQualified();

public static ConsistencyRequest forReplication(String tableId) {
return new AutoValue_ConsistencyRequest(
tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null);
tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null, false);
}

/**
Expand All @@ -59,17 +61,41 @@ public static ConsistencyRequest forReplication(String tableId, String consisten
Preconditions.checkNotNull(consistencyToken, "consistencyToken must not be null");

return new AutoValue_ConsistencyRequest(
tableId, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, consistencyToken);
tableId,
CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES,
consistencyToken,
false);
}

public static ConsistencyRequest forDataBoost(String tableId) {
return new AutoValue_ConsistencyRequest(
tableId, CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES, null);
tableId, CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES, null, false);
}

@InternalApi
public static ConsistencyRequest forReplicationFromTableName(String tableName) {
return new AutoValue_ConsistencyRequest(
tableName, CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES, null, true);
}

@InternalApi
public static ConsistencyRequest forReplicationFromTableName(
String tableName, String consistencyToken) {
Preconditions.checkNotNull(consistencyToken, "consistencyToken must not be null");
Comment thread
jinseopkim0 marked this conversation as resolved.

return new AutoValue_ConsistencyRequest(
tableName,
Comment thread
jinseopkim0 marked this conversation as resolved.
CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES,
consistencyToken,
true);
}

@InternalApi
public CheckConsistencyRequest toCheckConsistencyProto(
TableAdminRequestContext requestContext, String token) {
Preconditions.checkState(
!isFullyQualified(),
"Use toCheckConsistencyProto(String token) for fully qualified table names.");
Comment thread
jinseopkim0 marked this conversation as resolved.
CheckConsistencyRequest.Builder builder = CheckConsistencyRequest.newBuilder();
TableName tableName =
TableName.of(requestContext.getProjectId(), requestContext.getInstanceId(), getTableId());
Expand All @@ -83,13 +109,41 @@ public CheckConsistencyRequest toCheckConsistencyProto(
return builder.setName(tableName.toString()).setConsistencyToken(token).build();
}

@InternalApi
public CheckConsistencyRequest toCheckConsistencyProto(String token) {
Preconditions.checkState(
isFullyQualified(),
"Use toCheckConsistencyProto(TableAdminRequestContext, String) for non-qualified table"
+ " names.");
CheckConsistencyRequest.Builder builder = CheckConsistencyRequest.newBuilder();

if (getMode().equals(CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES)) {
builder.setStandardReadRemoteWrites(StandardReadRemoteWrites.newBuilder().build());
} else {
builder.setDataBoostReadLocalWrites(DataBoostReadLocalWrites.newBuilder().build());
Comment thread
jinseopkim0 marked this conversation as resolved.
Outdated
}

return builder.setName(getTableId()).setConsistencyToken(token).build();
}

@InternalApi
public GenerateConsistencyTokenRequest toGenerateTokenProto(
TableAdminRequestContext requestContext) {
Preconditions.checkState(
!isFullyQualified(), "Use toGenerateTokenProto() for fully qualified table names.");
GenerateConsistencyTokenRequest.Builder builder = GenerateConsistencyTokenRequest.newBuilder();
TableName tableName =
TableName.of(requestContext.getProjectId(), requestContext.getInstanceId(), getTableId());

return builder.setName(tableName.toString()).build();
}

@InternalApi
public GenerateConsistencyTokenRequest toGenerateTokenProto() {
Preconditions.checkState(
isFullyQualified(),
"Use toGenerateTokenProto(TableAdminRequestContext) for non-qualified table names.");
GenerateConsistencyTokenRequest.Builder builder = GenerateConsistencyTokenRequest.newBuilder();
return builder.setName(getTableId()).build();
}
}
34 changes: 26 additions & 8 deletions ...table/src/main/java/com/google/cloud/bigtable/admin/v2/stub/AwaitConsistencyCallable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.google.common.util.concurrent.MoreExecutors;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
import javax.annotation.Nullable;

/**
* Callable that waits until either replication or Data Boost has caught up to the point it was
Expand All @@ -56,15 +57,15 @@ class AwaitConsistencyCallable extends UnaryCallable<ConsistencyRequest, Void> {
private final UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable;
private final RetryingExecutor<CheckConsistencyResponse> executor;

private final TableAdminRequestContext requestContext;
@Nullable private final TableAdminRequestContext requestContext;

static AwaitConsistencyCallable create(
UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
generateCallable,
UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
ClientContext clientContext,
RetrySettings pollingSettings,
TableAdminRequestContext requestContext) {
@Nullable TableAdminRequestContext requestContext) {

RetryAlgorithm<CheckConsistencyResponse> retryAlgorithm =
new RetryAlgorithm<>(
Expand All @@ -78,13 +79,22 @@ static AwaitConsistencyCallable create(
generateCallable, checkCallable, retryingExecutor, requestContext);
}

static AwaitConsistencyCallable create(
UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
generateCallable,
UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
ClientContext clientContext,
RetrySettings pollingSettings) {
return create(generateCallable, checkCallable, clientContext, pollingSettings, null);
}

@VisibleForTesting
AwaitConsistencyCallable(
UnaryCallable<GenerateConsistencyTokenRequest, GenerateConsistencyTokenResponse>
generateCallable,
UnaryCallable<CheckConsistencyRequest, CheckConsistencyResponse> checkCallable,
RetryingExecutor<CheckConsistencyResponse> executor,
TableAdminRequestContext requestContext) {
@Nullable TableAdminRequestContext requestContext) {
this.generateCallable = generateCallable;
this.checkCallable = checkCallable;
this.executor = executor;
Expand All @@ -98,22 +108,30 @@ public ApiFuture<Void> futureCall(
// If the token is already provided, skip generation and poll directly.
if (consistencyRequest.getConsistencyToken() != null) {
CheckConsistencyRequest request =
consistencyRequest.toCheckConsistencyProto(
requestContext, consistencyRequest.getConsistencyToken());
requestContext == null
? consistencyRequest.toCheckConsistencyProto(consistencyRequest.getConsistencyToken())
: consistencyRequest.toCheckConsistencyProto(
requestContext, consistencyRequest.getConsistencyToken());
return pollToken(request, apiCallContext);
}

ApiFuture<GenerateConsistencyTokenResponse> tokenFuture =
generateToken(consistencyRequest.toGenerateTokenProto(requestContext), apiCallContext);
generateToken(
requestContext == null
? consistencyRequest.toGenerateTokenProto()
: consistencyRequest.toGenerateTokenProto(requestContext),
apiCallContext);

return ApiFutures.transformAsync(
tokenFuture,
new ApiAsyncFunction<GenerateConsistencyTokenResponse, Void>() {
@Override
public ApiFuture<Void> apply(GenerateConsistencyTokenResponse input) {
CheckConsistencyRequest request =
consistencyRequest.toCheckConsistencyProto(
requestContext, input.getConsistencyToken());
requestContext == null
? consistencyRequest.toCheckConsistencyProto(input.getConsistencyToken())
: consistencyRequest.toCheckConsistencyProto(
requestContext, input.getConsistencyToken());
return pollToken(request, apiCallContext);
}
},
Expand Down
9 changes: 7 additions & 2 deletions ...src/main/java/com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ public class EnhancedBigtableTableAdminStub extends GrpcBigtableTableAdminStub {
private final BigtableTableAdminStubSettings settings;
private final ClientContext clientContext;

private final TableAdminRequestContext requestContext;
@javax.annotation.Nullable private final TableAdminRequestContext requestContext;

@Deprecated private final AwaitReplicationCallable awaitReplicationCallable;

private final AwaitConsistencyCallable awaitConsistencyCallable;
private final OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
optimizeRestoredTableOperationBaseCallable;

public static EnhancedBigtableTableAdminStub createEnhanced(
BigtableTableAdminStubSettings settings) throws IOException {
return new EnhancedBigtableTableAdminStub(settings, ClientContext.create(settings), null);
}
Comment thread
jinseopkim0 marked this conversation as resolved.

Comment thread
jinseopkim0 marked this conversation as resolved.
public static EnhancedBigtableTableAdminStub createEnhanced(
BigtableTableAdminStubSettings settings, TableAdminRequestContext requestContext)
throws IOException {
Expand All @@ -72,7 +77,7 @@ public static EnhancedBigtableTableAdminStub createEnhanced(
private EnhancedBigtableTableAdminStub(
BigtableTableAdminStubSettings settings,
ClientContext clientContext,
TableAdminRequestContext requestContext)
@javax.annotation.Nullable TableAdminRequestContext requestContext)
throws IOException {
super(settings, clientContext);

Expand Down
Loading