Skip to content

Commit 6e937ab

Browse files
authored
fix: return type of max commit delay option. (#2953)
* Use `TransactionOption` as return type instead of `TransactionOption`
1 parent 3247a05 commit 6e937ab

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

google-cloud-spanner/clirr-ignored-differences.xml

+8
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,14 @@
605605
<method>com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings getInstanceAdminStubSettings()</method>
606606
</difference>
607607

608+
<!-- (Modify return type of maxCommitDelay. Feature not announced) -->
609+
<difference>
610+
<differenceType>7006</differenceType>
611+
<className>com/google/cloud/spanner/Options</className>
612+
<method>com.google.cloud.spanner.Options$ReadQueryUpdateTransactionOption maxCommitDelay(java.time.Duration)</method>
613+
<to>com.google.cloud.spanner.Options$TransactionOption</to>
614+
</difference>
615+
608616
<difference>
609617
<differenceType>7005</differenceType>
610618
<className>com/google/cloud/spanner/PartitionedDmlTransaction</className>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public static ReadQueryUpdateTransactionOption priority(RpcPriority priority) {
141141
return new PriorityOption(priority);
142142
}
143143

144-
public static ReadQueryUpdateTransactionOption maxCommitDelay(Duration maxCommitDelay) {
144+
public static TransactionOption maxCommitDelay(Duration maxCommitDelay) {
145145
Preconditions.checkArgument(!maxCommitDelay.isNegative(), "maxCommitDelay should be positive");
146146
return new MaxCommitDelayOption(maxCommitDelay);
147147
}
@@ -258,8 +258,7 @@ void appendToOptions(Options options) {
258258
static final CommitStatsOption COMMIT_STATS_OPTION = new CommitStatsOption();
259259

260260
/** Option to request {@link MaxCommitDelayOption} for read/write transactions. */
261-
static final class MaxCommitDelayOption extends InternalOption
262-
implements ReadQueryUpdateTransactionOption {
261+
static final class MaxCommitDelayOption extends InternalOption implements TransactionOption {
263262
final Duration maxCommitDelay;
264263

265264
MaxCommitDelayOption(Duration maxCommitDelay) {

0 commit comments

Comments
 (0)