From ca81bbc3d07360791e003e008440db81c695a502 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 14:56:16 +0000 Subject: [PATCH 01/15] chore(main): release 6.33.1-SNAPSHOT (#2167) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index a09ec737bff..1e7aaa3ebdc 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.33.0 + 6.33.1-SNAPSHOT pom com.google.cloud @@ -53,43 +53,43 @@ com.google.cloud google-cloud-spanner - 6.33.0 + 6.33.1-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 42c4cbfc818..c415fd1cac7 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.33.0 + 6.33.1-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 2f66ddb18fb..d2280d3c8b3 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 9163309605b..de07a4ef4de 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index fe0f0837d2d..fef5274c001 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 74134a3e62a..660b879111a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.33.0 + 6.33.1-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT com.google.cloud google-cloud-spanner - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index b6d688336b7..0c8e9de8eae 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.0 + 6.33.1-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index e615a5a5366..99e65d7e92e 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.0 + 6.33.1-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 9f44563ec73..6db754638cd 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.0 + 6.33.1-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 554bafaed14..4b924d2ec6e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.33.0 + 6.33.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 038bb96ac5b..97f41c7416f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.0 -proto-google-cloud-spanner-v1:6.33.0:6.33.0 -proto-google-cloud-spanner-admin-database-v1:6.33.0:6.33.0 -grpc-google-cloud-spanner-v1:6.33.0:6.33.0 -grpc-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.0 -grpc-google-cloud-spanner-admin-database-v1:6.33.0:6.33.0 -google-cloud-spanner:6.33.0:6.33.0 +proto-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.1-SNAPSHOT +proto-google-cloud-spanner-v1:6.33.0:6.33.1-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:6.33.0:6.33.1-SNAPSHOT +grpc-google-cloud-spanner-v1:6.33.0:6.33.1-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.1-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:6.33.0:6.33.1-SNAPSHOT +google-cloud-spanner:6.33.0:6.33.1-SNAPSHOT From 56f91293716621572a3483b8490933eecb575e15 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 17 Nov 2022 22:39:28 +0100 Subject: [PATCH 02/15] chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.33.0 (#2168) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-spanner to v6.33.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 6 +++--- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fad7a98ef09..d0f5134d6df 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-spanner - 6.32.0 + 6.33.0 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-spanner' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.32.0' +implementation 'com.google.cloud:google-cloud-spanner:6.33.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.32.0" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.33.0" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6fe651c6e93..6c96e112de5 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.32.0 + 6.33.0 From ddd062527674659ca2ea73e079bca4dee62ca67f Mon Sep 17 00:00:00 2001 From: Robert Wang Date: Thu, 17 Nov 2022 20:14:14 -0800 Subject: [PATCH 03/15] fix: remove the statement of session number limits (#1928) Cloud Spanner no longer has the 10K "Sessions per database per node" limit. Doc fix only Fixes #1927 --- .../src/main/java/com/google/cloud/spanner/Session.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java index 697521554e9..d322e0fb6d0 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java @@ -28,10 +28,9 @@ * read-write/write-only transactions, create multiple sessions. Note that standalone reads and * queries use a transaction internally, and count toward the one transaction limit. * - *

Cloud Spanner limits the number of sessions that can exist at any given time; thus, it is a - * good idea to delete idle and/or unneeded sessions. Aside from explicit deletes, Cloud Spanner can - * delete sessions for which no operations are sent for more than an hour, or due to internal - * errors. If a session is deleted, requests to it return {@link ErrorCode#NOT_FOUND}. + *

It is a good idea to delete idle and/or unneeded sessions. Aside from explicit deletes, Cloud + * Spanner can delete sessions for which no operations are sent for more than an hour, or due to + * internal errors. If a session is deleted, requests to it return {@link ErrorCode#NOT_FOUND}. * *

Idle sessions can be kept alive by sending a trivial SQL query periodically, for example, * {@code SELECT 1}. From 5adeddf2179c1cc722fa8c462be25a68b31f6458 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 18 Nov 2022 23:12:18 +0100 Subject: [PATCH 04/15] chore(deps): update dependency com.google.cloud:libraries-bom to v26.1.5 (#2170) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.1.4` -> `26.1.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/compatibility-slim/26.1.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.5/confidence-slim/26.1.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- README.md | 4 ++-- samples/native-image/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d0f5134d6df..3e782b61cae 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.1.4 + 26.1.5 pom import @@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.1.4') +implementation platform('com.google.cloud:libraries-bom:26.1.5') implementation 'com.google.cloud:google-cloud-spanner' ``` diff --git a/samples/native-image/pom.xml b/samples/native-image/pom.xml index 0391300694f..56216c3d4cf 100644 --- a/samples/native-image/pom.xml +++ b/samples/native-image/pom.xml @@ -28,7 +28,7 @@ com.google.cloud libraries-bom - 26.1.4 + 26.1.5 pom import diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 39061fea820..5f03bb34b98 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -33,7 +33,7 @@ com.google.cloud libraries-bom - 26.1.4 + 26.1.5 pom import From f3487805fe5f976596e94047c3796bc623eeae95 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 21 Nov 2022 22:07:59 +0100 Subject: [PATCH 05/15] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 (#2171) --- samples/native-image/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image/pom.xml b/samples/native-image/pom.xml index 56216c3d4cf..0425bc71500 100644 --- a/samples/native-image/pom.xml +++ b/samples/native-image/pom.xml @@ -109,7 +109,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.17 + 0.9.18 test From dcdd2c3b684e38892fac0abbdf06081e9c7d83b2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 21 Nov 2022 23:16:15 +0100 Subject: [PATCH 06/15] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 (#2145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.16` -> `0.9.18` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.18/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.18/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.18/compatibility-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.18/confidence-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes

graalvm/native-build-tools ### [`v0.9.18`](https://togithub.com/graalvm/native-build-tools/compare/0.9.17...0.9.18) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.17...0.9.18) ### [`v0.9.17`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.17) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Make GraalVM installation check lazy by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/345](https://togithub.com/graalvm/native-build-tools/pull/345) - Add a check for the minimal GraalVM version by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/353](https://togithub.com/graalvm/native-build-tools/pull/353) - Bump metadata repo version to 0.2.4 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/356](https://togithub.com/graalvm/native-build-tools/pull/356) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner). --- samples/native-image/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/native-image/pom.xml b/samples/native-image/pom.xml index 0425bc71500..f134552ae5a 100644 --- a/samples/native-image/pom.xml +++ b/samples/native-image/pom.xml @@ -130,7 +130,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.16 + 0.9.18 true com.example.spanner.NativeImageSpannerSample From 028505b26f8da0541e8e281fc5f6646b469b332d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 22:18:11 -0500 Subject: [PATCH 07/15] chore: require hashes when installing dependencies in owlbot postprocessor job (#1691) (#2138) * chore: install dependencies through requirements file Source-Link: https://github.com/googleapis/synthtool/commit/35f4cbaf1295a726cb43fd4471129ec74b48e04e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:821ab7aba89af2c7907e29297bba024d4cd5366d0684e5eb463391cdf4edc9ee Co-authored-by: Owl Bot Co-authored-by: Diego Alonso Marquez Palacios --- .github/.OwlBot.lock.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index c1e4d2da2a8..202e7084cba 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -14,3 +14,4 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest digest: sha256:a57d2ea6d1a77aa96c17ad0850b779ec6295f88b6c1da3d214b2095d140a2066 + From 19058b4cd324ce33e8dd52447bde2486c87d4754 Mon Sep 17 00:00:00 2001 From: Sri Harsha CH <57220027+harshachinta@users.noreply.github.com> Date: Mon, 5 Dec 2022 06:27:27 +0000 Subject: [PATCH 08/15] fix: update samples/snippets pom.xml configuration to avoid fat jar (#2100) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: update samples/snippets pom.xml configuration to avoid fat jar * fix: refactor path of jar creation and remove assembly-descriptor.xml file * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- samples/snippets/assembly-descriptor.xml | 27 ----------- samples/snippets/pom.xml | 61 ++++++++++++++++++------ 2 files changed, 46 insertions(+), 42 deletions(-) delete mode 100644 samples/snippets/assembly-descriptor.xml diff --git a/samples/snippets/assembly-descriptor.xml b/samples/snippets/assembly-descriptor.xml deleted file mode 100644 index 8a9e7f8f500..00000000000 --- a/samples/snippets/assembly-descriptor.xml +++ /dev/null @@ -1,27 +0,0 @@ - - jar-with-dependencies - - jar - - false - - - / - false - true - - - io.grpc.LoadBalancerProvider - - - - - - - ${project.build.outputDirectory} - . - - - diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 5f03bb34b98..79b88560263 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -115,30 +115,61 @@ - spanner-google-cloud-samples - maven-assembly-plugin - 3.4.2 + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${project.build.directory}/spanner-snippets + + + resources + true + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/spanner-snippets/lib + false + false + true + + + + + + org.apache.maven.plugins + maven-jar-plugin - - assembly-descriptor.xml - + spanner-snippets/spanner-google-cloud-samples + false com.example.spanner.SpannerSample + true + lib/ - - - make-assembly - package - - single - - - org.apache.maven.plugins From d82115d82743d4a414a519d088c389017a1d7b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Mon, 5 Dec 2022 12:19:45 +0100 Subject: [PATCH 09/15] test: mock Spanner did not create jsonb parameters (#2182) The mock Spanner server that is used for testing did not create statements with PG JSONB typed parameters. Instead, all parameters with TypeCode JSON would create statements with parameters of type JSON, regardless of any TypeAnnotationCode. --- .../cloud/spanner/MockSpannerServiceImpl.java | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java index 340f999d8ee..29ab79450b5 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java @@ -1289,7 +1289,11 @@ private Statement buildStatement( builder.bind(fieldName).toTimestampArray(null); break; case JSON: - builder.bind(fieldName).toJsonArray(null); + if (elementType.getTypeAnnotation() == TypeAnnotationCode.PG_JSONB) { + builder.bind(fieldName).toPgJsonbArray(null); + } else { + builder.bind(fieldName).toJsonArray(null); + } break; case STRUCT: case TYPE_CODE_UNSPECIFIED: @@ -1331,7 +1335,11 @@ private Statement buildStatement( builder.bind(fieldName).to((com.google.cloud.Timestamp) null); break; case JSON: - builder.bind(fieldName).to(Value.json(null)); + if (fieldType.getTypeAnnotation() == TypeAnnotationCode.PG_JSONB) { + builder.bind(fieldName).to(Value.pgJsonb(null)); + } else { + builder.bind(fieldName).to(Value.json(null)); + } break; case TYPE_CODE_UNSPECIFIED: case UNRECOGNIZED: @@ -1416,12 +1424,21 @@ private Statement buildStatement( com.google.cloud.spanner.Type.timestamp(), value.getListValue())); break; case JSON: - builder - .bind(fieldName) - .toJsonArray( - (Iterable) - GrpcStruct.decodeArrayValue( - com.google.cloud.spanner.Type.json(), value.getListValue())); + if (elementType.getTypeAnnotation() == TypeAnnotationCode.PG_JSONB) { + builder + .bind(fieldName) + .toPgJsonbArray( + (Iterable) + GrpcStruct.decodeArrayValue( + com.google.cloud.spanner.Type.pgJsonb(), value.getListValue())); + } else { + builder + .bind(fieldName) + .toJsonArray( + (Iterable) + GrpcStruct.decodeArrayValue( + com.google.cloud.spanner.Type.json(), value.getListValue())); + } break; case STRUCT: case TYPE_CODE_UNSPECIFIED: @@ -1464,7 +1481,11 @@ private Statement buildStatement( .to(com.google.cloud.Timestamp.parseTimestamp(value.getStringValue())); break; case JSON: - builder.bind(fieldName).to(Value.json(value.getStringValue())); + if (fieldType.getTypeAnnotation() == TypeAnnotationCode.PG_JSONB) { + builder.bind(fieldName).to(Value.pgJsonb(value.getStringValue())); + } else { + builder.bind(fieldName).to(Value.json(value.getStringValue())); + } break; case TYPE_CODE_UNSPECIFIED: case UNRECOGNIZED: From 074cd1abde59cf8fc0a80d1e49b308b5b2506139 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:03:48 -0500 Subject: [PATCH 10/15] chore: upgrade native image checks to graalvm-22.3.0 (#1718) (#2177) chore: upgrade native image checks to graalvm-22.3.0 Source-Link: https://github.com/googleapis/synthtool/commit/5e52896b69b145a3fac6827e4e75e617abdc9dd8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 3 +-- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 202e7084cba..4ca0036da32 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a57d2ea6d1a77aa96c17ad0850b779ec6295f88b6c1da3d214b2095d140a2066 - + digest: sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index a3f7fb9d494..e20330c3ca6 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 4c7225ec924..0fd6ba2fa0c 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0" } env_vars: { From e237a213cf5cb5edc338ca4e5f8ad5dd0593d2d1 Mon Sep 17 00:00:00 2001 From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com> Date: Tue, 6 Dec 2022 03:18:14 +0530 Subject: [PATCH 11/15] feat: setting up 6.33.x branch (#2184) enable releases --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index d0d8ce428c2..45821c154cf 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -26,3 +26,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.23.x + - releaseType: java-yoshi + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.33.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 87ddc5b58dc..167e52ec6dc 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -107,6 +107,20 @@ branchProtectionRules: - checkstyle - compile (8) - compile (11) + - pattern: 6.33.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - lint + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - checkstyle + - compile (8) + - compile (11) permissionRules: - team: yoshi-admins permission: admin From 4d74a0d8ae48e190c126ab4047b81cca117f4de1 Mon Sep 17 00:00:00 2001 From: Roman Slyusarchuk Date: Tue, 6 Dec 2022 09:01:15 -0800 Subject: [PATCH 12/15] fix: use a proper endpoint for DirectPath tests (#2186) * fix: use a proper endpoint for DirectPath tests --- .../test/java/com/google/cloud/spanner/GceTestEnvConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java index ab8e3933f9f..7a27123bdc3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java @@ -53,7 +53,7 @@ public class GceTestEnvConfig implements TestEnvConfig { public static final String DP_IPV6_PREFIX = "2001:4860:8040"; public static final String DP_IPV4_PREFIX = "34.126"; - private static final String DIRECT_PATH_ENDPOINT = "aa423245250f2bbf.sandbox.googleapis.com:443"; + private static final String DIRECT_PATH_ENDPOINT = "wrenchworks-nonprod.googleapis.com:443"; private final SpannerOptions options; From f85391885b78f3ec1fc6a0d784c9282afcc51255 Mon Sep 17 00:00:00 2001 From: Gaurav Purohit Date: Wed, 7 Dec 2022 22:53:14 +0530 Subject: [PATCH 13/15] refactor: Removing duplicated code to handle array values (#2143) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: Removing duplicated code to handle array values The same deserialization logic for data types have been duplicated at multiple places which is prone to error. * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * refactor: Using lazy computation for all the data types and adding docs Co-authored-by: Owl Bot --- .../cloud/spanner/AbstractResultSet.java | 71 +---------- .../google/cloud/spanner/StructReader.java | 112 ++++++++++++++---- 2 files changed, 93 insertions(+), 90 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java index fdbea3335b9..789e0945e17 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java @@ -67,7 +67,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import javax.annotation.Nullable; /** Implementation of {@link ResultSet}. */ @@ -547,88 +546,24 @@ private static Struct decodeStructValue(Type structType, ListValue structValue) static Object decodeArrayValue(Type elementType, ListValue listValue) { switch (elementType.getCode()) { - case BOOL: - // Use a view: element conversion is virtually free. - return Lists.transform( - listValue.getValuesList(), - input -> input.getKindCase() == KindCase.NULL_VALUE ? null : input.getBoolValue()); case INT64: // For int64/float64 types, use custom containers. These avoid wrapper object // creation for non-null arrays. return new Int64Array(listValue); case FLOAT64: return new Float64Array(listValue); + case BOOL: case NUMERIC: - { - // Materialize list: element conversion is expensive and should happen only once. - ArrayList list = new ArrayList<>(listValue.getValuesCount()); - for (com.google.protobuf.Value value : listValue.getValuesList()) { - list.add( - value.getKindCase() == KindCase.NULL_VALUE - ? null - : new BigDecimal(value.getStringValue())); - } - return list; - } case PG_NUMERIC: case STRING: case JSON: case PG_JSONB: - return listValue.getValuesList().stream() - .map( - input -> - input.getKindCase() == KindCase.NULL_VALUE ? null : input.getStringValue()) - .collect(Collectors.toList()); case BYTES: - { - // Materialize list: element conversion is expensive and should happen only once. - ArrayList list = new ArrayList<>(listValue.getValuesCount()); - for (com.google.protobuf.Value value : listValue.getValuesList()) { - list.add( - value.getKindCase() == KindCase.NULL_VALUE - ? null - : ByteArray.fromBase64(value.getStringValue())); - } - return list; - } case TIMESTAMP: - { - // Materialize list: element conversion is expensive and should happen only once. - ArrayList list = new ArrayList<>(listValue.getValuesCount()); - for (com.google.protobuf.Value value : listValue.getValuesList()) { - list.add( - value.getKindCase() == KindCase.NULL_VALUE - ? null - : Timestamp.parseTimestamp(value.getStringValue())); - } - return list; - } case DATE: - { - // Materialize list: element conversion is expensive and should happen only once. - ArrayList list = new ArrayList<>(listValue.getValuesCount()); - for (com.google.protobuf.Value value : listValue.getValuesList()) { - list.add( - value.getKindCase() == KindCase.NULL_VALUE - ? null - : Date.parseDate(value.getStringValue())); - } - return list; - } - case STRUCT: - { - ArrayList list = new ArrayList<>(listValue.getValuesCount()); - for (com.google.protobuf.Value value : listValue.getValuesList()) { - if (value.getKindCase() == KindCase.NULL_VALUE) { - list.add(null); - } else { - ListValue structValue = value.getListValue(); - list.add(decodeStructValue(elementType, structValue)); - } - } - return list; - } + return Lists.transform( + listValue.getValuesList(), input -> decodeValue(elementType, input)); default: throw new AssertionError("Unhandled type code: " + elementType.getCode()); } diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java index a96c95cb953..b767bd6d82c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java @@ -178,10 +178,18 @@ default Value getValue(String columnName) { */ boolean[] getBooleanArray(String columnName); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bool())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bool())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getBooleanList(int columnIndex); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bool())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bool())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getBooleanList(String columnName); /** @@ -200,10 +208,18 @@ default Value getValue(String columnName) { */ long[] getLongArray(String columnName); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.int64())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.int64())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getLongList(int columnIndex); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.int64())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.int64())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getLongList(String columnName); /** @@ -223,84 +239,136 @@ default Value getValue(String columnName) { double[] getDoubleArray(String columnName); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.float64())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.float64())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ List getDoubleList(int columnIndex); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.float64())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.float64())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ List getDoubleList(String columnName); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.numeric())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.numeric())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ List getBigDecimalList(int columnIndex); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.numeric())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.numeric())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ List getBigDecimalList(String columnName); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.string())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.string())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getStringList(int columnIndex); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.string())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.string())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getStringList(String columnName); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.json())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.json())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ default List getJsonList(int columnIndex) { throw new UnsupportedOperationException("method should be overwritten"); }; - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.json())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.json())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ default List getJsonList(String columnName) { throw new UnsupportedOperationException("method should be overwritten"); }; /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.pgJsonb())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.pgJsonb())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ default List getPgJsonbList(int columnIndex) { throw new UnsupportedOperationException("method should be overwritten"); }; /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.pgJsonb())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.pgJsonb())} The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. */ default List getPgJsonbList(String columnName) { throw new UnsupportedOperationException("method should be overwritten"); }; - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bytes())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bytes())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getBytesList(int columnIndex); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bytes())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.bytes())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getBytesList(String columnName); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.timestamp())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.timestamp())} + * The list returned by this method is lazily constructed. Create a copy of it if you intend to + * access each element in the list multiple times. */ List getTimestampList(int columnIndex); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.timestamp())}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.timestamp())} + * The list returned by this method is lazily constructed. Create a copy of it if you intend to + * access each element in the list multiple times. */ List getTimestampList(String columnName); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.date())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.date())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getDateList(int columnIndex); - /** Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.date())}. */ + /** + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.date())}. The + * list returned by this method is lazily constructed. Create a copy of it if you intend to access + * each element in the list multiple times. + */ List getDateList(String columnName); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.struct(...))}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.struct(...))} + * The list returned by this method is lazily constructed. Create a copy of it if you intend to + * access each element in the list multiple times. */ List getStructList(int columnIndex); /** - * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.struct(...))}. + * Returns the value of a non-{@code NULL} column with type {@code Type.array(Type.struct(...))} + * The list returned by this method is lazily constructed. Create a copy of it if you intend to + * access each element in the list multiple times. */ List getStructList(String columnName); } From b81000e0d76ec6d093428261833e6d7ae4cb0090 Mon Sep 17 00:00:00 2001 From: Gaurav Purohit Date: Mon, 12 Dec 2022 21:35:05 +0530 Subject: [PATCH 14/15] chore: Adding Kokoro configuration to run integration test against staging (#2189) chore: Adding Kokoro configuration to run integration test against staging --- .kokoro/build.sh | 16 +++++++++++++ .kokoro/nightly/integration-staging.cfg | 32 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 .kokoro/nightly/integration-staging.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 750b4915792..421141c76be 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -86,6 +86,22 @@ integration) verify RETURN_CODE=$? ;; +integration-staging) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ + -Penable-integration-tests \ + -Djava.net.preferIPv4Stack=true \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.main.skip=true \ + -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ + -Dspanner.testenv.instance=projects/span-cloud-testing/instances/gaurav-test-instance \ + -Dspanner.gce.config.project_id=span-cloud-testing + -fae \ + verify + RETURN_CODE=$? + ;; graalvm) # Run Unit and Integration Tests with Native Image mvn test -Pnative -Penable-integration-tests diff --git a/.kokoro/nightly/integration-staging.cfg b/.kokoro/nightly/integration-staging.cfg new file mode 100644 index 00000000000..ea89f65a3a6 --- /dev/null +++ b/.kokoro/nightly/integration-staging.cfg @@ -0,0 +1,32 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration-staging" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} From 6c3e3ccd278145337c05f33d81dd5bbe1c1e2c36 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 05:00:19 +0000 Subject: [PATCH 15/15] chore(main): release 6.34.0 (#2169) :robot: I have created a release *beep* *boop* --- ## [6.34.0](https://togithub.com/googleapis/java-spanner/compare/v6.33.0...v6.34.0) (2022-12-12) ### Features * Setting up 6.33.x branch ([#2184](https://togithub.com/googleapis/java-spanner/issues/2184)) ([e237a21](https://togithub.com/googleapis/java-spanner/commit/e237a213cf5cb5edc338ca4e5f8ad5dd0593d2d1)) ### Bug Fixes * Remove the statement of session number limits ([#1928](https://togithub.com/googleapis/java-spanner/issues/1928)) ([ddd0625](https://togithub.com/googleapis/java-spanner/commit/ddd062527674659ca2ea73e079bca4dee62ca67f)), closes [#1927](https://togithub.com/googleapis/java-spanner/issues/1927) * Update samples/snippets pom.xml configuration to avoid fat jar ([#2100](https://togithub.com/googleapis/java-spanner/issues/2100)) ([19058b4](https://togithub.com/googleapis/java-spanner/commit/19058b4cd324ce33e8dd52447bde2486c87d4754)) * Use a proper endpoint for DirectPath tests ([#2186](https://togithub.com/googleapis/java-spanner/issues/2186)) ([4d74a0d](https://togithub.com/googleapis/java-spanner/commit/4d74a0d8ae48e190c126ab4047b81cca117f4de1)) ### Dependencies * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#2171](https://togithub.com/googleapis/java-spanner/issues/2171)) ([f348780](https://togithub.com/googleapis/java-spanner/commit/f3487805fe5f976596e94047c3796bc623eeae95)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#2145](https://togithub.com/googleapis/java-spanner/issues/2145)) ([dcdd2c3](https://togithub.com/googleapis/java-spanner/commit/dcdd2c3b684e38892fac0abbdf06081e9c7d83b2)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 20 +++++++++++++++++++ google-cloud-spanner-bom/pom.xml | 18 ++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 +++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 ++++++------- 12 files changed, 59 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2131d9423bc..a42cd255d57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [6.34.0](https://github.com/googleapis/java-spanner/compare/v6.33.0...v6.34.0) (2022-12-12) + + +### Features + +* Setting up 6.33.x branch ([#2184](https://github.com/googleapis/java-spanner/issues/2184)) ([e237a21](https://github.com/googleapis/java-spanner/commit/e237a213cf5cb5edc338ca4e5f8ad5dd0593d2d1)) + + +### Bug Fixes + +* Remove the statement of session number limits ([#1928](https://github.com/googleapis/java-spanner/issues/1928)) ([ddd0625](https://github.com/googleapis/java-spanner/commit/ddd062527674659ca2ea73e079bca4dee62ca67f)), closes [#1927](https://github.com/googleapis/java-spanner/issues/1927) +* Update samples/snippets pom.xml configuration to avoid fat jar ([#2100](https://github.com/googleapis/java-spanner/issues/2100)) ([19058b4](https://github.com/googleapis/java-spanner/commit/19058b4cd324ce33e8dd52447bde2486c87d4754)) +* Use a proper endpoint for DirectPath tests ([#2186](https://github.com/googleapis/java-spanner/issues/2186)) ([4d74a0d](https://github.com/googleapis/java-spanner/commit/4d74a0d8ae48e190c126ab4047b81cca117f4de1)) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.18 ([#2171](https://github.com/googleapis/java-spanner/issues/2171)) ([f348780](https://github.com/googleapis/java-spanner/commit/f3487805fe5f976596e94047c3796bc623eeae95)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.18 ([#2145](https://github.com/googleapis/java-spanner/issues/2145)) ([dcdd2c3](https://github.com/googleapis/java-spanner/commit/dcdd2c3b684e38892fac0abbdf06081e9c7d83b2)) + ## [6.33.0](https://github.com/googleapis/java-spanner/compare/v6.32.0...v6.33.0) (2022-11-17) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 1e7aaa3ebdc..ab10695432e 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.33.1-SNAPSHOT + 6.34.0 pom com.google.cloud @@ -53,43 +53,43 @@ com.google.cloud google-cloud-spanner - 6.33.1-SNAPSHOT + 6.34.0 com.google.cloud google-cloud-spanner test-jar - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index c415fd1cac7..8f3fd5978c4 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.33.1-SNAPSHOT + 6.34.0 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index d2280d3c8b3..291ea157c3a 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index de07a4ef4de..fae6478c7a8 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index fef5274c001..b898649cf39 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/pom.xml b/pom.xml index 660b879111a..652d8d9fd44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.33.1-SNAPSHOT + 6.34.0 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 com.google.cloud google-cloud-spanner - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index 0c8e9de8eae..fa7c95abd5f 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.33.1-SNAPSHOT + 6.34.0 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 99e65d7e92e..fd5ab4f350d 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.33.1-SNAPSHOT + 6.34.0 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 6db754638cd..28743a2a639 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.33.1-SNAPSHOT + 6.34.0 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4b924d2ec6e..e4844a745b1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.33.1-SNAPSHOT + 6.34.0 diff --git a/versions.txt b/versions.txt index 97f41c7416f..6dc1e7ccffd 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.1-SNAPSHOT -proto-google-cloud-spanner-v1:6.33.0:6.33.1-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:6.33.0:6.33.1-SNAPSHOT -grpc-google-cloud-spanner-v1:6.33.0:6.33.1-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:6.33.0:6.33.1-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:6.33.0:6.33.1-SNAPSHOT -google-cloud-spanner:6.33.0:6.33.1-SNAPSHOT +proto-google-cloud-spanner-admin-instance-v1:6.34.0:6.34.0 +proto-google-cloud-spanner-v1:6.34.0:6.34.0 +proto-google-cloud-spanner-admin-database-v1:6.34.0:6.34.0 +grpc-google-cloud-spanner-v1:6.34.0:6.34.0 +grpc-google-cloud-spanner-admin-instance-v1:6.34.0:6.34.0 +grpc-google-cloud-spanner-admin-database-v1:6.34.0:6.34.0 +google-cloud-spanner:6.34.0:6.34.0