From 669a68048607478c2dd14caa5785110d1f26f95c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 21:08:03 +0000 Subject: [PATCH 01/19] chore: release 1.25.1-SNAPSHOT (#822) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-bigtable-bom/pom.xml | 14 +++++++------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator/pom.xml | 8 ++++---- google-cloud-bigtable/pom.xml | 10 +++++----- grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++---- pom.xml | 2 +- proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 209383476e..7d300a728c 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.25.0 + 1.25.1-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator - 0.134.0 + 0.134.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.25.0 + 1.25.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.25.0 + 1.25.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.25.0 + 1.25.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.25.0 + 1.25.1-SNAPSHOT diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index fafd8b4999..4fcdaf021b 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 36589179a0..8098fae1dd 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.134.0 + 0.134.1-SNAPSHOT Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index ad986f5ce3..d1021dfd22 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.25.0 + 1.25.1-SNAPSHOT jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT - 1.25.0 + 1.25.1-SNAPSHOT google-cloud-bigtable @@ -39,14 +39,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index a41b19e5d8..06414a5a95 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.25.0 + 1.25.1-SNAPSHOT grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index b9548e215f..ebf24967af 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.25.0 + 1.25.1-SNAPSHOT grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 9ad62891e2..b5f43fa80b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.25.0 + 1.25.1-SNAPSHOT Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index dddaa9559e..4549dabde3 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.25.0 + 1.25.1-SNAPSHOT proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 8ef7feca6d..75a126a440 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.25.0 + 1.25.1-SNAPSHOT proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.0 + 1.25.1-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.25.0 + 1.25.1-SNAPSHOT pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 66f6be6be8..2a1622f3bc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.25.0 + 1.25.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index c9c1b91bfa..401b68e140 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.25.0:1.25.0 -grpc-google-cloud-bigtable-admin-v2:1.25.0:1.25.0 -grpc-google-cloud-bigtable-v2:1.25.0:1.25.0 -proto-google-cloud-bigtable-admin-v2:1.25.0:1.25.0 -proto-google-cloud-bigtable-v2:1.25.0:1.25.0 -google-cloud-bigtable-emulator:0.134.0:0.134.0 +google-cloud-bigtable:1.25.0:1.25.1-SNAPSHOT +grpc-google-cloud-bigtable-admin-v2:1.25.0:1.25.1-SNAPSHOT +grpc-google-cloud-bigtable-v2:1.25.0:1.25.1-SNAPSHOT +proto-google-cloud-bigtable-admin-v2:1.25.0:1.25.1-SNAPSHOT +proto-google-cloud-bigtable-v2:1.25.0:1.25.1-SNAPSHOT +google-cloud-bigtable-emulator:0.134.0:0.134.1-SNAPSHOT From 7f66e405e0c89590c948389d6aede8e623881f6b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 20 May 2021 21:18:03 +0200 Subject: [PATCH 02/19] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v1.25.0 (#826) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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:google-cloud-bigtable](https://togithub.com/googleapis/java-bigtable) | `1.24.1` -> `1.25.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/1.25.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/1.25.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/1.25.0/compatibility-slim/1.24.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-bigtable/1.25.0/confidence-slim/1.24.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-bigtable ### [`v1.25.0`](https://togithub.com/googleapis/java-bigtable/blob/master/CHANGELOG.md#​1250-httpswwwgithubcomgoogleapisjava-bigtablecomparev1241v1250-2021-05-19) [Compare Source](https://togithub.com/googleapis/java-bigtable/compare/v1.24.1...v1.25.0) ##### Features - add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#​815](https://www.github.com/googleapis/java-bigtable/issues/815)) ([ea558b0](https://www.github.com/googleapis/java-bigtable/commit/ea558b05b369c6131f94e471e5652866a037b948)) ##### Dependencies - update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#​814](https://www.github.com/googleapis/java-bigtable/issues/814)) ([1299d72](https://www.github.com/googleapis/java-bigtable/commit/1299d727066e0aa24319b99d438503ea0cf60d86)) ##### [1.24.1](https://www.github.com/googleapis/java-bigtable/compare/v1.24.0...v1.24.1) (2021-05-11) ##### Bug Fixes - filter limit constant ([#​787](https://www.github.com/googleapis/java-bigtable/issues/787)) ([04f8ad4](https://www.github.com/googleapis/java-bigtable/commit/04f8ad463d1fa9efe0ab941ee5f3d0794baed814)) - fix flaky test ([#​798](https://www.github.com/googleapis/java-bigtable/issues/798)) ([83e0e8c](https://www.github.com/googleapis/java-bigtable/commit/83e0e8cf2cdbc143c10ce0f8b053096d61d5686f)) ##### Dependencies - update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#​805](https://www.github.com/googleapis/java-bigtable/issues/805)) ([a498687](https://www.github.com/googleapis/java-bigtable/commit/a498687d15dd9af35c57b0df6d08c87ef36833da)) ##### Documentation - update the comments in Cloud Bigtable RestoreTable API to reflect the new API capability ([#​804](https://www.github.com/googleapis/java-bigtable/issues/804)) ([f5e5d5a](https://www.github.com/googleapis/java-bigtable/commit/f5e5d5ac196529d5b070ef5fd8118038fec2e2de))
--- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6a596bf71e..72051aae72 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 1.24.1 + 1.25.0 From f48b913207f31612df211bc28747e22f8f702b2c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 20 May 2021 12:36:03 -0700 Subject: [PATCH 03/19] chore: regenerate README (#827) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-20 19:20:18,830 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-20 19:20:20,178 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/fb585fea-e9b1-4610-9b28-a6b2e90ff752/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9523420418..ecc921f17d 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "06a08e1121d0baa61a3342009ce208d3be305a18" + "sha": "7f66e405e0c89590c948389d6aede8e623881f6b" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ] diff --git a/README.md b/README.md index f350365665..f7422d3ee0 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 1.24.1 + 1.25.0 ``` @@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-bigtable' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigtable:1.24.1' +compile 'com.google.cloud:google-cloud-bigtable:1.25.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.24.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.25.0" ``` ## Authentication From ebf6d1dfc13162e7239b276f7eaaba2d9ead7fe5 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Thu, 20 May 2021 16:36:42 -0400 Subject: [PATCH 04/19] build: configure branch 1.22.0-sp as a release branch (#828) --- .github/release-please.yml | 5 ++ .github/sync-repo-settings.yaml | 82 +++++++++++++++------------------ 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9cabc..bc66f49326 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-lts + branch: 1.22.0-sp diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6bddd18eac..273a781325 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,43 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - pattern: 1.22.0-sp + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push \ No newline at end of file + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push From f91495474cb34e1f178d9362ab0251d364079f6d Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Thu, 20 May 2021 17:41:34 -0400 Subject: [PATCH 05/19] fix: add back in extraFiles and fix file path (#833) --- .github/release-please.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index bc66f49326..6238da1566 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -6,3 +6,5 @@ branches: handleGHRelease: true releaseType: java-lts branch: 1.22.0-sp +extraFiles: + - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java \ No newline at end of file From fbf35f93e2b0575fd3dcb9ca8bb8fb2f0252a1f9 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 20 May 2021 14:48:03 -0700 Subject: [PATCH 06/19] chore: synthtool template regen (#834) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/c9254d7f-caa0-4a8a-89a7-64678caa0903/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/8eae0234a16b26c2ff616d305dbd9786c8b10a47 --- .kokoro/build.sh | 4 ++-- .kokoro/release/publish_javadoc11.sh | 2 +- synth.metadata | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index a26c201b20..42ed274009 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 05fdc5276b..7fced9e0ab 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -38,7 +38,7 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # V3 generates docfx yml from javadoc # generate yml -mvn clean javadoc:aggregate-jar -B -q -P docFX +mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md diff --git a/synth.metadata b/synth.metadata index 63a9f084b3..0930a47c4d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "b660246070999138c04bdca9445efbfe3a128673" + "sha": "ebf6d1dfc13162e7239b276f7eaaba2d9ead7fe5" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], From 848fb1f911d09bd6ce9ad3008a01183783cfadd4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 May 2021 15:16:47 +0200 Subject: [PATCH 07/19] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0 (#837) --- grpc-google-cloud-bigtable-admin-v2/pom.xml | 2 +- grpc-google-cloud-bigtable-v2/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 06414a5a95..1edab74bed 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 protected true diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index ebf24967af..c5a1b75bdc 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 protected true diff --git a/pom.xml b/pom.xml index b5f43fa80b..b99d80abdf 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 aggregate @@ -294,7 +294,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 com.microsoft.doclet.DocFxDoclet false From 1d8bddd4f2a9eef8628d198e6b3beafc920643ca Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 25 May 2021 00:14:48 +0200 Subject: [PATCH 08/19] chore(deps): update dependency com.google.cloud:libraries-bom to v20.5.0 (#839) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index aea4e74a85..1b1a5b0920 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.4.0 + 20.5.0 pom import From faca80b05bfdb1fc9f890d3d55290a4873732484 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 May 2021 15:32:02 -0700 Subject: [PATCH 09/19] chore: regenerate README (#840) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-05-24 22:17:06,041 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-05-24 22:17:07,185 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/30143043-0f12-474c-b2de-0ec8aa8f0632/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index ecc921f17d..006f3c5079 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "7f66e405e0c89590c948389d6aede8e623881f6b" + "sha": "1d8bddd4f2a9eef8628d198e6b3beafc920643ca" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9" } } ] diff --git a/README.md b/README.md index f7422d3ee0..ab1a5bfcbc 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.4.0 + 20.5.0 pom import @@ -45,7 +45,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:20.4.0') +implementation platform('com.google.cloud:libraries-bom:20.5.0') compile 'com.google.cloud:google-cloud-bigtable' ``` From 9df4c6ace6beb5b4eb7d6856d8e2eb2e305483e0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 May 2021 16:19:22 +0200 Subject: [PATCH 10/19] test(deps): update dependency com.google.truth:truth to v1.1.3 (#843) --- pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b99d80abdf..687dcfdb54 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 com.google.truth.extensions diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 72051aae72..3d586b34ee 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -42,7 +42,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2a1622f3bc..63338db577 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -41,7 +41,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1b1a5b0920..305a60b6b3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -53,7 +53,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test From 61262c93513b321409d11fa4c107073cc42002c9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 May 2021 16:22:03 +0200 Subject: [PATCH 11/19] test(deps): update dependency com.google.cloud:google-cloud-conformance-tests to v0.1.0 (#841) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 687dcfdb54..01ab3196e0 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ com.google.cloud google-cloud-conformance-tests - 0.0.13 + 0.1.0 + + * + * + + com.google.truth diff --git a/pom.xml b/pom.xml index 01ab3196e0..41e17b52c6 100644 --- a/pom.xml +++ b/pom.xml @@ -163,20 +163,6 @@ com.google.cloud google-cloud-conformance-tests 0.1.0 - - - - * - * - - com.google.truth From b23b0d7a7d8a2b9bed1cdabce420cb6568cf82ef Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Tue, 1 Jun 2021 10:20:26 -0400 Subject: [PATCH 13/19] fix: revert conformance test version (#846) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41e17b52c6..f69775533c 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ com.google.cloud google-cloud-conformance-tests - 0.1.0 + 0.0.13 com.google.truth From 8b9c52cbccf0bee1c518c8ad6be9bd573c200b3c Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Wed, 2 Jun 2021 15:42:02 -0400 Subject: [PATCH 14/19] Revert "fix: revert conformance test version" (#849) Undo revert, the issue was caused by an old maven version in internal tests which has been updated --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f69775533c..41e17b52c6 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ com.google.cloud google-cloud-conformance-tests - 0.0.13 + 0.1.0 com.google.truth From e1c951c549bf455cdd6e997756d9464a1e06dad2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Jun 2021 22:16:33 +0200 Subject: [PATCH 15/19] deps: update dependency com.google.cloud:google-cloud-conformance-tests to v0.1.1 (#852) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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:google-cloud-conformance-tests](https://togithub.com/googleapis/java-shared-config) | `0.1.0` -> `0.1.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-conformance-tests/0.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-conformance-tests/0.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-conformance-tests/0.1.1/compatibility-slim/0.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-conformance-tests/0.1.1/confidence-slim/0.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v0.1.1`](https://togithub.com/googleapis/java-shared-config/releases/v0.1.1) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.1.0...v0.1.1) 09-06-2019 15:05 PDT ##### Bug Fixes - use upper bounds checks, not full convergence ([#​18](https://togithub.com/googleapis/java-shared-config/pull/18)) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v8.24 ([#​15](https://togithub.com/googleapis/java-shared-config/pull/15)) ##### Internal / Testing Changes - regenerate build files from templates ([#​16](https://togithub.com/googleapis/java-shared-config/pull/16)) - bump next snapshot ([#​17](https://togithub.com/googleapis/java-shared-config/pull/17))
--- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41e17b52c6..e5b96cbd2f 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ com.google.cloud google-cloud-conformance-tests - 0.1.0 + 0.1.1 com.google.truth From 32284d22b635d770a7c76d71b8e1a6a7c0ccae03 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 3 Jun 2021 07:42:20 -0700 Subject: [PATCH 16/19] chore: release gapic-generator-java v1.0.10 (#853) Committer: @miraleung PiperOrigin-RevId: 377081269 Source-Author: Google APIs Source-Date: Wed Jun 2 09:51:13 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: a5f96d06ef57e325761bad010f460d0c5dbeccda Source-Link: https://github.com/googleapis/googleapis/commit/a5f96d06ef57e325761bad010f460d0c5dbeccda --- .../admin/v2/BaseBigtableInstanceAdminClientTest.java | 2 +- synth.metadata | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java index 67b351f1a6..6b4f87e4a6 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java @@ -86,9 +86,9 @@ @Generated("by gapic-generator-java") public class BaseBigtableInstanceAdminClientTest { + private static MockBigtableInstanceAdmin mockBigtableInstanceAdmin; private static MockServiceHelper mockServiceHelper; private BaseBigtableInstanceAdminClient client; - private static MockBigtableInstanceAdmin mockBigtableInstanceAdmin; private LocalChannelProvider channelProvider; @BeforeClass diff --git a/synth.metadata b/synth.metadata index 0930a47c4d..87085c35ad 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "ebf6d1dfc13162e7239b276f7eaaba2d9ead7fe5" + "sha": "e1c951c549bf455cdd6e997756d9464a1e06dad2" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "43d201c7deb4639441d0cbb1c734f1e974b566eb", - "internalRef": "372995286" + "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda", + "internalRef": "377081269" } }, { From 66a9c9ebc520dd20c336a5cf4040912138137be6 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 3 Jun 2021 11:00:51 -0400 Subject: [PATCH 17/19] fix: Fix the race condition in decay average (#850) * fix: Fix the race condition in decay average * fix format * fix * remove initial condition * update * code review * update * use clock and don't decay mean * merge getDecay and getWeight * update * update --- .../data/v2/stub/DynamicFlowControlStats.java | 101 +++++++++--------- .../v2/stub/DynamicFlowControlStatsTest.java | 48 +++++---- 2 files changed, 78 insertions(+), 71 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStats.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStats.java index 4169ac213d..01fabe52cb 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStats.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStats.java @@ -15,48 +15,50 @@ */ package com.google.cloud.bigtable.data.v2.stub; +import com.google.api.core.ApiClock; +import com.google.api.core.InternalApi; +import com.google.api.core.NanoClock; import com.google.api.gax.batching.FlowController; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; /** * Records stats used in dynamic flow control, the decaying average of recorded latencies and the * last timestamp when the thresholds in {@link FlowController} are updated. + * + *
Exponential decaying average = weightedSum / weightedCount, where
+ *   weightedSum(n) = weight(n) * value(n) + weightedSum(n - 1)
+ *   weightedCount(n) = weight(n) + weightedCount(n - 1),
+ * and weight(n) grows exponentially over elapsed time. Biased to the past 5 minutes.
  */
 final class DynamicFlowControlStats {
 
-  private static final double DEFAULT_DECAY_CONSTANT = 0.015; // Biased to the past 5 minutes
+  // Biased to the past 5 minutes (300 seconds), e^(-decay_constant * 300) = 0.01, decay_constant ~=
+  // 0.015
+  private static final double DEFAULT_DECAY_CONSTANT = 0.015;
+  // Update decay cycle start time every 15 minutes so the values won't be infinite
+  private static final long DECAY_CYCLE_SECOND = TimeUnit.MINUTES.toSeconds(15);
 
-  private AtomicLong lastAdjustedTimestampMs;
-  private DecayingAverage meanLatency;
+  private final AtomicLong lastAdjustedTimestampMs;
+  private final DecayingAverage meanLatency;
 
   DynamicFlowControlStats() {
-    this(DEFAULT_DECAY_CONSTANT);
+    this(DEFAULT_DECAY_CONSTANT, NanoClock.getDefaultClock());
   }
 
-  DynamicFlowControlStats(double decayConstant) {
+  @InternalApi("visible for testing")
+  DynamicFlowControlStats(double decayConstant, ApiClock clock) {
     this.lastAdjustedTimestampMs = new AtomicLong(0);
-    this.meanLatency = new DecayingAverage(decayConstant);
+    this.meanLatency = new DecayingAverage(decayConstant, clock);
   }
 
   void updateLatency(long latency) {
-    updateLatency(latency, System.currentTimeMillis());
-  }
-
-  @VisibleForTesting
-  void updateLatency(long latency, long timestampMs) {
-    meanLatency.update(latency, timestampMs);
+    meanLatency.update(latency);
   }
 
+  /** Return the mean calculated from the last update, will not decay over time. */
   double getMeanLatency() {
-    return getMeanLatency(System.currentTimeMillis());
-  }
-
-  @VisibleForTesting
-  double getMeanLatency(long timestampMs) {
-    return meanLatency.getMean(timestampMs);
+    return meanLatency.getMean();
   }
 
   public long getLastAdjustedTimestampMs() {
@@ -71,46 +73,45 @@ private class DecayingAverage {
     private double decayConstant;
     private double mean;
     private double weightedCount;
-    private AtomicLong lastUpdateTimeInSecond;
+    private long decayCycleStartEpoch;
+    private final ApiClock clock;
 
-    DecayingAverage(double decayConstant) {
+    DecayingAverage(double decayConstant, ApiClock clock) {
       this.decayConstant = decayConstant;
       this.mean = 0.0;
       this.weightedCount = 0.0;
-      this.lastUpdateTimeInSecond = new AtomicLong(0);
+      this.clock = clock;
+      this.decayCycleStartEpoch = TimeUnit.MILLISECONDS.toSeconds(clock.millisTime());
     }
 
-    synchronized void update(long value, long timestampMs) {
-      long now = TimeUnit.MILLISECONDS.toSeconds(timestampMs);
-      Preconditions.checkArgument(
-          now >= lastUpdateTimeInSecond.get(), "can't update an event in the past");
-      if (lastUpdateTimeInSecond.get() == 0) {
-        lastUpdateTimeInSecond.set(now);
-        mean = value;
-        weightedCount = 1;
-      } else {
-        long prev = lastUpdateTimeInSecond.getAndSet(now);
-        long elapsed = now - prev;
-        double alpha = getAlpha(elapsed);
-        // Exponential moving average = weightedSum / weightedCount, where
-        // weightedSum(n) = value + alpha * weightedSum(n - 1)
-        // weightedCount(n) = 1 + alpha * weightedCount(n - 1)
-        // Using weighted count in case the sum overflows
-        mean =
-            mean * ((weightedCount * alpha) / (weightedCount * alpha + 1))
-                + value / (weightedCount * alpha + 1);
-        weightedCount = weightedCount * alpha + 1;
-      }
+    synchronized void update(long value) {
+      long now = TimeUnit.MILLISECONDS.toSeconds(clock.millisTime());
+      double weight = getWeight(now);
+      // Using weighted count in case the sum overflows.
+      mean =
+          mean * (weightedCount / (weightedCount + weight))
+              + weight * value / (weightedCount + weight);
+      weightedCount += weight;
     }
 
-    double getMean(long timestampMs) {
-      long timestampSecs = TimeUnit.MILLISECONDS.toSeconds(timestampMs);
-      long elapsed = timestampSecs - lastUpdateTimeInSecond.get();
-      return mean * getAlpha(Math.max(0, elapsed));
+    double getMean() {
+      return mean;
     }
 
-    private double getAlpha(long elapsedSecond) {
-      return Math.exp(-decayConstant * elapsedSecond);
+    private double getWeight(long now) {
+      long elapsedSecond = now - decayCycleStartEpoch;
+      double weight = Math.exp(decayConstant * elapsedSecond);
+      // Decay mean, weightedCount and reset decay cycle start epoch every 15 minutes, so the
+      // values won't be infinite
+      if (elapsedSecond > DECAY_CYCLE_SECOND) {
+        mean /= weight;
+        weightedCount /= weight;
+        decayCycleStartEpoch = now;
+        // After resetting start time, weight = e^0 = 1
+        return 1;
+      } else {
+        return weight;
+      }
     }
   }
 }
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStatsTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStatsTest.java
index 653489f330..2a407dda93 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStatsTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlStatsTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.api.core.ApiClock;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -24,43 +25,48 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public class DynamicFlowControlStatsTest {
 
+  @Rule public final MockitoRule rule = MockitoJUnit.rule();
+
+  @Mock private ApiClock clock;
+
   @Test
   public void testUpdate() {
-    DynamicFlowControlStats stats = new DynamicFlowControlStats();
-    long now = System.currentTimeMillis();
 
-    stats.updateLatency(10, now);
-    assertThat(stats.getMeanLatency(now)).isEqualTo(10);
-
-    stats.updateLatency(10, now);
-    stats.updateLatency(10, now);
-    assertThat(stats.getMeanLatency(now)).isEqualTo(10);
+    Mockito.when(clock.millisTime()).thenReturn(0L);
+    DynamicFlowControlStats stats = new DynamicFlowControlStats(0.015, clock);
+    stats.updateLatency(10);
+    assertThat(stats.getMeanLatency()).isEqualTo(10);
+    stats.updateLatency(10);
+    stats.updateLatency(10);
+    assertThat(stats.getMeanLatency()).isEqualTo(10);
 
     // In five minutes the previous latency should be decayed to under 1. And the new average should
     // be very close to 20
-    long fiveMinutesLater = now + TimeUnit.MINUTES.toMillis(5);
-    assertThat(stats.getMeanLatency(fiveMinutesLater)).isLessThan(1);
-    stats.updateLatency(20, fiveMinutesLater);
-    assertThat(stats.getMeanLatency(fiveMinutesLater)).isGreaterThan(19);
-    assertThat(stats.getMeanLatency(fiveMinutesLater)).isLessThan(20);
-
-    long aDayLater = now + TimeUnit.HOURS.toMillis(24);
-    assertThat(stats.getMeanLatency(aDayLater)).isZero();
+    Mockito.when(clock.millisTime()).thenReturn(TimeUnit.MINUTES.toMillis(5));
+    stats.updateLatency(20);
+    assertThat(stats.getMeanLatency()).isGreaterThan(19);
+    assertThat(stats.getMeanLatency()).isLessThan(20);
 
-    long timestamp = aDayLater;
+    // After a day
+    long aDay = TimeUnit.DAYS.toMillis(1);
     for (int i = 0; i < 10; i++) {
-      timestamp += TimeUnit.SECONDS.toMillis(i);
-      stats.updateLatency(i, timestamp);
+      Mockito.when(clock.millisTime()).thenReturn(aDay + TimeUnit.SECONDS.toMillis(i));
+      stats.updateLatency(i);
     }
-    assertThat(stats.getMeanLatency(timestamp)).isGreaterThan(4.5);
-    assertThat(stats.getMeanLatency(timestamp)).isLessThan(6);
+    assertThat(stats.getMeanLatency()).isGreaterThan(4.5);
+    assertThat(stats.getMeanLatency()).isLessThan(6);
   }
 
   @Test(timeout = 1000)

From 9b3c6013fef396fcc923e53c13f73a03a48c9c02 Mon Sep 17 00:00:00 2001
From: Igor Bernstein 
Date: Thu, 3 Jun 2021 12:00:24 -0400
Subject: [PATCH 18/19] feat: promote stream wait timeouts to deadlines for
 point reads (#848)

Special case point reads to use grpc's deadlines instead of relying on the watchdog
---
 .../data/v2/stub/EnhancedBigtableStub.java    |   9 +-
 .../readrows/PointReadTimeoutCallable.java    |  86 ++++++++
 .../PointReadTimeoutCallableTest.java         | 183 ++++++++++++++++++
 3 files changed, 276 insertions(+), 2 deletions(-)
 create mode 100644 google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallable.java
 create mode 100644 google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallableTest.java

diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
index c08f0aec1e..55e928d59f 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -75,6 +75,7 @@
 import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsBatchingDescriptor;
 import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsRetryingCallable;
 import com.google.cloud.bigtable.data.v2.stub.readrows.FilterMarkerRowsCallable;
+import com.google.cloud.bigtable.data.v2.stub.readrows.PointReadTimeoutCallable;
 import com.google.cloud.bigtable.data.v2.stub.readrows.ReadRowsBatchingDescriptor;
 import com.google.cloud.bigtable.data.v2.stub.readrows.ReadRowsConvertExceptionCallable;
 import com.google.cloud.bigtable.data.v2.stub.readrows.ReadRowsResumptionStrategy;
@@ -336,7 +337,7 @@ public  UnaryCallable createReadRowCallable(RowAdapter
   private  ServerStreamingCallable createReadRowsBaseCallable(
       ServerStreamingCallSettings readRowsSettings, RowAdapter rowAdapter) {
 
-    ServerStreamingCallable base =
+    final ServerStreamingCallable base =
         GrpcRawCallableFactory.createServerStreamingCallable(
             GrpcCallSettings.newBuilder()
                 .setMethodDescriptor(BigtableGrpc.getReadRowsMethod())
@@ -352,11 +353,15 @@ public Map extract(ReadRowsRequest readRowsRequest) {
                 .build(),
             readRowsSettings.getRetryableCodes());
 
+    // Promote streamWaitTimeout to deadline for point reads
+    ServerStreamingCallable withPointTimeouts =
+        new PointReadTimeoutCallable<>(base);
+
     // Sometimes ReadRows connections are disconnected via an RST frame. This error is transient and
     // should be treated similar to UNAVAILABLE. However, this exception has an INTERNAL error code
     // which by default is not retryable. Convert the exception so it can be retried in the client.
     ServerStreamingCallable convertException =
-        new ReadRowsConvertExceptionCallable<>(base);
+        new ReadRowsConvertExceptionCallable<>(withPointTimeouts);
 
     ServerStreamingCallable merging =
         new RowMergingCallable<>(convertException, rowAdapter);
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallable.java
new file mode 100644
index 0000000000..7ce0e8b7c6
--- /dev/null
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallable.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.bigtable.data.v2.stub.readrows;
+
+import com.google.api.core.InternalApi;
+import com.google.api.gax.rpc.ApiCallContext;
+import com.google.api.gax.rpc.ResponseObserver;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.bigtable.v2.ReadRowsRequest;
+import javax.annotation.Nullable;
+import org.threeten.bp.Duration;
+
+/**
+ * Specialization of ReadRows streams for point reads.
+ *
+ * 

Under normal circumstances, the ReadRows RPC can't make any assumptions about deadlines. In + * general case the end user can be issuing a full table scan. However, when dealing with point + * reads, the client can make assumptions and promote the per row timeout to be a per attempt + * timeout. + * + *

This callable will check if the request is a point read and promote the timeout to be a + * deadline. + */ +@InternalApi +public class PointReadTimeoutCallable + extends ServerStreamingCallable { + private final ServerStreamingCallable inner; + + public PointReadTimeoutCallable(ServerStreamingCallable inner) { + this.inner = inner; + } + + @Override + public void call(ReadRowsRequest request, ResponseObserver observer, ApiCallContext ctx) { + if (isPointRead(request)) { + Duration effectiveTimeout = getEffectivePointReadTimeout(ctx); + if (effectiveTimeout != null) { + ctx = ctx.withTimeout(effectiveTimeout); + } + } + inner.call(request, observer, ctx); + } + + private boolean isPointRead(ReadRowsRequest request) { + if (request.getRowsLimit() == 1) { + return true; + } + if (!request.getRows().getRowRangesList().isEmpty()) { + return false; + } + return request.getRows().getRowKeysCount() == 1; + } + + /** + * Extracts the effective timeout for a point read. + * + *

The effective time is the minimum of a streamWaitTimeout and a user set attempt timeout. + */ + @Nullable + private Duration getEffectivePointReadTimeout(ApiCallContext ctx) { + Duration streamWaitTimeout = ctx.getStreamWaitTimeout(); + Duration attemptTimeout = ctx.getTimeout(); + + if (streamWaitTimeout == null) { + return attemptTimeout; + } + + if (attemptTimeout == null) { + return streamWaitTimeout; + } + return (attemptTimeout.compareTo(streamWaitTimeout) <= 0) ? attemptTimeout : streamWaitTimeout; + } +} diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallableTest.java new file mode 100644 index 0000000000..a3941cd5c1 --- /dev/null +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/PointReadTimeoutCallableTest.java @@ -0,0 +1,183 @@ +/* + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.bigtable.data.v2.stub.readrows; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.api.gax.grpc.GrpcCallContext; +import com.google.api.gax.rpc.ApiCallContext; +import com.google.api.gax.rpc.ResponseObserver; +import com.google.api.gax.rpc.ServerStreamingCallable; +import com.google.bigtable.v2.ReadRowsRequest; +import com.google.bigtable.v2.RowRange; +import com.google.bigtable.v2.RowSet; +import com.google.common.collect.ImmutableList; +import com.google.protobuf.ByteString; +import java.util.Arrays; +import java.util.List; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.threeten.bp.Duration; + +@RunWith(JUnit4.class) +public class PointReadTimeoutCallableTest { + @Rule public final MockitoRule moo = MockitoJUnit.rule(); + + @Mock private ServerStreamingCallable inner; + private ArgumentCaptor ctxCaptor; + @Mock private ResponseObserver responseObserver; + + @Before + public void setUp() throws Exception { + ctxCaptor = ArgumentCaptor.forClass(ApiCallContext.class); + + Mockito.doNothing() + .when(inner) + .call( + Mockito.isA(ReadRowsRequest.class), + Mockito.any(ResponseObserver.class), + ctxCaptor.capture()); + } + + @Test + public void promotesStreamWaitTimeout() { + Duration duration = Duration.ofMillis(100); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + for (ReadRowsRequest req : createPointReadRequests()) { + callable.call( + req, responseObserver, GrpcCallContext.createDefault().withStreamWaitTimeout(duration)); + + assertThat(ctxCaptor.getValue().getTimeout()).isEqualTo(duration); + } + } + + @Test + public void promotesStreamWaitTimeoutForRowLimit() { + Duration duration = Duration.ofMillis(100); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + for (ReadRowsRequest req : createPointReadRequests()) { + callable.call( + createRowsLimitRequest(), + responseObserver, + GrpcCallContext.createDefault().withStreamWaitTimeout(duration)); + + assertThat(ctxCaptor.getValue().getTimeout()).isEqualTo(duration); + } + } + + @Test + public void respectsExistingTimeout() { + Duration duration = Duration.ofMillis(100); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + List requests = + ImmutableList.builder() + .addAll(createPointReadRequests()) + .add(ReadRowsRequest.getDefaultInstance()) + .build(); + + for (ReadRowsRequest req : requests) { + callable.call(req, responseObserver, GrpcCallContext.createDefault().withTimeout(duration)); + assertThat(ctxCaptor.getValue().getTimeout()).isEqualTo(duration); + } + } + + @Test + public void usesMinimum1() { + Duration attemptTimeout = Duration.ofMillis(100); + Duration streamTimeout = Duration.ofMillis(200); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + for (ReadRowsRequest req : createPointReadRequests()) { + GrpcCallContext ctx = + GrpcCallContext.createDefault() + .withTimeout(attemptTimeout) + .withStreamWaitTimeout(streamTimeout); + callable.call(req, responseObserver, ctx); + + assertThat(ctxCaptor.getValue().getTimeout()).isEqualTo(attemptTimeout); + } + } + + @Test + public void usesMinimum2() { + Duration attemptTimeout = Duration.ofMillis(200); + Duration streamTimeout = Duration.ofMillis(100); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + for (ReadRowsRequest req : createPointReadRequests()) { + GrpcCallContext ctx = + GrpcCallContext.createDefault() + .withTimeout(attemptTimeout) + .withStreamWaitTimeout(streamTimeout); + + callable.call(req, responseObserver, ctx); + + assertThat(ctxCaptor.getValue().getTimeout()).isEqualTo(streamTimeout); + } + } + + @Test + public void nonPointReadsAreUntouched() { + Duration streamTimeout = Duration.ofMillis(100); + PointReadTimeoutCallable callable = new PointReadTimeoutCallable<>(inner); + + List requests = + Arrays.asList( + ReadRowsRequest.getDefaultInstance(), + ReadRowsRequest.newBuilder() + .setRows( + RowSet.newBuilder() + .addRowKeys(ByteString.copyFromUtf8("a")) + .addRowKeys(ByteString.copyFromUtf8("ab"))) + .build(), + ReadRowsRequest.newBuilder() + .setRows(RowSet.newBuilder().addRowRanges(RowRange.getDefaultInstance())) + .build()); + + for (ReadRowsRequest req : requests) { + callable.call( + req, + responseObserver, + GrpcCallContext.createDefault().withStreamWaitTimeout(streamTimeout)); + assertThat(ctxCaptor.getValue().getTimeout()).isNull(); + } + } + + private List createPointReadRequests() { + return Arrays.asList(createRowsLimitRequest(), createRowKeyRequest()); + } + + private ReadRowsRequest createRowsLimitRequest() { + return ReadRowsRequest.newBuilder().setRowsLimit(1).build(); + } + + private ReadRowsRequest createRowKeyRequest() { + return ReadRowsRequest.newBuilder() + .setRows(RowSet.newBuilder().addRowKeys(ByteString.copyFromUtf8("key"))) + .build(); + } +} From db7600533a2902468c4a2b1ef1e7e90b0012a727 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 14:44:01 -0400 Subject: [PATCH 19/19] chore: release 1.26.0 (#836) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 20 +++++++++++++++++++ google-cloud-bigtable-bom/pom.xml | 14 ++++++------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator/pom.xml | 8 ++++---- google-cloud-bigtable/pom.xml | 10 +++++----- .../com/google/cloud/bigtable/Version.java | 2 +- grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++---- pom.xml | 2 +- proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- versions.txt | 12 +++++------ 13 files changed, 62 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a0e0d319a..db3f9a4e91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [1.26.0](https://www.github.com/googleapis/java-bigtable/compare/v1.25.0...v1.26.0) (2021-06-03) + + +### Features + +* promote stream wait timeouts to deadlines for point reads ([#848](https://www.github.com/googleapis/java-bigtable/issues/848)) ([9b3c601](https://www.github.com/googleapis/java-bigtable/commit/9b3c6013fef396fcc923e53c13f73a03a48c9c02)) + + +### Bug Fixes + +* add back in extraFiles and fix file path ([#833](https://www.github.com/googleapis/java-bigtable/issues/833)) ([f914954](https://www.github.com/googleapis/java-bigtable/commit/f91495474cb34e1f178d9362ab0251d364079f6d)) +* exclude protobuf from conformance-tests ([#845](https://www.github.com/googleapis/java-bigtable/issues/845)) ([1d89191](https://www.github.com/googleapis/java-bigtable/commit/1d89191a2453b5565aafe72367329eddb36ea90a)) +* Fix the race condition in decay average ([#850](https://www.github.com/googleapis/java-bigtable/issues/850)) ([66a9c9e](https://www.github.com/googleapis/java-bigtable/commit/66a9c9ebc520dd20c336a5cf4040912138137be6)) +* revert conformance test version ([#846](https://www.github.com/googleapis/java-bigtable/issues/846)) ([b23b0d7](https://www.github.com/googleapis/java-bigtable/commit/b23b0d7a7d8a2b9bed1cdabce420cb6568cf82ef)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-conformance-tests to v0.1.1 ([#852](https://www.github.com/googleapis/java-bigtable/issues/852)) ([e1c951c](https://www.github.com/googleapis/java-bigtable/commit/e1c951c549bf455cdd6e997756d9464a1e06dad2)) + ## [1.25.0](https://www.github.com/googleapis/java-bigtable/compare/v1.24.1...v1.25.0) (2021-05-19) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 7d300a728c..23b7b8a7dc 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.25.1-SNAPSHOT + 1.26.0 com.google.cloud google-cloud-bigtable-emulator - 0.134.1-SNAPSHOT + 0.135.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.25.1-SNAPSHOT + 1.26.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.25.1-SNAPSHOT + 1.26.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.25.1-SNAPSHOT + 1.26.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.25.1-SNAPSHOT + 1.26.0 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 4fcdaf021b..2534ac5030 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 8098fae1dd..537d391fe0 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.134.1-SNAPSHOT + 0.135.0 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 80ed1b2f3b..51fd620d9c 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.25.1-SNAPSHOT + 1.26.0 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 - 1.25.1-SNAPSHOT + 1.26.0 google-cloud-bigtable @@ -39,14 +39,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index 9a18460b1d..61e64ae0a3 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "1.22.1-SNAPSHOT"; + public static String VERSION = "1.26.0"; // {x-version-update-end} } diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 1edab74bed..d10aa7c4db 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.25.1-SNAPSHOT + 1.26.0 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index c5a1b75bdc..c50db165a7 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.25.1-SNAPSHOT + 1.26.0 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/pom.xml b/pom.xml index e5b96cbd2f..747756b4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.25.1-SNAPSHOT + 1.26.0 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 4549dabde3..2ce6f7c92a 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.25.1-SNAPSHOT + 1.26.0 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 75a126a440..99b89d19a8 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.25.1-SNAPSHOT + 1.26.0 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.25.1-SNAPSHOT + 1.26.0 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import com.google.cloud google-cloud-bigtable-bom - 1.25.1-SNAPSHOT + 1.26.0 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 63338db577..053cf40dd6 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.25.1-SNAPSHOT + 1.26.0 diff --git a/versions.txt b/versions.txt index 401b68e140..ea8295e2ea 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.25.0:1.25.1-SNAPSHOT -grpc-google-cloud-bigtable-admin-v2:1.25.0:1.25.1-SNAPSHOT -grpc-google-cloud-bigtable-v2:1.25.0:1.25.1-SNAPSHOT -proto-google-cloud-bigtable-admin-v2:1.25.0:1.25.1-SNAPSHOT -proto-google-cloud-bigtable-v2:1.25.0:1.25.1-SNAPSHOT -google-cloud-bigtable-emulator:0.134.0:0.134.1-SNAPSHOT +google-cloud-bigtable:1.26.0:1.26.0 +grpc-google-cloud-bigtable-admin-v2:1.26.0:1.26.0 +grpc-google-cloud-bigtable-v2:1.26.0:1.26.0 +proto-google-cloud-bigtable-admin-v2:1.26.0:1.26.0 +proto-google-cloud-bigtable-v2:1.26.0:1.26.0 +google-cloud-bigtable-emulator:0.135.0:0.135.0