Visitar URL original
fix: fix tests and argument checks (#1833) · googleapis/java-bigtable@cb160af · GitHub
Skip to content
This repository was archived by the owner on Aug 30, 2026. It is now read-only.

Commit cb160af

Browse files
mutianfmutianf
authored
fix: fix tests and argument checks (#1833)
1 parent 8d0b546 commit cb160af

6 files changed

Lines changed: 57 additions & 25 deletions

File tree

‎google-cloud-bigtable-deps-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.google.cloud</groupId>
6868
<artifactId>google-cloud-shared-dependencies</artifactId>
69-
<version>3.12.0</version>
69+
<version>3.13.0</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>

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

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -294,28 +294,28 @@ public boolean isServerInitiatedFlowControlEnabled() {
294294
@Override
295295
public BigtableBatchingCallSettings build() {
296296
Preconditions.checkState(batchingSettings != null, "batchingSettings must be set");
297-
FlowControlSettings defaultSettings = batchingSettings.getFlowControlSettings();
297+
FlowControlSettings flowControlSettings = batchingSettings.getFlowControlSettings();
298298
Preconditions.checkState(
299-
defaultSettings.getMaxOutstandingElementCount() != null,
299+
flowControlSettings.getMaxOutstandingElementCount() != null,
300300
"maxOutstandingElementCount must be set in BatchingSettings#FlowControlSettings");
301301
Preconditions.checkState(
302-
defaultSettings.getMaxOutstandingRequestBytes() != null,
302+
flowControlSettings.getMaxOutstandingRequestBytes() != null,
303303
"maxOutstandingRequestBytes must be set in BatchingSettings#FlowControlSettings");
304304
Preconditions.checkArgument(
305305
batchingSettings.getElementCountThreshold() == null
306-
|| defaultSettings.getMaxOutstandingElementCount()
307-
>= batchingSettings.getElementCountThreshold(),
308-
"if elementCountThreshold is set in BatchingSettings, maxOutstandingElementCount must be >= elementCountThreshold");
306+
|| flowControlSettings.getMaxOutstandingElementCount()
307+
> batchingSettings.getElementCountThreshold(),
308+
"if batch elementCountThreshold is set in BatchingSettings, flow control maxOutstandingElementCount must be > elementCountThreshold");
309309
Preconditions.checkArgument(
310310
batchingSettings.getRequestByteThreshold() == null
311-
|| defaultSettings.getMaxOutstandingRequestBytes()
312-
>= batchingSettings.getRequestByteThreshold(),
313-
"if requestByteThreshold is set in BatchingSettings, getMaxOutstandingRequestBytes must be >= getRequestByteThreshold");
311+
|| flowControlSettings.getMaxOutstandingRequestBytes()
312+
> batchingSettings.getRequestByteThreshold(),
313+
"if batch requestByteThreshold is set in BatchingSettings, flow control maxOutstandingRequestBytes must be > getRequestByteThreshold");
314314
// Combine static FlowControlSettings with latency based throttling settings to create
315315
// DynamicFlowControlSettings.
316316
if (isLatencyBasedThrottlingEnabled()) {
317-
long maxThrottlingElementCount = defaultSettings.getMaxOutstandingElementCount();
318-
long maxThrottlingRequestByteCount = defaultSettings.getMaxOutstandingRequestBytes();
317+
long maxThrottlingElementCount = flowControlSettings.getMaxOutstandingElementCount();
318+
long maxThrottlingRequestByteCount = flowControlSettings.getMaxOutstandingRequestBytes();
319319
// The maximum in flight element count is pretty high. Set the initial parallelism to 25%
320320
// of the maximum and then work up or down. This reduction should reduce the
321321
// impacts of a bursty job, such as those found in Dataflow.
@@ -332,7 +332,7 @@ public BigtableBatchingCallSettings build() {
332332
}
333333
dynamicFlowControlSettings =
334334
DynamicFlowControlSettings.newBuilder()
335-
.setLimitExceededBehavior(defaultSettings.getLimitExceededBehavior())
335+
.setLimitExceededBehavior(flowControlSettings.getLimitExceededBehavior())
336336
.setInitialOutstandingElementCount(initialElementCount)
337337
.setMaxOutstandingElementCount(maxThrottlingElementCount)
338338
.setMinOutstandingElementCount(minElementCount)
@@ -343,13 +343,15 @@ public BigtableBatchingCallSettings build() {
343343
} else {
344344
dynamicFlowControlSettings =
345345
DynamicFlowControlSettings.newBuilder()
346-
.setLimitExceededBehavior(defaultSettings.getLimitExceededBehavior())
347-
.setInitialOutstandingElementCount(defaultSettings.getMaxOutstandingElementCount())
348-
.setMaxOutstandingElementCount(defaultSettings.getMaxOutstandingElementCount())
349-
.setMinOutstandingElementCount(defaultSettings.getMaxOutstandingElementCount())
350-
.setInitialOutstandingRequestBytes(defaultSettings.getMaxOutstandingRequestBytes())
351-
.setMinOutstandingRequestBytes(defaultSettings.getMaxOutstandingRequestBytes())
352-
.setMaxOutstandingRequestBytes(defaultSettings.getMaxOutstandingRequestBytes())
346+
.setLimitExceededBehavior(flowControlSettings.getLimitExceededBehavior())
347+
.setInitialOutstandingElementCount(
348+
flowControlSettings.getMaxOutstandingElementCount())
349+
.setMaxOutstandingElementCount(flowControlSettings.getMaxOutstandingElementCount())
350+
.setMinOutstandingElementCount(flowControlSettings.getMaxOutstandingElementCount())
351+
.setInitialOutstandingRequestBytes(
352+
flowControlSettings.getMaxOutstandingRequestBytes())
353+
.setMinOutstandingRequestBytes(flowControlSettings.getMaxOutstandingRequestBytes())
354+
.setMaxOutstandingRequestBytes(flowControlSettings.getMaxOutstandingRequestBytes())
353355
.build();
354356
}
355357
return new BigtableBatchingCallSettings(this);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,6 @@ public UnaryCallSettings.Builder<PingAndWarmRequest, Void> pingAndWarmSettings()
959959
public EnhancedBigtableStubSettings build() {
960960
Preconditions.checkState(projectId != null, "Project id must be set");
961961
Preconditions.checkState(instanceId != null, "Instance id must be set");
962-
963962
if (isRefreshingChannel) {
964963
Preconditions.checkArgument(
965964
getTransportChannelProvider() instanceof InstantiatingGrpcChannelProvider,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ public void testFlowControlMandatorySettings() {
176176
BatchingSettings.newBuilder()
177177
.setFlowControlSettings(
178178
FlowControlSettings.newBuilder()
179-
.setMaxOutstandingElementCount(10L)
180-
.setMaxOutstandingRequestBytes(10L)
179+
.setMaxOutstandingElementCount(11L)
180+
.setMaxOutstandingRequestBytes(11L)
181181
.build())
182182
.setElementCountThreshold(10L)
183183
.setRequestByteThreshold(10L)

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ public void sendMessage(ReqT message) {
207207
.setDelayThreshold(Duration.ofHours(1))
208208
.setFlowControlSettings(
209209
FlowControlSettings.newBuilder()
210-
.setMaxOutstandingElementCount((long) batchElementCount)
211-
.setMaxOutstandingRequestBytes(1000L)
210+
.setMaxOutstandingElementCount((long) batchElementCount + 1)
211+
.setMaxOutstandingRequestBytes(1001L)
212212
.build())
213213
.build());
214214
stubSettingsBuilder.setTracerFactory(mockFactory);
@@ -478,6 +478,9 @@ public void testBatchBlockingLatencies() throws InterruptedException {
478478
batcher.add(RowMutationEntry.create("key").setCell("f", "q", "v"));
479479
}
480480

481+
// closing the batcher to trigger the third flush
482+
batcher.close();
483+
481484
int expectedNumRequests = 6 / batchElementCount;
482485
ArgumentCaptor<Long> throttledTime = ArgumentCaptor.forClass(Long.class);
483486
verify(statsRecorderWrapper, timeout(1000).times(expectedNumRequests))

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.mockito.Mockito.doAnswer;
2121
import static org.mockito.Mockito.when;
2222

23+
import com.google.api.gax.batching.BatchResource;
2324
import com.google.api.gax.batching.Batcher;
2425
import com.google.api.gax.batching.BatcherImpl;
2526
import com.google.api.gax.batching.BatchingDescriptor;
@@ -422,6 +423,8 @@ public Object answer(InvocationOnMock invocation) {
422423
public void testBatchMutateRowsThrottledTime() throws Exception {
423424
FlowController flowController = Mockito.mock(FlowController.class);
424425
BatchingDescriptor batchingDescriptor = Mockito.mock(MutateRowsBatchingDescriptor.class);
426+
when(batchingDescriptor.createResource(any())).thenReturn(new FakeBatchResource());
427+
when(batchingDescriptor.createEmptyResource()).thenReturn(new FakeBatchResource());
425428
// Mock throttling
426429
final long throttled = 50;
427430
doAnswer(
@@ -486,4 +489,29 @@ public Object answer(InvocationOnMock invocation) {
486489
private static <T> StreamObserver<T> anyObserver(Class<T> returnType) {
487490
return (StreamObserver<T>) any(returnType);
488491
}
492+
493+
private class FakeBatchResource implements BatchResource {
494+
495+
FakeBatchResource() {}
496+
497+
@Override
498+
public BatchResource add(BatchResource resource) {
499+
return new FakeBatchResource();
500+
}
501+
502+
@Override
503+
public long getElementCount() {
504+
return 1;
505+
}
506+
507+
@Override
508+
public long getByteCount() {
509+
return 1;
510+
}
511+
512+
@Override
513+
public boolean shouldFlush(long maxElementThreshold, long maxBytesThreshold) {
514+
return false;
515+
}
516+
}
489517
}

0 commit comments

Comments
 (0)