Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 3fbce54

Browse files
authored
Merge branch 'main' into migrate-hermetic-build
2 parents b770fc6 + d6c3770 commit 3fbce54

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

google-cloud-firestore/src/main/java/com/google/cloud/firestore/ServerSideTransaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public ApiFuture<Pipeline.Snapshot> execute(
281281
@Nonnull Pipeline pipeline, @Nonnull PipelineExecuteOptions options) {
282282
Preconditions.checkState(isEmpty(), READ_BEFORE_WRITE_ERROR_MSG);
283283
try (TraceUtil.Scope ignored = transactionTraceContext.makeCurrent()) {
284-
return pipeline.execute(new PipelineExecuteOptions(), transactionId, null);
284+
return pipeline.execute(options, transactionId, null);
285285
}
286286
}
287287
}

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITPipelineTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3883,7 +3883,11 @@ public void testPipelineInTransactionsWithOptions() throws Exception {
38833883
firestore
38843884
.runTransaction(
38853885
transaction -> {
3886-
PipelineExecuteOptions options = new PipelineExecuteOptions().with("foo", "bar");
3886+
PipelineExecuteOptions options =
3887+
new PipelineExecuteOptions()
3888+
.withExplainOptions(
3889+
new ExplainOptions()
3890+
.withExecutionMode(ExplainOptions.ExecutionMode.ANALYZE));
38873891
List<PipelineResult> results =
38883892
transaction.execute(pipeline, options).get().getResults();
38893893
assertThat(results).hasSize(1);

0 commit comments

Comments
 (0)