From 910285cf17d8c83b9be8e3ab895d4c4f076537f6 Mon Sep 17 00:00:00 2001 From: Yiru Tang Date: Mon, 6 Nov 2023 23:24:33 +0000 Subject: [PATCH 1/4] fix: add retry setting documentation --- .../bigquery/storage/v1/JsonStreamWriter.java | 18 ++++++++++++-- .../bigquery/storage/v1/StreamWriter.java | 24 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java index 548941ae51..d2a95b82c5 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java @@ -348,10 +348,24 @@ public Builder setCompressorName(String compressorName) { } /** - * Sets the RetrySettings to use for in-stream error retry. + * Enable client lib automatic retries on request level errors. + * + * 
+     * Immeidate Retry code:
+     * ABORTED, UNAVAILABLE, CANCELLED, INTERNAL, DEADLINE_EXCEEDED
+     * Backoff Retry code:
+     * RESOURCE_EXHAUSTED
+     *
+     * Example:
+     * RetrySettings retrySettings = RetrySettings.newBuilder()
+     *      .setInitialRetryDelay(Duration.ofMillis(500)) // applies to backoff retry
+     *      .setRetryDelayMultiplier(1.1) // applies to backoff retry
+     *      .setMaxAttempts(5) // applies to both retrys
+     *      .setMaxRetryDelay(Duration.ofMinutes(1)) // applies to backoff retry .build();
+     *
* * @param retrySettings - * @return Builder + * @return */ public Builder setRetrySettings(RetrySettings retrySettings) { this.schemaAwareStreamWriterBuilder.setRetrySettings(retrySettings); 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 538bec4e32..2d3a1d14ac 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 @@ -766,11 +766,35 @@ public Builder setDefaultMissingValueInterpretation( return this; } + /** + * Enable client lib automatic retries on request level errors. + * + * 
+     * Immeidate Retry code:
+     * ABORTED, UNAVAILABLE, CANCELLED, INTERNAL, DEADLINE_EXCEEDED
+     * Backoff Retry code:
+     * RESOURCE_EXHAUSTED
+     *
+     * Example:
+     * RetrySettings retrySettings = RetrySettings.newBuilder()
+     *      .setInitialRetryDelay(Duration.ofMillis(500)) // applies to backoff retry
+     *      .setRetryDelayMultiplier(1.1) // applies to backoff retry
+     *      .setMaxAttempts(5) // applies to both retrys
+     *      .setMaxRetryDelay(Duration.ofMinutes(1)) // applies to backoff retry .build();
+     *
+ * + * @param retrySettings + * @return + */ public Builder setRetrySettings(RetrySettings retrySettings) { this.retrySettings = retrySettings; return this; } + public Builder enableLargerRequesLimit() { + this.enableLargeRequestLimit = true; + } + /** Builds the {@code StreamWriterV2}. */ public StreamWriter build() throws IOException { return new StreamWriter(this); From ef0add502d46982bfde4d63d9ca83d0575202ee5 Mon Sep 17 00:00:00 2001 From: Yiru Tang Date: Mon, 6 Nov 2023 23:25:12 +0000 Subject: [PATCH 2/4] . --- .../com/google/cloud/bigquery/storage/v1/StreamWriter.java | 4 ---- 1 file changed, 4 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 2d3a1d14ac..337619014d 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 @@ -791,10 +791,6 @@ public Builder setRetrySettings(RetrySettings retrySettings) { return this; } - public Builder enableLargerRequesLimit() { - this.enableLargeRequestLimit = true; - } - /** Builds the {@code StreamWriterV2}. */ public StreamWriter build() throws IOException { return new StreamWriter(this); From d00d763404513e796b79745347513c5463bd3385 Mon Sep 17 00:00:00 2001 From: Yiru Tang Date: Tue, 7 Nov 2023 17:52:08 +0000 Subject: [PATCH 3/4] . --- .../com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java | 2 +- .../java/com/google/cloud/bigquery/storage/v1/StreamWriter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java index d2a95b82c5..8aa66b789e 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java @@ -360,7 +360,7 @@ public Builder setCompressorName(String compressorName) { * RetrySettings retrySettings = RetrySettings.newBuilder() * .setInitialRetryDelay(Duration.ofMillis(500)) // applies to backoff retry * .setRetryDelayMultiplier(1.1) // applies to backoff retry - * .setMaxAttempts(5) // applies to both retrys + * .setMaxAttempts(5) // applies to both retries * .setMaxRetryDelay(Duration.ofMinutes(1)) // applies to backoff retry .build(); * * 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 337619014d..b9d16ca84a 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 @@ -779,7 +779,7 @@ public Builder setDefaultMissingValueInterpretation( * RetrySettings retrySettings = RetrySettings.newBuilder() * .setInitialRetryDelay(Duration.ofMillis(500)) // applies to backoff retry * .setRetryDelayMultiplier(1.1) // applies to backoff retry - * .setMaxAttempts(5) // applies to both retrys + * .setMaxAttempts(5) // applies to both retries * .setMaxRetryDelay(Duration.ofMinutes(1)) // applies to backoff retry .build(); * * From 14ff7c1f88e082485ff629966aa183fa7ccc7c60 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 7 Nov 2023 18:14:20 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 82c9e4277d..ccf1fd95ae 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,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.44.1' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.45.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.44.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.45.0" ``` @@ -220,7 +220,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigquerystorage.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.44.1 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigquerystorage/2.45.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles