Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 4c7eb1e

Browse files
committed
fix
1 parent 1f22527 commit 4c7eb1e

3 files changed

Lines changed: 33 additions & 30 deletions

File tree

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ public static BigtableClientContext create(
175175
break;
176176
case DEFAULT:
177177
default:
178-
System.out.println("Using default direct access checker");
179-
directAccessChecker = new ClassicDirectAccessChecker(metrics.getDirectPathCompatibleTracer(), channelPrimer, backgroundExecutor);
178+
directAccessChecker =
179+
new ClassicDirectAccessChecker(
180+
metrics.getDirectPathCompatibleTracer(), channelPrimer, backgroundExecutor);
180181
break;
181182
}
182183

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,15 @@ public void testCreateWithRefreshingChannel() throws Exception {
286286
Mockito.verify(credentialsProvider, Mockito.times(2)).getCredentials();
287287
Mockito.verify(executorProvider, Mockito.times(1)).getExecutor();
288288
Mockito.verify(watchdogProvider, Mockito.times(1)).getWatchdog();
289-
assertThat(warmedChannels).hasSize(poolSize+1);
289+
assertThat(warmedChannels).hasSize(poolSize + 1);
290290
assertThat(warmedChannels.values()).doesNotContain(false);
291291

292292
// Wait for all the connections to close asynchronously
293293
factory.close();
294294
long sleepTimeMs = 1000;
295295
Thread.sleep(sleepTimeMs);
296296
// Verify that all the channels are closed
297-
assertThat(terminateAttributes).hasSize(poolSize+1);
297+
assertThat(terminateAttributes).hasSize(poolSize + 1);
298298
}
299299

300300
@Test
@@ -303,19 +303,19 @@ public void testCreateWithRefreshingChannelWithDirectAccessByDefault() throws Ex
303303
// TODO: remove the suppression when setRefreshingChannel can be removed
304304
@SuppressWarnings("deprecation")
305305
BigtableDataSettings.Builder builder =
306-
BigtableDataSettings.newBuilderForEmulator(server.getPort())
307-
.setProjectId(DEFAULT_PROJECT_ID)
308-
.setInstanceId(DEFAULT_INSTANCE_ID)
309-
.setAppProfileId(DEFAULT_APP_PROFILE_ID)
310-
.setRefreshingChannel(true);
306+
BigtableDataSettings.newBuilderForEmulator(server.getPort())
307+
.setProjectId(DEFAULT_PROJECT_ID)
308+
.setInstanceId(DEFAULT_INSTANCE_ID)
309+
.setAppProfileId(DEFAULT_APP_PROFILE_ID)
310+
.setRefreshingChannel(true);
311311
builder
312-
.stubSettings()
313-
.setCredentialsProvider(credentialsProvider)
314-
.setStreamWatchdogProvider(watchdogProvider)
315-
.setBackgroundExecutorProvider(executorProvider)
316-
.setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.DEFAULT);
312+
.stubSettings()
313+
.setCredentialsProvider(credentialsProvider)
314+
.setStreamWatchdogProvider(watchdogProvider)
315+
.setBackgroundExecutorProvider(executorProvider)
316+
.setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.DEFAULT);
317317
InstantiatingGrpcChannelProvider channelProvider =
318-
(InstantiatingGrpcChannelProvider) builder.stubSettings().getTransportChannelProvider();
318+
(InstantiatingGrpcChannelProvider) builder.stubSettings().getTransportChannelProvider();
319319
InstantiatingGrpcChannelProvider.Builder channelProviderBuilder = channelProvider.toBuilder();
320320
channelProviderBuilder.setChannelPoolSettings(ChannelPoolSettings.staticallySized(poolSize));
321321
builder.stubSettings().setTransportChannelProvider(channelProviderBuilder.build());
@@ -331,7 +331,7 @@ public void testCreateWithRefreshingChannelWithDirectAccessByDefault() throws Ex
331331
Mockito.verify(credentialsProvider, Mockito.times(2)).getCredentials();
332332
Mockito.verify(executorProvider, Mockito.times(1)).getExecutor();
333333
Mockito.verify(watchdogProvider, Mockito.times(1)).getWatchdog();
334-
assertThat(warmedChannels).hasSize(poolSize+1);
334+
assertThat(warmedChannels).hasSize(poolSize + 1);
335335
assertThat(warmedChannels.values()).doesNotContain(false);
336336

337337
// Wait for all the connections to close asynchronously
@@ -340,30 +340,29 @@ public void testCreateWithRefreshingChannelWithDirectAccessByDefault() throws Ex
340340
Thread.sleep(sleepTimeMs);
341341
// Verify that all the channels are closed
342342
// If we have DEFAULT, it will add one channel temporily
343-
assertThat(terminateAttributes).hasSize(poolSize+1);
343+
assertThat(terminateAttributes).hasSize(poolSize + 1);
344344
}
345345

346-
347346
@Test
348347
public void testCreateWithRefreshingChannelDisableDirectAccess() throws Exception {
349348
int poolSize = 3;
350349
// TODO: remove the suppression when setRefreshingChannel can be removed
351350
@SuppressWarnings("deprecation")
352351
BigtableDataSettings.Builder builder =
353-
BigtableDataSettings.newBuilderForEmulator(server.getPort())
354-
.setProjectId(DEFAULT_PROJECT_ID)
355-
.setInstanceId(DEFAULT_INSTANCE_ID)
356-
.setAppProfileId(DEFAULT_APP_PROFILE_ID)
357-
.setRefreshingChannel(true);
352+
BigtableDataSettings.newBuilderForEmulator(server.getPort())
353+
.setProjectId(DEFAULT_PROJECT_ID)
354+
.setInstanceId(DEFAULT_INSTANCE_ID)
355+
.setAppProfileId(DEFAULT_APP_PROFILE_ID)
356+
.setRefreshingChannel(true);
358357

359358
builder
360-
.stubSettings()
361-
.setCredentialsProvider(credentialsProvider)
362-
.setStreamWatchdogProvider(watchdogProvider)
363-
.setBackgroundExecutorProvider(executorProvider)
364-
.setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.FORCED_OFF);
359+
.stubSettings()
360+
.setCredentialsProvider(credentialsProvider)
361+
.setStreamWatchdogProvider(watchdogProvider)
362+
.setBackgroundExecutorProvider(executorProvider)
363+
.setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.FORCED_OFF);
365364
InstantiatingGrpcChannelProvider channelProvider =
366-
(InstantiatingGrpcChannelProvider) builder.stubSettings().getTransportChannelProvider();
365+
(InstantiatingGrpcChannelProvider) builder.stubSettings().getTransportChannelProvider();
367366
InstantiatingGrpcChannelProvider.Builder channelProviderBuilder = channelProvider.toBuilder();
368367
channelProviderBuilder.setChannelPoolSettings(ChannelPoolSettings.staticallySized(poolSize));
369368
builder.stubSettings().setTransportChannelProvider(channelProviderBuilder.build());

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,10 @@ public void testChannelPrimerConfigured() throws IOException {
549549
// TODO: remove the suppression once setRefreshingChannel can be removed
550550
@SuppressWarnings("deprecation")
551551
EnhancedBigtableStubSettings settings =
552-
defaultSettings.toBuilder().setRefreshingChannel(true).setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.DEFAULT).build();
552+
defaultSettings.toBuilder()
553+
.setRefreshingChannel(true)
554+
.setDirectPathConfig(EnhancedBigtableStubSettings.DirectPathConfig.DEFAULT)
555+
.build();
553556

554557
try (EnhancedBigtableStub ignored = EnhancedBigtableStub.create(settings)) {
555558
// direct access checker ping

0 commit comments

Comments
 (0)