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: client sends routing cookie back to server #1888

Merged
merged 23 commits into from
Nov 27, 2023
Merged

feat: client sends routing cookie back to server #1888

merged 23 commits into from
Nov 27, 2023

Conversation

mutianf
Copy link
Contributor

@mutianf mutianf commented Aug 16, 2023

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

  • Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
  • Ensure the tests and linter pass
  • Code coverage does not decrease (if any source code was changed)
  • Appropriate docs were updated (if necessary)

Fixes #<issue_number_goes_here> ☕️

If you write sample code, please follow the samples format.

@product-auto-label product-auto-label bot added size: l Pull request size is large. api: bigtable Issues related to the googleapis/java-bigtable API. labels Aug 16, 2023
@mutianf mutianf changed the title feat: [POC] client sends retry cookie back to server feat: client sends retry cookie back to server Oct 18, 2023
@mutianf mutianf marked this pull request as ready for review October 24, 2023 14:15
@mutianf mutianf requested a review from a team as a code owner October 24, 2023 14:15
@mutianf mutianf changed the title feat: client sends retry cookie back to server feat: client sends routing cookie back to server Nov 14, 2023
igorbernstein2
igorbernstein2 requested changes Nov 14, 2023
View reviewed changes
...e-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookieInterceptor.java Outdated Show resolved Hide resolved
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java Outdated Show resolved Hide resolved
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java Outdated Show resolved Hide resolved
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java Outdated Show resolved Hide resolved
...ble/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesServerStreamingCallable.java Outdated Show resolved Hide resolved
...loud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesUnaryCallable.java Outdated Show resolved Hide resolved
...loud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesUnaryCallable.java Outdated Show resolved Hide resolved
...table/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java Outdated Show resolved Hide resolved
...le-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookieHolderTest.java Outdated Show resolved Hide resolved
igorbernstein2
igorbernstein2 reviewed Nov 16, 2023
View reviewed changes
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java Show resolved Hide resolved
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java Outdated Show resolved Hide resolved
...-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesInterceptor.java Outdated Show resolved Hide resolved
...e-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java Show resolved Hide resolved
...e-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java Outdated Show resolved Hide resolved
...e-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java Outdated Show resolved Hide resolved
igorbernstein2
igorbernstein2 reviewed Nov 21, 2023
View reviewed changes
...e-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java Outdated Show resolved Hide resolved
...e-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java Outdated
String bytes1 = serverMetadata.get(1).get(ROUTING_COOKIE_1);
String bytes2 = serverMetadata.get(1).get(ROUTING_COOKIE_2);
assertThat(bytes1).isNotNull();
assertThat(bytes1).isEqualTo("readRows");
Copy link
Contributor

Choose a reason for hiding this comment

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

assertThat(bytes1).isEqualTo("readRows"); should cover isNotNull

Copy link
Contributor

Choose a reason for hiding this comment

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

why get(1)? is that the last one? if so please make it explicit

Copy link
Contributor

Choose a reason for hiding this comment

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

Ideally you would add a MetadataSubject and then did something like this:

assertThat(serverMetadata).isNotEmpty();
Metadata lastMd = serverMetadata.get(serverMetadata.size() - 1);

assertThat(serverMetadata.get(lastMd).containsAtLeast(ROUTING_COOKIE_1, "readRows", ROUTING_COOKIE_2, testCookieValue);
assertThat(serverMetadata.get(lastMd).doesNotContainKey(BAD_KEY)

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 don't think I can do assertThat(serverMetadata.get(lastMd).containsAtLeast(ROUTING_COOKIE_1, "readRows", ROUTING_COOKIE_2, testCookieValue); because metadata is not a map :( and I can't get the map out of it :(

Copy link
Contributor

@igorbernstein2 igorbernstein2 Nov 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

with a custom subject you can

@mutianf mutianf requested a review from a team as a code owner November 22, 2023 18:16
@generated-files-bot Generated Files Bot
Copy link

Warning: This pull request is touching the following templated files:

  • .kokoro/build.sh

igorbernstein2
igorbernstein2 approved these changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@igorbernstein2 igorbernstein2 left a comment

Choose a reason for hiding this comment

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

lgtm after the last set of comments

@mutianf mutianf added the owlbot:run Add this label to trigger the Owlbot post processor. label Nov 22, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Nov 22, 2023
@mutianf mutianf added the owlbot:run Add this label to trigger the Owlbot post processor. label Nov 22, 2023
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Nov 22, 2023
@mutianf mutianf merged commit 4c73abd into googleapis:main Nov 27, 2023
19 checks passed
@mutianf mutianf deleted the cookie branch November 27, 2023 15:15
@release-please release-please bot mentioned this pull request Nov 27, 2023
Merged
gcf-merge-on-green bot pushed a commit that referenced this pull request Dec 5, 2023
@release-please
chore(main): release 2.30.0 (#2008)
a28ac9e 
🤖 I have created a release *beep* *boop*
---


## [2.30.0](https://togithub.com/googleapis/java-bigtable/compare/v2.29.1...v2.30.0) (2023-12-05)


### Features

* Client sends routing cookie back to server ([#1888](https://togithub.com/googleapis/java-bigtable/issues/1888)) ([4c73abd](https://togithub.com/googleapis/java-bigtable/commit/4c73abd2f4a07808b591dd9178e87715d2f3008d))


### Dependencies

* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.1 ([#1990](https://togithub.com/googleapis/java-bigtable/issues/1990)) ([7ad70e3](https://togithub.com/googleapis/java-bigtable/commit/7ad70e3abc1af7dfab715386978bf14f02b34e5d))
* Update shared dependencies ([#2016](https://togithub.com/googleapis/java-bigtable/issues/2016)) ([4e49dff](https://togithub.com/googleapis/java-bigtable/commit/4e49dffa72db8dd04e75ca86178d875fab6f566b))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
dbolduc
dbolduc reviewed Dec 12, 2023
View reviewed changes
google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolder.java
import javax.annotation.Nullable;

/** A cookie that holds information for retry or routing */
class CookiesHolder {
Copy link
Member

Choose a reason for hiding this comment

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

I would have called this a CookieJar

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbolduc dbolduc dbolduc left review comments

@igorbernstein2 igorbernstein2 igorbernstein2 approved these changes

Assignees
No one assigned
Labels
api: bigtable Issues related to the googleapis/java-bigtable API. size: l Pull request size is large.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mutianf @dbolduc @igorbernstein2