From 760ba6eac0323b07ce4be94f2412197c566a1771 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 19:10:13 +0000 Subject: [PATCH 1/6] chore(main): release 2.31.1-SNAPSHOT (#1986) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-cloud-bigquerystorage-bom/pom.xml | 16 ++++++++-------- google-cloud-bigquerystorage/pom.xml | 4 ++-- grpc-google-cloud-bigquerystorage-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- proto-google-cloud-bigquerystorage-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index bb951517b2..968c75b1db 100644 --- a/google-cloud-bigquerystorage-bom/pom.xml +++ b/google-cloud-bigquerystorage-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage-bom - 2.31.0 + 2.31.1-SNAPSHOT pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.31.0 + 2.31.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index e11580f671..d9cd6fa346 100644 --- a/google-cloud-bigquerystorage/pom.xml +++ b/google-cloud-bigquerystorage/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage - 2.31.0 + 2.31.1-SNAPSHOT jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT google-cloud-bigquerystorage diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index 15e6ecc6bb..67bcef191e 100644 --- a/grpc-google-cloud-bigquerystorage-v1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index efd8e12e1e..49a77c0ee3 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index d43064b96e..a9891030c1 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5a6f4d6f55..96b2eb437f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.31.0 + 2.31.1-SNAPSHOT BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -83,37 +83,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT com.google.cloud google-cloud-bigquerystorage - 2.31.0 + 2.31.1-SNAPSHOT org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index f74fe96309..a473323c93 100644 --- a/proto-google-cloud-bigquerystorage-v1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.0 + 2.31.1-SNAPSHOT proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index add59b8c89..952d6604fa 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.0 + 0.155.1-SNAPSHOT proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index eaa6f022ca..af256af19a 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.0 + 0.155.1-SNAPSHOT proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 98a212b6e1..e4d105f81e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.31.0 + 2.31.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 1aaf4ac285..ac2d6b5ea9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.31.0:2.31.0 -grpc-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.0 -grpc-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.0 -grpc-google-cloud-bigquerystorage-v1:2.31.0:2.31.0 -proto-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.0 -proto-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.0 -proto-google-cloud-bigquerystorage-v1:2.31.0:2.31.0 +google-cloud-bigquerystorage:2.31.0:2.31.1-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.1-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.1-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1:2.31.0:2.31.1-SNAPSHOT +proto-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.1-SNAPSHOT +proto-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.1-SNAPSHOT +proto-google-cloud-bigquerystorage-v1:2.31.0:2.31.1-SNAPSHOT From da06a4623e89b5f3caf90f85dd87d8538fc7d312 Mon Sep 17 00:00:00 2001 From: Yiru Tang Date: Fri, 10 Feb 2023 20:56:39 +0000 Subject: [PATCH 2/6] fix: refactor only, add StreamWriter to AppendRowsRequestResponse (#1981) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: refactor only, add StreamWriter to AppendRequestResponse, so that we could callback on StreamWriter to manage its close * . * . * . * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 7 ++- .../bigquery/storage/v1/ConnectionWorker.java | 25 +++++++--- .../storage/v1/ConnectionWorkerPool.java | 3 +- .../bigquery/storage/v1/StreamWriter.java | 5 +- .../storage/v1/ConnectionWorkerTest.java | 50 ++++++++++--------- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 71b696c69d..3159568293 100644 --- a/README.md +++ b/README.md @@ -49,20 +49,19 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.6.0') +implementation platform('com.google.cloud:libraries-bom:26.7.0') 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.30.0' -``` +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.31.0' If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.30.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.31.0" ``` ## Authentication diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java index 32f749c3f1..05390c56aa 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java @@ -24,6 +24,7 @@ import com.google.cloud.bigquery.storage.v1.StreamConnection.DoneCallback; import com.google.cloud.bigquery.storage.v1.StreamConnection.RequestCallback; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Uninterruptibles; import com.google.protobuf.Int64Value; import io.grpc.Status; @@ -267,16 +268,19 @@ public void run(Throwable finalStatus) { } /** Schedules the writing of rows at given offset. */ - ApiFuture append( - String streamName, ProtoSchema writerSchema, ProtoRows rows, long offset) { + ApiFuture append(StreamWriter streamWriter, ProtoRows rows, long offset) { + Preconditions.checkNotNull(streamWriter); AppendRowsRequest.Builder requestBuilder = AppendRowsRequest.newBuilder(); requestBuilder.setProtoRows( - ProtoData.newBuilder().setWriterSchema(writerSchema).setRows(rows).build()); + ProtoData.newBuilder() + .setWriterSchema(streamWriter.getProtoSchema()) + .setRows(rows) + .build()); if (offset >= 0) { requestBuilder.setOffset(Int64Value.of(offset)); } - requestBuilder.setWriteStream(streamName); - return appendInternal(requestBuilder.build()); + requestBuilder.setWriteStream(streamWriter.getStreamName()); + return appendInternal(streamWriter, requestBuilder.build()); } Boolean isUserClosed() { @@ -288,8 +292,9 @@ Boolean isUserClosed() { } } - private ApiFuture appendInternal(AppendRowsRequest message) { - AppendRequestAndResponse requestWrapper = new AppendRequestAndResponse(message); + private ApiFuture appendInternal( + StreamWriter streamWriter, AppendRowsRequest message) { + AppendRequestAndResponse requestWrapper = new AppendRequestAndResponse(message, streamWriter); if (requestWrapper.messageSize > getApiMaxRequestBytes()) { requestWrapper.appendResult.setException( new StatusRuntimeException( @@ -840,10 +845,14 @@ static final class AppendRequestAndResponse { final AppendRowsRequest message; final long messageSize; - AppendRequestAndResponse(AppendRowsRequest message) { + // The writer that issues the call of the request. + final StreamWriter streamWriter; + + AppendRequestAndResponse(AppendRowsRequest message, StreamWriter streamWriter) { this.appendResult = SettableApiFuture.create(); this.message = message; this.messageSize = message.getProtoRows().getSerializedSize(); + this.streamWriter = streamWriter; } } diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java index fa2729aad9..8fcb84165e 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java @@ -264,8 +264,7 @@ ApiFuture append(StreamWriter streamWriter, ProtoRows rows, } Stopwatch stopwatch = Stopwatch.createStarted(); ApiFuture responseFuture = - connectionWorker.append( - streamWriter.getStreamName(), streamWriter.getProtoSchema(), rows, offset); + connectionWorker.append(streamWriter, rows, offset); return ApiFutures.transform( responseFuture, // Add callback for update schema 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 0a65c656b4..77bad3eb24 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 @@ -145,8 +145,7 @@ public enum Kind { public ApiFuture append( StreamWriter streamWriter, ProtoRows protoRows, long offset) { if (getKind() == Kind.CONNECTION_WORKER) { - return connectionWorker() - .append(streamWriter.getStreamName(), streamWriter.getProtoSchema(), protoRows, offset); + return connectionWorker().append(streamWriter, protoRows, offset); } else { return connectionWorkerPool().append(streamWriter, protoRows, offset); } @@ -376,7 +375,7 @@ public ApiFuture append(ProtoRows rows) { public ApiFuture append(ProtoRows rows, long offset) { if (userClosed.get()) { AppendRequestAndResponse requestWrapper = - new AppendRequestAndResponse(AppendRowsRequest.newBuilder().build()); + new AppendRequestAndResponse(AppendRowsRequest.newBuilder().build(), this); requestWrapper.appendResult.setException( new Exceptions.StreamWriterClosedException( Status.fromCode(Status.Code.FAILED_PRECONDITION) diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java index 6cc3247279..4edf0f3e9d 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java @@ -80,6 +80,14 @@ public void testMultiplexedAppendSuccess() throws Exception { testBigQueryWrite.addResponse(createAppendResponse(i)); } List> futures = new ArrayList<>(); + StreamWriter sw1 = + StreamWriter.newBuilder(TEST_STREAM_1, client) + .setWriterSchema(createProtoSchema("foo")) + .build(); + StreamWriter sw2 = + StreamWriter.newBuilder(TEST_STREAM_2, client) + .setWriterSchema(createProtoSchema("complicate")) + .build(); // We do a pattern of: // send to stream1, string1 // send to stream1, string2 @@ -95,8 +103,7 @@ public void testMultiplexedAppendSuccess() throws Exception { futures.add( sendTestMessage( connectionWorker, - TEST_STREAM_1, - createProtoSchema("foo"), + sw1, createFooProtoRows(new String[] {String.valueOf(i)}), i)); break; @@ -105,8 +112,7 @@ public void testMultiplexedAppendSuccess() throws Exception { futures.add( sendTestMessage( connectionWorker, - TEST_STREAM_2, - createProtoSchema("complicate"), + sw2, createComplicateTypeProtoRows(new String[] {String.valueOf(i)}), i)); break; @@ -197,14 +203,19 @@ public void testAppendInSameStream_switchSchema() throws Exception { // send to stream1, schema3 // send to stream1, schema1 // ... + StreamWriter sw1 = + StreamWriter.newBuilder(TEST_STREAM_1, client).setWriterSchema(schema1).build(); + StreamWriter sw2 = + StreamWriter.newBuilder(TEST_STREAM_1, client).setWriterSchema(schema2).build(); + StreamWriter sw3 = + StreamWriter.newBuilder(TEST_STREAM_1, client).setWriterSchema(schema3).build(); for (long i = 0; i < appendCount; i++) { switch ((int) i % 4) { case 0: futures.add( sendTestMessage( connectionWorker, - TEST_STREAM_1, - schema1, + sw1, createFooProtoRows(new String[] {String.valueOf(i)}), i)); break; @@ -212,8 +223,7 @@ public void testAppendInSameStream_switchSchema() throws Exception { futures.add( sendTestMessage( connectionWorker, - TEST_STREAM_1, - schema2, + sw2, createFooProtoRows(new String[] {String.valueOf(i)}), i)); break; @@ -222,8 +232,7 @@ public void testAppendInSameStream_switchSchema() throws Exception { futures.add( sendTestMessage( connectionWorker, - TEST_STREAM_1, - schema3, + sw3, createFooProtoRows(new String[] {String.valueOf(i)}), i)); break; @@ -293,6 +302,9 @@ public void testAppendInSameStream_switchSchema() throws Exception { @Test public void testAppendButInflightQueueFull() throws Exception { + ProtoSchema schema1 = createProtoSchema("foo"); + StreamWriter sw1 = + StreamWriter.newBuilder(TEST_STREAM_1, client).setWriterSchema(schema1).build(); ConnectionWorker connectionWorker = new ConnectionWorker( TEST_STREAM_1, @@ -305,7 +317,6 @@ public void testAppendButInflightQueueFull() throws Exception { client.getSettings()); testBigQueryWrite.setResponseSleep(org.threeten.bp.Duration.ofSeconds(1)); ConnectionWorker.setMaxInflightQueueWaitTime(500); - ProtoSchema schema1 = createProtoSchema("foo"); long appendCount = 6; for (int i = 0; i < appendCount; i++) { @@ -322,11 +333,7 @@ public void testAppendButInflightQueueFull() throws Exception { StatusRuntimeException.class, () -> { sendTestMessage( - connectionWorker, - TEST_STREAM_1, - schema1, - createFooProtoRows(new String[] {String.valueOf(5)}), - 5); + connectionWorker, sw1, createFooProtoRows(new String[] {String.valueOf(5)}), 5); }); long timeDiff = System.currentTimeMillis() - startTime; assertEquals(connectionWorker.getLoad().inFlightRequestsCount(), 5); @@ -334,11 +341,7 @@ public void testAppendButInflightQueueFull() throws Exception { } else { futures.add( sendTestMessage( - connectionWorker, - TEST_STREAM_1, - schema1, - createFooProtoRows(new String[] {String.valueOf(i)}), - i)); + connectionWorker, sw1, createFooProtoRows(new String[] {String.valueOf(i)}), i)); assertEquals(connectionWorker.getLoad().inFlightRequestsCount(), i + 1); } } @@ -396,11 +399,10 @@ private ProtoSchema createProtoSchema(String protoName) { private ApiFuture sendTestMessage( ConnectionWorker connectionWorker, - String streamName, - ProtoSchema protoSchema, + StreamWriter streamWriter, ProtoRows protoRows, long offset) { - return connectionWorker.append(streamName, protoSchema, protoRows, offset); + return connectionWorker.append(streamWriter, protoRows, offset); } private ProtoRows createFooProtoRows(String[] messages) { From 1caec8feeee7798f5a0c1b28b1cef6df94963628 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 13 Feb 2023 17:37:32 -0500 Subject: [PATCH 3/6] chore: move graalvm checks to continuous builds (#1997) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: move graalvm checks to continuous builds * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .github/sync-repo-settings.yaml | 4 --- .kokoro/continuous/graalvm-native-17.cfg | 38 ++++++++++++++++++++++++ .kokoro/continuous/graalvm-native.cfg | 38 ++++++++++++++++++++++++ README.md | 1 + 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 .kokoro/continuous/graalvm-native-17.cfg create mode 100644 .kokoro/continuous/graalvm-native.cfg diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1da816e3e8..b00a77cda0 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -17,8 +17,6 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - OwlBot Post Processor - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -79,8 +77,6 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - OwlBot Post Processor - - 'Kokoro - Test: Java GraalVM Native Image' - - 'Kokoro - Test: Java 17 GraalVM Native Image' permissionRules: - team: yoshi-admins permission: admin diff --git a/.kokoro/continuous/graalvm-native-17.cfg b/.kokoro/continuous/graalvm-native-17.cfg new file mode 100644 index 0000000000..9c1849588c --- /dev/null +++ b/.kokoro/continuous/graalvm-native-17.cfg @@ -0,0 +1,38 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} \ No newline at end of file diff --git a/.kokoro/continuous/graalvm-native.cfg b/.kokoro/continuous/graalvm-native.cfg new file mode 100644 index 0000000000..e0d0546c89 --- /dev/null +++ b/.kokoro/continuous/graalvm-native.cfg @@ -0,0 +1,38 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} diff --git a/README.md b/README.md index 3159568293..5f5b83db3f 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ If you are using Gradle without BOM, add this to your dependencies: ```Groovy implementation 'com.google.cloud:google-cloud-bigquerystorage:2.31.0' +``` If you are using SBT, add this to your dependencies: From 0263b0054fbb7d9f49157f507cfe11c5b5816b07 Mon Sep 17 00:00:00 2001 From: Siddharth Agrawal Date: Tue, 14 Feb 2023 10:43:17 -0800 Subject: [PATCH 4/6] fix: support ByteString values on repeated fields (#1996) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: support ByteString values on repeated fields * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../storage/v1/JsonToProtoMessage.java | 4 +- .../storage/v1/JsonStreamWriterTest.java | 136 ++++++++++++++++++ .../src/test/proto/test.proto | 9 ++ 3 files changed, 148 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java index e2cc1cc6b0..27cd9ef41a 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java @@ -608,7 +608,9 @@ private static void fillRepeatedField( } } if (!added) { - if (val instanceof byte[]) { + if (val instanceof ByteString) { + protoMsg.addRepeatedField(fieldDescriptor, ((ByteString) val).toByteArray()); + } else if (val instanceof byte[]) { protoMsg.addRepeatedField(fieldDescriptor, val); } else if (val instanceof JSONArray) { try { diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java index 286061a795..691ec4afde 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java @@ -33,16 +33,20 @@ import com.google.cloud.bigquery.storage.test.SchemaTest; import com.google.cloud.bigquery.storage.test.Test.FlexibleType; import com.google.cloud.bigquery.storage.test.Test.FooType; +import com.google.cloud.bigquery.storage.test.Test.RepetitionType; import com.google.cloud.bigquery.storage.test.Test.UpdatedFooType; import com.google.cloud.bigquery.storage.v1.ConnectionWorkerPool.Settings; import com.google.cloud.bigquery.storage.v1.Exceptions.AppendSerializtionError; import com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode; +import com.google.protobuf.ByteString; import com.google.protobuf.Descriptors.DescriptorValidationException; import com.google.protobuf.Int64Value; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Arrays; import java.util.Map; import java.util.UUID; @@ -63,6 +67,7 @@ @RunWith(JUnit4.class) public class JsonStreamWriterTest { private static final Logger LOG = Logger.getLogger(JsonStreamWriterTest.class.getName()); + private static int NUMERIC_SCALE = 9; private static final String TEST_STREAM = "projects/p/datasets/d/tables/t/streams/_default"; private static final String TEST_STREAM_2 = "projects/p/datasets/d2/tables/t2/streams/_default"; private static final String TEST_TABLE = "projects/p/datasets/d/tables/t"; @@ -329,6 +334,137 @@ public void testSpecialTypeAppend() throws Exception { } } + @Test + public void testRepeatedByteStringAppend() throws Exception { + TableFieldSchema NON_REPEATED_A = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.REQUIRED) + .setName("a") + .build(); + + TableFieldSchema NON_REPEATED_B = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BYTES) + .setMode(TableFieldSchema.Mode.REQUIRED) + .setName("b") + .build(); + + TableFieldSchema NON_REPEATED_C = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BYTES) + .setMode(TableFieldSchema.Mode.REQUIRED) + .setName("c") + .build(); + + TableFieldSchema REPEATED_A = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("aa") + .build(); + + TableFieldSchema REPEATED_B = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BYTES) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("bb") + .build(); + + TableFieldSchema REPEATED_C = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BYTES) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("cc") + .build(); + + TableSchema tableSchema = + TableSchema.newBuilder() + .addFields(0, NON_REPEATED_A) + .addFields(1, NON_REPEATED_B) + .addFields(2, NON_REPEATED_C) + .addFields(3, REPEATED_A) + .addFields(4, REPEATED_B) + .addFields(5, REPEATED_C) + .build(); + + BigDecimal bigDecimal1 = new BigDecimal(1.1); + if (bigDecimal1.scale() > NUMERIC_SCALE) { + bigDecimal1 = bigDecimal1.setScale(NUMERIC_SCALE, RoundingMode.HALF_UP); + } + BigDecimal bigDecimal2 = new BigDecimal(2.2); + if (bigDecimal2.scale() > NUMERIC_SCALE) { + bigDecimal2 = bigDecimal2.setScale(NUMERIC_SCALE, RoundingMode.HALF_UP); + } + JSONArray aaValue = new JSONArray(); + aaValue.put(BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal1)); + aaValue.put(BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal2)); + + byte[] byteArray1 = "bb1".getBytes("UTF-8"); + byte[] byteArray2 = "bb2".getBytes("UTF-8"); + JSONArray bbValue = new JSONArray(); + bbValue.put(ByteString.copyFrom(byteArray1)); + bbValue.put(ByteString.copyFrom(byteArray2)); + + ByteString byteString1 = ByteString.copyFrom("cc1", "UTF-8"); + ByteString byteString2 = ByteString.copyFrom("cc2", "UTF-8"); + JSONArray ccValue = new JSONArray(); + ccValue.put(byteString1); + ccValue.put(byteString2); + + JSONObject foo = new JSONObject(); + foo.put("a", BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal1)); + foo.put("b", ByteString.copyFrom(byteArray1)); + foo.put("c", byteString1); + foo.put("aa", aaValue); + foo.put("bb", bbValue); + foo.put("cc", ccValue); + JSONArray jsonArr = new JSONArray(); + jsonArr.put(foo); + + RepetitionType expectedProto = + RepetitionType.newBuilder() + .setA(BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal1)) + .setB(ByteString.copyFrom(byteArray1)) + .setC(byteString1) + .addAa(BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal1)) + .addAa(BigDecimalByteStringEncoder.encodeToNumericByteString(bigDecimal2)) + .addBb(ByteString.copyFrom(byteArray1)) + .addBb(ByteString.copyFrom(byteArray2)) + .addCc(byteString1) + .addCc(byteString2) + .build(); + try (JsonStreamWriter writer = + getTestJsonStreamWriterBuilder(TEST_STREAM, tableSchema).build()) { + + testBigQueryWrite.addResponse( + AppendRowsResponse.newBuilder() + .setAppendResult( + AppendRowsResponse.AppendResult.newBuilder().setOffset(Int64Value.of(0)).build()) + .build()); + + ApiFuture appendFuture = writer.append(jsonArr); + assertEquals(0L, appendFuture.get().getAppendResult().getOffset().getValue()); + appendFuture.get(); + assertEquals( + 1, + testBigQueryWrite + .getAppendRequests() + .get(0) + .getProtoRows() + .getRows() + .getSerializedRowsCount()); + assertEquals( + testBigQueryWrite + .getAppendRequests() + .get(0) + .getProtoRows() + .getRows() + .getSerializedRows(0), + expectedProto.toByteString()); + } + } + @Test public void testSingleAppendMultipleSimpleJson() throws Exception { FooType expectedProto = FooType.newBuilder().setFoo("allen").build(); diff --git a/google-cloud-bigquerystorage/src/test/proto/test.proto b/google-cloud-bigquerystorage/src/test/proto/test.proto index 7b1d74fe47..191f641f25 100644 --- a/google-cloud-bigquerystorage/src/test/proto/test.proto +++ b/google-cloud-bigquerystorage/src/test/proto/test.proto @@ -93,3 +93,12 @@ message FlexibleType { optional string col_dGVzdC3liJc = 1 [(.google.cloud.bigquery.storage.v1.column_name) = "test-列"]; } + +message RepetitionType { + required bytes a = 1; + required bytes b = 2; + required bytes c = 3; + repeated bytes aa = 4; + repeated bytes bb = 5; + repeated bytes cc = 6; +} \ No newline at end of file From 200379727bb53d4bfb26ec513c55410ca0c92227 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:25:06 -0500 Subject: [PATCH 5/6] build(deps): bump cryptography from 38.0.3 to 39.0.1 in /synthtool/gcp/templates/java_library/.kokoro (#1761) (#1992) * build(deps): bump cryptography Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.3 to 39.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/38.0.3...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... * chore: disabling dependabot --------- Source-Link: https://github.com/googleapis/synthtool/commit/0c6f8d4ac5358553ee734e26574f390bc43a736e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1 Signed-off-by: dependabot[bot] Co-authored-by: Owl Bot Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tomo Suzuki Co-authored-by: ddixit14 --- .github/.OwlBot.lock.yaml | 2 +- .github/dependabot.yml | 14 +++++++++++ .kokoro/requirements.txt | 53 ++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index f8a8575314..090264303f 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 + digest: sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1 diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..c8f413b0da --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + # Disable version updates for Maven dependencies + open-pull-requests-limit: 0 + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + # Disable version updates for pip dependencies + open-pull-requests-limit: 0 \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 4895c9631f..cfadd22ce9 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -97,33 +97,28 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -cryptography==38.0.3 \ - --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ - --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ - --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ - --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ - --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ - --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ - --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ - --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ - --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ - --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ - --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ - --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ - --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ - --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ - --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ - --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ - --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ - --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ - --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ - --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ - --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ - --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ - --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ - --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ - --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ - --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 +cryptography==39.0.1 \ + --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ + --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ + --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ + --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ + --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ + --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ + --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ + --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ + --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ + --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ + --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ + --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ + --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ + --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ + --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ + --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ + --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ + --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ + --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ + --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ + --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 # via # gcp-releasetool # secretstorage @@ -379,10 +374,6 @@ secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring -setuptools==65.6.3 \ - --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ - --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 - # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 From 585359ca02fd725170c96976b5e4e71ce818192a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 19:44:17 +0000 Subject: [PATCH 6/6] chore(main): release 2.31.1 (#1994) :robot: I have created a release *beep* *boop* --- ## [2.31.1](https://togithub.com/googleapis/java-bigquerystorage/compare/v2.31.0...v2.31.1) (2023-02-14) ### Bug Fixes * Refactor only, add StreamWriter to AppendRowsRequestResponse ([#1981](https://togithub.com/googleapis/java-bigquerystorage/issues/1981)) ([da06a46](https://togithub.com/googleapis/java-bigquerystorage/commit/da06a4623e89b5f3caf90f85dd87d8538fc7d312)) * Support ByteString values on repeated fields ([#1996](https://togithub.com/googleapis/java-bigquerystorage/issues/1996)) ([0263b00](https://togithub.com/googleapis/java-bigquerystorage/commit/0263b0054fbb7d9f49157f507cfe11c5b5816b07)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 8 ++++++++ README.md | 2 +- google-cloud-bigquerystorage-bom/pom.xml | 16 ++++++++-------- google-cloud-bigquerystorage/pom.xml | 4 ++-- grpc-google-cloud-bigquerystorage-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- proto-google-cloud-bigquerystorage-v1/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 47 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d861c2b99..6318de8f07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.31.1](https://github.com/googleapis/java-bigquerystorage/compare/v2.31.0...v2.31.1) (2023-02-14) + + +### Bug Fixes + +* Refactor only, add StreamWriter to AppendRowsRequestResponse ([#1981](https://github.com/googleapis/java-bigquerystorage/issues/1981)) ([da06a46](https://github.com/googleapis/java-bigquerystorage/commit/da06a4623e89b5f3caf90f85dd87d8538fc7d312)) +* Support ByteString values on repeated fields ([#1996](https://github.com/googleapis/java-bigquerystorage/issues/1996)) ([0263b00](https://github.com/googleapis/java-bigquerystorage/commit/0263b0054fbb7d9f49157f507cfe11c5b5816b07)) + ## [2.31.0](https://github.com/googleapis/java-bigquerystorage/compare/v2.30.0...v2.31.0) (2023-02-08) diff --git a/README.md b/README.md index 5f5b83db3f..993057d651 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.7.0') +implementation platform('com.google.cloud:libraries-bom:26.8.0') implementation 'com.google.cloud:google-cloud-bigquerystorage' ``` diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index 968c75b1db..3debd3529c 100644 --- a/google-cloud-bigquerystorage-bom/pom.xml +++ b/google-cloud-bigquerystorage-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage-bom - 2.31.1-SNAPSHOT + 2.31.1 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.31.1-SNAPSHOT + 2.31.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index d9cd6fa346..160b52c923 100644 --- a/google-cloud-bigquerystorage/pom.xml +++ b/google-cloud-bigquerystorage/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage - 2.31.1-SNAPSHOT + 2.31.1 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 google-cloud-bigquerystorage diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index 67bcef191e..6c1facc6cc 100644 --- a/grpc-google-cloud-bigquerystorage-v1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index 49a77c0ee3..e16599f28b 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index a9891030c1..9985b229d6 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/pom.xml b/pom.xml index 96b2eb437f..f4933af4ad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.31.1-SNAPSHOT + 2.31.1 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -83,37 +83,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 com.google.cloud google-cloud-bigquerystorage - 2.31.1-SNAPSHOT + 2.31.1 org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index a473323c93..ae7d5a7698 100644 --- a/proto-google-cloud-bigquerystorage-v1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.31.1-SNAPSHOT + 2.31.1 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 952d6604fa..84826b4f26 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.155.1-SNAPSHOT + 0.155.1 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index af256af19a..637de51267 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.155.1-SNAPSHOT + 0.155.1 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e4d105f81e..e8b4217de8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.31.1-SNAPSHOT + 2.31.1 diff --git a/versions.txt b/versions.txt index ac2d6b5ea9..77fa36fa6c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.31.0:2.31.1-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.1-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.1-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1:2.31.0:2.31.1-SNAPSHOT -proto-google-cloud-bigquerystorage-v1beta1:0.155.0:0.155.1-SNAPSHOT -proto-google-cloud-bigquerystorage-v1beta2:0.155.0:0.155.1-SNAPSHOT -proto-google-cloud-bigquerystorage-v1:2.31.0:2.31.1-SNAPSHOT +google-cloud-bigquerystorage:2.31.1:2.31.1 +grpc-google-cloud-bigquerystorage-v1beta1:0.155.1:0.155.1 +grpc-google-cloud-bigquerystorage-v1beta2:0.155.1:0.155.1 +grpc-google-cloud-bigquerystorage-v1:2.31.1:2.31.1 +proto-google-cloud-bigquerystorage-v1beta1:0.155.1:0.155.1 +proto-google-cloud-bigquerystorage-v1beta2:0.155.1:0.155.1 +proto-google-cloud-bigquerystorage-v1:2.31.1:2.31.1