From 1b60fea60f46fd8765461461fb7bab221830f706 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2026 15:03:58 -0400 Subject: [PATCH 01/14] chore(main): release 2.17.1-SNAPSHOT (#4562) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../pom.xml | 2 +- .../bigtable-hbase/pom.xml | 6 +++--- .../bigtable/hbase/BigtableHBaseVersion.java | 2 +- bigtable-client-core-parent/pom.xml | 2 +- .../bigtable-beam-import/pom.xml | 6 +++--- .../bigtable-hbase-beam/pom.xml | 6 +++--- bigtable-dataflow-parent/pom.xml | 2 +- .../bigtable-hbase-1.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 14 +++++++------- .../bigtable-hbase-1.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-1.x-tools/pom.xml | 4 ++-- .../bigtable-hbase-1.x/pom.xml | 8 ++++---- bigtable-hbase-1.x-parent/pom.xml | 2 +- .../bigtable-hbase-2.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-2.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-2.x/pom.xml | 6 +++--- bigtable-hbase-2.x-parent/pom.xml | 2 +- bigtable-test/bigtable-build-helper/pom.xml | 4 ++-- .../it/verify-mirror-deps-misaligned/pom.xml | 2 +- .../src/it/verify-mirror-deps-ok/pom.xml | 2 +- .../src/it/verify-shaded-exclusions-ok/pom.xml | 2 +- .../pom.xml | 2 +- .../it/verify-shaded-jar-entries-leak/pom.xml | 2 +- .../it/verify-shaded-jar-entries-ok/pom.xml | 2 +- .../bigtable-emulator-maven-plugin/pom.xml | 2 +- .../bigtable-internal-test-helper/pom.xml | 2 +- .../hbase-minicluster-maven-plugin/pom.xml | 2 +- bigtable-test/pom.xml | 2 +- .../bigtable-hbase-1.x-replication/pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-replication/pom.xml | 10 +++++----- .../bigtable-hbase-replication-core/pom.xml | 6 +++--- .../bigtable-hbase-replication/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 14 +++++++------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 18 +++++++++--------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../protobuf-java-format-shaded/pom.xml | 6 +++--- hbase-migration-tools/mirroring-client/pom.xml | 4 ++-- hbase-migration-tools/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 6 +++--- 53 files changed, 156 insertions(+), 156 deletions(-) diff --git a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml index efa510a404..4f93e5f73e 100644 --- a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-integration-tests-common diff --git a/bigtable-client-core-parent/bigtable-hbase/pom.xml b/bigtable-client-core-parent/bigtable-hbase/pom.xml index bdcd08db4d..b4a9e9d4dd 100644 --- a/bigtable-client-core-parent/bigtable-hbase/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test @@ -149,7 +149,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java index 244266cfa0..5e62356e7c 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java @@ -34,7 +34,7 @@ public class BigtableHBaseVersion { private static final AtomicBoolean wasInitialized = new AtomicBoolean(false); // {x-version-update-start:bigtable-client-parent:current} - public static final String VERSION = "2.17.0"; + public static final String VERSION = "2.17.1-SNAPSHOT"; // {x-version-update-end} /** diff --git a/bigtable-client-core-parent/pom.xml b/bigtable-client-core-parent/pom.xml index 76071cfe48..fff581f22d 100644 --- a/bigtable-client-core-parent/pom.xml +++ b/bigtable-client-core-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-client-core-parent diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 269ac5a0c1..fad06128f6 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -83,7 +83,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -156,7 +156,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml index a2d450388f..427856efc6 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml @@ -16,7 +16,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-beam @@ -75,7 +75,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT + 2.17.1-SNAPSHOT verify-mirror-deps-beam diff --git a/bigtable-dataflow-parent/pom.xml b/bigtable-dataflow-parent/pom.xml index 8dd8b4eeef..847a332152 100644 --- a/bigtable-dataflow-parent/pom.xml +++ b/bigtable-dataflow-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-dataflow-parent diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml index 99d670d98c..699cf543bd 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT @@ -170,7 +170,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml index 575897a736..f5acbad3e1 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-1.x-integration-tests @@ -79,7 +79,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -117,7 +117,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -285,7 +285,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -375,7 +375,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -466,7 +466,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -587,7 +587,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml index 3cfeb57868..1ac9fbfd50 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-1.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-hadoop - 2.17.0 + 2.17.1-SNAPSHOT @@ -120,7 +120,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test @@ -186,7 +186,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index dca40c0761..543c32ab02 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -113,7 +113,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.17.0 + 2.17.1-SNAPSHOT + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index 95c0a7f90d..ce0bd3358d 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -3,7 +3,7 @@ bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -21,7 +21,7 @@ ${project.groupId} bigtable-hbase-1.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT + 2.17.1-SNAPSHOT bigtable-hbase-1.x @@ -73,7 +73,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase - 2.17.0 + 2.17.1-SNAPSHOT @@ -86,7 +86,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test @@ -131,7 +131,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/pom.xml b/bigtable-hbase-1.x-parent/pom.xml index 4ce4d5ca78..3d6bfad618 100644 --- a/bigtable-hbase-1.x-parent/pom.xml +++ b/bigtable-hbase-1.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-1.x-parent diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml index 952cf22c2f..16b1601901 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT @@ -152,7 +152,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml index 46985b994e..1c2a07a3b2 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-2.x-integration-tests @@ -69,7 +69,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -101,7 +101,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -232,7 +232,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -326,7 +326,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -434,7 +434,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.17.0 + 2.17.1-SNAPSHOT test-jar test diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml index a50dd46f8d..ad3c61a316 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-2.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-hadoop - 2.17.0 + 2.17.1-SNAPSHOT @@ -135,7 +135,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test @@ -176,7 +176,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index de6677e8b0..41579cfdf3 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 @@ -111,7 +111,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.0 + 2.17.1-SNAPSHOT + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml index 0e3e868cd0..5e1b7352ea 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-2.x @@ -68,7 +68,7 @@ limitations under the License. ${project.groupId} bigtable-hbase - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -154,7 +154,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/pom.xml b/bigtable-hbase-2.x-parent/pom.xml index b5dc270cae..38435c62ed 100644 --- a/bigtable-hbase-2.x-parent/pom.xml +++ b/bigtable-hbase-2.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-2.x-parent diff --git a/bigtable-test/bigtable-build-helper/pom.xml b/bigtable-test/bigtable-build-helper/pom.xml index cb1252fe22..7bb999eb3c 100644 --- a/bigtable-test/bigtable-build-helper/pom.xml +++ b/bigtable-test/bigtable-build-helper/pom.xml @@ -3,13 +3,13 @@ bigtable-test com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT maven-plugin java-bigtable-hbase internal maven extensions. diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml index ff41067be1..2cda320670 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml index a29e1ed2bc..d38d98a903 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml index 1cc9bfc10c..67126c19c4 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml index d05ab4a1c1..8a85ec7288 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml @@ -65,7 +65,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml index d243dcf4b1..951b118ff7 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml index dff87b6aa4..91f267ab60 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml index b2857289ea..a73cdc17be 100644 --- a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml +++ b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-test - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-test/bigtable-internal-test-helper/pom.xml b/bigtable-test/bigtable-internal-test-helper/pom.xml index c3d45a26b3..ba7259c506 100644 --- a/bigtable-test/bigtable-internal-test-helper/pom.xml +++ b/bigtable-test/bigtable-internal-test-helper/pom.xml @@ -3,7 +3,7 @@ bigtable-test com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 diff --git a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml index d52de3e1e5..34b2ddc139 100644 --- a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml +++ b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.google.cloud.bigtable bigtable-test - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/bigtable-test/pom.xml b/bigtable-test/pom.xml index 1cdffad445..1249854617 100644 --- a/bigtable-test/pom.xml +++ b/bigtable-test/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml index 12a5b24ee7..45baf911c8 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-1.x-replication - 2.17.0 + 2.17.1-SNAPSHOT jar bigtable-hbase-1.x-replication @@ -37,7 +37,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT verify-mirror-deps-hbase @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -104,7 +104,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.17.0 + 2.17.1-SNAPSHOT @@ -143,7 +143,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index 3d418fde87..e7f84c7403 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-2.x-replication - 2.17.0 + 2.17.1-SNAPSHOT jar bigtable-hbase-2.x-replication Library to enable one way replication from HBase to Cloud Bigtable. @@ -66,7 +66,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-hadoop - 2.17.0 + 2.17.1-SNAPSHOT @@ -119,7 +119,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.17.1-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml index 8b45c2b85c..e2620254cf 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml @@ -19,13 +19,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.0 + 2.17.1-SNAPSHOT jar bigtable-hbase-replication-core Library to enable one way replication from HBase to Cloud @@ -43,7 +43,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.17.0 + 2.17.1-SNAPSHOT org.apache.hbase diff --git a/hbase-migration-tools/bigtable-hbase-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/pom.xml index 54bce3f7cb..b612518d48 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/pom.xml @@ -18,12 +18,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication - 2.17.0 + 2.17.1-SNAPSHOT com.google.cloud.bigtable hbase-migration-tools - 2.17.0 + 2.17.1-SNAPSHOT pom diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml index ec07a25727..b3c568b618 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-hadoop jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -57,7 +57,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml index 42cf0d8db6..220974fe2c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-integration-tests jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -113,7 +113,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -200,7 +200,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -213,7 +213,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -238,7 +238,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index 5dc54b517e..4d8006fad3 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-shaded jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -173,7 +173,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml index a9b9399409..e4e58c9a57 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -94,7 +94,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -112,7 +112,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml index acda7071b4..34161168da 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-parent pom - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml index 06f8c0a379..096c2ce41a 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-2.x-integration-tests jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -198,7 +198,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -212,7 +212,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -237,7 +237,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -251,7 +251,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.17.0 + 2.17.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml index e3bd2f3cd0..4117f93362 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-hadoop jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -54,7 +54,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-shaded - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -162,7 +162,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml index c23feba489..512fe84ef8 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-integration-tests jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -47,7 +47,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.0 + 2.17.1-SNAPSHOT @@ -197,7 +197,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -211,7 +211,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.0 + 2.17.1-SNAPSHOT test @@ -236,7 +236,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -250,7 +250,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -264,7 +264,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-2.x-integration-tests - 2.17.0 + 2.17.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index 7f0c4674bf..eb0864ef1b 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-shaded jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -45,7 +45,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.0 + 2.17.1-SNAPSHOT @@ -165,7 +165,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml index d5310bb812..c48364e512 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -44,7 +44,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.0 + 2.17.1-SNAPSHOT test-jar test @@ -107,7 +107,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml index 3858a2f46d..bb8bbbab62 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-parent pom - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml index 8c0d02b50b..ccd37479a3 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core-parent - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-core jar - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -63,7 +63,7 @@ limitations under the License. com.google.cloud.bigtable protobuf-java-format-shaded - 2.17.0 + 2.17.1-SNAPSHOT compile @@ -130,7 +130,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml index 312022b4f9..6b857ef317 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.0 + 2.17.1-SNAPSHOT bigtable-hbase-mirroring-client-core-parent pom - 2.17.0 + 2.17.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml index 980e15bb1f..f72201ffbf 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml @@ -5,12 +5,12 @@ bigtable-hbase-mirroring-client-core-parent com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT protobuf-java-format-shaded ${project.groupId}:${project.artifactId} - 2.17.0 + 2.17.1-SNAPSHOT This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain @@ -75,7 +75,7 @@ com.google.cloud.bigtable.test bigtable-build-helper - 2.17.0 + 2.17.1-SNAPSHOT verify-shaded-jar-entries diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml index 272e40a357..4cc2dfd7d4 100644 --- a/hbase-migration-tools/mirroring-client/pom.xml +++ b/hbase-migration-tools/mirroring-client/pom.xml @@ -5,13 +5,13 @@ com.google.cloud.bigtable hbase-migration-tools - 2.17.0 + 2.17.1-SNAPSHOT mirroring-client ${project.groupId}:${project.artifactId} pom - 2.17.0 + 2.17.1-SNAPSHOT com.google.bigtable.hbase.mirroring.shaded diff --git a/hbase-migration-tools/pom.xml b/hbase-migration-tools/pom.xml index 0d9987a941..ce191c3e41 100644 --- a/hbase-migration-tools/pom.xml +++ b/hbase-migration-tools/pom.xml @@ -17,12 +17,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable - 2.17.0 + 2.17.1-SNAPSHOT com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT hbase-migration-tools diff --git a/pom.xml b/pom.xml index 4f7d35ed76..ae23c34347 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.0 + 2.17.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} https://cloud.google.com/bigtable/ diff --git a/versions.txt b/versions.txt index 630d8434be..0e1aa94250 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -bigtable-client-parent:2.17.0:2.17.0 -bigtable-hbase-replication:2.17.0:2.17.0 -bigtable-hbase-mirroring:2.17.0:2.17.0 \ No newline at end of file +bigtable-client-parent:2.17.0:2.17.1-SNAPSHOT +bigtable-hbase-replication:2.17.0:2.17.1-SNAPSHOT +bigtable-hbase-mirroring:2.17.0:2.17.1-SNAPSHOT \ No newline at end of file From 315c5d6a026b443d5c40cda4f7c55c4f08cac91b Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Fri, 10 Apr 2026 15:53:02 -0400 Subject: [PATCH 02/14] deps: upgrade to to java-bigtable 2.77 for session support (#4563) Release-As: 2.18.0 Change-Id: Idce1bb7d060136043931a566b4268823157270fc --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ae23c34347..f034a7878f 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ limitations under the License. UTF-8 - 2.76.0 - 0.213.0 + 2.77.0 + 0.214.0 1.29.2 4.2.22 From b939b436673df4672b5499381560b607ffdb213d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2026 20:56:23 +0000 Subject: [PATCH 03/14] chore(main): release 2.18.0 (#4564) :robot: I have created a release *beep* *boop* --- ## [2.18.0](https://togithub.com/googleapis/java-bigtable-hbase/compare/v2.17.0...v2.18.0) (2026-04-10) ### Dependencies * upgrade to to java-bigtable 2.77 for session support ([#4563](https://togithub.com/googleapis/java-bigtable-hbase/issues/4563)) ([315c5d6](https://togithub.com/googleapis/java-bigtable-hbase/commit/315c5d6a026b443d5c40cda4f7c55c4f08cac91b)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ .../pom.xml | 2 +- .../bigtable-hbase/pom.xml | 6 +++--- .../bigtable/hbase/BigtableHBaseVersion.java | 2 +- bigtable-client-core-parent/pom.xml | 2 +- .../bigtable-beam-import/pom.xml | 6 +++--- .../bigtable-hbase-beam/pom.xml | 6 +++--- bigtable-dataflow-parent/pom.xml | 2 +- .../bigtable-hbase-1.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 14 +++++++------- .../bigtable-hbase-1.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-1.x-tools/pom.xml | 4 ++-- .../bigtable-hbase-1.x/pom.xml | 8 ++++---- bigtable-hbase-1.x-parent/pom.xml | 2 +- .../bigtable-hbase-2.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-2.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-2.x/pom.xml | 6 +++--- bigtable-hbase-2.x-parent/pom.xml | 2 +- bigtable-test/bigtable-build-helper/pom.xml | 4 ++-- .../it/verify-mirror-deps-misaligned/pom.xml | 2 +- .../src/it/verify-mirror-deps-ok/pom.xml | 2 +- .../src/it/verify-shaded-exclusions-ok/pom.xml | 2 +- .../pom.xml | 2 +- .../it/verify-shaded-jar-entries-leak/pom.xml | 2 +- .../it/verify-shaded-jar-entries-ok/pom.xml | 2 +- .../bigtable-emulator-maven-plugin/pom.xml | 2 +- .../bigtable-internal-test-helper/pom.xml | 2 +- .../hbase-minicluster-maven-plugin/pom.xml | 2 +- bigtable-test/pom.xml | 2 +- .../bigtable-hbase-1.x-replication/pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-replication/pom.xml | 10 +++++----- .../bigtable-hbase-replication-core/pom.xml | 6 +++--- .../bigtable-hbase-replication/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 14 +++++++------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 18 +++++++++--------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../protobuf-java-format-shaded/pom.xml | 6 +++--- hbase-migration-tools/mirroring-client/pom.xml | 4 ++-- hbase-migration-tools/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 6 +++--- 55 files changed, 164 insertions(+), 157 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index c1a7e63f69..ca3496a3e6 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.17.0" + ".": "2.18.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b4db397fcc..cea8a9affb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.18.0](https://github.com/googleapis/java-bigtable-hbase/compare/v2.17.0...v2.18.0) (2026-04-10) + + +### Dependencies + +* upgrade to to java-bigtable 2.77 for session support ([#4563](https://github.com/googleapis/java-bigtable-hbase/issues/4563)) ([315c5d6](https://github.com/googleapis/java-bigtable-hbase/commit/315c5d6a026b443d5c40cda4f7c55c4f08cac91b)) + ## [2.17.0](https://github.com/googleapis/java-bigtable-hbase/compare/v2.16.2...v2.17.0) (2026-04-10) diff --git a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml index 4f93e5f73e..354f5f6f23 100644 --- a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-integration-tests-common diff --git a/bigtable-client-core-parent/bigtable-hbase/pom.xml b/bigtable-client-core-parent/bigtable-hbase/pom.xml index b4a9e9d4dd..9b01aa45f5 100644 --- a/bigtable-client-core-parent/bigtable-hbase/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test @@ -149,7 +149,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java index 5e62356e7c..a332a23231 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java @@ -34,7 +34,7 @@ public class BigtableHBaseVersion { private static final AtomicBoolean wasInitialized = new AtomicBoolean(false); // {x-version-update-start:bigtable-client-parent:current} - public static final String VERSION = "2.17.1-SNAPSHOT"; + public static final String VERSION = "2.18.0"; // {x-version-update-end} /** diff --git a/bigtable-client-core-parent/pom.xml b/bigtable-client-core-parent/pom.xml index fff581f22d..b7b9db74ef 100644 --- a/bigtable-client-core-parent/pom.xml +++ b/bigtable-client-core-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-client-core-parent diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index fad06128f6..2c15bcdee1 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -83,7 +83,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -156,7 +156,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml index 427856efc6..f22c8556d3 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml @@ -16,7 +16,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-beam @@ -75,7 +75,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 + 2.18.0 verify-mirror-deps-beam diff --git a/bigtable-dataflow-parent/pom.xml b/bigtable-dataflow-parent/pom.xml index 847a332152..67abb7f1e0 100644 --- a/bigtable-dataflow-parent/pom.xml +++ b/bigtable-dataflow-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-dataflow-parent diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml index 699cf543bd..14b7d6caad 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 @@ -170,7 +170,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml index f5acbad3e1..c1acbf015c 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-1.x-integration-tests @@ -79,7 +79,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -117,7 +117,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -285,7 +285,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -375,7 +375,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -466,7 +466,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -587,7 +587,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml index 1ac9fbfd50..0bdb66cf1e 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-1.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-hadoop - 2.17.1-SNAPSHOT + 2.18.0 @@ -120,7 +120,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test @@ -186,7 +186,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 verify-mirror-deps-hbase diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index 543c32ab02..0359434ccb 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -113,7 +113,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.17.1-SNAPSHOT + 2.18.0 + 2.18.0 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index ce0bd3358d..5da953763e 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -3,7 +3,7 @@ bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -21,7 +21,7 @@ ${project.groupId} bigtable-hbase-1.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 + 2.18.0 bigtable-hbase-1.x @@ -73,7 +73,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase - 2.17.1-SNAPSHOT + 2.18.0 @@ -86,7 +86,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test @@ -131,7 +131,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-hbase-1.x-parent/pom.xml b/bigtable-hbase-1.x-parent/pom.xml index 3d6bfad618..86095c54d3 100644 --- a/bigtable-hbase-1.x-parent/pom.xml +++ b/bigtable-hbase-1.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-1.x-parent diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml index 16b1601901..ac1ff26b87 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 @@ -152,7 +152,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml index 1c2a07a3b2..a413e85ae5 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-2.x-integration-tests @@ -69,7 +69,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -101,7 +101,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -232,7 +232,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -326,7 +326,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -434,7 +434,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.17.1-SNAPSHOT + 2.18.0 test-jar test diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml index ad3c61a316..b964819ae9 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-2.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-hadoop - 2.17.1-SNAPSHOT + 2.18.0 @@ -135,7 +135,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test @@ -176,7 +176,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 verify-mirror-deps-hbase diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index 41579cfdf3..c6bf4e4238 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 @@ -111,7 +111,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.1-SNAPSHOT + 2.18.0 + 2.18.0 diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml index 5e1b7352ea..e98f52b515 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-2.x @@ -68,7 +68,7 @@ limitations under the License. ${project.groupId} bigtable-hbase - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -154,7 +154,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-hbase-2.x-parent/pom.xml b/bigtable-hbase-2.x-parent/pom.xml index 38435c62ed..bcf9a28880 100644 --- a/bigtable-hbase-2.x-parent/pom.xml +++ b/bigtable-hbase-2.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-2.x-parent diff --git a/bigtable-test/bigtable-build-helper/pom.xml b/bigtable-test/bigtable-build-helper/pom.xml index 7bb999eb3c..3fc0e39e2f 100644 --- a/bigtable-test/bigtable-build-helper/pom.xml +++ b/bigtable-test/bigtable-build-helper/pom.xml @@ -3,13 +3,13 @@ bigtable-test com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 maven-plugin java-bigtable-hbase internal maven extensions. diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml index 2cda320670..2721a4475e 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml index d38d98a903..7fb98505b6 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml index 67126c19c4..cfe75effb8 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml index 8a85ec7288..9b6b9b69f8 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml @@ -65,7 +65,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml index 951b118ff7..e01317094a 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml index 91f267ab60..03067ff303 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml index a73cdc17be..49e3917847 100644 --- a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml +++ b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-test - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-test/bigtable-internal-test-helper/pom.xml b/bigtable-test/bigtable-internal-test-helper/pom.xml index ba7259c506..489b26b72a 100644 --- a/bigtable-test/bigtable-internal-test-helper/pom.xml +++ b/bigtable-test/bigtable-internal-test-helper/pom.xml @@ -3,7 +3,7 @@ bigtable-test com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 diff --git a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml index 34b2ddc139..bfd0331dfa 100644 --- a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml +++ b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.google.cloud.bigtable bigtable-test - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/bigtable-test/pom.xml b/bigtable-test/pom.xml index 1249854617..d38d797a39 100644 --- a/bigtable-test/pom.xml +++ b/bigtable-test/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml index 45baf911c8..05d1bbb3ee 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 com.google.cloud.bigtable bigtable-hbase-1.x-replication - 2.17.1-SNAPSHOT + 2.18.0 jar bigtable-hbase-1.x-replication @@ -37,7 +37,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 verify-mirror-deps-hbase @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -104,7 +104,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.17.1-SNAPSHOT + 2.18.0 @@ -143,7 +143,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index e7f84c7403..ce1d6c0ef4 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 com.google.cloud.bigtable bigtable-hbase-2.x-replication - 2.17.1-SNAPSHOT + 2.18.0 jar bigtable-hbase-2.x-replication Library to enable one way replication from HBase to Cloud Bigtable. @@ -66,7 +66,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-hadoop - 2.17.1-SNAPSHOT + 2.18.0 @@ -119,7 +119,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.1-SNAPSHOT + 2.18.0 test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml index e2620254cf..ed416abbe4 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml @@ -19,13 +19,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication-core - 2.17.1-SNAPSHOT + 2.18.0 jar bigtable-hbase-replication-core Library to enable one way replication from HBase to Cloud @@ -43,7 +43,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.17.1-SNAPSHOT + 2.18.0 org.apache.hbase diff --git a/hbase-migration-tools/bigtable-hbase-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/pom.xml index b612518d48..4300358527 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/pom.xml @@ -18,12 +18,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication - 2.17.1-SNAPSHOT + 2.18.0 com.google.cloud.bigtable hbase-migration-tools - 2.17.1-SNAPSHOT + 2.18.0 pom diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml index b3c568b618..ef3bbd0fe3 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x-hadoop jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -57,7 +57,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml index 220974fe2c..0d737a01c0 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x-integration-tests jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -113,7 +113,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -200,7 +200,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -213,7 +213,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -238,7 +238,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index 4d8006fad3..ed9633a9f5 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x-shaded jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -173,7 +173,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml index e4e58c9a57..4777068db1 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -94,7 +94,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -112,7 +112,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml index 34161168da..4b5a4e9126 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x-parent pom - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml index 096c2ce41a..fcba600b61 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-1.x-2.x-integration-tests jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -198,7 +198,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -212,7 +212,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -237,7 +237,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -251,7 +251,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.17.1-SNAPSHOT + 2.18.0 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml index 4117f93362..d24c9518ff 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-2.x-hadoop jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -54,7 +54,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-shaded - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -162,7 +162,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml index 512fe84ef8..7f82790c0c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-2.x-integration-tests jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -47,7 +47,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.17.1-SNAPSHOT + 2.18.0 @@ -197,7 +197,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -211,7 +211,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.17.1-SNAPSHOT + 2.18.0 test @@ -236,7 +236,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -250,7 +250,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -264,7 +264,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-2.x-integration-tests - 2.17.1-SNAPSHOT + 2.18.0 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index eb0864ef1b..ab4de39150 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-2.x-shaded jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -45,7 +45,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.17.1-SNAPSHOT + 2.18.0 @@ -165,7 +165,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml index c48364e512..5623e8f5ec 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-2.x jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -44,7 +44,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.17.1-SNAPSHOT + 2.18.0 test-jar test @@ -107,7 +107,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml index bb8bbbab62..7125ae54ab 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-2.x-parent pom - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml index ccd37479a3..f4ca7be255 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core-parent - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-core jar - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} @@ -63,7 +63,7 @@ limitations under the License. com.google.cloud.bigtable protobuf-java-format-shaded - 2.17.1-SNAPSHOT + 2.18.0 compile @@ -130,7 +130,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml index 6b857ef317..bcfa270a2c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.17.1-SNAPSHOT + 2.18.0 bigtable-hbase-mirroring-client-core-parent pom - 2.17.1-SNAPSHOT + 2.18.0 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml index f72201ffbf..e929df647f 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml @@ -5,12 +5,12 @@ bigtable-hbase-mirroring-client-core-parent com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 protobuf-java-format-shaded ${project.groupId}:${project.artifactId} - 2.17.1-SNAPSHOT + 2.18.0 This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain @@ -75,7 +75,7 @@ com.google.cloud.bigtable.test bigtable-build-helper - 2.17.1-SNAPSHOT + 2.18.0 verify-shaded-jar-entries diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml index 4cc2dfd7d4..d6bf314ec4 100644 --- a/hbase-migration-tools/mirroring-client/pom.xml +++ b/hbase-migration-tools/mirroring-client/pom.xml @@ -5,13 +5,13 @@ com.google.cloud.bigtable hbase-migration-tools - 2.17.1-SNAPSHOT + 2.18.0 mirroring-client ${project.groupId}:${project.artifactId} pom - 2.17.1-SNAPSHOT + 2.18.0 com.google.bigtable.hbase.mirroring.shaded diff --git a/hbase-migration-tools/pom.xml b/hbase-migration-tools/pom.xml index ce191c3e41..6296dd7474 100644 --- a/hbase-migration-tools/pom.xml +++ b/hbase-migration-tools/pom.xml @@ -17,12 +17,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable - 2.17.1-SNAPSHOT + 2.18.0 com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 hbase-migration-tools diff --git a/pom.xml b/pom.xml index f034a7878f..bc057467a5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.17.1-SNAPSHOT + 2.18.0 pom ${project.groupId}:${project.artifactId} https://cloud.google.com/bigtable/ diff --git a/versions.txt b/versions.txt index 0e1aa94250..c618a12d55 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -bigtable-client-parent:2.17.0:2.17.1-SNAPSHOT -bigtable-hbase-replication:2.17.0:2.17.1-SNAPSHOT -bigtable-hbase-mirroring:2.17.0:2.17.1-SNAPSHOT \ No newline at end of file +bigtable-client-parent:2.18.0:2.18.0 +bigtable-hbase-replication:2.18.0:2.18.0 +bigtable-hbase-mirroring:2.18.0:2.18.0 \ No newline at end of file From bb23792bf77a04680b2104ad12c46574db4e86f1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2026 22:34:24 +0000 Subject: [PATCH 04/14] chore(main): release 2.18.1-SNAPSHOT (#4565) :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). --- .../pom.xml | 2 +- .../bigtable-hbase/pom.xml | 6 +++--- .../bigtable/hbase/BigtableHBaseVersion.java | 2 +- bigtable-client-core-parent/pom.xml | 2 +- .../bigtable-beam-import/pom.xml | 6 +++--- .../bigtable-hbase-beam/pom.xml | 6 +++--- bigtable-dataflow-parent/pom.xml | 2 +- .../bigtable-hbase-1.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 14 +++++++------- .../bigtable-hbase-1.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-1.x-tools/pom.xml | 4 ++-- .../bigtable-hbase-1.x/pom.xml | 8 ++++---- bigtable-hbase-1.x-parent/pom.xml | 2 +- .../bigtable-hbase-2.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-2.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-2.x/pom.xml | 6 +++--- bigtable-hbase-2.x-parent/pom.xml | 2 +- bigtable-test/bigtable-build-helper/pom.xml | 4 ++-- .../it/verify-mirror-deps-misaligned/pom.xml | 2 +- .../src/it/verify-mirror-deps-ok/pom.xml | 2 +- .../src/it/verify-shaded-exclusions-ok/pom.xml | 2 +- .../pom.xml | 2 +- .../it/verify-shaded-jar-entries-leak/pom.xml | 2 +- .../it/verify-shaded-jar-entries-ok/pom.xml | 2 +- .../bigtable-emulator-maven-plugin/pom.xml | 2 +- .../bigtable-internal-test-helper/pom.xml | 2 +- .../hbase-minicluster-maven-plugin/pom.xml | 2 +- bigtable-test/pom.xml | 2 +- .../bigtable-hbase-1.x-replication/pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-replication/pom.xml | 10 +++++----- .../bigtable-hbase-replication-core/pom.xml | 6 +++--- .../bigtable-hbase-replication/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 14 +++++++------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 18 +++++++++--------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../protobuf-java-format-shaded/pom.xml | 6 +++--- hbase-migration-tools/mirroring-client/pom.xml | 4 ++-- hbase-migration-tools/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 6 +++--- 53 files changed, 156 insertions(+), 156 deletions(-) diff --git a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml index 354f5f6f23..6942f23624 100644 --- a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-integration-tests-common diff --git a/bigtable-client-core-parent/bigtable-hbase/pom.xml b/bigtable-client-core-parent/bigtable-hbase/pom.xml index 9b01aa45f5..836b7645cc 100644 --- a/bigtable-client-core-parent/bigtable-hbase/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test @@ -149,7 +149,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java index a332a23231..b344954cfd 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java @@ -34,7 +34,7 @@ public class BigtableHBaseVersion { private static final AtomicBoolean wasInitialized = new AtomicBoolean(false); // {x-version-update-start:bigtable-client-parent:current} - public static final String VERSION = "2.18.0"; + public static final String VERSION = "2.18.1-SNAPSHOT"; // {x-version-update-end} /** diff --git a/bigtable-client-core-parent/pom.xml b/bigtable-client-core-parent/pom.xml index b7b9db74ef..40b0505222 100644 --- a/bigtable-client-core-parent/pom.xml +++ b/bigtable-client-core-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-client-core-parent diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 2c15bcdee1..2d8ee9d28e 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -83,7 +83,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -156,7 +156,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml index f22c8556d3..332a5be1a5 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml @@ -16,7 +16,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-beam @@ -75,7 +75,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT + 2.18.1-SNAPSHOT verify-mirror-deps-beam diff --git a/bigtable-dataflow-parent/pom.xml b/bigtable-dataflow-parent/pom.xml index 67abb7f1e0..bd1de2074a 100644 --- a/bigtable-dataflow-parent/pom.xml +++ b/bigtable-dataflow-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-dataflow-parent diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml index 14b7d6caad..c3b5fa36e6 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT @@ -170,7 +170,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml index c1acbf015c..cf0e2c80b3 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-1.x-integration-tests @@ -79,7 +79,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -117,7 +117,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -285,7 +285,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -375,7 +375,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -466,7 +466,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -587,7 +587,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml index 0bdb66cf1e..ce31fd856d 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-1.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-hadoop - 2.18.0 + 2.18.1-SNAPSHOT @@ -120,7 +120,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test @@ -186,7 +186,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index 0359434ccb..8b95a1ee16 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -113,7 +113,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.0 + 2.18.1-SNAPSHOT + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index 5da953763e..f35d71ae3d 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -3,7 +3,7 @@ bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -21,7 +21,7 @@ ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT + 2.18.1-SNAPSHOT bigtable-hbase-1.x @@ -73,7 +73,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase - 2.18.0 + 2.18.1-SNAPSHOT @@ -86,7 +86,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test @@ -131,7 +131,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/pom.xml b/bigtable-hbase-1.x-parent/pom.xml index 86095c54d3..98f5205ceb 100644 --- a/bigtable-hbase-1.x-parent/pom.xml +++ b/bigtable-hbase-1.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-1.x-parent diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml index ac1ff26b87..757e7607b3 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT @@ -152,7 +152,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml index a413e85ae5..945a1d3a85 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-2.x-integration-tests @@ -69,7 +69,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -101,7 +101,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -232,7 +232,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -326,7 +326,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -434,7 +434,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.0 + 2.18.1-SNAPSHOT test-jar test diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml index b964819ae9..844975d2ff 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-2.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-hadoop - 2.18.0 + 2.18.1-SNAPSHOT @@ -135,7 +135,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test @@ -176,7 +176,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index c6bf4e4238..18e791bbc1 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 @@ -111,7 +111,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.0 + 2.18.1-SNAPSHOT + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml index e98f52b515..27417e2c23 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-2.x @@ -68,7 +68,7 @@ limitations under the License. ${project.groupId} bigtable-hbase - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -154,7 +154,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/pom.xml b/bigtable-hbase-2.x-parent/pom.xml index bcf9a28880..0925c8fb31 100644 --- a/bigtable-hbase-2.x-parent/pom.xml +++ b/bigtable-hbase-2.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-2.x-parent diff --git a/bigtable-test/bigtable-build-helper/pom.xml b/bigtable-test/bigtable-build-helper/pom.xml index 3fc0e39e2f..020651ff52 100644 --- a/bigtable-test/bigtable-build-helper/pom.xml +++ b/bigtable-test/bigtable-build-helper/pom.xml @@ -3,13 +3,13 @@ bigtable-test com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT maven-plugin java-bigtable-hbase internal maven extensions. diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml index 2721a4475e..9abf6638c5 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml index 7fb98505b6..1d843a6508 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml index cfe75effb8..5d5d2f4f68 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml index 9b6b9b69f8..f9d42a6308 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml @@ -65,7 +65,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml index e01317094a..97e32d2e19 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml index 03067ff303..450e7e6772 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml index 49e3917847..ebfd5c6cd3 100644 --- a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml +++ b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-test - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-test/bigtable-internal-test-helper/pom.xml b/bigtable-test/bigtable-internal-test-helper/pom.xml index 489b26b72a..4c65a07d9b 100644 --- a/bigtable-test/bigtable-internal-test-helper/pom.xml +++ b/bigtable-test/bigtable-internal-test-helper/pom.xml @@ -3,7 +3,7 @@ bigtable-test com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 diff --git a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml index bfd0331dfa..08d5461094 100644 --- a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml +++ b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.google.cloud.bigtable bigtable-test - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/bigtable-test/pom.xml b/bigtable-test/pom.xml index d38d797a39..80d9355514 100644 --- a/bigtable-test/pom.xml +++ b/bigtable-test/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml index 05d1bbb3ee..d76573e33b 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-1.x-replication - 2.18.0 + 2.18.1-SNAPSHOT jar bigtable-hbase-1.x-replication @@ -37,7 +37,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT verify-mirror-deps-hbase @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -104,7 +104,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.0 + 2.18.1-SNAPSHOT @@ -143,7 +143,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index ce1d6c0ef4..60a33b7365 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-2.x-replication - 2.18.0 + 2.18.1-SNAPSHOT jar bigtable-hbase-2.x-replication Library to enable one way replication from HBase to Cloud Bigtable. @@ -66,7 +66,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-hadoop - 2.18.0 + 2.18.1-SNAPSHOT @@ -119,7 +119,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.0 + 2.18.1-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml index ed416abbe4..894a509a06 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml @@ -19,13 +19,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.0 + 2.18.1-SNAPSHOT jar bigtable-hbase-replication-core Library to enable one way replication from HBase to Cloud @@ -43,7 +43,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.0 + 2.18.1-SNAPSHOT org.apache.hbase diff --git a/hbase-migration-tools/bigtable-hbase-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/pom.xml index 4300358527..e10e7f3f81 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/pom.xml @@ -18,12 +18,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication - 2.18.0 + 2.18.1-SNAPSHOT com.google.cloud.bigtable hbase-migration-tools - 2.18.0 + 2.18.1-SNAPSHOT pom diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml index ef3bbd0fe3..e6b8a2a06a 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-hadoop jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -57,7 +57,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml index 0d737a01c0..5a623a1b2c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-integration-tests jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -113,7 +113,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -200,7 +200,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -213,7 +213,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -238,7 +238,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index ed9633a9f5..e0d95679b4 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-shaded jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -173,7 +173,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml index 4777068db1..14867193cc 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -94,7 +94,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -112,7 +112,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml index 4b5a4e9126..361e52706a 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-parent pom - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml index fcba600b61..e4155c05ff 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-1.x-2.x-integration-tests jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -198,7 +198,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -212,7 +212,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -237,7 +237,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -251,7 +251,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.0 + 2.18.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml index d24c9518ff..71022cebf1 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-hadoop jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -54,7 +54,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-shaded - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -162,7 +162,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml index 7f82790c0c..a40ee61c93 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-integration-tests jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -47,7 +47,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT @@ -197,7 +197,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -211,7 +211,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.0 + 2.18.1-SNAPSHOT test @@ -236,7 +236,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -250,7 +250,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -264,7 +264,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-2.x-integration-tests - 2.18.0 + 2.18.1-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index ab4de39150..ad279a9c9c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-shaded jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -45,7 +45,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.0 + 2.18.1-SNAPSHOT @@ -165,7 +165,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml index 5623e8f5ec..c8469be0bf 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -44,7 +44,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.0 + 2.18.1-SNAPSHOT test-jar test @@ -107,7 +107,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml index 7125ae54ab..12f8d8d754 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-2.x-parent pom - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml index f4ca7be255..5e874d5965 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core-parent - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-core jar - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -63,7 +63,7 @@ limitations under the License. com.google.cloud.bigtable protobuf-java-format-shaded - 2.18.0 + 2.18.1-SNAPSHOT compile @@ -130,7 +130,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml index bcfa270a2c..f1bb248efd 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.0 + 2.18.1-SNAPSHOT bigtable-hbase-mirroring-client-core-parent pom - 2.18.0 + 2.18.1-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml index e929df647f..1df93ddd8e 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml @@ -5,12 +5,12 @@ bigtable-hbase-mirroring-client-core-parent com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT protobuf-java-format-shaded ${project.groupId}:${project.artifactId} - 2.18.0 + 2.18.1-SNAPSHOT This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain @@ -75,7 +75,7 @@ com.google.cloud.bigtable.test bigtable-build-helper - 2.18.0 + 2.18.1-SNAPSHOT verify-shaded-jar-entries diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml index d6bf314ec4..d5370f6eab 100644 --- a/hbase-migration-tools/mirroring-client/pom.xml +++ b/hbase-migration-tools/mirroring-client/pom.xml @@ -5,13 +5,13 @@ com.google.cloud.bigtable hbase-migration-tools - 2.18.0 + 2.18.1-SNAPSHOT mirroring-client ${project.groupId}:${project.artifactId} pom - 2.18.0 + 2.18.1-SNAPSHOT com.google.bigtable.hbase.mirroring.shaded diff --git a/hbase-migration-tools/pom.xml b/hbase-migration-tools/pom.xml index 6296dd7474..04d1826335 100644 --- a/hbase-migration-tools/pom.xml +++ b/hbase-migration-tools/pom.xml @@ -17,12 +17,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable - 2.18.0 + 2.18.1-SNAPSHOT com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT hbase-migration-tools diff --git a/pom.xml b/pom.xml index bc057467a5..28cab3ab56 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.0 + 2.18.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} https://cloud.google.com/bigtable/ diff --git a/versions.txt b/versions.txt index c618a12d55..597d81de47 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -bigtable-client-parent:2.18.0:2.18.0 -bigtable-hbase-replication:2.18.0:2.18.0 -bigtable-hbase-mirroring:2.18.0:2.18.0 \ No newline at end of file +bigtable-client-parent:2.18.0:2.18.1-SNAPSHOT +bigtable-hbase-replication:2.18.0:2.18.1-SNAPSHOT +bigtable-hbase-mirroring:2.18.0:2.18.1-SNAPSHOT \ No newline at end of file From 3cbf0be147140417904bb0e1be01ab8c303b9039 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Sun, 12 Apr 2026 22:19:13 -0400 Subject: [PATCH 05/14] fix: fixing splitting logic (#4554) * fix: increasing max splits to 1 million Change-Id: I305c6b2182300f4ffdce8b8de523a5c0487d41ec * fix: improve splitting logic Change-Id: I68bbe7fd1b1026c13f9bf1c2f28b43a99280971e * update Change-Id: I06e3cdec7bc246ec27e6a83240175af5143e61fe * update Change-Id: I90db995cac0cf27de9520be459b06e834b23dae0 * add comment back Change-Id: I09b61e2c740739fd26279b79e3d4f9eafb4f637c --- .../cloud/bigtable/beam/CloudBigtableIO.java | 71 ++++++++---- .../bigtable/beam/CloudBigtableIOTest.java | 109 +++++++++++++++++- 2 files changed, 154 insertions(+), 26 deletions(-) diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableIO.java b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableIO.java index a5f6494cba..37d48ec5f1 100755 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableIO.java +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableIO.java @@ -26,6 +26,7 @@ import com.google.bigtable.repackaged.com.google.common.base.Preconditions; import com.google.bigtable.repackaged.com.google.common.collect.ImmutableMap; import com.google.cloud.bigtable.batch.common.CloudBigtableServiceImpl; +import com.google.cloud.bigtable.beam.CloudBigtableScanConfiguration.ScanType; import com.google.cloud.bigtable.hbase.BigtableFixedProtoScan; import com.google.cloud.bigtable.hbase.BigtableOptionsFactory; import java.io.IOException; @@ -145,8 +146,7 @@ public class CloudBigtableIO { abstract static class AbstractSource extends BoundedSource { protected static final Logger SOURCE_LOG = LoggerFactory.getLogger(AbstractSource.class); - protected static final long SIZED_BASED_MAX_SPLIT_COUNT = 4_000; - static final long COUNT_MAX_SPLIT_COUNT = 15_360; + private static final long COUNT_MAX_SPLIT_COUNT = 5_000_000; /** Configuration for a Cloud Bigtable connection, a table, and an optional scan. */ private final CloudBigtableScanConfiguration configuration; @@ -165,16 +165,16 @@ public Coder getOutputCoder() { // TODO: Move the splitting logic to bigtable-hbase, and separate concerns between beam needs // and Cloud Bigtable logic. protected List getSplits(long desiredBundleSizeBytes) throws Exception { - desiredBundleSizeBytes = - Math.max( - calculateEstimatedSizeBytes(null) / SIZED_BASED_MAX_SPLIT_COUNT, - desiredBundleSizeBytes); CloudBigtableScanConfiguration conf = getConfiguration(); byte[] scanStartKey = conf.getStartRow(); byte[] scanEndKey = conf.getStopRow(); List splits = new ArrayList<>(); byte[] startKey = HConstants.EMPTY_START_ROW; long lastOffset = 0; + + byte[] currentStartKey = null; + long accumulatedSize = 0; + for (KeyOffset response : getSampleRowKeys()) { byte[] endKey = response.getKey().toByteArray(); // Avoid empty regions. @@ -183,34 +183,63 @@ protected List getSplits(long desiredBundleSizeBytes) throws Exc } long offset = response.getOffsetBytes(); - // Get all the start/end key ranges that match the user supplied Scan. See + long tabletSize = offset - lastOffset; + + // Get all the start/end key ranges that match the user supplied Scan. See // https://github.com/apache/hbase/blob/master/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java#L298 // for original logic. if (isWithinRange(scanStartKey, scanEndKey, startKey, endKey)) { - byte[] splitStart = null; - byte[] splitStop = null; - if (scanStartKey.length == 0 || Bytes.compareTo(startKey, scanStartKey) >= 0) { - splitStart = startKey; - } else { - splitStart = scanStartKey; - } - - if ((scanEndKey.length == 0 || Bytes.compareTo(endKey, scanEndKey) <= 0) - && endKey.length > 0) { - splitStop = endKey; + byte[] splitStart = + (scanStartKey.length == 0 || Bytes.compareTo(startKey, scanStartKey) >= 0) + ? startKey + : scanStartKey; + byte[] splitStop = + ((scanEndKey.length == 0 || Bytes.compareTo(endKey, scanEndKey) <= 0) + && endKey.length > 0) + ? endKey + : scanEndKey; + + // Merging tablets that are smaller than desired bundle size + if (tabletSize >= desiredBundleSizeBytes) { + // If the current tablet size is already > bundle size, add previously accumulated + // tablets + // if the currentStartKey is not null. + if (currentStartKey != null) { + splits.add(createSourceWithKeys(currentStartKey, splitStart, accumulatedSize)); + currentStartKey = null; + accumulatedSize = 0; + } + // and also add the current tablet to the splits + splits.add(createSourceWithKeys(splitStart, splitStop, tabletSize)); } else { - splitStop = scanEndKey; + if (currentStartKey == null) { + currentStartKey = splitStart; + } + accumulatedSize += tabletSize; + if (accumulatedSize >= desiredBundleSizeBytes) { + splits.add(createSourceWithKeys(currentStartKey, splitStop, accumulatedSize)); + currentStartKey = null; + accumulatedSize = 0; + } } - splits.addAll(split(offset - lastOffset, desiredBundleSizeBytes, splitStart, splitStop)); } lastOffset = offset; startKey = endKey; } + // Create one last region if the last region doesn't reach the end or there are no regions. byte[] endKey = HConstants.EMPTY_END_ROW; if (!Bytes.equals(startKey, endKey) && scanEndKey.length == 0) { - splits.add(createSourceWithKeys(startKey, endKey, 0)); + if (currentStartKey != null) { + splits.add(createSourceWithKeys(currentStartKey, endKey, accumulatedSize)); + currentStartKey = null; + } else { + splits.add(createSourceWithKeys(startKey, endKey, 0)); + } + } else if (currentStartKey != null) { + splits.add(createSourceWithKeys(currentStartKey, scanEndKey, accumulatedSize)); } + List result = reduceSplits(splits); // Randomize the list, since the default behavior would lead to multiple workers hitting the diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/src/test/java/com/google/cloud/bigtable/beam/CloudBigtableIOTest.java b/bigtable-dataflow-parent/bigtable-hbase-beam/src/test/java/com/google/cloud/bigtable/beam/CloudBigtableIOTest.java index 288edca27c..af1c324d87 100755 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/src/test/java/com/google/cloud/bigtable/beam/CloudBigtableIOTest.java +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/src/test/java/com/google/cloud/bigtable/beam/CloudBigtableIOTest.java @@ -23,7 +23,6 @@ import com.google.bigtable.repackaged.com.google.cloud.bigtable.data.v2.internal.ByteStringComparator; import com.google.bigtable.repackaged.com.google.cloud.bigtable.data.v2.models.KeyOffset; import com.google.bigtable.repackaged.com.google.protobuf.ByteString; -import com.google.cloud.bigtable.beam.CloudBigtableIO.AbstractSource; import com.google.cloud.bigtable.beam.CloudBigtableIO.Source; import com.google.cloud.bigtable.beam.CloudBigtableIO.SourceWithKeys; import java.util.ArrayList; @@ -112,7 +111,7 @@ public void testSourceToString() throws Exception { @Test public void testSampleRowKeys() throws Exception { List sampleRowKeys = new ArrayList<>(); - int count = (int) (AbstractSource.COUNT_MAX_SPLIT_COUNT * 3 - 5); + int count = 5; byte[][] keys = Bytes.split("A".getBytes(), "Z".getBytes(), count - 2); long tabletSize = 2L * 1024L * 1024L * 1024L; long boundary = 0; @@ -129,7 +128,7 @@ public void testSampleRowKeys() throws Exception { } Source source = (Source) CloudBigtableIO.read(scanConfig); source.setSampleRowKeys(sampleRowKeys); - List splits = source.getSplits(20000); + List splits = source.getSplits(tabletSize * 2); Collections.sort( splits, new Comparator() { @@ -140,7 +139,6 @@ public int compare(SourceWithKeys o1, SourceWithKeys o2) { ByteString.copyFrom(o2.getConfiguration().getStartRow())); } }); - Assert.assertTrue(splits.size() <= AbstractSource.COUNT_MAX_SPLIT_COUNT); Iterator iter = splits.iterator(); SourceWithKeys last = iter.next(); while (iter.hasNext()) { @@ -159,7 +157,108 @@ public int compare(SourceWithKeys o1, SourceWithKeys o2) { Assert.assertTrue(current.getEstimatedSize() >= tabletSize); last = current; } - // check first and last + } + + @Test + public void testMergeSmallTablets() throws Exception { + List sampleRowKeys = new ArrayList<>(); + long tabletSize = 10 * 1024 * 1024; // 10MB + // Tablets: + // "" to "A" (10MB) + // "A" to "B" (10MB) + // "B" to "C" (10MB) + // "C" to "D" (10MB) + // "D" to "E" (10MB) + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("A"), tabletSize)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("B"), tabletSize * 2)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("C"), tabletSize * 3)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("D"), tabletSize * 4)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("E"), tabletSize * 5)); + + Source source = (Source) CloudBigtableIO.read(scanConfig); + source.setSampleRowKeys(sampleRowKeys); + + // desired = 25MB + long desiredSize = 25 * 1024 * 1024; + List splits = source.getSplits(desiredSize); + + Collections.sort( + splits, + (o1, o2) -> + ByteStringComparator.INSTANCE.compare( + ByteString.copyFrom(o1.getConfiguration().getStartRow()), + ByteString.copyFrom(o2.getConfiguration().getStartRow()))); + + // Expecting: + // Split 1: "" to "C" (30MB) + // Split 2: "C" to "" (20MB) + Assert.assertEquals(2, splits.size()); + Assert.assertEquals("", Bytes.toStringBinary(splits.get(0).getConfiguration().getStartRow())); + Assert.assertEquals("C", Bytes.toStringBinary(splits.get(0).getConfiguration().getStopRow())); + Assert.assertEquals("C", Bytes.toStringBinary(splits.get(1).getConfiguration().getStartRow())); + Assert.assertEquals("", Bytes.toStringBinary(splits.get(1).getConfiguration().getStopRow())); + } + + @Test + public void testRespectScanRange() throws Exception { + List sampleRowKeys = new ArrayList<>(); + long tabletSize = 10 * 1024 * 1024; + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("A"), tabletSize)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("B"), tabletSize * 2)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("C"), tabletSize * 3)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("D"), tabletSize * 4)); + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("E"), tabletSize * 5)); + + // Scan from "B" to "D" + CloudBigtableScanConfiguration customScanConfig = + scanConfig.toBuilder().withKeys("B".getBytes(), "D".getBytes()).build(); + + Source source = (Source) CloudBigtableIO.read(customScanConfig); + source.setSampleRowKeys(sampleRowKeys); + + List splits = source.getSplits(25 * 1024 * 1024); + + Collections.sort( + splits, + (o1, o2) -> + ByteStringComparator.INSTANCE.compare( + ByteString.copyFrom(o1.getConfiguration().getStartRow()), + ByteString.copyFrom(o2.getConfiguration().getStartRow()))); + + // Tablet 3 ("B" to "C") and Tablet 4 ("C" to "D") are within range. + // They are merged into one split of "B" to "D" (20MB). + // Note: Due to current logic without flush on scanEnd, the last piece might get lost if it + // doesn't cross desiredBundleSize, + // but here we are checking if it respects the range. If it fails, it means it's lost and we + // should check if bug exists. + Assert.assertEquals(1, splits.size()); + Assert.assertEquals("B", Bytes.toStringBinary(splits.get(0).getConfiguration().getStartRow())); + Assert.assertEquals("D", Bytes.toStringBinary(splits.get(0).getConfiguration().getStopRow())); + } + + @Test + public void testLargeTabletsAsIs() throws Exception { + List sampleRowKeys = new ArrayList<>(); + long tabletSize = 100 * 1024 * 1024; // 100MB + sampleRowKeys.add(KeyOffset.create(ByteString.copyFromUtf8("A"), tabletSize)); + + Source source = (Source) CloudBigtableIO.read(scanConfig); + source.setSampleRowKeys(sampleRowKeys); + + List splits = source.getSplits(25 * 1024 * 1024); // desired 25MB + + Collections.sort( + splits, + (o1, o2) -> + Bytes.compareTo( + o1.getConfiguration().getStartRow(), o2.getConfiguration().getStartRow())); + + Assert.assertEquals(2, splits.size()); // The tablet + trailing region to end of table + Assert.assertEquals("", Bytes.toStringBinary(splits.get(0).getConfiguration().getStartRow())); + Assert.assertEquals("A", Bytes.toStringBinary(splits.get(0).getConfiguration().getStopRow())); + Assert.assertEquals("A", Bytes.toStringBinary(splits.get(1).getConfiguration().getStartRow())); + Assert.assertEquals("", Bytes.toStringBinary(splits.get(1).getConfiguration().getStopRow())); + Assert.assertEquals(tabletSize, splits.get(0).getEstimatedSize()); } @Test From 8e6f94371dd13ceb76677db8e286e4a271130372 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Mon, 13 Apr 2026 13:32:21 -0400 Subject: [PATCH 06/14] fix: increase sample row key default timeout for beam (#4567) Change-Id: I004f0881e24600e14a37cf62a78b8e341edc70ed --- .../batch/common/CloudBigtableServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/batch/common/CloudBigtableServiceImpl.java b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/batch/common/CloudBigtableServiceImpl.java index 45defc8404..7bf036335b 100755 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/batch/common/CloudBigtableServiceImpl.java +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/batch/common/CloudBigtableServiceImpl.java @@ -24,6 +24,7 @@ import com.google.cloud.bigtable.beam.CloudBigtableTableConfiguration; import com.google.cloud.bigtable.hbase.wrappers.veneer.BigtableHBaseVeneerSettings; import java.io.IOException; +import java.time.Duration; import java.util.List; /** For internal use only - public for technical reasons. */ @@ -52,6 +53,15 @@ public List getSampleRowKeys(CloudBigtableTableConfiguration config) .setPreemptiveRefreshEnabled(false) .build()) .build()); + + builder + .stubSettings() + .sampleRowKeysSettings() + .retrySettings() + .setInitialRpcTimeoutDuration(Duration.ofMinutes(20)) + .setMaxRpcTimeoutDuration(Duration.ofMinutes(20)) + .setTotalTimeoutDuration(Duration.ofMinutes(20)); + try (BigtableDataClient client = BigtableDataClient.create(builder.build())) { return client.sampleRowKeys(config.getTableId()); } From ebec77c7a919188fe9dfe5a5ff9c17735a2a03aa Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2026 18:54:34 +0000 Subject: [PATCH 07/14] chore(main): release 2.18.1 (#4566) :robot: I have created a release *beep* *boop* --- ## [2.18.1](https://togithub.com/googleapis/java-bigtable-hbase/compare/v2.18.0...v2.18.1) (2026-04-13) ### Bug Fixes * fixing splitting logic ([#4554](https://togithub.com/googleapis/java-bigtable-hbase/issues/4554)) ([3cbf0be](https://togithub.com/googleapis/java-bigtable-hbase/commit/3cbf0be147140417904bb0e1be01ab8c303b9039)) * increase sample row key default timeout for beam ([#4567](https://togithub.com/googleapis/java-bigtable-hbase/issues/4567)) ([8e6f943](https://togithub.com/googleapis/java-bigtable-hbase/commit/8e6f94371dd13ceb76677db8e286e4a271130372)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- CHANGELOG.md | 8 ++++++++ .../pom.xml | 2 +- .../bigtable-hbase/pom.xml | 6 +++--- .../bigtable/hbase/BigtableHBaseVersion.java | 2 +- bigtable-client-core-parent/pom.xml | 2 +- .../bigtable-beam-import/pom.xml | 6 +++--- .../bigtable-hbase-beam/pom.xml | 6 +++--- bigtable-dataflow-parent/pom.xml | 2 +- .../bigtable-hbase-1.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 14 +++++++------- .../bigtable-hbase-1.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-1.x-tools/pom.xml | 4 ++-- .../bigtable-hbase-1.x/pom.xml | 8 ++++---- bigtable-hbase-1.x-parent/pom.xml | 2 +- .../bigtable-hbase-2.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-2.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-2.x/pom.xml | 6 +++--- bigtable-hbase-2.x-parent/pom.xml | 2 +- bigtable-test/bigtable-build-helper/pom.xml | 4 ++-- .../it/verify-mirror-deps-misaligned/pom.xml | 2 +- .../src/it/verify-mirror-deps-ok/pom.xml | 2 +- .../src/it/verify-shaded-exclusions-ok/pom.xml | 2 +- .../pom.xml | 2 +- .../it/verify-shaded-jar-entries-leak/pom.xml | 2 +- .../it/verify-shaded-jar-entries-ok/pom.xml | 2 +- .../bigtable-emulator-maven-plugin/pom.xml | 2 +- .../bigtable-internal-test-helper/pom.xml | 2 +- .../hbase-minicluster-maven-plugin/pom.xml | 2 +- bigtable-test/pom.xml | 2 +- .../bigtable-hbase-1.x-replication/pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-replication/pom.xml | 10 +++++----- .../bigtable-hbase-replication-core/pom.xml | 6 +++--- .../bigtable-hbase-replication/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 14 +++++++------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 18 +++++++++--------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../protobuf-java-format-shaded/pom.xml | 6 +++--- hbase-migration-tools/mirroring-client/pom.xml | 4 ++-- hbase-migration-tools/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 6 +++--- 55 files changed, 165 insertions(+), 157 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index ca3496a3e6..6e970a7f33 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.18.0" + ".": "2.18.1" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cea8a9affb..87893cfae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.18.1](https://github.com/googleapis/java-bigtable-hbase/compare/v2.18.0...v2.18.1) (2026-04-13) + + +### Bug Fixes + +* fixing splitting logic ([#4554](https://github.com/googleapis/java-bigtable-hbase/issues/4554)) ([3cbf0be](https://github.com/googleapis/java-bigtable-hbase/commit/3cbf0be147140417904bb0e1be01ab8c303b9039)) +* increase sample row key default timeout for beam ([#4567](https://github.com/googleapis/java-bigtable-hbase/issues/4567)) ([8e6f943](https://github.com/googleapis/java-bigtable-hbase/commit/8e6f94371dd13ceb76677db8e286e4a271130372)) + ## [2.18.0](https://github.com/googleapis/java-bigtable-hbase/compare/v2.17.0...v2.18.0) (2026-04-10) diff --git a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml index 6942f23624..62c52ef8dc 100644 --- a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-integration-tests-common diff --git a/bigtable-client-core-parent/bigtable-hbase/pom.xml b/bigtable-client-core-parent/bigtable-hbase/pom.xml index 836b7645cc..02219b62d0 100644 --- a/bigtable-client-core-parent/bigtable-hbase/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test @@ -149,7 +149,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java index b344954cfd..68e639679c 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java @@ -34,7 +34,7 @@ public class BigtableHBaseVersion { private static final AtomicBoolean wasInitialized = new AtomicBoolean(false); // {x-version-update-start:bigtable-client-parent:current} - public static final String VERSION = "2.18.1-SNAPSHOT"; + public static final String VERSION = "2.18.1"; // {x-version-update-end} /** diff --git a/bigtable-client-core-parent/pom.xml b/bigtable-client-core-parent/pom.xml index 40b0505222..f79d32cd65 100644 --- a/bigtable-client-core-parent/pom.xml +++ b/bigtable-client-core-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-client-core-parent diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 2d8ee9d28e..7e851609ec 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -83,7 +83,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -156,7 +156,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml index 332a5be1a5..c0380a47b4 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml @@ -16,7 +16,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-beam @@ -75,7 +75,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 + 2.18.1 verify-mirror-deps-beam diff --git a/bigtable-dataflow-parent/pom.xml b/bigtable-dataflow-parent/pom.xml index bd1de2074a..4e5b932e4a 100644 --- a/bigtable-dataflow-parent/pom.xml +++ b/bigtable-dataflow-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-dataflow-parent diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml index c3b5fa36e6..0cf1be9114 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 @@ -170,7 +170,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml index cf0e2c80b3..675b7e0c99 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-1.x-integration-tests @@ -79,7 +79,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -117,7 +117,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -285,7 +285,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -375,7 +375,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -466,7 +466,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -587,7 +587,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml index ce31fd856d..88294dfd12 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-1.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-hadoop - 2.18.1-SNAPSHOT + 2.18.1 @@ -120,7 +120,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test @@ -186,7 +186,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 verify-mirror-deps-hbase diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index 8b95a1ee16..2ec6912d1b 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -113,7 +113,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.1-SNAPSHOT + 2.18.1 + 2.18.1 diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index f35d71ae3d..7aa1488a01 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -3,7 +3,7 @@ bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -21,7 +21,7 @@ ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 + 2.18.1 bigtable-hbase-1.x @@ -73,7 +73,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase - 2.18.1-SNAPSHOT + 2.18.1 @@ -86,7 +86,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test @@ -131,7 +131,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-hbase-1.x-parent/pom.xml b/bigtable-hbase-1.x-parent/pom.xml index 98f5205ceb..b54be13d07 100644 --- a/bigtable-hbase-1.x-parent/pom.xml +++ b/bigtable-hbase-1.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-1.x-parent diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml index 757e7607b3..eb5848ec89 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 @@ -152,7 +152,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml index 945a1d3a85..5c8cea2391 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-2.x-integration-tests @@ -69,7 +69,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -101,7 +101,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -232,7 +232,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -326,7 +326,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -434,7 +434,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.1-SNAPSHOT + 2.18.1 test-jar test diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml index 844975d2ff..935b446c75 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-2.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-hadoop - 2.18.1-SNAPSHOT + 2.18.1 @@ -135,7 +135,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test @@ -176,7 +176,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 verify-mirror-deps-hbase diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index 18e791bbc1..6064d5a40e 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 @@ -111,7 +111,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1-SNAPSHOT + 2.18.1 + 2.18.1 diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml index 27417e2c23..ae9d53863e 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-2.x @@ -68,7 +68,7 @@ limitations under the License. ${project.groupId} bigtable-hbase - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -154,7 +154,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-hbase-2.x-parent/pom.xml b/bigtable-hbase-2.x-parent/pom.xml index 0925c8fb31..7ff49776a1 100644 --- a/bigtable-hbase-2.x-parent/pom.xml +++ b/bigtable-hbase-2.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-2.x-parent diff --git a/bigtable-test/bigtable-build-helper/pom.xml b/bigtable-test/bigtable-build-helper/pom.xml index 020651ff52..c990e2fb3c 100644 --- a/bigtable-test/bigtable-build-helper/pom.xml +++ b/bigtable-test/bigtable-build-helper/pom.xml @@ -3,13 +3,13 @@ bigtable-test com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 maven-plugin java-bigtable-hbase internal maven extensions. diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml index 9abf6638c5..50a20b5fa5 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml index 1d843a6508..494ed28f52 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml index 5d5d2f4f68..fc0a48109f 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml index f9d42a6308..d4f303e367 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml @@ -65,7 +65,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml index 97e32d2e19..6db471ed35 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml index 450e7e6772..f95e352796 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml index ebfd5c6cd3..2b34e3b244 100644 --- a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml +++ b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-test - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-test/bigtable-internal-test-helper/pom.xml b/bigtable-test/bigtable-internal-test-helper/pom.xml index 4c65a07d9b..7eefaf955d 100644 --- a/bigtable-test/bigtable-internal-test-helper/pom.xml +++ b/bigtable-test/bigtable-internal-test-helper/pom.xml @@ -3,7 +3,7 @@ bigtable-test com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 diff --git a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml index 08d5461094..b26fb273f0 100644 --- a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml +++ b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.google.cloud.bigtable bigtable-test - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/bigtable-test/pom.xml b/bigtable-test/pom.xml index 80d9355514..d4b85a310a 100644 --- a/bigtable-test/pom.xml +++ b/bigtable-test/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml index d76573e33b..6a666bf944 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 com.google.cloud.bigtable bigtable-hbase-1.x-replication - 2.18.1-SNAPSHOT + 2.18.1 jar bigtable-hbase-1.x-replication @@ -37,7 +37,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 verify-mirror-deps-hbase @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -104,7 +104,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.1-SNAPSHOT + 2.18.1 @@ -143,7 +143,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index 60a33b7365..ddeafcc297 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 com.google.cloud.bigtable bigtable-hbase-2.x-replication - 2.18.1-SNAPSHOT + 2.18.1 jar bigtable-hbase-2.x-replication Library to enable one way replication from HBase to Cloud Bigtable. @@ -66,7 +66,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-hadoop - 2.18.1-SNAPSHOT + 2.18.1 @@ -119,7 +119,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1-SNAPSHOT + 2.18.1 test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml index 894a509a06..b0cac7ca68 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml @@ -19,13 +19,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1-SNAPSHOT + 2.18.1 jar bigtable-hbase-replication-core Library to enable one way replication from HBase to Cloud @@ -43,7 +43,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.1-SNAPSHOT + 2.18.1 org.apache.hbase diff --git a/hbase-migration-tools/bigtable-hbase-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/pom.xml index e10e7f3f81..abcafe03d7 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/pom.xml @@ -18,12 +18,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication - 2.18.1-SNAPSHOT + 2.18.1 com.google.cloud.bigtable hbase-migration-tools - 2.18.1-SNAPSHOT + 2.18.1 pom diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml index e6b8a2a06a..6feaf14dee 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x-hadoop jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -57,7 +57,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml index 5a623a1b2c..400f83e9d5 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x-integration-tests jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -113,7 +113,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -200,7 +200,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -213,7 +213,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -238,7 +238,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index e0d95679b4..75f0312e49 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x-shaded jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -173,7 +173,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml index 14867193cc..c9eabc18a4 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -94,7 +94,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -112,7 +112,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml index 361e52706a..37c569d79a 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x-parent pom - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml index e4155c05ff..added4ea24 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-1.x-2.x-integration-tests jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -198,7 +198,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -212,7 +212,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -237,7 +237,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -251,7 +251,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.1-SNAPSHOT + 2.18.1 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml index 71022cebf1..dc7ffa22eb 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-2.x-hadoop jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -54,7 +54,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-shaded - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -162,7 +162,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml index a40ee61c93..22071c1790 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-2.x-integration-tests jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -47,7 +47,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1-SNAPSHOT + 2.18.1 @@ -197,7 +197,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -211,7 +211,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1-SNAPSHOT + 2.18.1 test @@ -236,7 +236,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -250,7 +250,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -264,7 +264,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-2.x-integration-tests - 2.18.1-SNAPSHOT + 2.18.1 test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index ad279a9c9c..f685b670ba 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-2.x-shaded jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -45,7 +45,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1-SNAPSHOT + 2.18.1 @@ -165,7 +165,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml index c8469be0bf..b9dd693755 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-2.x jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -44,7 +44,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1-SNAPSHOT + 2.18.1 test-jar test @@ -107,7 +107,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml index 12f8d8d754..4118d53873 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-2.x-parent pom - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml index 5e874d5965..f8d996c778 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core-parent - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-core jar - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} @@ -63,7 +63,7 @@ limitations under the License. com.google.cloud.bigtable protobuf-java-format-shaded - 2.18.1-SNAPSHOT + 2.18.1 compile @@ -130,7 +130,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml index f1bb248efd..4f82ea3316 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1-SNAPSHOT + 2.18.1 bigtable-hbase-mirroring-client-core-parent pom - 2.18.1-SNAPSHOT + 2.18.1 ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml index 1df93ddd8e..fb0b0cf999 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml @@ -5,12 +5,12 @@ bigtable-hbase-mirroring-client-core-parent com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 protobuf-java-format-shaded ${project.groupId}:${project.artifactId} - 2.18.1-SNAPSHOT + 2.18.1 This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain @@ -75,7 +75,7 @@ com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1-SNAPSHOT + 2.18.1 verify-shaded-jar-entries diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml index d5370f6eab..79d2a72a13 100644 --- a/hbase-migration-tools/mirroring-client/pom.xml +++ b/hbase-migration-tools/mirroring-client/pom.xml @@ -5,13 +5,13 @@ com.google.cloud.bigtable hbase-migration-tools - 2.18.1-SNAPSHOT + 2.18.1 mirroring-client ${project.groupId}:${project.artifactId} pom - 2.18.1-SNAPSHOT + 2.18.1 com.google.bigtable.hbase.mirroring.shaded diff --git a/hbase-migration-tools/pom.xml b/hbase-migration-tools/pom.xml index 04d1826335..8104425a71 100644 --- a/hbase-migration-tools/pom.xml +++ b/hbase-migration-tools/pom.xml @@ -17,12 +17,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable - 2.18.1-SNAPSHOT + 2.18.1 com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 hbase-migration-tools diff --git a/pom.xml b/pom.xml index 28cab3ab56..51157b6639 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1-SNAPSHOT + 2.18.1 pom ${project.groupId}:${project.artifactId} https://cloud.google.com/bigtable/ diff --git a/versions.txt b/versions.txt index 597d81de47..fb9ae9fc50 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -bigtable-client-parent:2.18.0:2.18.1-SNAPSHOT -bigtable-hbase-replication:2.18.0:2.18.1-SNAPSHOT -bigtable-hbase-mirroring:2.18.0:2.18.1-SNAPSHOT \ No newline at end of file +bigtable-client-parent:2.18.1:2.18.1 +bigtable-hbase-replication:2.18.1:2.18.1 +bigtable-hbase-mirroring:2.18.1:2.18.1 \ No newline at end of file From 1316f4e54de98a4f0fd1f6d226f59551b6a62337 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 16 Apr 2026 10:34:43 -0400 Subject: [PATCH 08/14] fix: remove batch endpoint (#4592) Change-Id: I53a61a9c3e0230d162b1b3176ebe2b78a2c2c07e --- .../wrappers/veneer/BigtableHBaseVeneerSettings.java | 8 -------- .../cloud/bigtable/beam/CloudBigtableConfiguration.java | 1 - 2 files changed, 9 deletions(-) diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java index 90bf8a193d..161df21159 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/BigtableHBaseVeneerSettings.java @@ -121,8 +121,6 @@ @InternalApi("For internal usage only") public class BigtableHBaseVeneerSettings extends BigtableHBaseSettings { - private static final String BIGTABLE_BATCH_DATA_HOST_DEFAULT = "batch-bigtable.googleapis.com"; - private static final ClientOperationTimeouts DEFAULT_TIMEOUTS = new ClientOperationTimeouts( /* unaryTimeouts= */ new OperationTimeouts( @@ -477,12 +475,6 @@ private void configureConnection( if (hostOverride.isPresent() || portOverride.isPresent()) { endpointOverride = Optional.of(hostOverride.or(defaultHostname) + ":" + portOverride.or(defaultPort)); - } else if (endpointKey.equals(BIGTABLE_HOST_KEY) - // only apply batch endpoint when the default endpoint hasnt changed (ie. when - // BIGTABLE_EMULATOR_HOST is set) - && defaultEndpoint.equals("bigtable.googleapis.com:443") - && configuration.getBoolean(BIGTABLE_USE_BATCH, false)) { - endpointOverride = Optional.of(BIGTABLE_BATCH_DATA_HOST_DEFAULT + ":443"); } if (endpointOverride.isPresent()) { diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java index 0477942a6c..bf40c2d62d 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/beam/CloudBigtableConfiguration.java @@ -230,7 +230,6 @@ public Configuration toHBaseConfig() { /** * Sets below setting for batch BIGTABLE_USE_CACHED_DATA_CHANNEL_POOL = true - * BigtableOptionsFactory.BIGTABLE_HOST_KEY = batch-bigtable.googleapis.com * BigtableOptionsFactory.INITIAL_ELAPSED_BACKOFF_MILLIS_KEY = 5ms * BigtableOptionsFactory.MAX_ELAPSED_BACKOFF_MILLIS_KEY = 5ms */ From 6c370939695b0692be5b173536998f197a81c144 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 16 Apr 2026 10:37:05 -0400 Subject: [PATCH 09/14] fix: expose max attempt (#4593) Change-Id: I227333d3bbf5ceef0ac3b7ccc71c4d59be042c17 --- .../java/com/google/cloud/bigtable/beam/TemplateUtils.java | 4 ++++ .../google/cloud/bigtable/beam/sequencefiles/ExportJob.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java index 53f79ae2b6..216f4fd514 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java @@ -106,6 +106,10 @@ public static CloudBigtableScanConfiguration buildExportConfig(ExportOptions opt BigtableOptionsFactory.BIGTABLE_READ_RPC_ATTEMPT_TIMEOUT_MS_KEY, options.getBigtableReadRpcAttemptTimeoutMs()); } + if (options.getBigtableMaxAttempts() != null) { + configBuilder.withConfiguration( + BigtableOptionsFactory.MAX_SCAN_TIMEOUT_RETRIES, options.getBigtableMaxAttempts()); + } return configBuilder.build(); } } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java index b70eef5c7d..ce17b5208a 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java @@ -191,6 +191,12 @@ public interface ExportOptions extends GcpOptions, GcsOptions { @SuppressWarnings("unused") void setBigtableReadRpcAttemptTimeoutMs(ValueProvider readRpcAttemptTimeoutMs); + + @Description("The maximum number of retry attempts for the Bigtable client.") + ValueProvider getBigtableMaxAttempts(); + + @SuppressWarnings("unused") + void setBigtableMaxAttempts(ValueProvider maxAttempts); } public static void main(String[] args) { From 64ece136347b7b7f8eb3b0915e353f1a87605376 Mon Sep 17 00:00:00 2001 From: Tianlei Pan Date: Thu, 16 Apr 2026 18:52:55 +0000 Subject: [PATCH 10/14] Pull bigtable-beam-import from jhambleton/dataflow-v2-v2.15.6 --- .../bigtable-beam-import/EnableAutoValue.txt | 0 .../bigtable-beam-import/pom.xml | 39 +- .../com/google/cloud/bigtable/beam/Main.java | 4 + .../cloud/bigtable/beam/TemplateUtils.java | 17 +- .../HBaseSnapshotRestoreTool.java | 149 +++++ .../ImportJobFromHbaseSnapshot.java | 281 +++++++++- .../beam/hbasesnapshots/SnapshotUtils.java | 326 +++++++++++ .../coders/RegionConfigCoder.java | 101 ++++ .../hbasesnapshots/coders/package-info.java | 21 + .../conf/HBaseSnapshotInputConfigBuilder.java | 142 +++++ .../hbasesnapshots/conf/ImportConfig.java | 175 ++++++ .../hbasesnapshots/conf/RegionConfig.java | 62 +++ .../hbasesnapshots/conf/SnapshotConfig.java | 89 +++ .../hbasesnapshots/conf/package-info.java | 17 + .../CleanupHBaseSnapshotRestoreFiles.java | 87 +++ .../dofn/CleanupRestoredSnapshots.java | 61 +++ .../hbasesnapshots/dofn/RestoreSnapshot.java | 60 ++ .../hbasesnapshots/dofn/package-info.java | 20 + .../transforms/HbaseRegionSplitTracker.java | 83 +++ .../transforms/ListRegions.java | 120 ++++ .../transforms/ReadRegions.java | 515 ++++++++++++++++++ .../transforms/package-info.java | 17 + .../beam/sequencefiles/ExportJob.java | 12 - .../BufferedHadoopHashTableSource.java | 1 - .../beam/hbasesnapshots/EndToEndIT.java | 20 +- .../HBaseSnapshotInputConfigBuilderTest.java | 1 + .../ImportJobFromHbaseSnapshotTest.java | 176 ++++++ .../hbasesnapshots/SnapshotTestHelper.java | 118 ++++ .../hbasesnapshots/SnapshotUtilsTest.java | 230 ++++++++ .../dofn/CleanUpRestoredSnapshotsTest.java | 70 +++ .../CleanupHBaseSnapshotRestoreFilesTest.java | 56 ++ .../dofn/RestoreSnapshotTest.java | 58 ++ .../bigtable/beam/it/CloudBigtableBeamIT.java | 3 - .../beam/sequencefiles/EndToEndIT.java | 10 +- .../sequencefiles/SequenceFileSourceTest.java | 8 +- 35 files changed, 3086 insertions(+), 63 deletions(-) create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/EnableAutoValue.txt create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotRestoreTool.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtils.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/RegionConfigCoder.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/package-info.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/ImportConfig.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/RegionConfig.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/SnapshotConfig.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/package-info.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFiles.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupRestoredSnapshots.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshot.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/package-info.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/HbaseRegionSplitTracker.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ListRegions.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ReadRegions.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/package-info.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshotTest.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotTestHelper.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtilsTest.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanUpRestoredSnapshotsTest.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFilesTest.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshotTest.java diff --git a/bigtable-dataflow-parent/bigtable-beam-import/EnableAutoValue.txt b/bigtable-dataflow-parent/bigtable-beam-import/EnableAutoValue.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 269ac5a0c1..bf70a19dde 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.17.0 + 2.15.6 4.0.0 @@ -39,6 +39,33 @@ limitations under the License. pom import + + + + + org.checkerframework + checker-qual + 3.31.0 + provided + + + com.google.errorprone + error_prone_annotations + 2.18.0 + provided + + + org.codehaus.mojo + animal-sniffer-annotations + 1.22 + provided + + + jakarta.annotation + jakarta.annotation-api + provided + @@ -83,7 +110,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.17.0 + 2.15.6 org.apache.hbase @@ -134,7 +161,11 @@ limitations under the License. beam-runners-direct-java test - + + com.google.cloud + google-cloud-bigtable-emulator-core + test + org.apache.hbase hbase-shaded-testing-util @@ -156,7 +187,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.17.0 + 2.15.6 test diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/Main.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/Main.java index 0c46e59c38..68eeebda46 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/Main.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/Main.java @@ -17,6 +17,7 @@ import com.google.bigtable.repackaged.com.google.api.core.InternalApi; import com.google.bigtable.repackaged.com.google.api.core.InternalExtensionOnly; +import com.google.cloud.bigtable.beam.hbasesnapshots.HBaseSnapshotRestoreTool; import com.google.cloud.bigtable.beam.hbasesnapshots.ImportJobFromHbaseSnapshot; import com.google.cloud.bigtable.beam.sequencefiles.CreateTableHelper; import com.google.cloud.bigtable.beam.sequencefiles.ExportJob; @@ -51,6 +52,9 @@ public static void main(String[] args) throws Exception { case "importsnapshot": ImportJobFromHbaseSnapshot.main(subArgs); break; + case "restoresnapshot": + HBaseSnapshotRestoreTool.main(subArgs); + break; case "create-table": CreateTableHelper.main(subArgs); break; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java index 53f79ae2b6..c339938e3d 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java @@ -20,6 +20,8 @@ import com.google.cloud.bigtable.beam.sequencefiles.ImportJob.ImportOptions; import com.google.cloud.bigtable.beam.validation.SyncTableJob.SyncTableOptions; import com.google.cloud.bigtable.hbase.BigtableOptionsFactory; +import com.google.cloud.bigtable.hbase.wrappers.BigtableHBaseSettings; +import java.util.concurrent.TimeUnit; import org.apache.beam.sdk.options.ValueProvider; /** @@ -44,7 +46,10 @@ public static CloudBigtableTableConfiguration buildImportConfig( .withProjectId(opts.getBigtableProject()) .withInstanceId(opts.getBigtableInstanceId()) .withTableId(opts.getBigtableTableId()) - .withConfiguration(BigtableOptionsFactory.CUSTOM_USER_AGENT_KEY, customUserAgent); + .withConfiguration(BigtableOptionsFactory.CUSTOM_USER_AGENT_KEY, customUserAgent) + .withConfiguration(BigtableOptionsFactory.MAX_INFLIGHT_RPCS_KEY, "100") + .withConfiguration(BigtableHBaseSettings.BULK_MUTATION_CLOSE_TIMEOUT_MILLISECONDS, + Long.toString(TimeUnit.MINUTES.toMillis(30))); if (opts.getBigtableAppProfileId() != null) { builder.withAppProfileId(opts.getBigtableAppProfileId()); } @@ -96,16 +101,6 @@ public static CloudBigtableScanConfiguration buildExportConfig(ExportOptions opt options.getBigtableStopRow(), options.getBigtableMaxVersions(), options.getBigtableFilter())); - if (options.getBigtableReadRpcTimeoutMs() != null) { - configBuilder.withConfiguration( - BigtableOptionsFactory.BIGTABLE_READ_RPC_TIMEOUT_MS_KEY, - options.getBigtableReadRpcTimeoutMs()); - } - if (options.getBigtableReadRpcAttemptTimeoutMs() != null) { - configBuilder.withConfiguration( - BigtableOptionsFactory.BIGTABLE_READ_RPC_ATTEMPT_TIMEOUT_MS_KEY, - options.getBigtableReadRpcAttemptTimeoutMs()); - } return configBuilder.build(); } } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotRestoreTool.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotRestoreTool.java new file mode 100644 index 0000000000..b4f3f0e699 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotRestoreTool.java @@ -0,0 +1,149 @@ +/* + * Copyright 2024 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 + * + * http://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.beam.hbasesnapshots; + +import com.google.api.core.InternalExtensionOnly; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.ImportConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import org.apache.beam.sdk.extensions.gcp.options.GcsOptions; +import org.apache.beam.sdk.options.PipelineOptionsFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper; + +/** + * + * + * 
+ *    java  -Dproject=$PROJECT \
+ *    -DhbaseSnapshotSourceDir=gs://HBASE_EXPORT_ROOT_PATH/data \
+ *    -Dsnapshots=$SNAPSHOT \
+ *    -Dregion=$REGION \
+ *    -DrestorePath=gs://HBASE_EXPORT_ROOT_PATH/restore \
+ *     -jar bigtable-dataflow-parent/bigtable-beam-import/target/bigtable-beam-import-2.12.1-shaded.jar  \
+ *     restoresnapshot
+ *
+ */ +@InternalExtensionOnly +public class HBaseSnapshotRestoreTool { + private static final Log LOG = LogFactory.getLog(HBaseSnapshotRestoreTool.class); + + @VisibleForTesting + static final String MISSING_SNAPSHOT_SOURCEPATH = + "Source Path containing hbase snapshots must be specified."; + + @VisibleForTesting + static final String MISSING_SNAPSHOT_NAMES = + "Snapshots must be specified. Allowed values are '*' (indicating all snapshots under source path) or " + + "'prefix*' (snapshots matching certain prefix) or 'snapshotname1:tablename1,snapshotname2:tablename2' " + + "(comma seperated list of snapshots)"; + + public static void main(String[] args) throws Exception { + GcsOptions options = PipelineOptionsFactory.create().as(GcsOptions.class); + options.setProject(System.getProperty("project")); + + ImportConfig importConfig = + System.getProperty("importConfigFilePath") != null + ? buildImportConfigFromConfigFile(System.getProperty("importConfigFilePath")) + : buildImportConfigFromArgs(options); + + LOG.info( + String.format( + "SourcePath:%s, RestorePath:%s", + importConfig.getSourcepath(), importConfig.getRestorepath())); + + Map configurations = + SnapshotUtils.getConfiguration( + null, // invoke from a local machine without using dataflow + options.getProject(), + importConfig.getSourcepath(), + importConfig.getHbaseConfiguration()); + + List snapshotConfigs = + SnapshotUtils.buildSnapshotConfigs( + importConfig.getSnapshots(), + configurations, + options.getProject(), + importConfig.getSourcepath(), + importConfig.getRestorepath()); + + for (SnapshotConfig config : snapshotConfigs) { + restoreSnapshot(config); + } + } + + @VisibleForTesting + static ImportConfig buildImportConfigFromArgs(GcsOptions gcsOptions) + throws IOException { + Preconditions.checkArgument( + System.getProperty("hbaseSnapshotSourceDir") != null, MISSING_SNAPSHOT_SOURCEPATH); + Preconditions.checkArgument(System.getProperty("snapshots") != null, MISSING_SNAPSHOT_NAMES); + + Map snapshots = + SnapshotUtils.isRegex(System.getProperty("snapshots")) + ? SnapshotUtils.getSnapshotsFromSnapshotPath( + System.getProperty("hbaseSnapshotSourceDir"), + gcsOptions.getGcsUtil(), + System.getProperty("snapshots")) + : SnapshotUtils.getSnapshotsFromString(System.getProperty("snapshots")); + + ImportConfig importConfig = new ImportConfig(); + importConfig.setSourcepath(System.getProperty("hbaseSnapshotSourceDir")); + importConfig.setSnapshotsFromMap(snapshots); + SnapshotUtils.setRestorePath(System.getProperty("restorePath"), importConfig); + + return importConfig; + } + + @VisibleForTesting + static ImportConfig buildImportConfigFromConfigFile(String configFilePath) throws Exception { + Gson gson = new GsonBuilder().create(); + ImportConfig importConfig = + gson.fromJson(SnapshotUtils.readFileContents(configFilePath), ImportConfig.class); + Preconditions.checkNotNull(importConfig.getSourcepath(), MISSING_SNAPSHOT_SOURCEPATH); + Preconditions.checkNotNull(importConfig.getSnapshots(), MISSING_SNAPSHOT_NAMES); + SnapshotUtils.setRestorePath(importConfig.getRestorepath(), importConfig); + return importConfig; + } + + @VisibleForTesting + /** + * Creates a copy of Snasphsot from the source path into restore path. + * + * @param snapshotConfig - Snapshot Configuration + * @throws IOException + */ + static void restoreSnapshot(SnapshotConfig snapshotConfig) throws IOException { + Path sourcePath = snapshotConfig.getSourcePath(); + Path restorePath = snapshotConfig.getRestorePath(); + Configuration configuration = snapshotConfig.getConfiguration(); + LOG.info( + "RestoreSnapshot - sourcePath:{" + sourcePath + "} restorePath: {" + restorePath + "}"); + FileSystem fileSystem = sourcePath.getFileSystem(configuration); + RestoreSnapshotHelper.copySnapshotForScanner( + configuration, fileSystem, sourcePath, restorePath, snapshotConfig.getSnapshotName()); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java index 064736a04b..60433a8251 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java @@ -15,21 +15,41 @@ */ package com.google.cloud.bigtable.beam.hbasesnapshots; -import com.google.bigtable.repackaged.com.google.api.core.InternalExtensionOnly; +import com.google.api.core.InternalExtensionOnly; +import com.google.api.services.dataflow.model.DebugOptions; +import org.apache.beam.sdk.options.PipelineOptions; import com.google.cloud.bigtable.beam.CloudBigtableIO; +import com.google.cloud.bigtable.beam.CloudBigtableTableConfiguration; import com.google.cloud.bigtable.beam.TemplateUtils; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.HBaseSnapshotInputConfigBuilder; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.ImportConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.dofn.CleanupHBaseSnapshotRestoreFiles; +import com.google.cloud.bigtable.beam.hbasesnapshots.dofn.CleanupRestoredSnapshots; +import com.google.cloud.bigtable.beam.hbasesnapshots.dofn.RestoreSnapshot; +import com.google.cloud.bigtable.beam.hbasesnapshots.transforms.ListRegions; +import com.google.cloud.bigtable.beam.hbasesnapshots.transforms.ReadRegions; import com.google.cloud.bigtable.beam.sequencefiles.HBaseResultToMutationFn; +import org.apache.beam.runners.dataflow.options.DataflowPipelineDebugOptions; import com.google.cloud.bigtable.beam.sequencefiles.ImportJob; import com.google.cloud.bigtable.beam.sequencefiles.Utils; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.Map; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; +import org.apache.beam.sdk.extensions.gcp.options.GcsOptions; +import org.apache.beam.sdk.io.FileSystems; import org.apache.beam.sdk.io.hadoop.format.HadoopFormatIO; import org.apache.beam.sdk.options.Default; import org.apache.beam.sdk.options.Description; import org.apache.beam.sdk.options.PipelineOptionsFactory; +import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.transforms.Create; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.Wait; @@ -37,6 +57,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -68,6 +89,16 @@ public class ImportJobFromHbaseSnapshot { private static final Log LOG = LogFactory.getLog(ImportJobFromHbaseSnapshot.class); + @VisibleForTesting + static final String MISSING_SNAPSHOT_SOURCEPATH = + "Source Path containing hbase snapshots must be specified."; + + @VisibleForTesting + static final String MISSING_SNAPSHOT_NAMES = + "Snapshots must be specified. Allowed values are '*' (indicating all snapshots under source path) or " + + "'prefix*' (snapshots matching certain prefix) or 'snapshotname1:tablename1,snapshotname2:tablename2' " + + "(comma seperated list of snapshots)"; + public interface ImportOptions extends ImportJob.ImportOptions { @Description("The HBase root dir where HBase snapshot files resides.") String getHbaseSnapshotSourceDir(); @@ -87,24 +118,264 @@ public interface ImportOptions extends ImportJob.ImportOptions { @SuppressWarnings("unused") void setEnableSnappy(Boolean enableSnappy); + + @Description("Path to config file containing snapshot source path/snapshot names.") + String getImportConfigFilePath(); + + void setImportConfigFilePath(String value); + + @Description( + "Snapshots to be imported. Can be '*', 'prefix*' or 'snap1,snap2' or 'snap1:table1,snap2:table2'.") + String getSnapshots(); + + void setSnapshots(String value); + + @Description("Specifies whether to use dynamic splitting while reading hbase region.") + @Default.Boolean(true) + boolean getUseDynamicSplitting(); + + void setUseDynamicSplitting(boolean value); + + @Description("Specifies the threshold for number of cells per mutation written.") + @Default.Integer(100_000 - 1) + int getMaxMutationsPerRequestThreshold(); + + void setMaxMutationsPerRequestThreshold(int value); + + @Description( + "Specifies whether to filter large rows that exceed FilterLargeRowsThresholdBytes should be logged and dropped.") + @Default.Boolean(false) + boolean getFilterLargeRows(); + + void setFilterLargeRows(boolean value); + + @Description( + "Specifies the size in bytes of a row that should be logged and dropped before loading to Bigtable.") + @Default.Long(256 * 1024 * 1024) + long getFilterLargeRowsThresholdBytes(); + + void setFilterLargeRowsThresholdBytes(long value); + + @Description( + "Specifies whether to filter large cells that exceed FilterLargeCellsThresholdBytes should be logged and dropped.") + @Default.Boolean(true) + boolean getFilterLargeCells(); + + void setFilterLargeCells(boolean value); + + @Description( + "Specifies the size in bytes of a cell that should be logged and dropped before loading to Bigtable.") + @Default.Integer(100 * 1024 * 1024) + int getFilterLargeCellsThresholdBytes(); + + void setFilterLargeCellsThresholdBytes(int value); + + @Description( + "Specifies whether to filter large row keys that exceed FilterLargeRowKeysThresholdBytes should be logged and dropped.") + @Default.Boolean(false) + boolean getFilterLargeRowKeys(); + + void setFilterLargeRowKeys(boolean value); + + @Description( + "Specifies the size in bytes of a row key that should be logged and dropped before loading to Bigtable.") + @Default.Integer(4 * 1024) + int getFilterLargeRowKeysThresholdBytes(); + + void setFilterLargeRowKeysThresholdBytes(int value); + + @Description("Specifies the number of shards to use when loading the snapshot. " + + "If set, shardIndex must also be set.") + Integer getNumShards(); + void setNumShards(Integer value); + + @Description("Specifies the shard index from [0, numShards) that this load represents.") + Integer getShardIndex(); + void setShardIndex(Integer value); + + @Description("Specifies the path to the restored Snapshot files.") + String getRestorePath(); + + void setRestorePath(String value); + + @Description("Specifies whether the snapshots restored should be deleted.") + @Default.Boolean(false) + Boolean getDeleteRestoredSnapshots(); + + void setDeleteRestoredSnapshots(Boolean value); + + @Description("Specifies whether the store step should be skipped.") + @Default.Boolean(false) + Boolean getSkipRestoreStep(); + + void setSkipRestoreStep(Boolean value); + + @Description("Specifies whether to perform only restore step.") + @Default.Boolean(false) + Boolean getPerformOnlyRestoreStep(); + + void setPerformOnlyRestoreStep(Boolean value); } public static void main(String[] args) throws Exception { PipelineOptionsFactory.register(ImportOptions.class); - ImportOptions opts = + ImportOptions options = PipelineOptionsFactory.fromArgs(args).withValidation().as(ImportOptions.class); + // To determine the Google Cloud Storage file scheme (gs://) + FileSystems.setDefaultPipelineOptions(PipelineOptionsFactory.create().as(GcsOptions.class)); + LOG.info("Building Pipeline"); - Pipeline pipeline = buildPipeline(opts); + Pipeline pipeline = null; + // Maintain Backward compatibility until deprecation + if (options.getSnapshotName() != null && !options.getSnapshotName().isEmpty()) { + pipeline = buildPipeline(options); + } else { + ImportConfig importConfig = + options.getImportConfigFilePath() != null + ? buildImportConfigFromConfigFile(options.getImportConfigFilePath()) + : buildImportConfigFromPipelineOptions(options, options.as(GcsOptions.class)); + + LOG.info( + String.format( + "SourcePath:%s, RestorePath:%s", + importConfig.getSourcepath(), importConfig.getRestorepath())); + pipeline = buildPipelineWithMultipleSnapshots(options, importConfig); + } + LOG.info("Running Pipeline"); PipelineResult result = pipeline.run(); - if (opts.getWait()) { + if (options.getWait()) { Utils.waitForPipelineToFinish(result); } } + @VisibleForTesting + static ImportConfig buildImportConfigFromConfigFile(String configFilePath) + throws Exception { + Gson gson = new GsonBuilder().create(); + ImportConfig importConfig = + gson.fromJson(SnapshotUtils.readFileContents(configFilePath), ImportConfig.class); + Preconditions.checkNotNull(importConfig.getSourcepath(), MISSING_SNAPSHOT_SOURCEPATH); + Preconditions.checkNotNull(importConfig.getSnapshots(), MISSING_SNAPSHOT_NAMES); + SnapshotUtils.setRestorePath(importConfig.getRestorepath(), importConfig); + return importConfig; + } + + @VisibleForTesting + static ImportConfig buildImportConfigFromPipelineOptions( + ImportOptions options, GcsOptions gcsOptions) throws IOException { + Preconditions.checkArgument( + options.getHbaseSnapshotSourceDir() != null, MISSING_SNAPSHOT_SOURCEPATH); + Preconditions.checkArgument(options.getSnapshots() != null, MISSING_SNAPSHOT_NAMES); + + Map snapshots = + SnapshotUtils.isRegex(options.getSnapshots()) + ? SnapshotUtils.getSnapshotsFromSnapshotPath( + options.getHbaseSnapshotSourceDir(), + gcsOptions.getGcsUtil(), + options.getSnapshots()) + : SnapshotUtils.getSnapshotsFromString(options.getSnapshots()); + + ImportConfig importConfig = new ImportConfig(); + importConfig.setSourcepath(options.getHbaseSnapshotSourceDir()); + importConfig.setSnapshotsFromMap(snapshots); + SnapshotUtils.setRestorePath(options.getRestorePath(), importConfig); + return importConfig; + } + + /** + * Builds the pipeline that supports loading multiple snapshots to BigTable. + * + * @param options - Pipeline options + * @param importConfig - Configuration representing snapshot source path, list of snapshots etc + * @return + * @throws Exception + */ + static Pipeline buildPipelineWithMultipleSnapshots( + ImportOptions options, ImportConfig importConfig) throws Exception { + Map configurations = + SnapshotUtils.getConfiguration( + options.getRunner().getSimpleName(), + options.getProject(), + importConfig.getSourcepath(), + importConfig.getHbaseConfiguration()); + + List snapshotConfigs = + SnapshotUtils.buildSnapshotConfigs( + importConfig.getSnapshots(), + configurations, + options.getProject(), + importConfig.getSourcepath(), + importConfig.getRestorepath()); + DataflowPipelineDebugOptions debugOptions = options.as(DataflowPipelineDebugOptions.class); + debugOptions.setGCThrashingPercentagePerPeriod(100.00); + + Pipeline pipeline = Pipeline.create(debugOptions); + + PCollection restoredSnapshots = + pipeline.apply("Read Snapshot Configs", Create.of(snapshotConfigs)); + if (!options.getSkipRestoreStep()) { + restoredSnapshots = + restoredSnapshots.apply("Restore Snapshots", ParDo.of(new RestoreSnapshot())); + } + if (options.getPerformOnlyRestoreStep()) { + return pipeline; + } + // Read records from hbase region files and write to Bigtable + // PCollection hbaseRecords = restoredSnapshots + // .apply("List Regions", new ListRegions()); + PCollection>> hbaseRecords = + restoredSnapshots + .apply("List Regions", new ListRegions()) + .apply( + "Read Regions", + new ReadRegions( + options.getUseDynamicSplitting(), + options.getMaxMutationsPerRequestThreshold(), + options.getFilterLargeRows(), + options.getFilterLargeRowsThresholdBytes(), + options.getFilterLargeCells(), + options.getFilterLargeCellsThresholdBytes(), + options.getFilterLargeRowKeys(), + options.getFilterLargeRowKeysThresholdBytes(), + options.getNumShards(), + options.getShardIndex())); + + options.setBigtableTableId(ValueProvider.StaticValueProvider.of("NA")); + CloudBigtableTableConfiguration bigtableConfiguration = + TemplateUtils.buildImportConfig(options, "HBaseSnapshotImportJob"); + if (importConfig.getBigtableConfiguration() != null) { + CloudBigtableTableConfiguration.Builder builder = bigtableConfiguration.toBuilder(); + for (Map.Entry entry : importConfig.getBigtableConfiguration().entrySet()) + builder = builder.withConfiguration(entry.getKey(), entry.getValue()); + bigtableConfiguration = builder.build(); + } + + hbaseRecords.apply( + "Write to BigTable", CloudBigtableIO.writeToMultipleTables(bigtableConfiguration)); + + // Clean up all the temporary restored snapshot HLinks after reading all the data + if (options.getDeleteRestoredSnapshots()) { + restoredSnapshots + .apply(Wait.on(hbaseRecords)) + .apply("Clean restored files", ParDo.of(new CleanupRestoredSnapshots())); + } + + return pipeline; + } + + /** + * Builds the pipeline that supports loading single snapshot to BigTable. Maintained for backward + * compatiablity and will be deprecated merging the functionality to + * buildPipelineWithMultipleSnapshots method. + * + * @param opts - Pipeline options + * @return + * @throws Exception + */ @VisibleForTesting static Pipeline buildPipeline(ImportOptions opts) throws Exception { Pipeline pipeline = Pipeline.create(Utils.tweakOptions(opts)); @@ -133,7 +404,7 @@ static Pipeline buildPipeline(ImportOptions opts) throws Exception { pipeline .apply(Create.of(sourceAndRestoreFolders)) .apply(Wait.on(readResult)) - .apply(ParDo.of(new CleanupHBaseSnapshotRestoreFilesFn())); + .apply(ParDo.of(new CleanupHBaseSnapshotRestoreFiles())); return pipeline; } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtils.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtils.java new file mode 100644 index 0000000000..cf4fa08438 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtils.java @@ -0,0 +1,326 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots; + +import com.google.api.core.InternalApi; +import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.ImportConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.base.Joiner; +import com.google.common.io.CharStreams; +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.channels.Channels; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import org.apache.beam.sdk.extensions.gcp.util.GcsUtil; +import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; +import org.apache.beam.sdk.io.FileSystems; +import org.apache.beam.sdk.util.BackOff; +import org.apache.beam.sdk.util.FluentBackoff; +import org.apache.beam.sdk.util.Sleeper; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HConstants; +import org.joda.time.Duration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Contains various helper methods to handle different tasks associated with importing of hbase + * snapshots + */ +@InternalApi("For internal usage only") +public class SnapshotUtils { + private static final Logger LOG = LoggerFactory.getLogger(SnapshotUtils.class); + private static final String DIRECTRUNNER = "DirectRunner"; + private static final String SNAPSHOT_MANIFEST_DIRECTORY = ".hbase-snapshot"; + private static final String GCS_SCHEME = "gs"; + private static final Sleeper sleeper = Sleeper.DEFAULT; + private static final Object lock = new Object(); + private static Configuration hbaseConfiguration; + + private SnapshotUtils() {} + + private static String getParentDirectory(String hbaseSnapshotSourceDirectory) { + URI hbaseSnapshotSourceUri; + try { + hbaseSnapshotSourceUri = new URI(hbaseSnapshotSourceDirectory); + } catch (URISyntaxException e) { + throw new RuntimeException( + String.format( + "Invalid file path format for snapshot source directory: %s. Valid paths should have file scheme (gs://, file://)", + hbaseSnapshotSourceDirectory)); + } + + if (hbaseSnapshotSourceUri.getScheme() != null + && hbaseSnapshotSourceUri.getScheme().equals("gs")) // i.e Cloud Storage file system + { + return GcsPath.fromUri(hbaseSnapshotSourceUri).getParent().toString(); + } + + return new File(hbaseSnapshotSourceDirectory).getParent(); + } + + static String removeSuffixSlashIfExists(String directory) { + return directory.endsWith("/") ? directory.substring(0, directory.length() - 1) : directory; + } + + static String appendCurrentTimestamp(String directory) { + DateTimeFormatter formatter = + DateTimeFormatter.ofPattern("yyyyMMddHHmm").withZone(ZoneId.of("UTC")); + String uuid = UUID.randomUUID().toString(); + return String.join( + "/", removeSuffixSlashIfExists(directory), formatter.format(Instant.now()) + "-" + uuid); + } + + static String getNamedDirectory(String sourceDirectory, String subFoldername) { + String parentDirectory = removeSuffixSlashIfExists(getParentDirectory(sourceDirectory)); + return appendCurrentTimestamp(String.join("/", parentDirectory, subFoldername)); + } + + /** Builds the configuration combining default and user provided values. */ + static Map getConfiguration( + String runner, + String project, + String sourcedir, + @Nullable Map hbaseConfiguration) { + Map configurations = new HashMap<>(); + + configurations.put(HConstants.HBASE_DIR, sourcedir); + configurations.put( + "fs.AbstractFileSystem.gs.impl", "com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS"); + configurations.put("fs.gs.project.id", project); + configurations.put("google.cloud.auth.service.account.enable", "true"); + + if (runner == null || runner.equals(DIRECTRUNNER)) { + // https://github.com/GoogleCloudDataproc/hadoop-connectors/blob/master/gcs/CONFIGURATION.md#authentication + configurations.put("fs.gs.auth.type", "APPLICATION_DEFAULT"); + } + + // Update the default configurations with user supplied configuration values + if (hbaseConfiguration != null) { + configurations.putAll(hbaseConfiguration); + } + return configurations; + } + + public static Configuration getHBaseConfiguration(Map configurations) { + if (hbaseConfiguration == null) { + synchronized (lock) { + if (hbaseConfiguration == null) + hbaseConfiguration = createHbaseConfiguration(configurations); + } + } + return hbaseConfiguration; + } + + private static Configuration createHbaseConfiguration(Map configurations) { + LOG.info("Create HBase Configuration instance"); + Configuration hbaseConfiguration = HBaseConfiguration.create(); + for (Map.Entry entry : configurations.entrySet()) + hbaseConfiguration.set(entry.getKey(), entry.getValue()); + return hbaseConfiguration; + } + + /** + * Build Snapshot Configurations. + * + * @param snapshotdetails - Snapshot details representing hbase snapshot name and corresponding + * bigtable table name. + * @param configurations - BigTable Configurations + * @param projectId - Google Cloud Project Id + * @param sourcePath - Source path containing snapshot files + * @param restorePath - Path snapshot files gets stored during job runs. + * @return + */ + static List buildSnapshotConfigs( + List snapshotdetails, + Map configurations, + String projectId, + String sourcePath, + String restorePath) { + + return snapshotdetails.stream() + .map( + snapshotInfo -> + SnapshotConfig.builder() + .setProjectId(projectId) + .setSourceLocation(sourcePath) + .setRestoreLocation(restorePath) + .setSnapshotName(snapshotInfo.getSnapshotName()) + .setTableName(snapshotInfo.getbigtableTableName()) + .setConfigurationDetails(configurations) + .build()) + .collect(Collectors.toList()); + } + + public static BackOff createBackOff( + long backoffInitialIntervalInMillis, long backoffMaxIntervalInMillis, int maxRetries) { + return FluentBackoff.DEFAULT + .withInitialBackoff(Duration.millis(backoffInitialIntervalInMillis)) + .withMaxRetries(maxRetries) + .withMaxBackoff(Duration.millis(backoffMaxIntervalInMillis)) + .backoff(); + } + + /** + * Creates restore path based on the input configuration + * + * @param importConfig - Job Configuration + */ + public static void setRestorePath(ImportConfig importConfig) { + importConfig.setRestorepath( + formatRestorePath(importConfig.getRestorepath(), importConfig.getSourcepath())); + } + + /** + * Creates restore path based on the input configuration + * + * @param restorePath - Restore path of the job. + * @param importConfig - Import config where we will set the restorePath property. + */ + public static void setRestorePath(String restorePath, ImportConfig importConfig) { + if (restorePath != null) { + importConfig.setRestorepath(restorePath); + return; + } + importConfig.setRestorepath( + formatRestorePath(importConfig.getRestorepath(), importConfig.getSourcepath())); + } + + /** + * Parses the provided input to generate snapshot names and corresponding bigtable names. For + * single snapshot names the following are valid formats: If both Snapshotname and bigtablename + * are same then only snapshotname can be provided If bigtablename is different then should be + * provided in the format snapshotname:bigtablename Multiple snapshots can be provided in + * snapshot1:table1,snapshot2:table2 format or snapshot1,snapshot2 format + * + * @param snapshotNames - Snapshot names and corresponding bigtable table names. + */ + public static Map getSnapshotsFromString(String snapshotNames) { + Map snapshots = new HashMap<>(); + for (String snapshotInfo : snapshotNames.split(",")) { + String[] snapshotWithTableName = snapshotInfo.split(":"); + if (snapshotWithTableName.length == 2) + snapshots.put(snapshotWithTableName[0], snapshotWithTableName[1]); + else if (snapshotWithTableName.length == 1) + snapshots.put(snapshotWithTableName[0], snapshotWithTableName[0]); + else + throw new IllegalArgumentException( + "Invalid specification format for snapshots. Expected format is snapshot1:table1,snapshot2:table2"); + } + return snapshots; + } + + public static String formatRestorePath(String providedPath, String hbaseSnapshotsPath) { + return providedPath == null + ? SnapshotUtils.getNamedDirectory(hbaseSnapshotsPath, "restore") + : SnapshotUtils.appendCurrentTimestamp(providedPath); + } + + /** + * Read list of Snapshot names from Snapshot Source Path + * + * @param importSnapshotpath - Path representing the snapshot source directory + * @param gcsUtil - GCS Instance + * @param prefix - Specific prefix to be matched or '*' for all files. + * @return + * @throws IOException + */ + public static Map getSnapshotsFromSnapshotPath( + String importSnapshotpath, GcsUtil gcsUtil, String prefix) throws IOException { + + importSnapshotpath = + Joiner.on("/") + .join(removeSuffixSlashIfExists(importSnapshotpath), SNAPSHOT_MANIFEST_DIRECTORY); + // Build GCS path from given string e.g: + // gs://sym-bucket/snapshots/20220309230526/.hbase-snapshot + GcsPath gcsPath = GcsPath.fromUri(importSnapshotpath); + // LOG.info("GCS Path:" + gcsPath + ";Object:" + gcsPath.getObject()); + Map snapshots = new HashMap<>(); + + List objects = + gcsUtil.listObjects(gcsPath.getBucket(), gcsPath.getObject(), null).getItems(); + if (objects == null) + throw new IllegalStateException( + String.format("Snapshot path %s does not contain any snapshots", importSnapshotpath)); + + // Build a pattern for object portion e.g if path is + // gs://sym-bucket/snapshots/20220309230526/.hbase-snapshot + // the object portion would be snapshots/60G/20220309230526/.hbase-snapshot + Pattern pathPattern = Pattern.compile(String.format("%s/(.+?/)", gcsPath.getObject())); + Pattern prefixPattern = prefix.equals("*") ? null : Pattern.compile(prefix); + Matcher pathMatcher = null; + String snapshotName = null; + for (StorageObject object : objects) { + pathMatcher = pathPattern.matcher(object.getId()); + if (pathMatcher.find()) { + // Group 1 represents the snapshot directory name along with suffix slash (e.g: snapshot1/) + snapshotName = pathMatcher.group(1).replace("/", ""); + if (prefix.equals("*") || prefixPattern.matcher(snapshotName).find()) + snapshots.put(snapshotName, snapshotName); + } + } + + return snapshots; + } + + /** + * Reads the contents of file + * + * @param filePath - Path of the file. + * @return + * @throws IOException + */ + public static String readFileContents(String filePath) throws IOException { + try (Reader reader = + Channels.newReader( + FileSystems.open(FileSystems.matchSingleFileSpec(filePath).resourceId()), + StandardCharsets.UTF_8.name())) { + return CharStreams.toString(reader); + } + } + + /** + * Check if the given value contains any character in given meta characters list + * + * @param data - text value + * @return + */ + public static boolean isRegex(String data) { + String[] metaChars = {"*", "+", "?"}; + return Arrays.stream(metaChars).anyMatch(data::contains); + } + + public static Sleeper getSleeper() { + return sleeper; + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/RegionConfigCoder.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/RegionConfigCoder.java new file mode 100644 index 0000000000..ecf2b8dd23 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/RegionConfigCoder.java @@ -0,0 +1,101 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.coders; + +import com.google.api.core.InternalApi; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.RegionConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import java.io.*; +import java.util.Collections; +import java.util.List; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.CoderException; +import org.apache.beam.sdk.coders.VarLongCoder; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; +import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; + +/** Implementation of {@link Coder} for encoding and decoding of {@link RegionConfig} */ +@InternalApi("For internal usage only") +public class RegionConfigCoder extends Coder { + private static final VarLongCoder longCoder = VarLongCoder.of(); + + @Override + public void encode(RegionConfig value, OutputStream outStream) throws IOException { + ObjectOutputStream objectOutputStream = new ObjectOutputStream(outStream); + objectOutputStream.writeObject(value.getSnapshotConfig()); + + HBaseProtos.RegionInfo regionInfo = ProtobufUtil.toRegionInfo(value.getRegionInfo()); + ByteArrayOutputStream boas1 = new ByteArrayOutputStream(); + regionInfo.writeTo(boas1); + objectOutputStream.writeObject(boas1.toByteArray()); + + HBaseProtos.TableSchema tableSchema = ProtobufUtil.toTableSchema(value.getTableDescriptor()); + ByteArrayOutputStream boas2 = new ByteArrayOutputStream(); + tableSchema.writeTo(boas2); + objectOutputStream.writeObject(boas2.toByteArray()); + + longCoder.encode(value.getRegionSize(), outStream); + } + + @Override + public RegionConfig decode(InputStream inStream) throws IOException { + ObjectInputStream objectInputStream = new ObjectInputStream(inStream); + SnapshotConfig snapshotConfig; + try { + snapshotConfig = (SnapshotConfig) objectInputStream.readObject(); + } catch (ClassNotFoundException e) { + throw new CoderException("Failed to deserialize RestoredSnapshotConfig", e); + } + + RegionInfo regionInfoProto = null; + try { + regionInfoProto = + ProtobufUtil.toRegionInfo( + HBaseProtos.RegionInfo.parseFrom((byte[]) objectInputStream.readObject())); + } catch (ClassNotFoundException e) { + throw new CoderException("Failed to parse regionInfo", e); + } + + TableDescriptor tableSchema = null; + try { + tableSchema = + ProtobufUtil.toTableDescriptor( + TableSchema.parseFrom((byte[]) objectInputStream.readObject())); + } catch (ClassNotFoundException e) { + throw new CoderException("Failed to parse tableSchema", e); + } + + Long regionsize = longCoder.decode(inStream); + + return RegionConfig.builder() + .setSnapshotConfig(snapshotConfig) + .setRegionInfo(regionInfoProto) + .setTableDescriptor(tableSchema) + .setRegionSize(regionsize) + .build(); + } + + @Override + public List> getCoderArguments() { + return Collections.emptyList(); + } + + @Override + public void verifyDeterministic() throws Coder.NonDeterministicException {} +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/package-info.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/package-info.java new file mode 100644 index 0000000000..c24c1f5d50 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/coders/package-info.java @@ -0,0 +1,21 @@ +/* + * Copyright 2026 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 + * + * http://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. + */ + +/** + * Contains coders to handle serialization and deserialization for different classes used in the + * pipeline. + */ +package com.google.cloud.bigtable.beam.hbasesnapshots.coders; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java new file mode 100644 index 0000000000..58ccd34425 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java @@ -0,0 +1,142 @@ +/* + * 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 + * + * http://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.beam.hbasesnapshots.conf; + +import com.google.common.base.Preconditions; +import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.mapreduce.TableInputFormat; +import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; +import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.mapreduce.InputFormat; +import org.apache.hadoop.mapreduce.Job; + +/** + * A {@link Configuration} that could be used in {@link HadoopFormatIO} for reading HBase snapshot + * hosted in Google Cloud Storage(GCS) bucket via GCS connector. It uses {@link + * TableSnapshotInputFormat} for reading HBase snapshots. + */ +public class HBaseSnapshotInputConfigBuilder { + + private static final Log LOG = LogFactory.getLog(HBaseSnapshotInputConfigBuilder.class); + // Batch size used for HBase snapshot scans + private static final int BATCH_SIZE = 1000; + + // a temp location to store metadata extracted from snapshot + public static final String RESTORE_DIR = "/.restore"; + + private String projectId; + private String hbaseSnapshotSourceDir; + private String snapshotName; + private String restoreDirSuffix; + + public HBaseSnapshotInputConfigBuilder() {} + + /* + * Set the project id use to access the GCS bucket with HBase snapshot data to be imported + */ + public HBaseSnapshotInputConfigBuilder setProjectId(String projectId) { + this.projectId = projectId; + return this; + } + + /* + * Set the GCS path where the HBase snapshot data is located + */ + public HBaseSnapshotInputConfigBuilder setHbaseSnapshotSourceDir(String hbaseSnapshotSourceDir) { + this.hbaseSnapshotSourceDir = hbaseSnapshotSourceDir; + return this; + } + + /* + * Set the name of the snapshot to be imported + * e.g when importing snapshot 'gs:///hbase-export/table_snapshot' + * put 'table_snapshot' as the {@code snapshotName} + * and 'gs:///hbase-export' as {@code exportedSnapshotDir} + */ + public HBaseSnapshotInputConfigBuilder setSnapshotName(String snapshotName) { + this.snapshotName = snapshotName; + return this; + } + + /* + * Set the unique suffix to be used for restore folder to avoid conflicts + */ + public HBaseSnapshotInputConfigBuilder setRestoreDirSuffix(String suffix) { + this.restoreDirSuffix = suffix; + return this; + } + + public String getRestoreDir() { + return RESTORE_DIR + this.restoreDirSuffix; + } + + public Configuration build() throws Exception { + Preconditions.checkState( + projectId != null && !projectId.isEmpty(), "Required value projectId must be set"); + Preconditions.checkState( + hbaseSnapshotSourceDir != null && !hbaseSnapshotSourceDir.isEmpty(), + "Required value hbaseSnapshotSourceDir must be set"); + Preconditions.checkState( + snapshotName != null && !snapshotName.isEmpty(), "Required value snapshotName must be set"); + Preconditions.checkState( + hbaseSnapshotSourceDir.startsWith(GcsPath.SCHEME), + "Snapshot folder must be hosted in a GCS bucket"); + + Configuration conf = createHBaseConfiguration(); + + // Configuring a MapReduce Job base on HBaseConfiguration + // and return the job Configuration + conf.set( + TableInputFormat.SCAN, + TableMapReduceUtil.convertScanToString(new Scan().setBatch(BATCH_SIZE))); + Job job = Job.getInstance(conf); // creates internal clone of hbaseConf + // the restore folder need to under current bucket root so to be considered + // within the same filesystem with the hbaseSnapshotSourceDir + TableSnapshotInputFormat.setInput(job, snapshotName, new Path(getRestoreDir())); + return job.getConfiguration(); // extract the modified clone + } + + // separate static part for unit testing + public Configuration createHBaseConfiguration() { + Configuration conf = HBaseConfiguration.create(); + + // Setup the input data location for HBase snapshot import + // exportedSnapshotDir should be a GCS Bucket path. + conf.set("hbase.rootdir", hbaseSnapshotSourceDir); + conf.set("fs.defaultFS", hbaseSnapshotSourceDir); + + // Setup GCS connector to use GCS as Hadoop filesystem + conf.set("fs.AbstractFileSystem.gs.impl", "com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS"); + conf.set("fs.gs.project.id", projectId); + conf.setBoolean("google.cloud.auth.service.account.enable", true); + + // Setup MapReduce config for TableSnapshotInputFormat + conf.setClass( + "mapreduce.job.inputformat.class", TableSnapshotInputFormat.class, InputFormat.class); + conf.setClass("key.class", ImmutableBytesWritable.class, Writable.class); + conf.setClass("value.class", Result.class, Object.class); + return conf; + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/ImportConfig.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/ImportConfig.java new file mode 100644 index 0000000000..b0b3e00010 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/ImportConfig.java @@ -0,0 +1,175 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.conf; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Class representing the job configuration loading the different input values and combinations of + * snapshot names (such as all snapshots or matching prefix or explicit names) provided. + */ +public final class ImportConfig implements Serializable { + private final long DEFAULT_BACKOFF_INITIAL_INTERVAL_MILLIS = 5000; // 5 seconds + private final long DEFAULT_BACKOFF_MAX_INTERVAL_MILLIS = 3 * 60 * 1000; // 180 seconds + private final int DEFAULT_BACKOFF_MAX_RETRIES = 3; + + @JsonAdapter(SnapshotInfoJsonAdapter.class) + public List snapshots; + + private String sourcepath; + private String restorepath; + private String runstatuspath; + private long backoffInitialIntervalInMillis = + DEFAULT_BACKOFF_INITIAL_INTERVAL_MILLIS; // Defaults to 5 seconds + private long backoffMaxIntervalInMillis = DEFAULT_BACKOFF_MAX_INTERVAL_MILLIS; // 60 seconds + private int backoffMaxretries = DEFAULT_BACKOFF_MAX_RETRIES; + private Map hbaseConfiguration; + private Map bigtableConfiguration; + + public void setSnapshotsFromMap(Map snapshots) { + this.snapshots = new ArrayList<>(); + snapshots.forEach( + (snapshotName, bigtableName) -> + this.snapshots.add(new SnapshotInfo(snapshotName, bigtableName))); + } + + public String getSourcepath() { + return this.sourcepath; + } + + public void setSourcepath(String sourcepath) { + this.sourcepath = sourcepath; + } + + public String getRestorepath() { + return restorepath; + } + + public void setRestorepath(String restorepath) { + this.restorepath = restorepath; + } + + public String getRunstatuspath() { + return runstatuspath; + } + + public void setRunstatuspath(String runstatuspath) { + this.runstatuspath = runstatuspath; + } + + public long getBackoffInitialIntervalInMillis() { + return backoffInitialIntervalInMillis; + } + + public void setBackoffInitialIntervalInMillis(long backoffInitialIntervalInMillis) { + this.backoffInitialIntervalInMillis = backoffInitialIntervalInMillis; + } + + public long getBackoffMaxIntervalInMillis() { + return this.backoffMaxIntervalInMillis; + } + + public void setBackoffMaxIntervalInMillis(long backoffMaxIntervalInMillis) { + this.backoffMaxIntervalInMillis = backoffMaxIntervalInMillis; + } + + public int getBackoffMaxretries() { + return this.backoffMaxretries; + } + + public void setBackoffMaxretries(int backoffMaxretries) { + this.backoffMaxretries = backoffMaxretries; + } + + public List getSnapshots() { + return this.snapshots; + } + + public void setSnapshots(List snapshots) { + this.snapshots = snapshots; + } + + public Map getHbaseConfiguration() { + return this.hbaseConfiguration; + } + + public void setHbaseConfiguration(Map hbaseConfiguration) { + this.hbaseConfiguration = hbaseConfiguration; + } + + public Map getBigtableConfiguration() { + return bigtableConfiguration; + } + + public void setBigtableConfiguration(Map bigtableConfiguration) { + this.bigtableConfiguration = bigtableConfiguration; + } + + public static class SnapshotInfo implements Serializable { + private final String snapshotName; + private final String bigtableTableName; + + public SnapshotInfo(String snapshotName, String tableName) { + this.snapshotName = snapshotName; + this.bigtableTableName = tableName; + } + + public String getSnapshotName() { + return snapshotName; + } + + public String getbigtableTableName() { + return bigtableTableName; + } + } + + static class SnapshotInfoJsonAdapter extends TypeAdapter> { + + @Override + public void write(JsonWriter jsonWriter, List snapshotInfos) throws IOException { + jsonWriter.beginObject(); + snapshotInfos.forEach( + snapshotInfo -> { + try { + jsonWriter.name(snapshotInfo.getSnapshotName()); + jsonWriter.value(snapshotInfo.getbigtableTableName()); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + jsonWriter.endObject(); + } + + @Override + public List read(JsonReader jsonReader) throws IOException { + List snapshotInfoList = new ArrayList<>(); + jsonReader.beginObject(); + while (jsonReader.hasNext()) { + snapshotInfoList.add(new SnapshotInfo(jsonReader.nextName(), jsonReader.nextString())); + } + jsonReader.endObject(); + return snapshotInfoList; + } + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/RegionConfig.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/RegionConfig.java new file mode 100644 index 0000000000..3176e71c63 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/RegionConfig.java @@ -0,0 +1,62 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.conf; + +import com.google.auto.value.AutoValue; +import com.google.cloud.bigtable.beam.hbasesnapshots.coders.RegionConfigCoder; +import javax.annotation.Nullable; +import org.apache.beam.sdk.coders.DefaultCoder; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.TableDescriptor; + +/** + * A {@link AutoValue} class representing the region configuration enclosing {@link SnapshotConfig}, + * hbase region info and hbase table descriptor. + */ +@DefaultCoder(RegionConfigCoder.class) +@AutoValue +public abstract class RegionConfig { + public static Builder builder() { + return new AutoValue_RegionConfig.Builder(); + } + + @Nullable + public abstract String getName(); + + public abstract SnapshotConfig getSnapshotConfig(); + + public abstract RegionInfo getRegionInfo(); + + public abstract TableDescriptor getTableDescriptor(); + + public abstract Long getRegionSize(); + + @AutoValue.Builder + public abstract static class Builder { + + public abstract Builder setName(String value); + + public abstract Builder setSnapshotConfig(SnapshotConfig value); + + public abstract Builder setRegionInfo(RegionInfo value); + + public abstract Builder setTableDescriptor(TableDescriptor value); + + public abstract Builder setRegionSize(Long value); + + public abstract RegionConfig build(); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/SnapshotConfig.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/SnapshotConfig.java new file mode 100644 index 0000000000..cef2557531 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/SnapshotConfig.java @@ -0,0 +1,89 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.conf; + +import com.google.auto.value.AutoValue; +import com.google.auto.value.extension.memoized.Memoized; +import com.google.cloud.bigtable.beam.hbasesnapshots.SnapshotUtils; +import java.io.Serializable; +import java.util.Map; +import org.apache.beam.sdk.schemas.AutoValueSchema; +import org.apache.beam.sdk.schemas.annotations.DefaultSchema; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; + +/** A {@link AutoValue} class representing the configuration associated with each snapshot. */ +@DefaultSchema(AutoValueSchema.class) +@AutoValue +public abstract class SnapshotConfig implements Serializable { + + public static Builder builder() { + return new AutoValue_SnapshotConfig.Builder(); + } + + public abstract String getProjectId(); + + public abstract String getSourceLocation(); + + // public abstract Path getSourcePath(); + @Memoized + public Path getSourcePath() { + return new Path(getSourceLocation()); + } + + @Memoized + public Path getRestorePath() { + return new Path(getRestoreLocation()); + } + + public abstract String getSnapshotName(); + + public abstract String getTableName(); + + public abstract String getRestoreLocation(); + + @Override + public abstract int hashCode(); + + @Override + public abstract boolean equals(Object obj); + + abstract Map getConfigurationDetails(); + + public Configuration getConfiguration() { + return SnapshotUtils.getHBaseConfiguration(getConfigurationDetails()); + } + + public abstract Builder toBuilder(); + + @AutoValue.Builder + public abstract static class Builder { + + public abstract Builder setProjectId(String projectId); + + public abstract Builder setSourceLocation(String value); + + public abstract Builder setSnapshotName(String value); + + public abstract Builder setTableName(String value); + + public abstract Builder setRestoreLocation(String value); + + public abstract Builder setConfigurationDetails(Map configuration); + + public abstract SnapshotConfig build(); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/package-info.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/package-info.java new file mode 100644 index 0000000000..5a7bb988eb --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2026 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 + * + * http://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 contains configuration classes used in the pipeline. */ +package com.google.cloud.bigtable.beam.hbasesnapshots.conf; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFiles.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFiles.java new file mode 100644 index 0000000000..6b5d92ec78 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFiles.java @@ -0,0 +1,87 @@ +/* + * 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import com.google.api.core.InternalApi; +import com.google.api.services.storage.model.Objects; +import com.google.common.base.Preconditions; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.apache.beam.sdk.extensions.gcp.options.GcpOptions; +import org.apache.beam.sdk.extensions.gcp.util.GcsUtil; +import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.values.KV; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A {@link DoFn} that could be used for cleaning up temp files generated during HBase snapshot + * scans in Google Cloud Storage(GCS) bucket via GCS connector. + */ +@InternalApi("For internal usage only") +public class CleanupHBaseSnapshotRestoreFiles extends DoFn, Boolean> { + private static final Log LOG = LogFactory.getLog(CleanupHBaseSnapshotRestoreFiles.class); + + public static String getWorkingBucketName(String hbaseSnapshotDir) { + Preconditions.checkArgument( + hbaseSnapshotDir.startsWith(GcsPath.SCHEME), + "snapshot folder must be hosted in a GCS bucket "); + + return GcsPath.fromUri(hbaseSnapshotDir).getBucket(); + } + + // getListPrefix convert absolute restorePath in a Hadoop filesystem + // to a match prefix in a GCS bucket + public static String getListPrefix(String restorePath) { + Preconditions.checkArgument( + restorePath.startsWith("/"), + "restore folder must be an absolute path in current filesystem"); + return restorePath.substring(1); + } + + @ProcessElement + public void processElement(ProcessContext context) throws IOException { + KV elem = context.element(); + + String hbaseSnapshotDir = elem.getKey(); + String restorePath = elem.getValue(); + String prefix = getListPrefix(restorePath); + String bucketName = getWorkingBucketName(hbaseSnapshotDir); + Preconditions.checkState( + !prefix.isEmpty() && !hbaseSnapshotDir.contains(String.format("%s/%s", bucketName, prefix)), + "restore folder should not be empty or a subfolder of hbaseSnapshotSourceDir"); + GcpOptions gcpOptions = context.getPipelineOptions().as(GcpOptions.class); + GcsUtil gcsUtil = new GcsUtil.GcsUtilFactory().create(gcpOptions); + + String pageToken = null; + List results = new ArrayList<>(); + do { + Objects objects = gcsUtil.listObjects(bucketName, prefix, pageToken); + if (objects.getItems() == null) { + break; + } + + objects.getItems().stream() + .map(storageObject -> GcsPath.fromObject(storageObject).toString()) + .forEach(results::add); + pageToken = objects.getNextPageToken(); + } while (pageToken != null); + gcsUtil.remove(results); + context.output(true); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupRestoredSnapshots.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupRestoredSnapshots.java new file mode 100644 index 0000000000..3a7873e1f7 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupRestoredSnapshots.java @@ -0,0 +1,61 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import com.google.api.core.InternalApi; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.annotations.VisibleForTesting; +import java.io.IOException; +import java.util.Arrays; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** A {@link DoFn} for cleaning up files from restore path generated during job run. */ +@InternalApi("For internal usage only") +public class CleanupRestoredSnapshots extends DoFn { + + private static final Logger LOG = LoggerFactory.getLogger(CleanupRestoredSnapshots.class); + + @ProcessElement + public void processElement( + @Element SnapshotConfig snapshotConfig, OutputReceiver outputReceiver) + throws IOException { + try { + cleanupSnapshot(snapshotConfig); + } catch (Exception ex) { + LOG.error( + "Exception: {}\n StackTrace:{}", ex.getMessage(), Arrays.toString(ex.getStackTrace())); + } + } + + /** + * Removes the snapshot files from restore path. + * + * @param snapshotConfig - Snapshot Configuration + * @throws IOException + */ + @VisibleForTesting + void cleanupSnapshot(SnapshotConfig snapshotConfig) throws IOException { + Path restorePath = snapshotConfig.getRestorePath(); + Configuration configuration = snapshotConfig.getConfiguration(); + FileSystem fileSystem = restorePath.getFileSystem(configuration); + fileSystem.delete(restorePath, true); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshot.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshot.java new file mode 100644 index 0000000000..3718e7fd81 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshot.java @@ -0,0 +1,60 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import com.google.api.core.InternalApi; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import java.io.IOException; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link DoFn} for preprocessing the Snapshot files to restore HLinks & References prior to + * reading the snapshot. + */ +@InternalApi("For internal usage only") +public class RestoreSnapshot extends DoFn { + private static final Logger LOG = LoggerFactory.getLogger(RestoreSnapshot.class); + + @ProcessElement + public void processElement( + @Element SnapshotConfig snapshotConfig, OutputReceiver outputReceiver) + throws IOException { + restoreSnapshot(snapshotConfig); + outputReceiver.output(snapshotConfig); + } + + /** + * Creates a copy of Snasphsot from the source path into restore path. + * + * @param snapshotConfig - Snapshot Configuration + * @throws IOException + */ + void restoreSnapshot(SnapshotConfig snapshotConfig) throws IOException { + Path sourcePath = snapshotConfig.getSourcePath(); + Path restorePath = snapshotConfig.getRestorePath(); + Configuration configuration = snapshotConfig.getConfiguration(); + LOG.info("RestoreSnapshot - sourcePath:{} restorePath: {}", sourcePath, restorePath); + FileSystem fileSystem = sourcePath.getFileSystem(configuration); + RestoreSnapshotHelper.copySnapshotForScanner( + configuration, fileSystem, sourcePath, restorePath, snapshotConfig.getSnapshotName()); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/package-info.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/package-info.java new file mode 100644 index 0000000000..d92ac7b6aa --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2026 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 + * + * http://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. + */ +/** + * Contains all the {@link org.apache.beam.sdk.transforms.DoFn} implementations used in the + * pipeline. + */ +package com.google.cloud.bigtable.beam.hbasesnapshots.dofn; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/HbaseRegionSplitTracker.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/HbaseRegionSplitTracker.java new file mode 100644 index 0000000000..fd794e7a61 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/HbaseRegionSplitTracker.java @@ -0,0 +1,83 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.transforms; + +import com.google.api.core.InternalApi; +import org.apache.beam.sdk.io.range.ByteKey; +import org.apache.beam.sdk.io.range.ByteKeyRange; +import org.apache.beam.sdk.transforms.splittabledofn.ByteKeyRangeTracker; +import org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker; +import org.apache.beam.sdk.transforms.splittabledofn.SplitResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link RestrictionTracker} wrapping the {@link ByteKeyRangeTracker} for controlled execution of + * dynamic splitting. + */ +@InternalApi("For internal usage only") +public class HbaseRegionSplitTracker extends RestrictionTracker + implements RestrictionTracker.HasProgress { + + private static final Logger LOG = LoggerFactory.getLogger(HbaseRegionSplitTracker.class); + + private final String snapshotName; + + private final String regionName; + private final ByteKeyRangeTracker byteKeyRangeTracker; + + private final boolean enableDynamicSplitting; + + public HbaseRegionSplitTracker( + String snapshotName, String regionName, ByteKeyRange range, boolean enableDynamicSplitting) { + this.snapshotName = snapshotName; + this.regionName = regionName; + this.byteKeyRangeTracker = ByteKeyRangeTracker.of(range); + this.enableDynamicSplitting = enableDynamicSplitting; + } + + public ByteKeyRange currentRestriction() { + return this.byteKeyRangeTracker.currentRestriction(); + } + + public SplitResult trySplit(double fractionOfRemainder) { + LOG.info( + "Splitting restriction for region:{} in snapshot:{}", this.regionName, this.snapshotName); + + return enableDynamicSplitting ? this.byteKeyRangeTracker.trySplit(fractionOfRemainder) : null; + } + + public boolean tryClaim(ByteKey key) { + return this.byteKeyRangeTracker.tryClaim(key); + } + + public void checkDone() throws IllegalStateException { + this.byteKeyRangeTracker.checkDone(); + } + + public RestrictionTracker.IsBounded isBounded() { + return this.byteKeyRangeTracker.isBounded(); + } + + public String toString() { + return this.byteKeyRangeTracker.toString(); + } + + @Override + public Progress getProgress() { + return this.byteKeyRangeTracker.getProgress(); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ListRegions.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ListRegions.java new file mode 100644 index 0000000000..b0e1698866 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ListRegions.java @@ -0,0 +1,120 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.transforms; + +import com.google.api.core.InternalApi; +import com.google.cloud.bigtable.beam.hbasesnapshots.coders.RegionConfigCoder; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.RegionConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.annotations.VisibleForTesting; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.Reshuffle; +import org.apache.beam.sdk.values.PCollection; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormatImpl; +import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos; +import org.apache.hadoop.hbase.snapshot.SnapshotManifest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link PTransform} for listing the regions from snapshot manifest and builds the {@link + * RegionConfig} instances + */ +@InternalApi("For internal usage only") +public class ListRegions + extends PTransform, PCollection> { + + @VisibleForTesting + static class ListRegionsFn extends DoFn { + private static final Logger LOG = LoggerFactory.getLogger(ListRegionsFn.class); + + private static long GIGA_BYTE = 1024 * 1024 * 1024; + + private Map computeRegionSize(SnapshotManifest snapshotManifest) { + Map regionsSize = new HashMap<>(); + long totalSize = 0; + for (SnapshotProtos.SnapshotRegionManifest regionManifest : + snapshotManifest.getRegionManifests()) { + totalSize = 0; + for (SnapshotProtos.SnapshotRegionManifest.FamilyFiles familyFiles : + regionManifest.getFamilyFilesList()) { + for (SnapshotProtos.SnapshotRegionManifest.StoreFile StoreFile : + familyFiles.getStoreFilesList()) totalSize += StoreFile.getFileSize(); + } + regionsSize.put(regionManifest.getRegionInfo().getRegionId(), totalSize); + } + + return regionsSize; // (int)Math.ceil((totalSize * 1.0)/GIGA_BYTE); + } + + /** + * Reads snapshot file manifest and lists all the regions including the size. + * + * @param snapshotConfig - Snapshot Configuration containing source path. + * @param outputReceiver + * @throws Exception + */ + @ProcessElement + public void processElement( + @Element SnapshotConfig snapshotConfig, OutputReceiver outputReceiver) + throws Exception { + + Configuration configuration = snapshotConfig.getConfiguration(); + Path sourcePath = snapshotConfig.getSourcePath(); + FileSystem fileSystem = sourcePath.getFileSystem(configuration); + SnapshotManifest snapshotManifest = + TableSnapshotInputFormatImpl.getSnapshotManifest( + configuration, snapshotConfig.getSnapshotName(), sourcePath, fileSystem); + + Map regionsSize = computeRegionSize(snapshotManifest); + TableDescriptor tableDescriptor = snapshotManifest.getTableDescriptor(); + + // Read Region info + List regionInfos = + TableSnapshotInputFormatImpl.getRegionInfosFromManifest(snapshotManifest); + + // List the regions + regionInfos.stream() + .map( + regionInfo -> + RegionConfig.builder() + .setSnapshotConfig(snapshotConfig) + .setTableDescriptor(tableDescriptor) + .setRegionInfo(regionInfo) + .setRegionSize(regionsSize.get(regionInfo.getRegionId())) + .build()) + .forEach(outputReceiver::output); + } + } + + @Override + public PCollection expand(PCollection snapshotconfigs) { + return snapshotconfigs + .apply("List Regions", ParDo.of(new ListRegionsFn())) + .setCoder(new RegionConfigCoder()) + .apply(Reshuffle.viaRandomKey()); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ReadRegions.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ReadRegions.java new file mode 100644 index 0000000000..70d761015b --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/ReadRegions.java @@ -0,0 +1,515 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.transforms; + +// import com.google.cloud.bigtable.beam.hbasesnapshots.ImportSnapshots; + +import com.google.api.core.InternalApi; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.RegionConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.primitives.UnsignedBytes; +import java.io.IOException; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.coders.CannotProvideCoderException; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.io.range.ByteKey; +import org.apache.beam.sdk.io.range.ByteKeyRange; +import org.apache.beam.sdk.schemas.NoSuchSchemaException; +import org.apache.beam.sdk.schemas.SchemaCoder; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.Filter; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.display.DisplayData; +import org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.TypeDescriptor; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.client.*; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.RegionScanner; +import org.apache.hadoop.hbase.regionserver.RegionServerServices; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.apache.hadoop.hbase.util.RegionSplitter; +import org.apache.hadoop.hbase.wal.WAL; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link PTransform} for reading the records from each region and creates Hbase {@link Mutation} + * instances. Each region will be split into configured size (512 MB) and pipeline option {@link + * ImportSnapshots.ImportSnapshotsOptions#getUseDynamicSplitting() useDynamicSplitting} can be used + * to control whether each split needs to be subdivided further or not. + */ +@InternalApi("For internal usage only") +public class ReadRegions + extends PTransform, PCollection>>> { + + private static final long BYTES_PER_SPLIT = 512 * 1024 * 1024; // 512 MB + + private static final long BYTES_PER_GB = 1024 * 1024 * 1024; + + private final boolean useDynamicSplitting; + + private final int maxMutationsPerRequestThreshold; + + private final boolean filterLargeRows; + private final long filterLargeRowThresholdBytes; + + private final boolean filterLargeCells; + private final int filterLargeCellThresholdBytes; + + private final boolean filterLargeRowKeys; + private final int filterLargeRowKeysThresholdBytes; + + private final Integer numShards; + private final Integer shardIndex; + + public ReadRegions( + boolean useDynamicSplitting, + int maxMutationsPerRequestThreshold, + boolean filterLargeRows, + long filterLargeRowThresholdBytes, + boolean filterLargeCells, + int filterLargeCellThresholdBytes, + boolean filterLargeRowKeys, + int filterLargeRowKeysThresholdBytes, + Integer numShards, + Integer shardIndex) { + this.useDynamicSplitting = useDynamicSplitting; + this.maxMutationsPerRequestThreshold = maxMutationsPerRequestThreshold; + + this.filterLargeRows = filterLargeRows; + this.filterLargeRowThresholdBytes = filterLargeRowThresholdBytes; + + this.filterLargeCells = filterLargeCells; + this.filterLargeCellThresholdBytes = filterLargeCellThresholdBytes; + + this.filterLargeRowKeys = filterLargeRowKeys; + this.filterLargeRowKeysThresholdBytes = filterLargeRowKeysThresholdBytes; + + if (numShards != null && shardIndex == null) { + throw new IllegalArgumentException("if numShards is set, shardIndex must also be"); + } + if (numShards != null && (shardIndex >= numShards || shardIndex < 0)) { + throw new IllegalArgumentException("shardIndex must be between [0, numShards)"); + } + + this.numShards = numShards; + this.shardIndex = shardIndex; + } + + @Override + public PCollection>> expand( + PCollection regionConfig) { + Pipeline pipeline = regionConfig.getPipeline(); + SchemaCoder snapshotConfigSchemaCoder; + Coder hbaseResultCoder; + try { + snapshotConfigSchemaCoder = pipeline.getSchemaRegistry().getSchemaCoder(SnapshotConfig.class); + hbaseResultCoder = pipeline.getCoderRegistry().getCoder(TypeDescriptor.of(Result.class)); + } catch (CannotProvideCoderException | NoSuchSchemaException e) { + throw new RuntimeException(e); + } + + PCollection maybeShardedRegions = regionConfig; + if (numShards != null) { + maybeShardedRegions = regionConfig.apply( + "Select regions for shard", + Filter.by(rc -> { + // encodedName is an MD5 hash of the region info and therefor should be well distributed + byte[] regionName = rc.getRegionInfo().getEncodedNameAsBytes(); + long remainder = new BigInteger(regionName).mod(BigInteger.valueOf(numShards)).longValue(); + boolean shouldTake = remainder == shardIndex; + ReadRegionFn.LOG.info("Region {} was {} due to sharding", + rc.getRegionInfo().getRegionNameAsString(), + shouldTake ? "taken" : "skipped"); + return shouldTake; + })); + } + + return maybeShardedRegions + .apply("Read snapshot region", ParDo.of(new ReadRegionFn(this.useDynamicSplitting))) + .setCoder(KvCoder.of(snapshotConfigSchemaCoder, hbaseResultCoder)) + .apply( + "Create Mutation", + ParDo.of( + new CreateMutationsFn( + this.maxMutationsPerRequestThreshold, + this.filterLargeRows, + this.filterLargeRowThresholdBytes, + this.filterLargeCells, + this.filterLargeCellThresholdBytes, + this.filterLargeRowKeys, + this.filterLargeRowKeysThresholdBytes))); + } + + static class ReadRegionFn extends DoFn> { + private static final Logger LOG = LoggerFactory.getLogger(ReadRegionFn.class); + + private final boolean useDynamicSplitting; + + public ReadRegionFn(boolean useDynamicSplitting) { + this.useDynamicSplitting = useDynamicSplitting; + } + + @ProcessElement + public void processElement( + @Element RegionConfig regionConfig, + OutputReceiver> outputReceiver, + RestrictionTracker tracker) + throws Exception { + + boolean hasSplit = false; + try (HBaseRegionScanner scanner = newScanner(regionConfig, tracker.currentRestriction())) { + for (Result result = scanner.next(); result != null; result = scanner.next()) { + // if (flag==0 ) { + if (tracker.tryClaim(ByteKey.copyFrom(result.getRow()))) { + outputReceiver.output(KV.of(regionConfig.getSnapshotConfig(), result)); + } else { + hasSplit = true; + break; + } + // } + } + } + // if (!hasSplit) + tracker.tryClaim(ByteKey.EMPTY); + } + + /** + * Scans each region for given key range and constructs a ClientSideRegionScanner instance + * + * @param regionConfig - HBase Region Configuration + * @param byteKeyRange - Key range covering start and end row key + * @return + * @throws Exception + */ + private HBaseRegionScanner newScanner(RegionConfig regionConfig, ByteKeyRange byteKeyRange) + throws Exception { + Scan scan = + new Scan() + // Limit scan to split range + .withStartRow(byteKeyRange.getStartKey().getBytes()) + .withStopRow(byteKeyRange.getEndKey().getBytes()) + .setIsolationLevel(IsolationLevel.READ_UNCOMMITTED) + .setCacheBlocks(false); + + SnapshotConfig snapshotConfig = regionConfig.getSnapshotConfig(); + + Path sourcePath = snapshotConfig.getSourcePath(); + Path restorePath = snapshotConfig.getRestorePath(); + Configuration configuration = snapshotConfig.getConfiguration(); + FileSystem fileSystem = sourcePath.getFileSystem(configuration); + + return new HBaseRegionScanner( + configuration, + fileSystem, + restorePath, + regionConfig.getTableDescriptor(), + regionConfig.getRegionInfo(), + scan); + } + + @GetInitialRestriction + public ByteKeyRange getInitialRange(@Element RegionConfig regionConfig) { + return ByteKeyRange.of( + ByteKey.copyFrom(regionConfig.getRegionInfo().getStartKey()), + ByteKey.copyFrom(regionConfig.getRegionInfo().getEndKey())); + } + + @GetSize + public double getSize(@Element RegionConfig regionConfig) { + return BYTES_PER_SPLIT; + } + + @NewTracker + public HbaseRegionSplitTracker newTracker( + @Element RegionConfig regionConfig, @Restriction ByteKeyRange range) { + return new HbaseRegionSplitTracker( + regionConfig.getSnapshotConfig().getSnapshotName(), + regionConfig.getRegionInfo().getEncodedName(), + range, + useDynamicSplitting); + } + + @SplitRestriction + public void splitRestriction( + @Element RegionConfig regionConfig, + @Restriction ByteKeyRange range, + OutputReceiver outputReceiver) { + try { + int numSplits = getSplits(regionConfig.getRegionSize()); + LOG.info( + "Splitting Initial Restriction for SnapshotName: {} - regionname:{} - regionsize(GB):{} - Splits: {}", + regionConfig.getSnapshotConfig().getSnapshotName(), + regionConfig.getRegionInfo().getEncodedName(), + (double) regionConfig.getRegionSize() / BYTES_PER_GB, + numSplits); + if (numSplits > 1) { + RegionSplitter.UniformSplit uniformSplit = new RegionSplitter.UniformSplit(); + byte[][] splits = + uniformSplit.split( + range.getStartKey().getBytes(), + range.getEndKey().getBytes(), + getSplits(regionConfig.getRegionSize()), + true); + for (int i = 0; i < splits.length - 1; i++) + outputReceiver.output( + ByteKeyRange.of(ByteKey.copyFrom(splits[i]), ByteKey.copyFrom(splits[i + 1]))); + } else { + outputReceiver.output(range); + } + } catch (Exception ex) { + LOG.warn( + "Unable to split range for region:{} in Snapshot:{}", + regionConfig.getRegionInfo().getEncodedName(), + regionConfig.getSnapshotConfig().getSnapshotName()); + outputReceiver.output(range); + } + } + + private int getSplits(long sizeInBytes) { + return (int) Math.ceil((double) sizeInBytes / BYTES_PER_SPLIT); + } + + @Override + public void populateDisplayData(DisplayData.Builder builder) { + builder.add( + DisplayData.item("DynamicSplitting", useDynamicSplitting ? "Enabled" : "Disabled") + .withLabel("Dynamic Splitting")); + } + } + + /** + * A {@link DoFn} class for converting Hbase {@link org.apache.hadoop.hbase.client.Result} to list + * of Hbase {@link org.apache.hadoop.hbase.client.Mutation}s + */ + static class CreateMutationsFn + extends DoFn, KV>> { + private static final Logger LOG = LoggerFactory.getLogger(CreateMutationsFn.class); + private final int maxMutationsPerRequestThreshold; + + private final boolean filterLargeRows; + + private final long filterLargeRowThresholdBytes; + + private final boolean filterLargeCells; + + private final int filterLargeCellThresholdBytes; + + private final boolean filterLargeRowKeys; + + private final int filterLargeRowKeysThresholdBytes; + + public CreateMutationsFn( + int maxMutationsPerRequestThreshold, + boolean filterLargeRows, + long filterLargeRowThresholdBytes, + boolean filterLargeCells, + int filterLargeCellThresholdBytes, + boolean filterLargeRowKeys, + int filterLargeRowKeysThresholdBytes) { + + this.maxMutationsPerRequestThreshold = maxMutationsPerRequestThreshold; + + this.filterLargeRows = filterLargeRows; + this.filterLargeRowThresholdBytes = filterLargeRowThresholdBytes; + + this.filterLargeCells = filterLargeCells; + this.filterLargeCellThresholdBytes = filterLargeCellThresholdBytes; + + this.filterLargeRowKeys = filterLargeRowKeys; + this.filterLargeRowKeysThresholdBytes = filterLargeRowKeysThresholdBytes; + } + + @ProcessElement + public void processElement( + @Element KV element, + OutputReceiver>> outputReceiver) + throws IOException { + if (element.getValue().listCells().isEmpty()) return; + String targetTable = element.getKey().getTableName(); + + // Limit the number of mutations per Put (server will reject >= 100k mutations per Put) + byte[] rowKey = element.getValue().getRow(); + List mutations = new ArrayList<>(); + + boolean logAndSkipIncompatibleRowMutations = + verifyRowMutationThresholds(rowKey, element.getValue().listCells(), mutations); + + if (!logAndSkipIncompatibleRowMutations && mutations.size() > 0) { + outputReceiver.output(KV.of(targetTable, mutations)); + } + } + + private boolean verifyRowMutationThresholds( + byte[] rowKey, List cells, List mutations) throws IOException { + boolean logAndSkipIncompatibleRows = false; + + Put put = null; + int cellCount = 0; + long totalByteSize = 0L; + + // create mutations + for (Cell cell : cells) { + totalByteSize += cell.heapSize(); + + // handle large cells + if (filterLargeCells && cell.getValueLength() > filterLargeCellThresholdBytes) { + // TODO add config name in log + LOG.warn( + "Dropping mutation, cell value length, " + + cell.getValueLength() + + ", exceeds filter length, " + + filterLargeCellThresholdBytes + + ", cell: " + + cell + + ", row key: " + + Bytes.toStringBinary(rowKey)); + continue; + } + + // Split the row into multiple mutations if mutations exceeds threshold limit + if (cellCount % maxMutationsPerRequestThreshold == 0) { + cellCount = 0; + put = new Put(rowKey); + mutations.add(put); + } + put.add(cell); + cellCount++; + } + + // TODO add config name in log + if (filterLargeRows && totalByteSize > filterLargeRowThresholdBytes) { + logAndSkipIncompatibleRows = true; + LOG.warn( + "Dropping row, row length, " + + totalByteSize + + ", exceeds filter length threshold, " + + filterLargeRowThresholdBytes + + ", row key: " + + Bytes.toStringBinary(rowKey)); + } + + // TODO add config name in log + if (filterLargeRowKeys && rowKey.length > filterLargeRowKeysThresholdBytes) { + logAndSkipIncompatibleRows = true; + LOG.warn( + "Dropping row, row key length, " + + rowKey.length + + ", exceeds filter length threshold, " + + filterLargeRowKeysThresholdBytes + + ", row key: " + + Bytes.toStringBinary(rowKey)); + } + + return logAndSkipIncompatibleRows; + } + } + + + /** + * A workalike for {@link org.apache.hadoop.hbase.client.ClientSideRegionScanner}. + * + *

It serves the same purpose, but skips block and mobFile cache initialization. + * Those caches dont appear to useful for the import job and leak threads on shutdown + */ + static class HBaseRegionScanner implements AutoCloseable { + private static final Logger LOG = LoggerFactory.getLogger(HBaseRegionScanner.class); + + private HRegion region; + private RegionScanner scanner; + private final List values; + boolean hasMore = true; + + public HBaseRegionScanner( + Configuration conf, + FileSystem fs, + Path rootDir, + TableDescriptor htd, + RegionInfo hri, + Scan scan) + throws IOException { + scan.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED); + htd = TableDescriptorBuilder.newBuilder(htd).setReadOnly(true).build(); + this.region = + HRegion.newHRegion( + CommonFSUtils.getTableDir(rootDir, htd.getTableName()), + (WAL) null, + fs, + conf, + hri, + htd, + (RegionServerServices) null); + this.region.setRestoredRegion(true); + conf.set("hfile.block.cache.policy", "IndexOnlyLRU"); + conf.setIfUnset("hfile.onheap.block.cache.fixed.size", String.valueOf(33554432L)); + conf.unset("hbase.bucketcache.ioengine"); + + this.region.initialize(); + this.scanner = this.region.getScanner(scan); + this.values = new ArrayList(); + + this.region.startRegionOperation(); + } + + public void close() { + if (this.scanner != null) { + try { + this.scanner.close(); + this.scanner = null; + } catch (IOException var3) { + LOG.warn("Exception while closing scanner", var3); + } + } + + if (this.region != null) { + try { + this.region.closeRegionOperation(); + this.region.close(true); + this.region = null; + } catch (IOException var2) { + LOG.warn("Exception while closing region", var2); + } + } + } + + public Result next() throws IOException { + do { + if (!this.hasMore) { + return null; + } + + this.values.clear(); + this.hasMore = this.scanner.nextRaw(this.values); + } while (this.values.isEmpty()); + + Result result = Result.create(this.values); + + return result; + } + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/package-info.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/package-info.java new file mode 100644 index 0000000000..17f27d4046 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/transforms/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2026 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 + * + * http://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 contains all the {@link org.apache.beam.sdk.transforms.PTransform} implementations. */ +package com.google.cloud.bigtable.beam.hbasesnapshots.transforms; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java index b70eef5c7d..740466b05d 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java @@ -179,18 +179,6 @@ public interface ExportOptions extends GcpOptions, GcsOptions { @SuppressWarnings("unused") void setRetryIdleTimeout(boolean retryIdleTimeout); - - @Description("Read RPC timeout in milliseconds.") - ValueProvider getBigtableReadRpcTimeoutMs(); - - @SuppressWarnings("unused") - void setBigtableReadRpcTimeoutMs(ValueProvider readRpcTimeoutMs); - - @Description("Read RPC attempt timeout in milliseconds.") - ValueProvider getBigtableReadRpcAttemptTimeoutMs(); - - @SuppressWarnings("unused") - void setBigtableReadRpcAttemptTimeoutMs(ValueProvider readRpcAttemptTimeoutMs); } public static void main(String[] args) { diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/validation/BufferedHadoopHashTableSource.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/validation/BufferedHadoopHashTableSource.java index e1219f88be..cdff1a2ae1 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/validation/BufferedHadoopHashTableSource.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/validation/BufferedHadoopHashTableSource.java @@ -50,7 +50,6 @@ class BufferedHadoopHashTableSource extends BoundedSource>> CODER = KvCoder.of(StringUtf8Coder.of(), ListCoder.of(RangeHashCoder.of())); - ; // Max number of RangeHashes to buffer. private final int maxBufferSize; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java index 1f3758dc21..3402a27773 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java @@ -19,6 +19,8 @@ import com.google.api.services.storage.model.StorageObject; import com.google.bigtable.repackaged.com.google.gson.Gson; import com.google.cloud.bigtable.beam.hbasesnapshots.ImportJobFromHbaseSnapshot.ImportOptions; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.HBaseSnapshotInputConfigBuilder; +import com.google.cloud.bigtable.beam.hbasesnapshots.dofn.CleanupHBaseSnapshotRestoreFiles; import com.google.cloud.bigtable.beam.sequencefiles.HBaseResultToMutationFn; import com.google.cloud.bigtable.beam.test_env.EnvSetup; import com.google.cloud.bigtable.beam.test_env.TestProperties; @@ -26,7 +28,6 @@ import com.google.cloud.bigtable.beam.validation.SyncTableJob; import com.google.cloud.bigtable.beam.validation.SyncTableJob.SyncTableOptions; import com.google.cloud.bigtable.hbase.BigtableConfiguration; -import com.google.cloud.bigtable.hbase.BigtableOptionsFactory; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; import java.io.BufferedReader; @@ -55,7 +56,6 @@ import org.apache.beam.sdk.metrics.MetricQueryResults; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; @@ -78,7 +78,7 @@ * End to end integration test for pipeline that import HBase snapshot data into Cloud Bigtable and * validates the imported data with SyncTable. * Prepare test data with gsutil(https://cloud.google.com/storage/docs/quickstart-gsutil): - * gcloud storage cp --recursive /bigtable-dataflow-parent/bigtable-beam-import/src/test/integration-test \ + * gsutil -m cp -r /bigtable-dataflow-parent/bigtable-beam-import/src/test/integration-test \ * gs:///cloud-data-dir/ */ public class EndToEndIT { @@ -124,13 +124,9 @@ public void setup() throws Exception { uploadFixture(gcsUtil, SNAPSHOT_FIXTURE_NAME, fixtureDir); - // Disable CSM to reduce noise in the test output - Configuration config = - BigtableConfiguration.configure(properties.getProjectId(), properties.getInstanceId()); - config.set(BigtableOptionsFactory.BIGTABLE_ENABLE_CLIENT_SIDE_METRICS, "false"); - // Bigtable config - connection = BigtableConfiguration.connect(config); + connection = + BigtableConfiguration.connect(properties.getProjectId(), properties.getInstanceId()); // TODO: use timebased names to allow for gc tableId = "test_" + UUID.randomUUID(); @@ -314,8 +310,7 @@ public void testHBaseSnapshotImport() throws Exception { // The restore directory is stored relative to the snapshot directory and contains the job name String bucket = GcsPath.fromUri(hbaseSnapshotDir).getBucket(); String restorePathPrefix = - CleanupHBaseSnapshotRestoreFilesFn.getListPrefix( - HBaseSnapshotInputConfigBuilder.RESTORE_DIR); + CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR); List allObjects = new ArrayList<>(); String nextToken; do { @@ -427,8 +422,7 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { // The restore directory is stored relative to the snapshot directory and contains the job name String bucket = GcsPath.fromUri(hbaseSnapshotDir).getBucket(); String restorePathPrefix = - CleanupHBaseSnapshotRestoreFilesFn.getListPrefix( - HBaseSnapshotInputConfigBuilder.RESTORE_DIR); + CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR); List allObjects = new ArrayList<>(); String nextToken; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilderTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilderTest.java index fb5346f72a..039bd5b3e2 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilderTest.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilderTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.HBaseSnapshotInputConfigBuilder; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat; import org.apache.hadoop.mapreduce.InputFormat; diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshotTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshotTest.java new file mode 100644 index 0000000000..904d85ceac --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshotTest.java @@ -0,0 +1,176 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import com.google.api.services.storage.model.Objects; +import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.ImportConfig; +import java.io.File; +import java.util.Arrays; +import java.util.List; +import org.apache.beam.sdk.extensions.gcp.options.GcsOptions; +import org.apache.beam.sdk.extensions.gcp.util.GcsUtil; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.rules.TemporaryFolder; +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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Test cases for the {@link ImportJobFromHbaseSnapshot} class. */ +@RunWith(JUnit4.class) +public class ImportJobFromHbaseSnapshotTest { + private static final Logger LOG = LoggerFactory.getLogger(ImportJobFromHbaseSnapshotTest.class); + + @ClassRule public static TemporaryFolder tempFolder = new TemporaryFolder(); + @Rule public final ExpectedException expectedException = ExpectedException.none(); + + @Rule public final MockitoRule mockito = MockitoJUnit.rule(); + @Mock GcsOptions gcsOptions; + @Mock GcsUtil gcsUtilMock; + @Mock Objects gcsObjects; + + @Test + public void testBuildImportConfigWithMissingSourcePathThrowsException() throws Exception { + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] { + "--snapshots='bookmark-2099:bookmark,malwarescanstate-9087:malwarescan'" + }); + + expectedException.expect(IllegalArgumentException.class); + expectedException.expectMessage(ImportJobFromHbaseSnapshot.MISSING_SNAPSHOT_SOURCEPATH); + ImportJobFromHbaseSnapshot.buildImportConfigFromPipelineOptions(options, gcsOptions); + } + + @Test + public void testBuildImportConfigWithMissingSnapshotsThrowsException() throws Exception { + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] {"--hbaseSnapshotSourceDir=gs://bucket/data/"}); + + expectedException.expect(IllegalArgumentException.class); + expectedException.expectMessage(ImportJobFromHbaseSnapshot.MISSING_SNAPSHOT_NAMES); + ImportJobFromHbaseSnapshot.buildImportConfigFromPipelineOptions(options, gcsOptions); + } + + @Test + public void testBuildImportConfigFromSnapshotsString() throws Exception { + String sourcePath = "gs://bucket/data/"; + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] { + "--hbaseSnapshotSourceDir=" + sourcePath, + "--snapshots='bookmark-2099:bookmark,malwarescanstate-9087:malwarescan'" + }); + + ImportConfig importConfig = + ImportJobFromHbaseSnapshot.buildImportConfigFromPipelineOptions(options, gcsOptions); + assertThat(importConfig.getSourcepath(), is(sourcePath)); + assertThat(importConfig.getRestorepath(), notNullValue()); + assertThat(importConfig.getSnapshots().size(), is(2)); + } + + private void setUpGcsObjectMocks(List fakeStorageObjects) throws Exception { + Mockito.when(gcsObjects.getItems()).thenReturn(fakeStorageObjects); + Mockito.when(gcsUtilMock.listObjects(Mockito.anyString(), Mockito.anyString(), Mockito.any())) + .thenReturn(gcsObjects); + } + + @Test + public void testBuildImportConfigForAllSnapshots() throws Exception { + String baseObjectPath = "snapshots/20220309230526"; + String importSnapshotpath = String.format("gs://sym-bucket/%s", baseObjectPath); + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] {"--hbaseSnapshotSourceDir=" + importSnapshotpath, "--snapshots=*"}); + Mockito.when(gcsOptions.getGcsUtil()).thenReturn(gcsUtilMock); + + List snapshotList = Arrays.asList("audit-events", "dlpInfo", "ce-metrics-manifest"); + List fakeStorageObjects = + SnapshotTestHelper.createFakeStorageObjects(baseObjectPath, snapshotList); + setUpGcsObjectMocks(fakeStorageObjects); + + ImportConfig importConfig = + ImportJobFromHbaseSnapshot.buildImportConfigFromPipelineOptions(options, gcsOptions); + assertThat(importConfig.getSourcepath(), is(importSnapshotpath)); + assertThat(importConfig.getRestorepath(), notNullValue()); + assertThat(importConfig.getSnapshots().size(), is(snapshotList.size())); + } + + @Test + public void testBuildImportConfigFromJsonFileWithMissingPathThrowsException() throws Exception { + String config = + "{\n" + + " \"snapshots\": {\n" + + " \"snap_demo1\": \"snap_demo1\",\n" + + " \"snap_demo2\": \"snap_demo2\"\n" + + " }\n" + + "}"; + File file = tempFolder.newFile(); + SnapshotTestHelper.writeToFile(file.getAbsolutePath(), config); + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] {"--importConfigFilePath=" + file.getAbsolutePath()}); + + expectedException.expect(NullPointerException.class); + expectedException.expectMessage(ImportJobFromHbaseSnapshot.MISSING_SNAPSHOT_SOURCEPATH); + + // ImportConfig importConfig = + // ImportJobFromHbaseSnapshot.buildImportConfigFromConfigFile( + // options.getImportConfigFilePath()); + } + + @Test + public void testBuildImportConfigFromJsonFile() throws Exception { + String importSnapshotpath = "gs://sym-datastore/snapshots/data/snap_demo"; + String restoreSnapshotpath = "gs://sym-datastore/snapshots/data/restore"; + String config = + String.format( + "{\n" + + " \"sourcepath\": \"%s\",\n" + + " \"restorepath\": \"%s\",\n" + + " \"snapshots\": {\n" + + " \"snap_demo1\": \"demo1\",\n" + + " \"snap_demo2\": \"demo2\"\n" + + " }\n" + + "}", + importSnapshotpath, restoreSnapshotpath); + + File file = tempFolder.newFile(); + SnapshotTestHelper.writeToFile(file.getAbsolutePath(), config); + ImportJobFromHbaseSnapshot.ImportOptions options = + SnapshotTestHelper.getPipelineOptions( + new String[] {"--importConfigFilePath=" + file.getAbsolutePath()}); + // ImportConfig importConfig = + // ImportJobFromHbaseSnapshot.buildImportConfigFromConfigFile( + // options.getImportConfigFilePath()); + // assertThat(importConfig.getSourcepath(), is(importSnapshotpath)); + // assertThat(importConfig.getRestorepath().startsWith(restoreSnapshotpath), is(true)); + // assertThat(importConfig.getSnapshots().get(0).getbigtableTableName(), is("demo1")); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotTestHelper.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotTestHelper.java new file mode 100644 index 0000000000..584db64822 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotTestHelper.java @@ -0,0 +1,118 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots; + +import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import com.google.common.base.Joiner; +import com.google.common.io.ByteStreams; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.WritableByteChannel; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.beam.sdk.io.FileSystems; +import org.apache.beam.sdk.io.fs.ResourceId; +import org.apache.beam.sdk.options.PipelineOptionsFactory; +import org.apache.beam.sdk.util.MimeTypes; + +/** Contains various helper methods to handle different tasks while executing tests. */ +public class SnapshotTestHelper { + private SnapshotTestHelper() {} + + /** + * Helper to generate files for testing. + * + * @param filePath The path to the file to write. + * @param fileContents The content to write. + * @throws IOException If an error occurs while creating or writing the file. + */ + static void writeToFile(String filePath, String fileContents) throws IOException { + + ResourceId resourceId = FileSystems.matchNewResource(filePath, false); + + // Write the file contents to the channel and close. + try (ReadableByteChannel readChannel = + Channels.newChannel(new ByteArrayInputStream(fileContents.getBytes()))) { + try (WritableByteChannel writeChannel = FileSystems.create(resourceId, MimeTypes.TEXT)) { + ByteStreams.copy(readChannel, writeChannel); + } + } + } + + /** + * @param restorePath - Path to which snapshots will be restored temporarily + * @return SnapshotConfig - Returns the snapshot config + */ + public static SnapshotConfig newSnapshotConfig(String restorePath) { + return newSnapshotConfig("testsourcepath", restorePath); + } + + public static SnapshotConfig newSnapshotConfig(String sourcePath, String restorePath) { + return SnapshotConfig.builder() + .setProjectId("testproject") + .setSourceLocation(sourcePath) + .setRestoreLocation(restorePath) + .setSnapshotName("testsnapshot") + .setTableName("testtable") + .setConfigurationDetails(new HashMap()) + .build(); + } + + /** + * Helper method providing pipeline options. + * + * @param args list of pipeline arguments. + */ + static ImportJobFromHbaseSnapshot.ImportOptions getPipelineOptions(String[] args) { + return PipelineOptionsFactory.fromArgs(args).as(ImportJobFromHbaseSnapshot.ImportOptions.class); + } + + /** + * Creates Fake Storage Objects + * + * @param basePath File System base path + * @param objectNames List of object names + * @return List of matching Storage objects + */ + static List createFakeStorageObjects(String basePath, List objectNames) { + if (objectNames == null) return null; + + List storageObjects = new ArrayList<>(); + objectNames.forEach( + name -> { + StorageObject object = new StorageObject(); + object.setId(Joiner.on("/").join(basePath, ".hbase-snapshot", name, ".snapshotinfo")); + storageObjects.add(object); + }); + + return storageObjects; + } + + static Map buildMapFromList(String[] values) { + if (values.length % 2 != 0) + throw new IllegalArgumentException( + "Input should contain even number of values to represent both" + + " key and value for the map."); + Map data = new HashMap<>(); + for (int i = 0; i < values.length; i += 2) data.put(values[i], values[i + 1]); + return data; + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtilsTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtilsTest.java new file mode 100644 index 0000000000..5851f578c0 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/SnapshotUtilsTest.java @@ -0,0 +1,230 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; + +import com.google.api.services.storage.model.Objects; +import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.ImportConfig; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import java.io.IOException; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.beam.sdk.extensions.gcp.util.GcsUtil; +import org.apache.hadoop.conf.Configuration; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Test cases for the {@link SnapshotUtils} class. */ +@RunWith(JUnit4.class) +public class SnapshotUtilsTest { + private static final Logger LOG = LoggerFactory.getLogger(SnapshotUtilsTest.class); + + @ClassRule public static TemporaryFolder tempFolder = new TemporaryFolder(); + // Preferred way to instantiate mocks in JUnit4 is via the JUnit rule MockitoJUnit + @Rule public final MockitoRule mockito = MockitoJUnit.rule(); + @Mock GcsUtil gcsUtilMock; + @Mock Objects gcsObjects; + + @Test + public void testRemoveSuffixSlashIfExists() { + String path = "gs://bucket/prefix"; + + assertThat(SnapshotUtils.removeSuffixSlashIfExists(path), is(path)); + assertThat(SnapshotUtils.removeSuffixSlashIfExists(path + "/"), is(path)); + } + + @Test + public void testAppendCurrentTimestamp() { + String path = "gs://bucket/prefix"; + DateTimeFormatter formatter = + DateTimeFormatter.ofPattern("yyyyMMddHHmm").withZone(ZoneId.of("UTC")); + long currentTime = Long.parseLong(formatter.format(Instant.now())); + long returnTime = + Long.parseLong(SnapshotUtils.appendCurrentTimestamp(path).replace(path + "/", "")); + assertThat((returnTime - currentTime), lessThan(2L)); + } + + @Test + public void testgetNamedDirectory() { + String path = "gs://bucket/subdir1"; + String subFolder = "subdir2"; + String expectedPath = "gs://bucket/subdir2"; + String retValue = SnapshotUtils.getNamedDirectory(path, subFolder); + assertThat(retValue.startsWith(expectedPath), is(true)); + } + + @Test + public void testGetConfigurationWithDataflowRunner() { + String projectId = "testproject"; + Map configurations = + SnapshotUtils.getConfiguration("DataflowRunner", projectId, "/path/to/sourcedir", null); + assertThat(configurations.get("fs.gs.project.id"), is(projectId)); + assertThat(configurations.get("s.gs.auth.type"), nullValue()); + } + + @Test + public void testGetConfigurationWithDirectRunner() { + Map hbaseConfiguration = + SnapshotTestHelper.buildMapFromList( + new String[] {"fs.AbstractFileSystem.gs.impl", "org.apache.hadoop.fs.hdfs"}); + Map configurations = + SnapshotUtils.getConfiguration( + "DirectRunner", "testproject", "/path/to/sourcedir", hbaseConfiguration); + assertThat( + configurations.get("fs.AbstractFileSystem.gs.impl"), + is(hbaseConfiguration.get("fs.AbstractFileSystem.gs.impl"))); + assertThat(configurations.get("fs.gs.auth.type"), is("APPLICATION_DEFAULT")); + } + + @Test + public void testGetHbaseConfiguration() { + Map configurations = + SnapshotTestHelper.buildMapFromList( + new String[] {"throttling.enable", "true", "throttling.threshold.ms", "200"}); + Configuration hbaseConfiguration = SnapshotUtils.getHBaseConfiguration(configurations); + assertThat(hbaseConfiguration.getBoolean("throttling.enable", false), is(true)); + assertThat(hbaseConfiguration.get("throttling.threshold.ms"), is("200")); + } + + @Test + public void testBuildSnapshotConfigs() { + String projectId = "testproject"; + String sourcePath = "/path/to/sourcedir"; + String restorePath = "/path/to/restoredir"; + List snapshotInfoList = + Arrays.asList( + new ImportConfig.SnapshotInfo("snapdemo", "btdemo"), + new ImportConfig.SnapshotInfo("bookcontent-9087", "bookcontent")); + + Map conbfiguration = + SnapshotTestHelper.buildMapFromList( + new String[] {"bigtable.row.size", "100", "bigtable.auth.type", "private"}); + + List snapshotConfigs = + SnapshotUtils.buildSnapshotConfigs( + snapshotInfoList, new HashMap<>(), projectId, sourcePath, restorePath); + + assertThat(snapshotConfigs.size(), is(2)); + assertThat(snapshotConfigs.get(0).getProjectId(), is(projectId)); + assertThat(snapshotConfigs.get(0).getSnapshotName(), is("snapdemo")); + assertThat(snapshotConfigs.get(1).getSourceLocation(), is(sourcePath)); + assertThat(snapshotConfigs.get(1).getTableName(), is("bookcontent")); + } + + @Test + public void testGetSnapshotsFromStringReturnsSameTableName() { + String snapshotsWithBigtableTableName = "bookmark-2099"; + Map snapshots = + SnapshotUtils.getSnapshotsFromString(snapshotsWithBigtableTableName); + assertThat(snapshots.size(), is(equalTo(1))); + assertThat(snapshots.get("bookmark-2099"), is("bookmark-2099")); + } + + @Test + public void testGetSnapshotsFromStringReturnsMultipleTables() { + String snapshotsWithBigtableTableName = "snapshot1,snapshot2,snapshot3:mytable3,snapshot4"; + Map snapshots = + SnapshotUtils.getSnapshotsFromString(snapshotsWithBigtableTableName); + assertThat(snapshots.size(), is(equalTo(4))); + assertThat(snapshots.get("snapshot1"), is("snapshot1")); + assertThat(snapshots.get("snapshot2"), is("snapshot2")); + assertThat(snapshots.get("snapshot3"), is("mytable3")); + assertThat(snapshots.get("snapshot4"), is("snapshot4")); + } + + @Test + public void testGetSnapshotsFromStringReturnsParsedValues() { + String snapshotsWithBigtableTableName = + "bookmark-2099:bookmark,malwarescanstate-9087:malwarescan"; + Map snapshots = + SnapshotUtils.getSnapshotsFromString(snapshotsWithBigtableTableName); + assertThat(snapshots.size(), is(equalTo(2))); + assertThat(snapshots.get("malwarescanstate-9087"), is("malwarescan")); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetSnapshotsFromStringThrowsException() { + String snapshotsWithBigtableTableName = + "bookmark-2099:bookmark,malwarescanstate-9087:malwarescan:snapdemo1"; + Map snapshots = + SnapshotUtils.getSnapshotsFromString(snapshotsWithBigtableTableName); + } + + private void setUpGcsObjectMocks(List fakeStorageObjects) throws IOException { + Mockito.when(gcsObjects.getItems()).thenReturn(fakeStorageObjects); + Mockito.when(gcsUtilMock.listObjects(Mockito.anyString(), Mockito.anyString(), Mockito.any())) + .thenReturn(gcsObjects); + } + + private Map getMatchingSnapshotsFromSnapshotPath( + List snapshotList, String prefix) throws IOException { + String baseObjectPath = "snapshots/20220309230526"; + String importSnapshotpath = String.format("gs://sym-bucket/%s", baseObjectPath); + List fakeStorageObjects = + SnapshotTestHelper.createFakeStorageObjects(baseObjectPath, snapshotList); + setUpGcsObjectMocks(fakeStorageObjects); + return SnapshotUtils.getSnapshotsFromSnapshotPath(importSnapshotpath, gcsUtilMock, prefix); + } + + @Test + public void testgetAllSnapshotsFromSnapshotPath() throws IOException { + List snapshotList = Arrays.asList("audit-events", "dlpInfo", "ce-metrics-manifest"); + Map snapshots = getMatchingSnapshotsFromSnapshotPath(snapshotList, "*"); + assertThat(snapshots.size(), is(equalTo(3))); + assertThat(snapshots.keySet(), containsInAnyOrder(snapshotList.toArray(new String[0]))); + } + + @Test + public void testgetSubSetSnapshotsFromSnapshotPath() throws IOException { + List snapshotList = + Arrays.asList( + "snapshot-audit-events", + "snapshot-attachments", + "snapshot-ce-metrics-manifest", + "snapshot-attachments-streams"); + Map snapshots = + getMatchingSnapshotsFromSnapshotPath(snapshotList, ".*attachments.*"); + List expectedResult = + snapshotList.stream().filter(e -> e.contains("attachments")).collect(Collectors.toList()); + // LOG.info("Matched:{} and expected:{}", snapshots.size(), expectedResult.size()); + assertThat(snapshots.size(), is(equalTo(expectedResult.size()))); + assertThat(snapshots.keySet(), containsInAnyOrder(expectedResult.toArray(new String[0]))); + } + + @Test(expected = IllegalStateException.class) + public void testgetSubSetSnapshotsFromSnapshotPathThrowsException() throws IOException { + Map snapshots = getMatchingSnapshotsFromSnapshotPath(null, "*"); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanUpRestoredSnapshotsTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanUpRestoredSnapshotsTest.java new file mode 100644 index 0000000000..b647ea404a --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanUpRestoredSnapshotsTest.java @@ -0,0 +1,70 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import com.google.cloud.bigtable.beam.hbasesnapshots.SnapshotTestHelper; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import java.io.File; +import org.apache.beam.sdk.testing.TestPipeline; +import org.apache.beam.sdk.transforms.Create; +import org.apache.beam.sdk.transforms.ParDo; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Tests the {@link CleanupRestoredSnapshots} functionality. */ +@RunWith(JUnit4.class) +public class CleanUpRestoredSnapshotsTest { + private static final Logger LOG = LoggerFactory.getLogger(CleanUpRestoredSnapshotsTest.class); + + @Rule public final transient TestPipeline pipeline = TestPipeline.create(); + @ClassRule public static TemporaryFolder tempFolder = new TemporaryFolder(); + + @Test + public void testDeleteRestoredSnapshot() throws Exception { + File restoreDir = tempFolder.newFolder(); + if (restoreDir.exists()) { + LOG.info("Created temp folder: {}", restoreDir.getAbsolutePath()); + SnapshotConfig snapshotConfig = + SnapshotTestHelper.newSnapshotConfig(restoreDir.getAbsolutePath()); + new CleanupRestoredSnapshots().cleanupSnapshot(snapshotConfig); + Assert.assertFalse(restoreDir.exists()); + } else { + LOG.warn( + "Skipping CleanUpRestoredSnapshotsTest since temporary file was unable to be created in restore path: {}", + restoreDir.getAbsolutePath()); + } + } + + /** + * Tests CleanupRestoredSnapshots with invalid path to verify exception is handled internally + * + * @throws Exception + */ + @Test + public void testDeleteRestoredSnapshotWithInvalidPath() throws Exception { + pipeline + .apply("CreateInput", Create.of(SnapshotTestHelper.newSnapshotConfig("invalid_path"))) + .apply("DeleteSnapshot", ParDo.of(new CleanupRestoredSnapshots())); + pipeline.run(); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFilesTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFilesTest.java new file mode 100644 index 0000000000..bfe46f5191 --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/CleanupHBaseSnapshotRestoreFilesTest.java @@ -0,0 +1,56 @@ +/* + * 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; + +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.HBaseSnapshotInputConfigBuilder; +import java.util.UUID; +import org.junit.Test; + +public class CleanupHBaseSnapshotRestoreFilesTest { + private static final String TEST_BUCKET_NAME = "test-bucket"; + private static final String TEST_SNAPSHOT_PATH = "gs://" + TEST_BUCKET_NAME + "/hbase-export"; + private static final String TEST_RESTORE_PATH = + HBaseSnapshotInputConfigBuilder.RESTORE_DIR + UUID.randomUUID(); + private static final String TEST_RESTORE_PREFIX = TEST_RESTORE_PATH.substring(1); + + @Test + public void testGetWorkingBucketName() { + assertEquals( + TEST_BUCKET_NAME, + CleanupHBaseSnapshotRestoreFiles.getWorkingBucketName(TEST_SNAPSHOT_PATH)); + + assertThrows( + IllegalArgumentException.class, + () -> { + CleanupHBaseSnapshotRestoreFiles.getWorkingBucketName(TEST_BUCKET_NAME); + }); + } + + @Test + public void testGetListPrefix() { + assertEquals( + TEST_RESTORE_PREFIX, CleanupHBaseSnapshotRestoreFiles.getListPrefix(TEST_RESTORE_PATH)); + + assertThrows( + IllegalArgumentException.class, + () -> { + CleanupHBaseSnapshotRestoreFiles.getWorkingBucketName(TEST_RESTORE_PREFIX); + }); + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshotTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshotTest.java new file mode 100644 index 0000000000..386f6a9b2d --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/dofn/RestoreSnapshotTest.java @@ -0,0 +1,58 @@ +/* + * Copyright 2026 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 + * + * http://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.beam.hbasesnapshots.dofn; + +import com.google.cloud.bigtable.beam.hbasesnapshots.SnapshotTestHelper; +import com.google.cloud.bigtable.beam.hbasesnapshots.conf.SnapshotConfig; +import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + +/** Tests the {@link RestoreSnapshot} functionality. */ +@RunWith(JUnit4.class) +public class RestoreSnapshotTest { + + @ClassRule public static TemporaryFolder tempFolder = new TemporaryFolder(); + + @Test + public void testRestoreSnapshot() throws Exception { + + SnapshotConfig snapshotConfig = + SnapshotTestHelper.newSnapshotConfig( + tempFolder.newFolder().getAbsolutePath(), tempFolder.newFolder().getAbsolutePath()); + + try (MockedStatic restoreSnapshotHelper = + Mockito.mockStatic(RestoreSnapshotHelper.class)) { + restoreSnapshotHelper + .when( + () -> + RestoreSnapshotHelper.copySnapshotForScanner( + snapshotConfig.getConfiguration(), + null, + snapshotConfig.getSourcePath(), + snapshotConfig.getRestorePath(), + snapshotConfig.getSnapshotName())) + .thenReturn(null); + + new RestoreSnapshot().restoreSnapshot(snapshotConfig); + } + } +} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java index b5d66f1dad..e813e2fea2 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java @@ -26,7 +26,6 @@ import com.google.cloud.bigtable.beam.test_env.EnvSetup; import com.google.cloud.bigtable.beam.test_env.TestProperties; import com.google.cloud.bigtable.hbase.BigtableConfiguration; -import com.google.cloud.bigtable.hbase.BigtableOptionsFactory; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -113,8 +112,6 @@ public void setUp() throws IOException { properties .getAdminEndpoint() .ifPresent(endpoint -> config.set(BIGTABLE_ADMIN_HOST_KEY, endpoint)); - // Disable CSM to reduce noise in the test output - config.set(BigtableOptionsFactory.BIGTABLE_ENABLE_CLIENT_SIDE_METRICS, "false"); connection = BigtableConfiguration.connect(config); diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/EndToEndIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/EndToEndIT.java index d5f5617fef..33828f69da 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/EndToEndIT.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/EndToEndIT.java @@ -22,7 +22,6 @@ import com.google.cloud.bigtable.beam.test_env.EnvSetup; import com.google.cloud.bigtable.beam.test_env.TestProperties; import com.google.cloud.bigtable.hbase.BigtableConfiguration; -import com.google.cloud.bigtable.hbase.BigtableOptionsFactory; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.truth.Correspondence; @@ -39,7 +38,6 @@ import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.TableName; @@ -91,13 +89,9 @@ public void setup() throws Exception { properties.applyTo(gcpOptions); gcsUtil = new GcsUtil.GcsUtilFactory().create(gcpOptions); - // Disable CSM to reduce noise in the test output - Configuration config = - BigtableConfiguration.configure(properties.getProjectId(), properties.getInstanceId()); - config.set(BigtableOptionsFactory.BIGTABLE_ENABLE_CLIENT_SIDE_METRICS, "false"); - // Bigtable config - connection = BigtableConfiguration.connect(config); + connection = + BigtableConfiguration.connect(properties.getProjectId(), properties.getInstanceId()); // TODO: support endpoints } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/SequenceFileSourceTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/SequenceFileSourceTest.java index 5d1715ccab..87f6a4c085 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/SequenceFileSourceTest.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/SequenceFileSourceTest.java @@ -16,12 +16,8 @@ package com.google.cloud.bigtable.beam.sequencefiles; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import com.google.common.collect.Lists; import java.io.File; From a393770acf79649673cc26972d26c5000da39bdc Mon Sep 17 00:00:00 2001 From: Tianlei Pan Date: Thu, 16 Apr 2026 20:42:27 +0000 Subject: [PATCH 11/14] Align bigtable-beam-import snapshot versions and dependencies to 2.17.0 --- .../bigtable-beam-import/pom.xml | 18 ++++++++++++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index bf70a19dde..888ddf48a3 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.15.6 + 2.17.0 4.0.0 @@ -110,7 +110,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.15.6 + 2.17.0 org.apache.hbase @@ -133,7 +133,7 @@ limitations under the License. org.apache.hbase - hbase-shaded-mapreduce + hbase-mapreduce ${hbase2.version} @@ -187,7 +187,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.15.6 + 2.17.0 test @@ -252,6 +252,13 @@ limitations under the License. + + org.apache.maven.plugins + maven-compiler-plugin + + true + + maven-jar-plugin @@ -426,6 +433,8 @@ limitations under the License. false + false + false **/*IT.java @@ -434,6 +443,7 @@ limitations under the License. --> 1 false + -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts all diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index dca40c0761..04266ea46f 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -244,6 +244,7 @@ limitations under the License. META-INF/DEPENDENCIES META-INF/versions/9/module-info.class META-INF/versions/11/module-info.class + META-INF/services/java.net.spi.InetAddressResolverProvider From 28ca698df709bdd47dd4cefda4b65f7d1abd80a3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2026 10:39:20 -0400 Subject: [PATCH 12/14] chore(main): release 2.18.2-SNAPSHOT (#4568) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../pom.xml | 2 +- .../bigtable-hbase/pom.xml | 6 +++--- .../bigtable/hbase/BigtableHBaseVersion.java | 2 +- bigtable-client-core-parent/pom.xml | 2 +- .../bigtable-beam-import/pom.xml | 6 +++--- .../bigtable-hbase-beam/pom.xml | 6 +++--- bigtable-dataflow-parent/pom.xml | 2 +- .../bigtable-hbase-1.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 14 +++++++------- .../bigtable-hbase-1.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-1.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-1.x-tools/pom.xml | 4 ++-- .../bigtable-hbase-1.x/pom.xml | 8 ++++---- bigtable-hbase-1.x-parent/pom.xml | 2 +- .../bigtable-hbase-2.x-hadoop/pom.xml | 6 +++--- .../pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-mapreduce/pom.xml | 8 ++++---- .../bigtable-hbase-2.x-shaded/pom.xml | 6 +++--- .../bigtable-hbase-2.x/pom.xml | 6 +++--- bigtable-hbase-2.x-parent/pom.xml | 2 +- bigtable-test/bigtable-build-helper/pom.xml | 4 ++-- .../it/verify-mirror-deps-misaligned/pom.xml | 2 +- .../src/it/verify-mirror-deps-ok/pom.xml | 2 +- .../src/it/verify-shaded-exclusions-ok/pom.xml | 2 +- .../pom.xml | 2 +- .../it/verify-shaded-jar-entries-leak/pom.xml | 2 +- .../it/verify-shaded-jar-entries-ok/pom.xml | 2 +- .../bigtable-emulator-maven-plugin/pom.xml | 2 +- .../bigtable-internal-test-helper/pom.xml | 2 +- .../hbase-minicluster-maven-plugin/pom.xml | 2 +- bigtable-test/pom.xml | 2 +- .../bigtable-hbase-1.x-replication/pom.xml | 12 ++++++------ .../bigtable-hbase-2.x-replication/pom.xml | 10 +++++----- .../bigtable-hbase-replication-core/pom.xml | 6 +++--- .../bigtable-hbase-replication/pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 14 +++++++------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 18 +++++++++--------- .../pom.xml | 8 ++++---- .../pom.xml | 10 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../protobuf-java-format-shaded/pom.xml | 6 +++--- hbase-migration-tools/mirroring-client/pom.xml | 4 ++-- hbase-migration-tools/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 6 +++--- 53 files changed, 156 insertions(+), 156 deletions(-) diff --git a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml index 62c52ef8dc..b150d206a2 100644 --- a/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-integration-tests-common diff --git a/bigtable-client-core-parent/bigtable-hbase/pom.xml b/bigtable-client-core-parent/bigtable-hbase/pom.xml index 02219b62d0..d107b20bf4 100644 --- a/bigtable-client-core-parent/bigtable-hbase/pom.xml +++ b/bigtable-client-core-parent/bigtable-hbase/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-core-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test @@ -149,7 +149,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java index 68e639679c..bc12f389bd 100644 --- a/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java +++ b/bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/BigtableHBaseVersion.java @@ -34,7 +34,7 @@ public class BigtableHBaseVersion { private static final AtomicBoolean wasInitialized = new AtomicBoolean(false); // {x-version-update-start:bigtable-client-parent:current} - public static final String VERSION = "2.18.1"; + public static final String VERSION = "2.18.2-SNAPSHOT"; // {x-version-update-end} /** diff --git a/bigtable-client-core-parent/pom.xml b/bigtable-client-core-parent/pom.xml index f79d32cd65..452141e147 100644 --- a/bigtable-client-core-parent/pom.xml +++ b/bigtable-client-core-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-client-core-parent diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 7e851609ec..0e50f6b6ef 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -83,7 +83,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-beam - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -156,7 +156,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml index c0380a47b4..1555c147ac 100644 --- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml +++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml @@ -16,7 +16,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-dataflow-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-beam @@ -75,7 +75,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT + 2.18.2-SNAPSHOT verify-mirror-deps-beam diff --git a/bigtable-dataflow-parent/pom.xml b/bigtable-dataflow-parent/pom.xml index 4e5b932e4a..f489054764 100644 --- a/bigtable-dataflow-parent/pom.xml +++ b/bigtable-dataflow-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-dataflow-parent diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml index 0cf1be9114..b73af10cef 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT @@ -170,7 +170,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml index 675b7e0c99..e823b99b87 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-1.x-integration-tests @@ -79,7 +79,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -117,7 +117,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -285,7 +285,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -375,7 +375,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -466,7 +466,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -587,7 +587,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml index 88294dfd12..f40c09a76c 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-1.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x-hadoop - 2.18.1 + 2.18.2-SNAPSHOT @@ -120,7 +120,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test @@ -186,7 +186,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index 2ec6912d1b..be62552c45 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -113,7 +113,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - 2.18.1 + 2.18.2-SNAPSHOT + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index 7aa1488a01..7ed60a74f8 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -3,7 +3,7 @@ bigtable-hbase-1.x-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -21,7 +21,7 @@ ${project.groupId} bigtable-hbase-1.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT + 2.18.2-SNAPSHOT bigtable-hbase-1.x @@ -73,7 +73,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase - 2.18.1 + 2.18.2-SNAPSHOT @@ -86,7 +86,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test @@ -131,7 +131,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-1.x-parent/pom.xml b/bigtable-hbase-1.x-parent/pom.xml index b54be13d07..44bb5b07e8 100644 --- a/bigtable-hbase-1.x-parent/pom.xml +++ b/bigtable-hbase-1.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-1.x-parent diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml index eb5848ec89..92cffc7ed5 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT @@ -152,7 +152,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml index 5c8cea2391..794e1a25f3 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-2.x-integration-tests @@ -69,7 +69,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -101,7 +101,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -232,7 +232,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -326,7 +326,7 @@ limitations under the License. com.google.cloud.bigtable hbase-minicluster-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -434,7 +434,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-integration-tests-common - 2.18.1 + 2.18.2-SNAPSHOT test-jar test diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml index 935b446c75..981f2c85d7 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-mapreduce/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-2.x-mapreduce @@ -60,7 +60,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x-hadoop - 2.18.1 + 2.18.2-SNAPSHOT @@ -135,7 +135,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test @@ -176,7 +176,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT verify-mirror-deps-hbase diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index 6064d5a40e..dc084d87f7 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -18,7 +18,7 @@ limitations under the License. bigtable-hbase-2.x-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 @@ -111,7 +111,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1 + 2.18.2-SNAPSHOT + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml index ae9d53863e..0b26914284 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-2.x @@ -68,7 +68,7 @@ limitations under the License. ${project.groupId} bigtable-hbase - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -154,7 +154,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-hbase-2.x-parent/pom.xml b/bigtable-hbase-2.x-parent/pom.xml index 7ff49776a1..b1ffc2013c 100644 --- a/bigtable-hbase-2.x-parent/pom.xml +++ b/bigtable-hbase-2.x-parent/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-2.x-parent diff --git a/bigtable-test/bigtable-build-helper/pom.xml b/bigtable-test/bigtable-build-helper/pom.xml index c990e2fb3c..2e300de45f 100644 --- a/bigtable-test/bigtable-build-helper/pom.xml +++ b/bigtable-test/bigtable-build-helper/pom.xml @@ -3,13 +3,13 @@ bigtable-test com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT maven-plugin java-bigtable-hbase internal maven extensions. diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml index 50a20b5fa5..788fcf5a30 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-misaligned/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml index 494ed28f52..a4eb115d9c 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-mirror-deps-ok/pom.xml @@ -35,7 +35,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml index fc0a48109f..bc06f6b090 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-ok/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml index d4f303e367..bc6f814556 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-exclusions-unpromoted/pom.xml @@ -65,7 +65,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml index 6db471ed35..d6053abc13 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-leak/pom.xml @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml index f95e352796..436ed0f11e 100644 --- a/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml +++ b/bigtable-test/bigtable-build-helper/src/it/verify-shaded-jar-entries-ok/pom.xml @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml index 2b34e3b244..9f3f43e77e 100644 --- a/bigtable-test/bigtable-emulator-maven-plugin/pom.xml +++ b/bigtable-test/bigtable-emulator-maven-plugin/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-test - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-test/bigtable-internal-test-helper/pom.xml b/bigtable-test/bigtable-internal-test-helper/pom.xml index 7eefaf955d..13ddb02a1c 100644 --- a/bigtable-test/bigtable-internal-test-helper/pom.xml +++ b/bigtable-test/bigtable-internal-test-helper/pom.xml @@ -3,7 +3,7 @@ bigtable-test com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 diff --git a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml index b26fb273f0..5deb4256b8 100644 --- a/bigtable-test/hbase-minicluster-maven-plugin/pom.xml +++ b/bigtable-test/hbase-minicluster-maven-plugin/pom.xml @@ -4,7 +4,7 @@ com.google.cloud.bigtable bigtable-test - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/bigtable-test/pom.xml b/bigtable-test/pom.xml index d4b85a310a..afee24238a 100644 --- a/bigtable-test/pom.xml +++ b/bigtable-test/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml index 6a666bf944..fd8ac89e43 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-1.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-1.x-replication - 2.18.1 + 2.18.2-SNAPSHOT jar bigtable-hbase-1.x-replication @@ -37,7 +37,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT verify-mirror-deps-hbase @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -104,7 +104,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.1 + 2.18.2-SNAPSHOT @@ -143,7 +143,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml index ddeafcc297..bcd10b380a 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-2.x-replication/pom.xml @@ -18,13 +18,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-2.x-replication - 2.18.1 + 2.18.2-SNAPSHOT jar bigtable-hbase-2.x-replication Library to enable one way replication from HBase to Cloud Bigtable. @@ -66,7 +66,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase @@ -81,7 +81,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-2.x-hadoop - 2.18.1 + 2.18.2-SNAPSHOT @@ -119,7 +119,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-internal-test-helper - 2.18.1 + 2.18.2-SNAPSHOT test diff --git a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml index b0cac7ca68..d3c26eea5a 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/bigtable-hbase-replication-core/pom.xml @@ -19,13 +19,13 @@ limitations under the License. bigtable-hbase-replication com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication-core - 2.18.1 + 2.18.2-SNAPSHOT jar bigtable-hbase-replication-core Library to enable one way replication from HBase to Cloud @@ -43,7 +43,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x-hadoop - 2.18.1 + 2.18.2-SNAPSHOT org.apache.hbase diff --git a/hbase-migration-tools/bigtable-hbase-replication/pom.xml b/hbase-migration-tools/bigtable-hbase-replication/pom.xml index abcafe03d7..c0bc83698f 100644 --- a/hbase-migration-tools/bigtable-hbase-replication/pom.xml +++ b/hbase-migration-tools/bigtable-hbase-replication/pom.xml @@ -18,12 +18,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable bigtable-hbase-replication - 2.18.1 + 2.18.2-SNAPSHOT com.google.cloud.bigtable hbase-migration-tools - 2.18.1 + 2.18.2-SNAPSHOT pom diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml index 6feaf14dee..88827ad2a2 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x-hadoop jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -57,7 +57,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml index 400f83e9d5..e96881c8d8 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x-integration-tests jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -113,7 +113,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -200,7 +200,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -213,7 +213,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-1.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -238,7 +238,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index 75f0312e49..9d57642c99 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x-shaded jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -173,7 +173,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml index c9eabc18a4..7472d5651f 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -56,7 +56,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -94,7 +94,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -112,7 +112,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml index 37c569d79a..a8dbef9b31 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x-parent pom - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml index added4ea24..7363b72a2c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-1.x-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-1.x-2.x-integration-tests jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -46,7 +46,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -198,7 +198,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -212,7 +212,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -237,7 +237,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -251,7 +251,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.1 + 2.18.2-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml index dc7ffa22eb..4f4319c252 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-hadoop/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-2.x-hadoop jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -54,7 +54,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-shaded - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -162,7 +162,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml index 22071c1790..6444bc1f10 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-integration-tests/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-2.x-integration-tests jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -47,7 +47,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -115,7 +115,7 @@ limitations under the License. ${project.groupId} bigtable-emulator-maven-plugin - 2.18.1 + 2.18.2-SNAPSHOT @@ -197,7 +197,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -211,7 +211,7 @@ limitations under the License. ${project.groupId} bigtable-hbase-2.x - 2.18.1 + 2.18.2-SNAPSHOT test @@ -236,7 +236,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -250,7 +250,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-integration-tests - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -264,7 +264,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-1.x-2.x-integration-tests - 2.18.1 + 2.18.2-SNAPSHOT test-jar test diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index f685b670ba..47d0a7b2c7 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-2.x-shaded jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -45,7 +45,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x - 2.18.1 + 2.18.2-SNAPSHOT @@ -165,7 +165,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml index b9dd693755..ec4c22a00e 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-2.x-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-2.x jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -44,7 +44,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -89,7 +89,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core - 2.18.1 + 2.18.2-SNAPSHOT test-jar test @@ -107,7 +107,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml index 4118d53873..51008410ee 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-2.x-parent pom - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml index f8d996c778..6b16e36f4c 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/bigtable-hbase-mirroring-client-core/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-mirroring-client-core-parent - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-core jar - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} @@ -63,7 +63,7 @@ limitations under the License. com.google.cloud.bigtable protobuf-java-format-shaded - 2.18.1 + 2.18.2-SNAPSHOT compile @@ -130,7 +130,7 @@ limitations under the License. com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml index 4f82ea3316..77f24714ad 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/pom.xml @@ -20,12 +20,12 @@ limitations under the License. com.google.cloud.bigtable mirroring-client - 2.18.1 + 2.18.2-SNAPSHOT bigtable-hbase-mirroring-client-core-parent pom - 2.18.1 + 2.18.2-SNAPSHOT ${project.groupId}:${project.artifactId} diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml index fb0b0cf999..30e2a92290 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml @@ -5,12 +5,12 @@ bigtable-hbase-mirroring-client-core-parent com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT protobuf-java-format-shaded ${project.groupId}:${project.artifactId} - 2.18.1 + 2.18.2-SNAPSHOT This is a wrapper around `com.googlecode.protobuf-java-format:protobuf-java-format` that rewrites the bytecode to use `org.apache.hadoop.hbase.shaded.com.google.protobuf` instead of plain @@ -75,7 +75,7 @@ com.google.cloud.bigtable.test bigtable-build-helper - 2.18.1 + 2.18.2-SNAPSHOT verify-shaded-jar-entries diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml index 79d2a72a13..e0dc736d68 100644 --- a/hbase-migration-tools/mirroring-client/pom.xml +++ b/hbase-migration-tools/mirroring-client/pom.xml @@ -5,13 +5,13 @@ com.google.cloud.bigtable hbase-migration-tools - 2.18.1 + 2.18.2-SNAPSHOT mirroring-client ${project.groupId}:${project.artifactId} pom - 2.18.1 + 2.18.2-SNAPSHOT com.google.bigtable.hbase.mirroring.shaded diff --git a/hbase-migration-tools/pom.xml b/hbase-migration-tools/pom.xml index 8104425a71..e2891b5bb0 100644 --- a/hbase-migration-tools/pom.xml +++ b/hbase-migration-tools/pom.xml @@ -17,12 +17,12 @@ limitations under the License. 4.0.0 com.google.cloud.bigtable - 2.18.1 + 2.18.2-SNAPSHOT com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT hbase-migration-tools diff --git a/pom.xml b/pom.xml index 51157b6639..2ea4160441 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-client-parent - 2.18.1 + 2.18.2-SNAPSHOT pom ${project.groupId}:${project.artifactId} https://cloud.google.com/bigtable/ diff --git a/versions.txt b/versions.txt index fb9ae9fc50..114e57008f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -bigtable-client-parent:2.18.1:2.18.1 -bigtable-hbase-replication:2.18.1:2.18.1 -bigtable-hbase-mirroring:2.18.1:2.18.1 \ No newline at end of file +bigtable-client-parent:2.18.1:2.18.2-SNAPSHOT +bigtable-hbase-replication:2.18.1:2.18.2-SNAPSHOT +bigtable-hbase-mirroring:2.18.1:2.18.2-SNAPSHOT \ No newline at end of file From e56ef1b7ce7e991d4bb82cabb0e25ea379246e74 Mon Sep 17 00:00:00 2001 From: Tianlei Pan Date: Tue, 21 Apr 2026 17:45:25 +0000 Subject: [PATCH 13/14] Fix credentials and Protobuf conflicts for HBase snapshot imports --- .../CleanupHBaseSnapshotRestoreFilesFn.java | 84 ----------- .../HBaseSnapshotInputConfigBuilder.java | 142 ------------------ .../ImportJobFromHbaseSnapshot.java | 1 + .../conf/HBaseSnapshotInputConfigBuilder.java | 11 +- ...leanupHBaseSnapshotRestoreFilesFnTest.java | 55 ------- .../beam/hbasesnapshots/EndToEndIT.java | 51 ++++++- .../testing/BigtableTableUtils.java | 22 +++ .../hadoop/hbase/util/ByteStringer.java | 40 +++++ 8 files changed, 121 insertions(+), 285 deletions(-) delete mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFn.java delete mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilder.java delete mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFnTest.java create mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFn.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFn.java deleted file mode 100644 index e0bdca69d5..0000000000 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFn.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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 - * - * http://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.beam.hbasesnapshots; - -import com.google.api.services.storage.model.Objects; -import com.google.common.base.Preconditions; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import org.apache.beam.sdk.extensions.gcp.options.GcpOptions; -import org.apache.beam.sdk.extensions.gcp.util.GcsUtil; -import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; -import org.apache.beam.sdk.transforms.DoFn; -import org.apache.beam.sdk.values.KV; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * A {@link DoFn} that could be used for cleaning up temp files generated during HBase snapshot - * scans in Google Cloud Storage(GCS) bucket via GCS connector. - */ -class CleanupHBaseSnapshotRestoreFilesFn extends DoFn, Boolean> { - private static final Log LOG = LogFactory.getLog(CleanupHBaseSnapshotRestoreFilesFn.class); - - @ProcessElement - public void processElement(ProcessContext context) throws IOException { - KV elem = context.element(); - - String hbaseSnapshotDir = elem.getKey(); - String restorePath = elem.getValue(); - String prefix = getListPrefix(restorePath); - String bucketName = getWorkingBucketName(hbaseSnapshotDir); - Preconditions.checkState( - !prefix.isEmpty() && !hbaseSnapshotDir.contains(String.format("%s/%s", bucketName, prefix)), - "restore folder should not be empty or a subfolder of hbaseSnapshotSourceDir"); - GcpOptions gcpOptions = context.getPipelineOptions().as(GcpOptions.class); - GcsUtil gcsUtil = new GcsUtil.GcsUtilFactory().create(gcpOptions); - - String pageToken = null; - List results = new ArrayList<>(); - do { - Objects objects = gcsUtil.listObjects(bucketName, prefix, pageToken); - if (objects.getItems() == null) { - break; - } - - objects.getItems().stream() - .map(storageObject -> GcsPath.fromObject(storageObject).toString()) - .forEach(results::add); - pageToken = objects.getNextPageToken(); - } while (pageToken != null); - gcsUtil.remove(results); - context.output(true); - } - - public static String getWorkingBucketName(String hbaseSnapshotDir) { - Preconditions.checkArgument( - hbaseSnapshotDir.startsWith(GcsPath.SCHEME), - "snapshot folder must be hosted in a GCS bucket "); - - return GcsPath.fromUri(hbaseSnapshotDir).getBucket(); - } - // getListPrefix convert absolute restorePath in a Hadoop filesystem - // to a match prefix in a GCS bucket - public static String getListPrefix(String restorePath) { - Preconditions.checkArgument( - restorePath.startsWith("/"), - "restore folder must be an absolute path in current filesystem"); - return restorePath.substring(1); - } -} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilder.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilder.java deleted file mode 100644 index 62b7a81ad5..0000000000 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/HBaseSnapshotInputConfigBuilder.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 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 - * - * http://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.beam.hbasesnapshots; - -import com.google.common.base.Preconditions; -import org.apache.beam.sdk.extensions.gcp.util.gcsfs.GcsPath; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.hadoop.hbase.mapreduce.TableInputFormat; -import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; -import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat; -import org.apache.hadoop.io.Writable; -import org.apache.hadoop.mapreduce.InputFormat; -import org.apache.hadoop.mapreduce.Job; - -/** - * A {@link Configuration} that could be used in {@link HadoopFormatIO} for reading HBase snapshot - * hosted in Google Cloud Storage(GCS) bucket via GCS connector. It uses {@link - * TableSnapshotInputFormat} for reading HBase snapshots. - */ -class HBaseSnapshotInputConfigBuilder { - - private static final Log LOG = LogFactory.getLog(HBaseSnapshotInputConfigBuilder.class); - // Batch size used for HBase snapshot scans - private static final int BATCH_SIZE = 1000; - - // a temp location to store metadata extracted from snapshot - public static final String RESTORE_DIR = "/.restore"; - - private String projectId; - private String hbaseSnapshotSourceDir; - private String snapshotName; - private String restoreDirSuffix; - - public HBaseSnapshotInputConfigBuilder() {} - - /* - * Set the project id use to access the GCS bucket with HBase snapshot data to be imported - */ - public HBaseSnapshotInputConfigBuilder setProjectId(String projectId) { - this.projectId = projectId; - return this; - } - - /* - * Set the GCS path where the HBase snapshot data is located - */ - public HBaseSnapshotInputConfigBuilder setHbaseSnapshotSourceDir(String hbaseSnapshotSourceDir) { - this.hbaseSnapshotSourceDir = hbaseSnapshotSourceDir; - return this; - } - - /* - * Set the name of the snapshot to be imported - * e.g when importing snapshot 'gs:///hbase-export/table_snapshot' - * put 'table_snapshot' as the {@code snapshotName} - * and 'gs:///hbase-export' as {@code exportedSnapshotDir} - */ - public HBaseSnapshotInputConfigBuilder setSnapshotName(String snapshotName) { - this.snapshotName = snapshotName; - return this; - } - - /* - * Set the unique suffix to be used for restore folder to avoid conflicts - */ - public HBaseSnapshotInputConfigBuilder setRestoreDirSuffix(String suffix) { - this.restoreDirSuffix = suffix; - return this; - } - - public String getRestoreDir() { - return RESTORE_DIR + this.restoreDirSuffix; - } - - public Configuration build() throws Exception { - Preconditions.checkState( - projectId != null && !projectId.isEmpty(), "Required value projectId must be set"); - Preconditions.checkState( - hbaseSnapshotSourceDir != null && !hbaseSnapshotSourceDir.isEmpty(), - "Required value hbaseSnapshotSourceDir must be set"); - Preconditions.checkState( - snapshotName != null && !snapshotName.isEmpty(), "Required value snapshotName must be set"); - Preconditions.checkState( - hbaseSnapshotSourceDir.startsWith(GcsPath.SCHEME), - "Snapshot folder must be hosted in a GCS bucket"); - - Configuration conf = createHBaseConfiguration(); - - // Configuring a MapReduce Job base on HBaseConfiguration - // and return the job Configuration - conf.set( - TableInputFormat.SCAN, - TableMapReduceUtil.convertScanToString(new Scan().setBatch(BATCH_SIZE))); - Job job = Job.getInstance(conf); // creates internal clone of hbaseConf - // the restore folder need to under current bucket root so to be considered - // within the same filesystem with the hbaseSnapshotSourceDir - TableSnapshotInputFormat.setInput(job, snapshotName, new Path(getRestoreDir())); - return job.getConfiguration(); // extract the modified clone - } - - // separate static part for unit testing - public Configuration createHBaseConfiguration() { - Configuration conf = HBaseConfiguration.create(); - - // Setup the input data location for HBase snapshot import - // exportedSnapshotDir should be a GCS Bucket path. - conf.set("hbase.rootdir", hbaseSnapshotSourceDir); - conf.set("fs.defaultFS", hbaseSnapshotSourceDir); - - // Setup GCS connector to use GCS as Hadoop filesystem - conf.set("fs.AbstractFileSystem.gs.impl", "com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS"); - conf.set("fs.gs.project.id", projectId); - conf.setBoolean("google.cloud.auth.service.account.enable", true); - - // Setup MapReduce config for TableSnapshotInputFormat - conf.setClass( - "mapreduce.job.inputformat.class", TableSnapshotInputFormat.class, InputFormat.class); - conf.setClass("key.class", ImmutableBytesWritable.class, Writable.class); - conf.setClass("value.class", Result.class, Object.class); - return conf; - } -} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java index 60433a8251..be91398aef 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java @@ -106,6 +106,7 @@ public interface ImportOptions extends ImportJob.ImportOptions { @SuppressWarnings("unused") void setHbaseSnapshotSourceDir(String hbaseSnapshotSourceDir); + @Description("Snapshot name") String getSnapshotName(); diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java index 58ccd34425..4baa37a1bd 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java @@ -61,6 +61,7 @@ public HBaseSnapshotInputConfigBuilder setProjectId(String projectId) { return this; } + /* * Set the GCS path where the HBase snapshot data is located */ @@ -115,7 +116,11 @@ public Configuration build() throws Exception { // the restore folder need to under current bucket root so to be considered // within the same filesystem with the hbaseSnapshotSourceDir TableSnapshotInputFormat.setInput(job, snapshotName, new Path(getRestoreDir())); - return job.getConfiguration(); // extract the modified clone + Configuration finalConf = job.getConfiguration(); + // Hack/Workaround: Explicitly unset the keyfile path so the worker falls back to its own + // default credentials instead of trying to use the submitter's local path which doesn't exist on workers. + finalConf.unset("google.cloud.auth.service.account.json.keyfile"); + return finalConf; } // separate static part for unit testing @@ -131,6 +136,10 @@ public Configuration createHBaseConfiguration() { conf.set("fs.AbstractFileSystem.gs.impl", "com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS"); conf.set("fs.gs.project.id", projectId); conf.setBoolean("google.cloud.auth.service.account.enable", true); + // Hack/Workaround: Set the keyfile path for the submitter to access GCS during job setup. + // We use user.home to keep this portable across different developer environments. + String userHome = System.getProperty("user.home"); + conf.set("google.cloud.auth.service.account.json.keyfile", userHome + "/.config/gcloud/application_default_credentials.json"); // Setup MapReduce config for TableSnapshotInputFormat conf.setClass( diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFnTest.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFnTest.java deleted file mode 100644 index 0183f856f1..0000000000 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/CleanupHBaseSnapshotRestoreFilesFnTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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 - * - * http://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.beam.hbasesnapshots; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - -import java.util.UUID; -import org.junit.Test; - -public class CleanupHBaseSnapshotRestoreFilesFnTest { - private static final String TEST_BUCKET_NAME = "test-bucket"; - private static final String TEST_SNAPSHOT_PATH = "gs://" + TEST_BUCKET_NAME + "/hbase-export"; - private static final String TEST_RESTORE_PATH = - HBaseSnapshotInputConfigBuilder.RESTORE_DIR + UUID.randomUUID(); - private static final String TEST_RESTORE_PREFIX = TEST_RESTORE_PATH.substring(1); - - @Test - public void testGetWorkingBucketName() { - assertEquals( - TEST_BUCKET_NAME, - CleanupHBaseSnapshotRestoreFilesFn.getWorkingBucketName(TEST_SNAPSHOT_PATH)); - - assertThrows( - IllegalArgumentException.class, - () -> { - CleanupHBaseSnapshotRestoreFilesFn.getWorkingBucketName(TEST_BUCKET_NAME); - }); - } - - @Test - public void testGetListPrefix() { - assertEquals( - TEST_RESTORE_PREFIX, CleanupHBaseSnapshotRestoreFilesFn.getListPrefix(TEST_RESTORE_PATH)); - - assertThrows( - IllegalArgumentException.class, - () -> { - CleanupHBaseSnapshotRestoreFilesFn.getWorkingBucketName(TEST_RESTORE_PREFIX); - }); - } -} diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java index 3402a27773..03879ce7ce 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java @@ -143,6 +143,25 @@ public void setup() throws Exception { HTableDescriptor descriptor = new HTableDescriptor(tableName); descriptor.addFamily(new HColumnDescriptor(CF)); connection.getAdmin().createTable(descriptor, SnapshotTestingUtils.getSplitKeys()); + + LOG.info("Waiting for table {} to be ready", tableId); + boolean ready = false; + for (int i = 0; i < 60; i++) { + try { + if (connection.getAdmin().isTableAvailable(tableName)) { + ready = true; + break; + } + } catch (Exception e) { + LOG.info("Exception while checking table availability: " + e.getMessage()); + } + LOG.info("Table " + tableId + " not ready yet, sleeping..."); + Thread.sleep(5000); + } + if (!ready) { + throw new RuntimeException("Table " + tableId + " did not become ready in time"); + } + } @After @@ -303,7 +322,15 @@ public void testHBaseSnapshotImport() throws Exception { ImportOptions importOpts = createImportOptions(); // run pipeline - State state = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run().waitUntilFinish(); + org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + State state = importResult.waitUntilFinish(); + if (state != State.DONE) { + System.err.println("Pipeline failed! State: " + state); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println("Dataflow Job ID: " + job.getJobId()); + } + } Assert.assertEquals(State.DONE, state); // check that the .restore dir used for temp files has been removed @@ -352,7 +379,15 @@ public void testHBaseSnapshotImport() throws Exception { public void testHBaseSnapshotImportWithCorruptions() throws Exception { // Import snapshot ImportOptions importOpts = createImportOptions(); - State state = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run().waitUntilFinish(); + org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + State state = importResult.waitUntilFinish(); + if (state != State.DONE) { + System.err.println("Pipeline failed! State: " + state); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println("Dataflow Job ID: " + job.getJobId()); + } + } Assert.assertEquals(State.DONE, state); // Rows where corruptions will be added. @@ -415,7 +450,15 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { importOpts.setSnapshotName(TEST_SNAPPY_SNAPSHOT_NAME); // run pipeline - State state = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run().waitUntilFinish(); + org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + State state = importResult.waitUntilFinish(); + if (state != State.DONE) { + System.err.println("Pipeline failed! State: " + state); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println("Dataflow Job ID: " + job.getJobId()); + } + } Assert.assertEquals(State.DONE, state); // check that the .restore dir used for temp files has been removed @@ -456,4 +499,6 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { Assert.assertEquals(counters.get("ranges_matched"), (Long) 100L); Assert.assertEquals(counters.get("ranges_not_matched"), (Long) 0L); } + + } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/testing/BigtableTableUtils.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/testing/BigtableTableUtils.java index 45a2da3a3f..0fcc8843d3 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/testing/BigtableTableUtils.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/sequencefiles/testing/BigtableTableUtils.java @@ -66,6 +66,28 @@ public void createEmptyTable() throws IOException { new HColumnDescriptor(columnFamilyName).setMaxVersions(MAX_VERSION)); } admin.createTable(tableDescriptor); + + org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(BigtableTableUtils.class); + log.info("Waiting for table {} to be ready", tableName); + boolean ready = false; + for (int i = 0; i < 60; i++) { + try (org.apache.hadoop.hbase.client.Table table = connection.getTable(tableName)) { + table.get(new org.apache.hadoop.hbase.client.Get(org.apache.hadoop.hbase.util.Bytes.toBytes("dummy"))); + ready = true; + break; + } catch (Exception e) { + log.info("Table " + tableName + " not ready yet (dummy get failed): " + e.getMessage()); + } + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } + } + if (!ready) { + throw new RuntimeException("Table " + tableName + " did not become ready in time"); + } } /** Delete the table if it exists */ diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java new file mode 100644 index 0000000000..14d393fbbf --- /dev/null +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java @@ -0,0 +1,40 @@ +/* + * Copyright 2026 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 + * + * http://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 org.apache.hadoop.hbase.util; + +import com.google.protobuf.ByteString; + +/** + * Hack/Workaround: This class overrides the one in hbase-common to resolve + * NoClassDefFoundError: com/google/protobuf/LiteralByteString. + * + * HBase 2.x ByteStringer tries to use reflection to access package-private + * LiteralByteString in Protobuf 2.x/3.x. Since this project forces Protobuf 4.x + * (required by Beam 2.72.0), that internal class is missing. + * + * This replacement uses public APIs available in Protobuf 4.x. + */ +public final class ByteStringer { + private ByteStringer() {} + + public static ByteString wrap(final byte[] array) { + return ByteString.copyFrom(array); + } + + public static ByteString wrap(final byte[] array, final int offset, final int length) { + return ByteString.copyFrom(array, offset, length); + } +} From b300b942e27ceaa41f7dd2dff6cafec50c13e582 Mon Sep 17 00:00:00 2001 From: Tianlei Pan Date: Mon, 27 Apr 2026 19:41:56 +0000 Subject: [PATCH 14/14] Switch to shaded HBase deps and add dnsjava exclusion --- .../bigtable-beam-import/pom.xml | 10 ++- .../conf/HBaseSnapshotInputConfigBuilder.java | 10 ++- .../beam/hbasesnapshots/EndToEndIT.java | 62 ++++++++++++++++--- .../hadoop/hbase/util/ByteStringer.java | 40 ------------ 4 files changed, 68 insertions(+), 54 deletions(-) delete mode 100644 bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml index 888ddf48a3..525ed37d0c 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml +++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml @@ -131,9 +131,14 @@ limitations under the License. + org.apache.hbase - hbase-mapreduce + hbase-shaded-mapreduce ${hbase2.version} @@ -325,6 +330,7 @@ limitations under the License. *:* + META-INF/services/java.net.spi.InetAddressResolverProvider META-INF/*.SF META-INF/*.DSA META-INF/*.RSA @@ -443,7 +449,7 @@ limitations under the License. --> 1 false - -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts + -Xmx16g -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts all diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java index 4baa37a1bd..9ae103a482 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/conf/HBaseSnapshotInputConfigBuilder.java @@ -137,9 +137,13 @@ public Configuration createHBaseConfiguration() { conf.set("fs.gs.project.id", projectId); conf.setBoolean("google.cloud.auth.service.account.enable", true); // Hack/Workaround: Set the keyfile path for the submitter to access GCS during job setup. - // We use user.home to keep this portable across different developer environments. - String userHome = System.getProperty("user.home"); - conf.set("google.cloud.auth.service.account.json.keyfile", userHome + "/.config/gcloud/application_default_credentials.json"); + // Check for a system property first, falling back to the default CloudTop location. + String keyfile = System.getProperty("hadoop.gcs.keyfile"); + if (keyfile == null) { + String userHome = System.getProperty("user.home"); + keyfile = userHome + "/.config/gcloud/application_default_credentials.json"; + } + conf.set("google.cloud.auth.service.account.json.keyfile", keyfile); // Setup MapReduce config for TableSnapshotInputFormat conf.setClass( diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java index 03879ce7ce..47dd450895 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/hbasesnapshots/EndToEndIT.java @@ -122,7 +122,9 @@ public void setup() throws Exception { properties.applyTo(gcpOptions); gcsUtil = new GcsUtil.GcsUtilFactory().create(gcpOptions); + System.err.println(">>> Starting test setup (uploading snapshot fixture to GCS)..."); uploadFixture(gcsUtil, SNAPSHOT_FIXTURE_NAME, fixtureDir); + System.err.println(">>> Snapshot fixture uploaded to GCS!"); // Bigtable config connection = @@ -147,15 +149,14 @@ public void setup() throws Exception { LOG.info("Waiting for table {} to be ready", tableId); boolean ready = false; for (int i = 0; i < 60; i++) { - try { - if (connection.getAdmin().isTableAvailable(tableName)) { - ready = true; - break; - } + try (Table table = connection.getTable(tableName)) { + // A dummy get ensures the table is actually serving data + table.get(new Get(org.apache.hadoop.hbase.util.Bytes.toBytes("dummy"))); + ready = true; + break; } catch (Exception e) { - LOG.info("Exception while checking table availability: " + e.getMessage()); + LOG.info("Table " + tableId + " not ready yet (read failed): " + e.getMessage()); } - LOG.info("Table " + tableId + " not ready yet, sleeping..."); Thread.sleep(5000); } if (!ready) { @@ -203,6 +204,7 @@ private static void uploadFixture(GcsUtil gcsUtil, String fixtureName, String de filesToUpload.entrySet().parallelStream() .forEach( e -> { + System.err.println(">>> Uploading fixture file to GCS: " + e.getKey()); GcsPath path = GcsPath.fromUri(destPath + e.getKey()); GcsUtil.CreateOptions opts = GcsUtil.CreateOptions.builder() @@ -322,7 +324,13 @@ public void testHBaseSnapshotImport() throws Exception { ImportOptions importOpts = createImportOptions(); // run pipeline + System.err.println(">>> Launching HBase Snapshot Import Dataflow Job..."); org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + System.err.println(">>> Import Job Launched!"); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println(">>> Dataflow Job ID: " + job.getJobId()); + } State state = importResult.waitUntilFinish(); if (state != State.DONE) { System.err.println("Pipeline failed! State: " + state); @@ -335,13 +343,16 @@ public void testHBaseSnapshotImport() throws Exception { // check that the .restore dir used for temp files has been removed // The restore directory is stored relative to the snapshot directory and contains the job name + System.err.println(">>> Auditing GCS for temporary restore files..."); String bucket = GcsPath.fromUri(hbaseSnapshotDir).getBucket(); String restorePathPrefix = - CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR); + CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR + importOpts.getJobName()); List allObjects = new ArrayList<>(); String nextToken; + int pageCount = 0; do { Objects objects = gcsUtil.listObjects(bucket, restorePathPrefix, null); + System.err.println(">>> Fetched page " + (++pageCount) + " of GCS objects in restore dir..."); List items = objects.getItems(); if (items != null) { allObjects.addAll(items); @@ -358,7 +369,13 @@ public void testHBaseSnapshotImport() throws Exception { // Verify the import using the sync job SyncTableOptions syncOpts = createSyncTableOptions(); + System.err.println(">>> Launching SyncTable Dataflow Job..."); PipelineResult result = SyncTableJob.buildPipeline(syncOpts).run(); + System.err.println(">>> SyncTable Job Launched!"); + if (result instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) result; + System.err.println(">>> SyncTable Dataflow Job ID: " + job.getJobId()); + } state = result.waitUntilFinish(); Assert.assertEquals(State.DONE, state); @@ -379,7 +396,13 @@ public void testHBaseSnapshotImport() throws Exception { public void testHBaseSnapshotImportWithCorruptions() throws Exception { // Import snapshot ImportOptions importOpts = createImportOptions(); + System.err.println(">>> Launching HBase Snapshot Import Job (with corruptions test)..."); org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + System.err.println(">>> Import Job Launched!"); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println(">>> Dataflow Job ID: " + job.getJobId()); + } State state = importResult.waitUntilFinish(); if (state != State.DONE) { System.err.println("Pipeline failed! State: " + state); @@ -425,7 +448,13 @@ public void testHBaseSnapshotImportWithCorruptions() throws Exception { // Run SyncTable job and expect 4 mismatches. SyncTableOptions syncOpts = createSyncTableOptions(); + System.err.println(">>> Launching SyncTable Job (expecting mismatches)..."); PipelineResult result = SyncTableJob.buildPipeline(syncOpts).run(); + System.err.println(">>> SyncTable Job Launched!"); + if (result instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) result; + System.err.println(">>> SyncTable Dataflow Job ID: " + job.getJobId()); + } state = result.waitUntilFinish(); Assert.assertEquals(State.DONE, state); @@ -450,7 +479,13 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { importOpts.setSnapshotName(TEST_SNAPPY_SNAPSHOT_NAME); // run pipeline + System.err.println(">>> Launching Snappy Compressed Snapshot Import Job..."); org.apache.beam.sdk.PipelineResult importResult = ImportJobFromHbaseSnapshot.buildPipeline(importOpts).run(); + System.err.println(">>> Import Job Launched!"); + if (importResult instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) importResult; + System.err.println(">>> Dataflow Job ID: " + job.getJobId()); + } State state = importResult.waitUntilFinish(); if (state != State.DONE) { System.err.println("Pipeline failed! State: " + state); @@ -463,14 +498,17 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { // check that the .restore dir used for temp files has been removed // The restore directory is stored relative to the snapshot directory and contains the job name + System.err.println(">>> Auditing GCS for temporary restore files (Snappy)..."); String bucket = GcsPath.fromUri(hbaseSnapshotDir).getBucket(); String restorePathPrefix = - CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR); + CleanupHBaseSnapshotRestoreFiles.getListPrefix(HBaseSnapshotInputConfigBuilder.RESTORE_DIR + importOpts.getJobName()); List allObjects = new ArrayList<>(); String nextToken; + int pageCount = 0; do { Objects objects = gcsUtil.listObjects(bucket, restorePathPrefix, null); + System.err.println(">>> Fetched page " + (++pageCount) + " of GCS objects in restore dir (Snappy)..."); List items = objects.getItems(); if (items != null) { allObjects.addAll(items); @@ -487,7 +525,13 @@ public void testSnappyCompressedHBaseSnapshotImport() throws Exception { // Verify the import using the sync job SyncTableOptions syncOpts = createSyncTableOptions(); + System.err.println(">>> Launching SyncTable Job for Snappy Snapshot..."); PipelineResult result = SyncTableJob.buildPipeline(syncOpts).run(); + System.err.println(">>> SyncTable Job Launched!"); + if (result instanceof org.apache.beam.runners.dataflow.DataflowPipelineJob) { + org.apache.beam.runners.dataflow.DataflowPipelineJob job = (org.apache.beam.runners.dataflow.DataflowPipelineJob) result; + System.err.println(">>> SyncTable Dataflow Job ID: " + job.getJobId()); + } state = result.waitUntilFinish(); Assert.assertEquals(State.DONE, state); diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java deleted file mode 100644 index 14d393fbbf..0000000000 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/org/apache/hadoop/hbase/util/ByteStringer.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2026 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 - * - * http://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 org.apache.hadoop.hbase.util; - -import com.google.protobuf.ByteString; - -/** - * Hack/Workaround: This class overrides the one in hbase-common to resolve - * NoClassDefFoundError: com/google/protobuf/LiteralByteString. - * - * HBase 2.x ByteStringer tries to use reflection to access package-private - * LiteralByteString in Protobuf 2.x/3.x. Since this project forces Protobuf 4.x - * (required by Beam 2.72.0), that internal class is missing. - * - * This replacement uses public APIs available in Protobuf 4.x. - */ -public final class ByteStringer { - private ByteStringer() {} - - public static ByteString wrap(final byte[] array) { - return ByteString.copyFrom(array); - } - - public static ByteString wrap(final byte[] array, final int offset, final int length) { - return ByteString.copyFrom(array, offset, length); - } -}