Skip to content
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

Jump to bottom

feat: add TransactionExecutionOptions support to executor. #2396

Merged
merged 10 commits into from Apr 25, 2023
Merged

feat: add TransactionExecutionOptions support to executor. #2396

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
242a082
feat: add TransactionExecutionOptions support to executor.
ko3a4ok Apr 20, 2023
1c038d6
feat: add TransactionExecutionOptions support to executor.
ko3a4ok Apr 20, 2023
1853f76
Merge remote-tracking branch 'origin/occ-test-executor' into occ-test…
ko3a4ok Apr 20, 2023
89331dd
feat: add TransactionExecutionOptions support to executor.
ko3a4ok Apr 20, 2023
02679fd
Merge remote-tracking branch 'origin/occ-test-executor' into occ-test…
ko3a4ok Apr 20, 2023
2931a22
feat: add TransactionExecutionOptions support to executor.
ko3a4ok Apr 20, 2023
d5c40bf
deps: update dependency com.google.cloud:google-cloud-trace to v2.15.…
renovate-bot Apr 14, 2023
dd337ce
Merge branch 'googleapis:main' into occ-test-executor
ko3a4ok Apr 20, 2023
81a503d
Merge remote-tracking branch 'origin/occ-test-executor' into occ-test…
ko3a4ok Apr 20, 2023
94e8f82
fix: lint
ko3a4ok Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
View file
Open in desktop
Expand Up @@ -140,6 +140,7 @@
import com.google.spanner.executor.v1.SpannerAsyncActionResponse;
import com.google.spanner.executor.v1.StartBatchTransactionAction;
import com.google.spanner.executor.v1.StartTransactionAction;
import com.google.spanner.executor.v1.TransactionExecutionOptions;
import com.google.spanner.executor.v1.UpdateCloudBackupAction;
import com.google.spanner.executor.v1.UpdateCloudDatabaseDdlAction;
import com.google.spanner.executor.v1.UpdateCloudInstanceAction;
Expand Down Expand Up @@ -227,13 +228,16 @@ private static class ReadWriteTransaction {
private Mode finishMode;
private SpannerException error;
private final String transactionSeed;
private final boolean optimistic;
// Set to true when the transaction runner completed, one of these three could happen: runner
// committed, abandoned or threw an error.
private boolean runnerCompleted;

public ReadWriteTransaction(DatabaseClient dbClient, String transactionSeed) {
public ReadWriteTransaction(
DatabaseClient dbClient, String transactionSeed, boolean optimistic) {
ko3a4ok marked this conversation as resolved.
Show resolved Hide resolved
this.dbClient = dbClient;
this.transactionSeed = transactionSeed;
this.optimistic = optimistic;
this.runnerCompleted = false;
}

Expand Down Expand Up @@ -318,7 +322,10 @@ public void startRWTransaction() throws Exception {
Runnable runnable =
() -> {
try {
runner = dbClient.readWriteTransaction();
runner =
optimistic
? dbClient.readWriteTransaction(Options.optimisticLock())
: dbClient.readWriteTransaction();
LOGGER.log(Level.INFO, String.format("Ready to run callable %s\n", transactionSeed));
runner.run(callable);
transactionSucceeded(runner.getCommitTimestamp().toProto());
Expand Down Expand Up @@ -537,7 +544,8 @@ public synchronized void startReadOnlyTxn(
}

/** Start a read-write transaction. */
public synchronized void startReadWriteTxn(DatabaseClient dbClient, Metadata metadata)
public synchronized void startReadWriteTxn(
DatabaseClient dbClient, Metadata metadata, TransactionExecutionOptions options)
throws Exception {
if ((rwTxn != null) || (roTxn != null) || (batchTxn != null)) {
throw SpannerExceptionFactory.newSpannerException(
Expand All @@ -548,7 +556,7 @@ public synchronized void startReadWriteTxn(DatabaseClient dbClient, Metadata met
String.format(
"There's no active transaction, safe to create rwTxn: %s\n", getTransactionSeed()));
this.metadata = metadata;
rwTxn = new ReadWriteTransaction(dbClient, transactionSeed);
rwTxn = new ReadWriteTransaction(dbClient, transactionSeed, options.getOptimistic());
LOGGER.log(
Level.INFO,
String.format(
Expand Down Expand Up @@ -2246,7 +2254,7 @@ private Status executeStartTxn(
Level.INFO,
"Starting read-write transaction %s\n",
executionContext.getTransactionSeed());
executionContext.startReadWriteTxn(dbClient, metadata);
executionContext.startReadWriteTxn(dbClient, metadata, action.getExecutionOptions());
}
executionContext.setDatabaseClient(dbClient);
executionContext.initReadState();
Expand Down