Skip to content

Commit 841bb29

Browse files
mutianfmutianf
authored
deps: update google-cloud-bigtable dependencies (#3934)
Bridge #3912 and disabling channel priming by default.
1 parent 29019ad commit 841bb29

File tree

7 files changed

+54
-14
lines changed

7 files changed

+54
-14
lines changed

‎bigtable-client-core-parent/bigtable-hbase/src/main/java/com/google/cloud/bigtable/hbase/wrappers/veneer/SharedDataClientWrapperFactory.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.google.cloud.bigtable.metrics.BigtableClientMetrics;
3232
import com.google.cloud.bigtable.metrics.BigtableClientMetrics.MetricLevel;
3333
import com.google.common.base.Objects;
34-
import com.google.common.base.Preconditions;
3534
import java.io.IOException;
3635
import java.util.HashMap;
3736
import java.util.Map;
@@ -49,9 +48,6 @@ class SharedDataClientWrapperFactory {
4948

5049
synchronized DataClientWrapper createDataClient(BigtableHBaseVeneerSettings settings)
5150
throws IOException {
52-
Preconditions.checkArgument(
53-
!settings.getDataSettings().isRefreshingChannel(),
54-
"Channel refreshing is not compatible with cached channel pools");
5551

5652
Key key = Key.createFromSettings(settings.getDataSettings());
5753

@@ -76,6 +72,7 @@ synchronized DataClientWrapper createDataClient(BigtableHBaseVeneerSettings sett
7672
Builder builder = settings.getDataSettings().toBuilder();
7773
builder
7874
.stubSettings()
75+
.setRefreshingChannel(false)
7976
.setTransportChannelProvider(
8077
FixedTransportChannelProvider.create(sharedCtx.getTransportChannel()))
8178
.setCredentialsProvider(FixedCredentialsProvider.create(sharedCtx.getCredentials()))

‎bigtable-client-core-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/wrappers/veneer/TestBigtableHBaseVeneerSettings.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,11 @@ public void testWithNullCredentials() throws IOException {
285285
configuration.setBoolean(BIGTABLE_NULL_CREDENTIAL_ENABLE_KEY, true);
286286

287287
BigtableDataSettings dataSettings =
288-
((BigtableHBaseVeneerSettings) BigtableHBaseVeneerSettings.create(configuration))
289-
.getDataSettings();
290-
assertTrue(
291-
dataSettings.getStubSettings().getCredentialsProvider() instanceof NoCredentialsProvider);
288+
BigtableHBaseVeneerSettings.create(configuration).getDataSettings();
292289
assertNull(dataSettings.getStubSettings().getCredentialsProvider().getCredentials());
293290

294291
BigtableTableAdminSettings adminSettings =
295-
((BigtableHBaseVeneerSettings) BigtableHBaseVeneerSettings.create(configuration))
296-
.getTableAdminSettings();
292+
BigtableHBaseVeneerSettings.create(configuration).getTableAdminSettings();
297293
assertTrue(
298294
adminSettings.getStubSettings().getCredentialsProvider() instanceof NoCredentialsProvider);
299295
assertNull(adminSettings.getStubSettings().getCredentialsProvider().getCredentials());

‎bigtable-dataflow-parent/bigtable-hbase-beam/src/main/java/com/google/cloud/bigtable/batch/common/CloudBigtableServiceImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
/** For internal use only - public for technical reasons. */
2727
@InternalApi("For internal usage only")
2828
public class CloudBigtableServiceImpl implements CloudBigtableService {
29-
3029
@Override
3130
public List<KeyOffset> getSampleRowKeys(CloudBigtableTableConfiguration config)
3231
throws IOException {

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-mapreduce/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License.
3636

3737
<properties>
3838
<mrunit.version>1.1.0</mrunit.version>
39-
<google-cloud-bigtable-emulator.version>0.154.1</google-cloud-bigtable-emulator.version>
39+
<google-cloud-bigtable-emulator.version>0.155.3</google-cloud-bigtable-emulator.version>
4040
</properties>
4141

4242
<!-- NOTE: this artifact is designed to be used alongside hbase-server via

‎bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ limitations under the License.
6969
<groupId>${project.groupId}</groupId>
7070
<artifactId>bigtable-hbase-1.x</artifactId>
7171
<version>2.6.6-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
72+
<exclusions>
73+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
74+
have a use of it so we're excluding it from the shaded jar. -->
75+
<exclusion>
76+
<groupId>com.google.auto.value</groupId>
77+
<artifactId>auto-value</artifactId>
78+
</exclusion>
79+
</exclusions>
7280
</dependency>
7381
<dependency>
7482
<groupId>com.google.cloud.bigtable</groupId>
@@ -94,10 +102,26 @@ limitations under the License.
94102
<dependency>
95103
<groupId>io.opencensus</groupId>
96104
<artifactId>opencensus-exporter-stats-stackdriver</artifactId>
105+
<exclusions>
106+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
107+
have a use of it so we're excluding it from the shaded jar. -->
108+
<exclusion>
109+
<groupId>com.google.auto.value</groupId>
110+
<artifactId>auto-value</artifactId>
111+
</exclusion>
112+
</exclusions>
97113
</dependency>
98114
<dependency>
99115
<groupId>io.opencensus</groupId>
100116
<artifactId>opencensus-exporter-trace-stackdriver</artifactId>
117+
<exclusions>
118+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
119+
have a use of it so we're excluding it from the shaded jar. -->
120+
<exclusion>
121+
<groupId>com.google.auto.value</groupId>
122+
<artifactId>auto-value</artifactId>
123+
</exclusion>
124+
</exclusions>
101125
</dependency>
102126
<dependency>
103127
<groupId>io.opencensus</groupId>

‎bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ limitations under the License.
6969
<groupId>${project.groupId}</groupId>
7070
<artifactId>bigtable-hbase-2.x</artifactId>
7171
<version>2.6.6-SNAPSHOT</version> <!-- {x-version-update:bigtable-client-parent:current} -->
72+
<exclusions>
73+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
74+
have a use of it so we're excluding it from the shaded jar. -->
75+
<exclusion>
76+
<groupId>com.google.auto.value</groupId>
77+
<artifactId>auto-value</artifactId>
78+
</exclusion>
79+
</exclusions>
7280
</dependency>
7381
<dependency>
7482
<groupId>com.google.cloud.bigtable</groupId>
@@ -88,10 +96,26 @@ limitations under the License.
8896
<dependency>
8997
<groupId>io.opencensus</groupId>
9098
<artifactId>opencensus-exporter-stats-stackdriver</artifactId>
99+
<exclusions>
100+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
101+
have a use of it so we're excluding it from the shaded jar. -->
102+
<exclusion>
103+
<groupId>com.google.auto.value</groupId>
104+
<artifactId>auto-value</artifactId>
105+
</exclusion>
106+
</exclusions>
91107
</dependency>
92108
<dependency>
93109
<groupId>io.opencensus</groupId>
94110
<artifactId>opencensus-exporter-trace-stackdriver</artifactId>
111+
<exclusions>
112+
<!-- api-common recently declared dependency on autovalue during migration to gradle. We don't
113+
have a use of it so we're excluding it from the shaded jar. -->
114+
<exclusion>
115+
<groupId>com.google.auto.value</groupId>
116+
<artifactId>auto-value</artifactId>
117+
</exclusion>
118+
</exclusions>
95119
</dependency>
96120
<dependency>
97121
<groupId>io.opencensus</groupId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ limitations under the License.
5656
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5757

5858
<!-- core dependency versions -->
59-
<bigtable.version>2.17.1</bigtable.version>
60-
<google-cloud-bigtable-emulator.version>0.154.1</google-cloud-bigtable-emulator.version>
59+
<bigtable.version>2.18.3</bigtable.version>
60+
<google-cloud-bigtable-emulator.version>0.155.3</google-cloud-bigtable-emulator.version>
6161
<bigtable-client-core.version>1.28.0</bigtable-client-core.version>
6262
<grpc-conscrypt.version>2.5.2</grpc-conscrypt.version>
6363
<!-- keeping at this version to align with hbase-->

0 commit comments

Comments
 (0)