From 2990214a50f50f1de5754e666a97ec26c3a55d7f Mon Sep 17 00:00:00 2001 From: yirutang Date: Fri, 3 Sep 2021 10:45:06 -0700 Subject: [PATCH 1/4] fix: update code comment to reflect max size change --- .../google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java index e3501268df..ad104c497b 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java @@ -136,7 +136,7 @@ public class StreamWriterV2 implements AutoCloseable { /** The maximum size of one request. Defined by the API. */ public static long getApiMaxRequestBytes() { - return 10L * 1000L * 1000L; // 8 megabytes (https://en.wikipedia.org/wiki/Megabyte) + return 10L * 1000L * 1000L; // 10 megabytes (https://en.wikipedia.org/wiki/Megabyte) } private StreamWriterV2(Builder builder) throws IOException { From c9dfc94aecbe3fe72776dedaf5f3523b89d238c3 Mon Sep 17 00:00:00 2001 From: yirutang Date: Wed, 13 Oct 2021 16:29:27 -0700 Subject: [PATCH 2/4] fix: fix verbose info logs in StreamWriter --- .../cloud/bigquery/storage/v1/StreamWriter.java | 14 +++++++------- .../bigquery/storage/v1beta2/StreamWriterV2.java | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java index 80a935ee93..3f94a85f03 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java @@ -307,7 +307,7 @@ public void close() { } finally { this.lock.unlock(); } - log.info("Waiting for append thread to finish. Stream: " + streamName); + log.fine("Waiting for append thread to finish. Stream: " + streamName); try { appendThread.join(); log.info("User close complete. Stream: " + streamName); @@ -366,17 +366,17 @@ private void appendLoop() { } } - log.info("Cleanup starts. Stream: " + streamName); + log.fine("Cleanup starts. Stream: " + streamName); // At this point, the waiting queue is drained, so no more requests. // We can close the stream connection and handle the remaining inflight requests. this.streamConnection.close(); waitForDoneCallback(); // At this point, there cannot be more callback. It is safe to clean up all inflight requests. - log.info( + log.fine( "Stream connection is fully closed. Cleaning up inflight requests. Stream: " + streamName); cleanupInflightRequests(); - log.info("Append thread is done. Stream: " + streamName); + log.fine("Append thread is done. Stream: " + streamName); } /* @@ -396,7 +396,7 @@ private boolean waitingQueueDrained() { } private void waitForDoneCallback() { - log.info("Waiting for done callback from stream connection. Stream: " + streamName); + log.fine("Waiting for done callback from stream connection. Stream: " + streamName); while (true) { this.lock.lock(); try { @@ -441,7 +441,7 @@ private void cleanupInflightRequests() { } finally { this.lock.unlock(); } - log.info( + log.fine( "Cleaning " + localQueue.size() + " inflight requests with error: " @@ -471,7 +471,7 @@ private void requestCallback(AppendRowsResponse response) { } private void doneCallback(Throwable finalStatus) { - log.info( + log.fine( "Received done callback. Stream: " + streamName + " Final status: " diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java index 1d83af111e..43496f667b 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java @@ -307,7 +307,7 @@ public void close() { } finally { this.lock.unlock(); } - log.info("Waiting for append thread to finish. Stream: " + streamName); + log.fine("Waiting for append thread to finish. Stream: " + streamName); try { appendThread.join(); log.info("User close complete. Stream: " + streamName); @@ -366,17 +366,17 @@ private void appendLoop() { } } - log.info("Cleanup starts. Stream: " + streamName); + log.fine("Cleanup starts. Stream: " + streamName); // At this point, the waiting queue is drained, so no more requests. // We can close the stream connection and handle the remaining inflight requests. this.streamConnection.close(); waitForDoneCallback(); // At this point, there cannot be more callback. It is safe to clean up all inflight requests. - log.info( + log.fine( "Stream connection is fully closed. Cleaning up inflight requests. Stream: " + streamName); cleanupInflightRequests(); - log.info("Append thread is done. Stream: " + streamName); + log.fine("Append thread is done. Stream: " + streamName); } /* @@ -396,7 +396,7 @@ private boolean waitingQueueDrained() { } private void waitForDoneCallback() { - log.info("Waiting for done callback from stream connection. Stream: " + streamName); + log.fine("Waiting for done callback from stream connection. Stream: " + streamName); while (true) { this.lock.lock(); try { @@ -441,7 +441,7 @@ private void cleanupInflightRequests() { } finally { this.lock.unlock(); } - log.info( + log.fine( "Cleaning " + localQueue.size() + " inflight requests with error: " @@ -471,7 +471,7 @@ private void requestCallback(AppendRowsResponse response) { } private void doneCallback(Throwable finalStatus) { - log.info( + log.fine( "Received done callback. Stream: " + streamName + " Final status: " From 7bcf5c5ca8a7e0efee0bc5babda32fc22a742dac Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 18 Oct 2021 16:07:32 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b3cd39b583..2265cbbf99 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigquerystorage' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.3.3' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.4.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.3.3" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.4.0" ``` ## Authentication From ebf46261463c787f497529045f77d7baa093ab90 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 18 Oct 2021 16:07:35 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b3cd39b583..2265cbbf99 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigquerystorage' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.3.3' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.4.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.3.3" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.4.0" ``` ## Authentication