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

fix: return type of max commit delay option. #2953

Merged
merged 24 commits into from
Mar 19, 2024
Merged

fix: return type of max commit delay option. #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
edc5bbf
fix: prevent illegal negative timeout values into thread sleep() meth…
arpan14 Feb 6, 2023
49a85df
Merge pull request #1 from arpan14/retryerror
arpan14 Feb 8, 2023
4cd497b
Fixing lint issues.
arpan14 Feb 8, 2023
4a6aa8e
Merge branch 'googleapis:main' into main
arpan14 Mar 13, 2023
b2aa09d
Merge branch 'googleapis:main' into main
arpan14 Mar 15, 2023
8d6d71e
Merge branch 'googleapis:main' into main
arpan14 May 9, 2023
77e6e7d
Merge branch 'googleapis:main' into main
arpan14 Jul 17, 2023
e8b7fad
Merge branch 'googleapis:main' into main
arpan14 Jul 25, 2023
8aa84e1
Merge branch 'googleapis:main' into main
arpan14 Oct 10, 2023
57fd405
Merge branch 'googleapis:main' into main
arpan14 Oct 27, 2023
1253563
Merge branch 'googleapis:main' into main
arpan14 Nov 20, 2023
d4f6a60
Merge branch 'googleapis:main' into main
arpan14 Dec 15, 2023
3efaf7c
Merge branch 'googleapis:main' into main
arpan14 Dec 26, 2023
f41b39f
Merge branch 'googleapis:main' into main
arpan14 Jan 3, 2024
7e3287f
Merge branch 'googleapis:main' into main
arpan14 Jan 13, 2024
7edd24d
Merge branch 'googleapis:main' into main
arpan14 Feb 13, 2024
fe3649b
Merge branch 'googleapis:main' into main
arpan14 Feb 20, 2024
ae0dbc9
Merge branch 'googleapis:main' into main
arpan14 Feb 23, 2024
99cd112
Merge branch 'googleapis:main' into main
arpan14 Feb 23, 2024
7da9d8d
Merge branch 'googleapis:main' into main
arpan14 Feb 27, 2024
03cfaed
Merge branch 'googleapis:main' into main
arpan14 Mar 7, 2024
52662f8
Merge branch 'googleapis:main' into main
arpan14 Mar 18, 2024
53f4fbd
chore: fix return type of max commit delay option.
arpan14 Mar 18, 2024
f356783
fix: return type of max commit delay option.
arpan14 Mar 19, 2024
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
8 changes: 8 additions & 0 deletions google-cloud-spanner/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,14 @@
<method>com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings getInstanceAdminStubSettings()</method>
</difference>

<!-- (Modify return type of maxCommitDelay. Feature not announced) -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/cloud/spanner/Options</className>
<method>com.google.cloud.spanner.Options$ReadQueryUpdateTransactionOption maxCommitDelay(java.time.Duration)</method>
<to>com.google.cloud.spanner.Options$TransactionOption</to>
</difference>

<difference>
<differenceType>7005</differenceType>
<className>com/google/cloud/spanner/PartitionedDmlTransaction</className>
Expand Down
5 changes: 2 additions & 3 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static ReadQueryUpdateTransactionOption priority(RpcPriority priority) {
return new PriorityOption(priority);
}

public static ReadQueryUpdateTransactionOption maxCommitDelay(Duration maxCommitDelay) {
public static TransactionOption maxCommitDelay(Duration maxCommitDelay) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can we also add a short javadoc comment to this public method that indicates where/how to use it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have asked Navarre from the backend team to add this since I didn't have the exact details on how our external docs are explaining this feature.

Preconditions.checkArgument(!maxCommitDelay.isNegative(), "maxCommitDelay should be positive");
return new MaxCommitDelayOption(maxCommitDelay);
}
Expand Down Expand Up @@ -258,8 +258,7 @@ void appendToOptions(Options options) {
static final CommitStatsOption COMMIT_STATS_OPTION = new CommitStatsOption();

/** Option to request {@link MaxCommitDelayOption} for read/write transactions. */
static final class MaxCommitDelayOption extends InternalOption
implements ReadQueryUpdateTransactionOption {
static final class MaxCommitDelayOption extends InternalOption implements TransactionOption {
final Duration maxCommitDelay;

MaxCommitDelayOption(Duration maxCommitDelay) {
Expand Down
Loading