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: multiple dbs support #928

Merged
merged 13 commits into from
Dec 16, 2022
Merged

feat: multiple dbs support #928

merged 13 commits into from
Dec 16, 2022

Conversation

kolea2
Copy link
Collaborator

@kolea2 kolea2 commented Nov 30, 2022

No description provided.

@kolea2 kolea2 requested review from a team as code owners November 30, 2022 14:50
@product-auto-label product-auto-label bot added the size: l Pull request size is large. label Nov 30, 2022
@generated-files-bot
Copy link

generated-files-bot bot commented Nov 30, 2022 •
edited
Loading

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

  • .kokoro/nightly/integration.cfg
  • .kokoro/nightly/java11-integration.cfg
  • .kokoro/presubmit/graalvm-native.cfg
  • .kokoro/presubmit/integration.cfg

@product-auto-label product-auto-label bot added the api: datastore Issues related to the googleapis/java-datastore API. label Nov 30, 2022
@kolea2 kolea2 added the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 14, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 14, 2022
@kolea2 kolea2 added the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 15, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 15, 2022
@kolea2 kolea2 added the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
mpeddada1
mpeddada1 approved these changes Dec 16, 2022
View reviewed changes
Copy link
Contributor

@mpeddada1 mpeddada1 left a comment

Choose a reason for hiding this comment

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

@kolea2 awesome job with troubleshooting and addressing the native image issues! I've added some comments about naming and the location of the config file but otherwise looks great.

.kokoro/presubmit/graalvm-native-17.cfg
@@ -30,4 +30,9 @@ env_vars: {
env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Let's also merge this PR with main so that it is tested with GraalVM 22.3.0. gcr.io/cloud-devrel-kokoro-resources/graalvm17 was recently upgraded to gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

will do - I will have a followup PR updating this branch, so stay tuned!

.../src/test/resources/META-INF/native-image/com/google/datastore/v1/client/reflect-config.json Outdated Show resolved Hide resolved
.../src/test/resources/META-INF/native-image/com/google/datastore/v1/client/reflect-config.json Outdated Show resolved Hide resolved
@mpeddada1 mpeddada1 mentioned this pull request Dec 16, 2022
Open
@kolea2 kolea2 added the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
@kolea2 kolea2 added automerge Merge the pull request once unit tests and other checks pass. owlbot:run Add this label to trigger the Owlbot post processor. labels Dec 16, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
mpeddada1
mpeddada1 reviewed Dec 16, 2022
View reviewed changes
datastore-v1-proto-client/src/main/resources/META-INF/native-image/reflect-config.json Outdated
@@ -29,5 +29,55 @@
"allPublicMethods":true,
"allDeclaredConstructors" : true,
"allPublicConstructors" : true
}
},
[
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah looks like we have an extra [ ] that's causing the graalvm job failure.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

😆 good catch, thanks!

@kolea2 kolea2 added the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
@gcf-owl-bot gcf-owl-bot bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Dec 16, 2022
@kolea2 kolea2 merged commit fab1ece into googleapis:multi-db Dec 16, 2022
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge the pull request once unit tests and other checks pass. label Dec 16, 2022
kolea2 added a commit to kolea2/java-datastore that referenced this pull request May 24, 2023
@kolea2
cherry pick of googleapis#928
577539f
@kolea2 kolea2 mentioned this pull request Jun 6, 2023
Merged
gcf-merge-on-green bot pushed a commit that referenced this pull request Jun 8, 2023
@kolea2
feat: multiple dbs support (#1102)
7887f32 
This PR consists of cherry picks from the https://github.com/googleapis/java-datastore/tree/multi-db branch. They include:

#928 
#940 
#942 

This also enables parameterized testing for ITDatastoreTest.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpeddada1 mpeddada1 mpeddada1 approved these changes

@jainsahab jainsahab jainsahab approved these changes

Assignees
No one assigned
Labels
api: datastore Issues related to the googleapis/java-datastore 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
@kolea2 @jainsahab @mpeddada1