@@ -47,14 +47,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.22.0
+ 2.23.0
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.22.0
+ 2.23.0
pom
import
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
index 3643c970e9dc..66008ca239d0 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
@InternalApi("For internal use only")
public final class Version {
// {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.22.0";
+ public static String VERSION = "2.23.0";
// {x-version-update-end}
}
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
index a887097485f3..701a5e8e49ae 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
@@ -197,13 +197,7 @@ public static void enableGfeOpenCensusStats() {
com.google.cloud.bigtable.data.v2.stub.metrics.RpcViews.registerBigtableClientGfeViews();
}
- /**
- * Register built in metrics.
- *
- * This is an experimental feature. Please fill up this form to have your project allow listed
- * for the private preview: https://forms.gle/xuhu6vCunn2MjV2m9
- */
- @BetaApi("Built in metric is not currently stable and may change in the future")
+ /** Register built in metrics. */
public static void enableBuiltinMetrics() throws IOException {
if (BUILTIN_METRICS_REGISTERED.compareAndSet(false, true)) {
BuiltinViews.registerBigtableBuiltinViews();
@@ -214,11 +208,7 @@ public static void enableBuiltinMetrics() throws IOException {
/**
* Register built in metrics with credentials. The credentials need to have metric write access
* for all the projects you're publishing to.
- *
- *
This is an experimental feature. Please fill up this form to have your project allow listed
- * for the private preview: https://forms.gle/xuhu6vCunn2MjV2m9
*/
- @BetaApi("Built in metric is not currently stable and may change in the future")
public static void enableBuiltinMetrics(Credentials credentials) throws IOException {
if (BUILTIN_METRICS_REGISTERED.compareAndSet(false, true)) {
BuiltinViews.registerBigtableBuiltinViews();
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
index bee6eb1694b7..53f02102f013 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
@@ -23,6 +23,7 @@
import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.grpc.ChannelPoolSettings;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.FixedHeaderProvider;
@@ -315,7 +316,13 @@ public Map getJwtAudienceMapping() {
/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return BigtableStubSettings.defaultGrpcTransportProviderBuilder()
- .setPoolSize(getDefaultChannelPoolSize())
+ .setChannelPoolSettings(
+ ChannelPoolSettings.builder()
+ .setInitialChannelCount(10)
+ .setMinRpcsPerChannel(1)
+ .setMaxRpcsPerChannel(50)
+ .setPreemptiveRefreshEnabled(true)
+ .build())
.setMaxInboundMessageSize(MAX_MESSAGE_SIZE)
.setKeepAliveTime(Duration.ofSeconds(30)) // sends ping in this interval
.setKeepAliveTimeout(
@@ -325,11 +332,6 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi
.setAttemptDirectPath(true);
}
- static int getDefaultChannelPoolSize() {
- // TODO: tune channels
- return 2 * Runtime.getRuntime().availableProcessors();
- }
-
@SuppressWarnings("WeakerAccess")
public static TransportChannelProvider defaultTransportChannelProvider() {
return defaultGrpcTransportProviderBuilder().build();
@@ -658,9 +660,7 @@ private Builder() {
copyRetrySettings(baseDefaults.mutateRowSettings(), mutateRowSettings);
long maxBulkMutateElementPerBatch = 100L;
- // Enables bulkMutate to support 10 outstanding batches upto per channel or up to 20K entries.
- long maxBulkMutateOutstandingElementCount =
- Math.min(20_000L, 10L * maxBulkMutateElementPerBatch * getDefaultChannelPoolSize());
+ long maxBulkMutateOutstandingElementCount = 20_000L;
bulkMutateRowsSettings =
BigtableBatchingCallSettings.newBuilder(new MutateRowsBatchingDescriptor())
@@ -682,9 +682,7 @@ private Builder() {
long maxBulkReadElementPerBatch = 100L;
long maxBulkReadRequestSizePerBatch = 400L * 1024L;
- // Enables bulkRead to support 10 outstanding batches per channel
- long maxBulkReadOutstandingElementCount =
- 10L * maxBulkReadElementPerBatch * getDefaultChannelPoolSize();
+ long maxBulkReadOutstandingElementCount = 20_000L;
bulkReadRowsSettings =
BigtableBulkReadRowsCallSettings.newBuilder(new ReadRowsBatchingDescriptor())
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 5f7390b6dc57..c06ca546583c 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.22.0
+ 2.23.0
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.22.0
+ 2.23.0
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.22.0
+ 2.23.0
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.22.0
+ 2.23.0
pom
import
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 9ed11bbe5bc8..f1b3e3a60f87 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.22.0
+ 2.23.0
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.22.0
+ 2.23.0
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.22.0
+ 2.23.0
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.22.0
+ 2.23.0
pom
import
diff --git a/pom.xml b/pom.xml
index fb792f880522..b75a21afed29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 2.22.0
+ 2.23.0
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -153,27 +153,27 @@
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.22.0
+ 2.23.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.22.0
+ 2.23.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.22.0
+ 2.23.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.22.0
+ 2.23.0
com.google.cloud
google-cloud-bigtable
- 2.22.0
+ 2.23.0
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index d81281d5ab40..e999ac93c488 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.22.0
+ 2.23.0
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.22.0
+ 2.23.0
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.22.0
+ 2.23.0
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.22.0
+ 2.23.0
pom
import
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 520d6f9bb43d..66a4d4972079 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.22.0
+ 2.23.0
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.22.0
+ 2.23.0
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.22.0
+ 2.23.0
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.22.0
+ 2.23.0
pom
import
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 3d7571294bfb..8599e186d779 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-bigtable
- 2.21.0
+ 2.22.0
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 6f248834a969..11fba91786b7 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
libraries-bom
- 26.13.0
+ 26.14.0
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 76bd45f094e8..dbb1304db069 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-bigtable
- 2.22.0
+ 2.23.0
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 0a40287c2a0e..dda8ddbaca6b 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.13.0
+ 26.14.0
pom
import
diff --git a/test-proxy/README.md b/test-proxy/README.md
index be9906138e9c..18778ba8c3d5 100644
--- a/test-proxy/README.md
+++ b/test-proxy/README.md
@@ -18,7 +18,7 @@ Build the proxy with the latest/head version of the client
cd java-bigtable
mvn clean install -DskipTests
cd test-proxy
-mvn clean install
+mvn clean install -DskipTests
```
Start the proxy on default port 9999
diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml
index 530e5b0a3f66..aefe6f551d6d 100644
--- a/test-proxy/pom.xml
+++ b/test-proxy/pom.xml
@@ -12,11 +12,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.22.0
+ 2.23.0
- 2.22.0
+ 2.23.0
diff --git a/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java b/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java
index c14d4b41860a..d07d06b6477c 100644
--- a/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java
+++ b/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/CbtTestProxy.java
@@ -341,7 +341,7 @@ public void bulkMutateRows(
MutateRowsResult.Builder resultBuilder = MutateRowsResult.newBuilder();
for (MutateRowsException.FailedMutation failed : e.getFailedMutations()) {
resultBuilder
- .addEntryBuilder()
+ .addEntriesBuilder()
.setIndex(failed.getIndex())
.setStatus(
com.google.rpc.Status.newBuilder()
@@ -543,7 +543,7 @@ private static RowsResult.Builder convertRowsResult(
for (com.google.cloud.bigtable.data.v2.models.Row row : rows) {
rowCounter++;
RowResult.Builder rowResultBuilder = convertRowResult(row);
- resultBuilder.addRow(rowResultBuilder.getRow());
+ resultBuilder.addRows(rowResultBuilder.getRow());
if (cancelAfterRows > 0 && rowCounter >= cancelAfterRows) {
logger.info(
@@ -593,7 +593,7 @@ public void sampleRowKeys(
SampleRowKeysResult.Builder resultBuilder = SampleRowKeysResult.newBuilder();
for (KeyOffset keyOffset : keyOffsets) {
resultBuilder
- .addSampleBuilder()
+ .addSamplesBuilder()
.setRowKey(keyOffset.getKey())
.setOffsetBytes(keyOffset.getOffsetBytes());
}
diff --git a/test-proxy/src/main/proto/test_proxy.proto b/test-proxy/src/main/proto/test_proxy.proto
index 432e49a1e573..551dd4d8b209 100644
--- a/test-proxy/src/main/proto/test_proxy.proto
+++ b/test-proxy/src/main/proto/test_proxy.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@ message RowsResult {
google.rpc.Status status = 1;
// The contents of rows.
- repeated google.bigtable.v2.Row row = 2;
+ repeated google.bigtable.v2.Row rows = 2;
}
// Request to test proxy service to mutate a row.
@@ -155,7 +155,7 @@ message MutateRowsResult {
google.rpc.Status status = 1;
// The results corresponding to the failed rows.
- repeated google.bigtable.v2.MutateRowsResponse.Entry entry = 2;
+ repeated google.bigtable.v2.MutateRowsResponse.Entry entries = 2;
}
// Request to test proxy service to check and mutate a row.
@@ -191,7 +191,7 @@ message SampleRowKeysResult {
google.rpc.Status status = 1;
// The raw responses from the Bigtable server.
- repeated google.bigtable.v2.SampleRowKeysResponse sample = 2;
+ repeated google.bigtable.v2.SampleRowKeysResponse samples = 2;
}
// Request to test proxy service to read modify write a row.
diff --git a/versions.txt b/versions.txt
index 9ccdba9a7ee2..fed45f41cd31 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:2.22.0:2.22.0
-grpc-google-cloud-bigtable-admin-v2:2.22.0:2.22.0
-grpc-google-cloud-bigtable-v2:2.22.0:2.22.0
-proto-google-cloud-bigtable-admin-v2:2.22.0:2.22.0
-proto-google-cloud-bigtable-v2:2.22.0:2.22.0
-google-cloud-bigtable-emulator:0.159.0:0.159.0
-google-cloud-bigtable-emulator-core:2.22.0:2.22.0
+google-cloud-bigtable:2.23.0:2.23.0
+grpc-google-cloud-bigtable-admin-v2:2.23.0:2.23.0
+grpc-google-cloud-bigtable-v2:2.23.0:2.23.0
+proto-google-cloud-bigtable-admin-v2:2.23.0:2.23.0
+proto-google-cloud-bigtable-v2:2.23.0:2.23.0
+google-cloud-bigtable-emulator:0.160.0:0.160.0
+google-cloud-bigtable-emulator-core:2.23.0:2.23.0