Merge f9aa2aa into 7c1bb12

yirutang · web-flow · commit 4f786fda2486 · 2021-03-03T17:50:23.000Z
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
@@ -924,7 +924,7 @@ public void onResponse(AppendRowsResponse response) {
             IllegalStateException exception =
                 new IllegalStateException(
                     String.format(
-                        "The append result offset %s does not match " + "the expected offset %s.",
+                        "The append result offset %s does not match the expected offset %s.",
                         response.getAppendResult().getOffset().getValue(),
                         inflightBatch.getExpectedOffset()));
             inflightBatch.onFailure(exception);
diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterTest.java
@@ -678,6 +678,7 @@ public void testAppendWhileShutdownSuccess() throws Exception {
                     .toBuilder()
                     // When shutdown, we should have something in batch.
                     .setElementCountThreshold(3L)
+                    .setDelayThreshold(Duration.ofSeconds(1000))
                     .setFlowControlSettings(
                         StreamWriter.Builder.DEFAULT_FLOW_CONTROL_SETTINGS
                             .toBuilder()
@@ -1072,6 +1073,7 @@ public void testOffset() throws Exception {
                 StreamWriter.Builder.DEFAULT_BATCHING_SETTINGS
                     .toBuilder()
                     .setElementCountThreshold(2L)
+                    .setDelayThreshold(Duration.ofSeconds(1000))
                     .build())
             .build()) {
 
