diff --git a/CHANGELOG.md b/CHANGELOG.md index 819637e395..4d861c2b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.31.0](https://github.com/googleapis/java-bigquerystorage/compare/v2.30.0...v2.31.0) (2023-02-08) + + +### Features + +* Add isDone to JsonWriter to indicate a JsonWriter is no longer usable and needs to be recreated. ([#1978](https://github.com/googleapis/java-bigquerystorage/issues/1978)) ([dc07ed8](https://github.com/googleapis/java-bigquerystorage/commit/dc07ed84778028f149cab3883af9bb9a7929efd1)) +* Add isUserClosed to indicate that user explicitly closed the StreamWriter ([#1983](https://github.com/googleapis/java-bigquerystorage/issues/1983)) ([abd6627](https://github.com/googleapis/java-bigquerystorage/commit/abd66274abca2315739c1b388dd363e107baad85)) + + +### Dependencies + +* Update arrow.version to v11 (major) ([#1961](https://github.com/googleapis/java-bigquerystorage/issues/1961)) ([c13ab23](https://github.com/googleapis/java-bigquerystorage/commit/c13ab23a96d72d5087653ebaf0a0635863a526a9)) +* Update dependency com.google.cloud:google-cloud-bigquery to v2.21.0 ([#1956](https://github.com/googleapis/java-bigquerystorage/issues/1956)) ([6a1d783](https://github.com/googleapis/java-bigquerystorage/commit/6a1d783b80bdd0e1846ee667e2a15d41e3f6980f)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.2.0 ([#1974](https://github.com/googleapis/java-bigquerystorage/issues/1974)) ([8e2c1e3](https://github.com/googleapis/java-bigquerystorage/commit/8e2c1e326d6a65ba814ef826cfcb98c58395f01f)) +* Update dependency org.apache.arrow:arrow-memory-netty to v11 ([#1962](https://github.com/googleapis/java-bigquerystorage/issues/1962)) ([48abc75](https://github.com/googleapis/java-bigquerystorage/commit/48abc75cdd2c372751790c197b83cf3aa59f1055)) +* Update dependency org.apache.arrow:arrow-vector to v11 ([#1963](https://github.com/googleapis/java-bigquerystorage/issues/1963)) ([e872723](https://github.com/googleapis/java-bigquerystorage/commit/e87272323a0267771f3ffbc857fbaf06c6656f90)) + ## [2.30.0](https://github.com/googleapis/java-bigquerystorage/compare/v2.29.0...v2.30.0) (2023-02-06) diff --git a/README.md b/README.md index 908faab2c6..71b696c69d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.4.0 + 26.6.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.30.0 ``` @@ -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.29.0' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.30.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.29.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.30.0" ``` ## Authentication @@ -108,7 +108,6 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-bigquerystora | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | -| Bq To Bq Storage Schema Converter | [source code](https://github.com/googleapis/java-bigquerystorage/blob/main/samples/snippets/src/main/java/com/example/bigquerystorage/BqToBqStorageSchemaConverter.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigquerystorage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigquerystorage/BqToBqStorageSchemaConverter.java) | | Parallel Write Committed Stream | [source code](https://github.com/googleapis/java-bigquerystorage/blob/main/samples/snippets/src/main/java/com/example/bigquerystorage/ParallelWriteCommittedStream.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigquerystorage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigquerystorage/ParallelWriteCommittedStream.java) | | Storage Arrow Sample | [source code](https://github.com/googleapis/java-bigquerystorage/blob/main/samples/snippets/src/main/java/com/example/bigquerystorage/StorageArrowSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigquerystorage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigquerystorage/StorageArrowSample.java) | | Storage Sample | [source code](https://github.com/googleapis/java-bigquerystorage/blob/main/samples/snippets/src/main/java/com/example/bigquerystorage/StorageSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigquerystorage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigquerystorage/StorageSample.java) | diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index e9307ca14d..bb951517b2 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.30.0 + 2.31.0 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.30.0 + 2.31.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.154.0 + 0.155.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.154.0 + 0.155.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.30.0 + 2.31.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.154.0 + 0.155.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.154.0 + 0.155.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.30.0 + 2.31.0 diff --git a/google-cloud-bigquerystorage/clirr-ignored-differences.xml b/google-cloud-bigquerystorage/clirr-ignored-differences.xml index b0d2b7c898..96d4b3d595 100644 --- a/google-cloud-bigquerystorage/clirr-ignored-differences.xml +++ b/google-cloud-bigquerystorage/clirr-ignored-differences.xml @@ -147,4 +147,15 @@ com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool ConnectionWorkerPool(long, long, java.time.Duration, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings) + + 7002 + com/google/cloud/bigquery/storage/v1/StreamWriter + boolean isDone() + + + 7002 + com/google/cloud/bigquery/storage/v1/JsonStreamWriter + boolean isDone() + + diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index 9864df264a..e11580f671 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.30.0 + 2.31.0 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 google-cloud-bigquerystorage 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 d2c58e372b..24061878f2 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 @@ -382,6 +382,20 @@ public void close() { this.streamWriter.close(); } + /** + * @return if a Json writer can no longer be used for writing. It is due to either the + * JsonStreamWriter is explicitly closed or the underlying connection is broken when + * connection pool is not used. Client should recreate JsonStreamWriter in this case. + */ + public boolean isClosed() { + return this.streamWriter.isClosed(); + } + + /** @return if user explicitly closed the writer. */ + public boolean isUserClosed() { + return this.streamWriter.isUserClosed(); + } + public static final class Builder { private String streamName; private BigQueryWriteClient client; 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 e09467981c..0a65c656b4 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 @@ -425,7 +425,7 @@ public String getLocation() { * StreamWriter is explicitly closed or the underlying connection is broken when connection * pool is not used. Client should recreate StreamWriter in this case. */ - public boolean isDone() { + public boolean isClosed() { if (singleConnectionOrConnectionPool.getKind() == Kind.CONNECTION_WORKER) { return userClosed.get() || singleConnectionOrConnectionPool.connectionWorker().isConnectionInUnrecoverableState(); @@ -435,6 +435,11 @@ public boolean isDone() { } } + /** @return if user explicitly closed the writer. */ + public boolean isUserClosed() { + return userClosed.get(); + } + /** Close the stream writer. Shut down all resources. */ @Override public void close() { 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 8c34ad9b3c..286061a795 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 @@ -1139,6 +1139,15 @@ public void testWriterId() Assert.assertNotEquals(writer1.getWriterId(), writer2.getWriterId()); } + @Test + public void testIsDone() throws DescriptorValidationException, IOException, InterruptedException { + JsonStreamWriter writer = getTestJsonStreamWriterBuilder(TEST_STREAM, TABLE_SCHEMA).build(); + Assert.assertFalse(writer.isClosed()); + writer.close(); + Assert.assertTrue(writer.isClosed()); + Assert.assertTrue(writer.isUserClosed()); + } + private AppendRowsResponse createAppendResponse(long offset) { return AppendRowsResponse.newBuilder() .setAppendResult( diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/StreamWriterTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/StreamWriterTest.java index 731d6d6364..383301d820 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/StreamWriterTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/StreamWriterTest.java @@ -1237,7 +1237,7 @@ public void testStreamWriterUserCloseMultiplexing() throws Exception { .build(); writer.close(); - assertTrue(writer.isDone()); + assertTrue(writer.isClosed()); ApiFuture appendFuture1 = sendTestMessage(writer, new String[] {"A"}); ExecutionException ex = assertThrows( @@ -1248,6 +1248,7 @@ public void testStreamWriterUserCloseMultiplexing() throws Exception { assertEquals( Status.Code.FAILED_PRECONDITION, ((StatusRuntimeException) ex.getCause()).getStatus().getCode()); + assertTrue(writer.isUserClosed()); } @Test(timeout = 10000) @@ -1256,7 +1257,7 @@ public void testStreamWriterUserCloseNoMultiplexing() throws Exception { StreamWriter.newBuilder(TEST_STREAM_1, client).setWriterSchema(createProtoSchema()).build(); writer.close(); - assertTrue(writer.isDone()); + assertTrue(writer.isClosed()); ApiFuture appendFuture1 = sendTestMessage(writer, new String[] {"A"}); ExecutionException ex = assertThrows( @@ -1267,6 +1268,7 @@ public void testStreamWriterUserCloseNoMultiplexing() throws Exception { assertEquals( Status.Code.FAILED_PRECONDITION, ((StatusRuntimeException) ex.getCause()).getStatus().getCode()); + assertTrue(writer.isUserClosed()); } @Test(timeout = 10000) @@ -1291,7 +1293,8 @@ public void testStreamWriterPermanentErrorMultiplexing() throws Exception { appendFuture2.get(); }); assertTrue(ex.getCause() instanceof InvalidArgumentException); - assertFalse(writer.isDone()); + assertFalse(writer.isClosed()); + assertFalse(writer.isUserClosed()); } @Test(timeout = 10000) @@ -1311,7 +1314,8 @@ public void testStreamWriterPermanentErrorNoMultiplexing() throws Exception { () -> { appendFuture2.get(); }); - assertTrue(writer.isDone()); + assertTrue(writer.isClosed()); assertTrue(ex.getCause() instanceof InvalidArgumentException); + assertFalse(writer.isUserClosed()); } } diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index f0052eaa61..15e6ecc6bb 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.30.0 + 2.31.0 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index 64e4359401..efd8e12e1e 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.154.0 + 0.155.0 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index 2739c466bf..d43064b96e 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.154.0 + 0.155.0 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/pom.xml b/pom.xml index 43852f17ea..5a6f4d6f55 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.30.0 + 2.31.0 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -76,44 +76,44 @@ com.google.cloud google-cloud-shared-dependencies - 3.1.2 + 3.2.0 pom import com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.154.0 + 0.155.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.154.0 + 0.155.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.30.0 + 2.31.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.154.0 + 0.155.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.154.0 + 0.155.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.30.0 + 2.31.0 com.google.cloud google-cloud-bigquerystorage - 2.30.0 + 2.31.0 org.json @@ -132,7 +132,7 @@ com.google.cloud google-cloud-bigquery - 2.20.2 + 2.21.0 test diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index 82868b73ad..f74fe96309 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.30.0 + 2.31.0 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AnnotationsProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AnnotationsProto.java index cc19833bb5..6d3ceebf99 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AnnotationsProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AnnotationsProto.java @@ -65,12 +65,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ations.proto\022 google.cloud.bigquery.stor" + "age.v1\032 google/protobuf/descriptor.proto" + ":9\n\013column_name\022\035.google.protobuf.FieldO" - + "ptions\030\265\303\367\330\001 \001(\t\210\001\001B\311\001\n$com.google.cloud" + + "ptions\030\265\303\367\330\001 \001(\t\210\001\001B\300\001\n$com.google.cloud" + ".bigquery.storage.v1B\020AnnotationsProtoP\001" - + "ZGgoogle.golang.org/genproto/googleapis/" - + "cloud/bigquery/storage/v1;storage\252\002 Goog" - + "le.Cloud.BigQuery.Storage.V1\312\002 Google\\Cl" - + "oud\\BigQuery\\Storage\\V1b\006proto3" + + "Z>cloud.google.com/go/bigquery/storage/a" + + "piv1/storagepb;storagepb\252\002 Google.Cloud." + + "BigQuery.Storage.V1\312\002 Google\\Cloud\\BigQu" + + "ery\\Storage\\V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowProto.java index 28d4e93718..a8d38d4b29 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowProto.java @@ -58,12 +58,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".storage.v1.ArrowSerializationOptions.Co" + "mpressionCodec\"H\n\020CompressionCodec\022\033\n\027CO" + "MPRESSION_UNSPECIFIED\020\000\022\r\n\tLZ4_FRAME\020\001\022\010" - + "\n\004ZSTD\020\002B\303\001\n$com.google.cloud.bigquery.s" - + "torage.v1B\nArrowProtoP\001ZGgoogle.golang.o" - + "rg/genproto/googleapis/cloud/bigquery/st" - + "orage/v1;storage\252\002 Google.Cloud.BigQuery" - + ".Storage.V1\312\002 Google\\Cloud\\BigQuery\\Stor" - + "age\\V1b\006proto3" + + "\n\004ZSTD\020\002B\272\001\n$com.google.cloud.bigquery.s" + + "torage.v1B\nArrowProtoP\001Z>cloud.google.co" + + "m/go/bigquery/storage/apiv1/storagepb;st" + + "oragepb\252\002 Google.Cloud.BigQuery.Storage." + + "V1\312\002 Google\\Cloud\\BigQuery\\Storage\\V1b\006p" + + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroProto.java index 5aa488b1b8..a47b485fef 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroProto.java @@ -54,12 +54,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "s\022\036\n\026serialized_binary_rows\030\001 \001(\014\022\025\n\trow" + "_count\030\002 \001(\003B\002\030\001\"A\n\030AvroSerializationOpt" + "ions\022%\n\035enable_display_name_attribute\030\001 " - + "\001(\010B\302\001\n$com.google.cloud.bigquery.storag" - + "e.v1B\tAvroProtoP\001ZGgoogle.golang.org/gen" - + "proto/googleapis/cloud/bigquery/storage/" - + "v1;storage\252\002 Google.Cloud.BigQuery.Stora" - + "ge.V1\312\002 Google\\Cloud\\BigQuery\\Storage\\V1" - + "b\006proto3" + + "\001(\010B\271\001\n$com.google.cloud.bigquery.storag" + + "e.v1B\tAvroProtoP\001Z>cloud.google.com/go/b" + + "igquery/storage/apiv1/storagepb;storagep" + + "b\252\002 Google.Cloud.BigQuery.Storage.V1\312\002 G" + + "oogle\\Cloud\\BigQuery\\Storage\\V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoBufProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoBufProto.java index 6179ae6b21..4f0d833af4 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoBufProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoBufProto.java @@ -49,12 +49,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".v1\032 google/protobuf/descriptor.proto\"I\n" + "\013ProtoSchema\022:\n\020proto_descriptor\030\001 \001(\0132 " + ".google.protobuf.DescriptorProto\"$\n\tProt" - + "oRows\022\027\n\017serialized_rows\030\001 \003(\014B\306\001\n$com.g" + + "oRows\022\027\n\017serialized_rows\030\001 \003(\014B\275\001\n$com.g" + "oogle.cloud.bigquery.storage.v1B\rProtoBu" - + "fProtoP\001ZGgoogle.golang.org/genproto/goo" - + "gleapis/cloud/bigquery/storage/v1;storag" - + "e\252\002 Google.Cloud.BigQuery.Storage.V1\312\002 G" - + "oogle\\Cloud\\BigQuery\\Storage\\V1b\006proto3" + + "fProtoP\001Z>cloud.google.com/go/bigquery/s" + + "torage/apiv1/storagepb;storagepb\252\002 Googl" + + "e.Cloud.BigQuery.Storage.V1\312\002 Google\\Clo" + + "ud\\BigQuery\\Storage\\V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageProto.java index e91cfc536f..ffeebe47b4 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageProto.java @@ -297,14 +297,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "oogleapis.com/auth/bigquery,https://www." + "googleapis.com/auth/bigquery.insertdata," + "https://www.googleapis.com/auth/cloud-pl" - + "atformB\235\002\n$com.google.cloud.bigquery.sto" - + "rage.v1B\014StorageProtoP\001ZGgoogle.golang.o" - + "rg/genproto/googleapis/cloud/bigquery/st" - + "orage/v1;storage\252\002 Google.Cloud.BigQuery" - + ".Storage.V1\312\002 Google\\Cloud\\BigQuery\\Stor" - + "age\\V1\352AU\n\035bigquery.googleapis.com/Table" - + "\0224projects/{project}/datasets/{dataset}/" - + "tables/{table}b\006proto3" + + "atformB\224\002\n$com.google.cloud.bigquery.sto" + + "rage.v1B\014StorageProtoP\001Z>cloud.google.co" + + "m/go/bigquery/storage/apiv1/storagepb;st" + + "oragepb\252\002 Google.Cloud.BigQuery.Storage." + + "V1\312\002 Google\\Cloud\\BigQuery\\Storage\\V1\352AU" + + "\n\035bigquery.googleapis.com/Table\0224project" + + "s/{project}/datasets/{dataset}/tables/{t" + + "able}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamProto.java index ba33e9e939..e0c8734f3f 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamProto.java @@ -117,12 +117,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ms/{stream}*>\n\nDataFormat\022\033\n\027DATA_FORMAT" + "_UNSPECIFIED\020\000\022\010\n\004AVRO\020\001\022\t\n\005ARROW\020\002*I\n\017W" + "riteStreamView\022!\n\035WRITE_STREAM_VIEW_UNSP" - + "ECIFIED\020\000\022\t\n\005BASIC\020\001\022\010\n\004FULL\020\002B\304\001\n$com.g" + + "ECIFIED\020\000\022\t\n\005BASIC\020\001\022\010\n\004FULL\020\002B\273\001\n$com.g" + "oogle.cloud.bigquery.storage.v1B\013StreamP" - + "rotoP\001ZGgoogle.golang.org/genproto/googl" - + "eapis/cloud/bigquery/storage/v1;storage\252" - + "\002 Google.Cloud.BigQuery.Storage.V1\312\002 Goo" - + "gle\\Cloud\\BigQuery\\Storage\\V1b\006proto3" + + "rotoP\001Z>cloud.google.com/go/bigquery/sto" + + "rage/apiv1/storagepb;storagepb\252\002 Google." + + "Cloud.BigQuery.Storage.V1\312\002 Google\\Cloud" + + "\\BigQuery\\Storage\\V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableProto.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableProto.java index a84bff59c6..1e47656907 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableProto.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableProto.java @@ -65,12 +65,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013\n\007NUMERIC\020\014\022\016\n\nBIGNUMERIC\020\r\022\014\n\010INTERVAL" + "\020\016\022\010\n\004JSON\020\017\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED" + "\020\000\022\014\n\010NULLABLE\020\001\022\014\n\010REQUIRED\020\002\022\014\n\010REPEAT" - + "ED\020\003B\303\001\n$com.google.cloud.bigquery.stora" - + "ge.v1B\nTableProtoP\001ZGgoogle.golang.org/g" - + "enproto/googleapis/cloud/bigquery/storag" - + "e/v1;storage\252\002 Google.Cloud.BigQuery.Sto" - + "rage.V1\312\002 Google\\Cloud\\BigQuery\\Storage\\" - + "V1b\006proto3" + + "ED\020\003B\272\001\n$com.google.cloud.bigquery.stora" + + "ge.v1B\nTableProtoP\001Z>cloud.google.com/go" + + "/bigquery/storage/apiv1/storagepb;storag" + + "epb\252\002 Google.Cloud.BigQuery.Storage.V1\312\002" + + " Google\\Cloud\\BigQuery\\Storage\\V1b\006proto" + + "3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/annotations.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/annotations.proto index 1627fd12a0..5ea5016dfd 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/annotations.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/annotations.proto @@ -5,7 +5,7 @@ package google.cloud.bigquery.storage.v1; import "google/protobuf/descriptor.proto"; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_package = "com.google.cloud.bigquery.storage.v1"; option java_multiple_files = true; option java_outer_classname = "AnnotationsProto"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/arrow.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/arrow.proto index 6d3f6080bf..4ac268c8b0 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/arrow.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/arrow.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "ArrowProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/avro.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/avro.proto index e1ecb667b6..52441e9fcf 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/avro.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/avro.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "AvroProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/protobuf.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/protobuf.proto index b3754acf7b..05ac778f03 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/protobuf.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/protobuf.proto @@ -19,7 +19,7 @@ package google.cloud.bigquery.storage.v1; import "google/protobuf/descriptor.proto"; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "ProtoBufProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/storage.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/storage.proto index 85daf6dfa2..e84a58df77 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/storage.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/storage.proto @@ -30,7 +30,7 @@ import "google/protobuf/wrappers.proto"; import "google/rpc/status.proto"; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "StorageProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/stream.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/stream.proto index ec137de19d..85f6dd8257 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/stream.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/stream.proto @@ -24,7 +24,7 @@ import "google/cloud/bigquery/storage/v1/table.proto"; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "StreamProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/table.proto b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/table.proto index 57e7933424..56f7852a19 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/table.proto +++ b/proto-google-cloud-bigquerystorage-v1/src/main/proto/google/cloud/bigquery/storage/v1/table.proto @@ -19,7 +19,7 @@ package google.cloud.bigquery.storage.v1; import "google/api/field_behavior.proto"; option csharp_namespace = "Google.Cloud.BigQuery.Storage.V1"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "TableProto"; option java_package = "com.google.cloud.bigquery.storage.v1"; diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 4499c285ab..add59b8c89 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.154.0 + 0.155.0 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java index da4ef6cee6..a66c26f895 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java @@ -1282,10 +1282,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ge.v1beta1\"(\n\013ArrowSchema\022\031\n\021serialized_" + "schema\030\001 \001(\014\"F\n\020ArrowRecordBatch\022\037\n\027seri" + "alized_record_batch\030\001 \001(\014\022\021\n\trow_count\030\002" - + " \001(\003B\205\001\n)com.google.cloud.bigquery.stora" - + "ge.v1beta1B\nArrowProtoZLgoogle.golang.or" - + "g/genproto/googleapis/cloud/bigquery/sto" - + "rage/v1beta1;storageb\006proto3" + + " \001(\003B|\n)com.google.cloud.bigquery.storag" + + "e.v1beta1B\nArrowProtoZCcloud.google.com/" + + "go/bigquery/storage/apiv1beta1/storagepb" + + ";storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java index 08acffd2a4..30181038ab 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java @@ -1374,11 +1374,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "avro.proto\022%google.cloud.bigquery.storag" + "e.v1beta1\"\034\n\nAvroSchema\022\016\n\006schema\030\001 \001(\t\"" + "=\n\010AvroRows\022\036\n\026serialized_binary_rows\030\001 " - + "\001(\014\022\021\n\trow_count\030\002 \001(\003B\204\001\n)com.google.cl" - + "oud.bigquery.storage.v1beta1B\tAvroProtoZ" - + "Lgoogle.golang.org/genproto/googleapis/c" - + "loud/bigquery/storage/v1beta1;storageb\006p" - + "roto3" + + "\001(\014\022\021\n\trow_count\030\002 \001(\003B{\n)com.google.clo" + + "ud.bigquery.storage.v1beta1B\tAvroProtoZC" + + "cloud.google.com/go/bigquery/storage/api" + + "v1beta1/storagepb;storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java index 7c7526758c..b091d922be 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java @@ -1140,10 +1140,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "read_options.proto\022%google.cloud.bigquer" + "y.storage.v1beta1\"D\n\020TableReadOptions\022\027\n" + "\017selected_fields\030\001 \003(\t\022\027\n\017row_restrictio" - + "n\030\002 \001(\tBy\n)com.google.cloud.bigquery.sto" - + "rage.v1beta1ZLgoogle.golang.org/genproto" - + "/googleapis/cloud/bigquery/storage/v1bet" - + "a1;storageb\006proto3" + + "n\030\002 \001(\tBp\n)com.google.cloud.bigquery.sto" + + "rage.v1beta1ZCcloud.google.com/go/bigque" + + "ry/storage/apiv1beta1/storagepb;storagep" + + "bb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java index ce164d7694..456f8108d7 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java @@ -17464,10 +17464,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "inal_stream\032{\312A\036bigquerystorage.googleap" + "is.com\322AWhttps://www.googleapis.com/auth" + "/bigquery,https://www.googleapis.com/aut" - + "h/cloud-platformBy\n)com.google.cloud.big" - + "query.storage.v1beta1ZLgoogle.golang.org" - + "/genproto/googleapis/cloud/bigquery/stor" - + "age/v1beta1;storageb\006proto3" + + "h/cloud-platformBp\n)com.google.cloud.big" + + "query.storage.v1beta1ZCcloud.google.com/" + + "go/bigquery/storage/apiv1beta1/storagepb" + + ";storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java index b77e7d77c8..0ffd790c57 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java @@ -1902,11 +1902,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "mestamp.proto\"J\n\016TableReference\022\022\n\nproje" + "ct_id\030\001 \001(\t\022\022\n\ndataset_id\030\002 \001(\t\022\020\n\010table" + "_id\030\003 \001(\t\"C\n\016TableModifiers\0221\n\rsnapshot_" - + "time\030\001 \001(\0132\032.google.protobuf.TimestampB\216" + + "time\030\001 \001(\0132\032.google.protobuf.TimestampB\205" + "\001\n)com.google.cloud.bigquery.storage.v1b" - + "eta1B\023TableReferenceProtoZLgoogle.golang" - + ".org/genproto/googleapis/cloud/bigquery/" - + "storage/v1beta1;storageb\006proto3" + + "eta1B\023TableReferenceProtoZCcloud.google." + + "com/go/bigquery/storage/apiv1beta1/stora" + + "gepb;storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/arrow.proto b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/arrow.proto index f70c61c724..77dbfe3eb2 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/arrow.proto +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/arrow.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1beta1; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta1/storagepb;storagepb"; option java_outer_classname = "ArrowProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta1"; diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/avro.proto b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/avro.proto index 7d034a28a7..222bdcc13f 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/avro.proto +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/avro.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1beta1; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta1/storagepb;storagepb"; option java_outer_classname = "AvroProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta1"; diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/read_options.proto b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/read_options.proto index 1ff8d8b5eb..90fb7f3e49 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/read_options.proto +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/read_options.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1beta1; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta1/storagepb;storagepb"; option java_package = "com.google.cloud.bigquery.storage.v1beta1"; // Options dictating how we read a table. diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/storage.proto b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/storage.proto index 0d311418a4..2bf2a2c094 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/storage.proto +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/storage.proto @@ -27,7 +27,7 @@ import "google/cloud/bigquery/storage/v1beta1/table_reference.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta1/storagepb;storagepb"; option java_package = "com.google.cloud.bigquery.storage.v1beta1"; // BigQuery storage API. diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/table_reference.proto b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/table_reference.proto index 22c940c0e6..9f643cd65e 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/table_reference.proto +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/proto/google/cloud/bigquery/storage/v1beta1/table_reference.proto @@ -18,7 +18,7 @@ package google.cloud.bigquery.storage.v1beta1; import "google/protobuf/timestamp.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta1;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta1/storagepb;storagepb"; option java_outer_classname = "TableReferenceProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta1"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index 4c99c2ed5c..eaa6f022ca 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.154.0 + 0.155.0 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.30.0 + 2.31.0 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowProto.java index 83bcf4d703..f0e4dbda3d 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowProto.java @@ -57,10 +57,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".cloud.bigquery.storage.v1beta2.ArrowSer" + "ializationOptions.Format\"@\n\006Format\022\026\n\022FO" + "RMAT_UNSPECIFIED\020\000\022\016\n\nARROW_0_14\020\001\022\016\n\nAR" - + "ROW_0_15\020\002B\207\001\n)com.google.cloud.bigquery" - + ".storage.v1beta2B\nArrowProtoP\001ZLgoogle.g" - + "olang.org/genproto/googleapis/cloud/bigq" - + "uery/storage/v1beta2;storageb\006proto3" + + "ROW_0_15\020\002B~\n)com.google.cloud.bigquery." + + "storage.v1beta2B\nArrowProtoP\001ZCcloud.goo" + + "gle.com/go/bigquery/storage/apiv1beta2/s" + + "toragepb;storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroProto.java index 799ef8fad4..b1eed9af9f 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroProto.java @@ -48,10 +48,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "avro.proto\022%google.cloud.bigquery.storag" + "e.v1beta2\"\034\n\nAvroSchema\022\016\n\006schema\030\001 \001(\t\"" + "*\n\010AvroRows\022\036\n\026serialized_binary_rows\030\001 " - + "\001(\014B\206\001\n)com.google.cloud.bigquery.storag" - + "e.v1beta2B\tAvroProtoP\001ZLgoogle.golang.or" - + "g/genproto/googleapis/cloud/bigquery/sto" - + "rage/v1beta2;storageb\006proto3" + + "\001(\014B}\n)com.google.cloud.bigquery.storage" + + ".v1beta2B\tAvroProtoP\001ZCcloud.google.com/" + + "go/bigquery/storage/apiv1beta2/storagepb" + + ";storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoBufProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoBufProto.java index 651b7f8a36..20e1c25c82 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoBufProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoBufProto.java @@ -50,10 +50,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "r.proto\"I\n\013ProtoSchema\022:\n\020proto_descript" + "or\030\001 \001(\0132 .google.protobuf.DescriptorPro" + "to\"$\n\tProtoRows\022\027\n\017serialized_rows\030\001 \003(\014" - + "B\212\001\n)com.google.cloud.bigquery.storage.v" - + "1beta2B\rProtoBufProtoP\001ZLgoogle.golang.o" - + "rg/genproto/googleapis/cloud/bigquery/st" - + "orage/v1beta2;storageb\006proto3" + + "B\201\001\n)com.google.cloud.bigquery.storage.v" + + "1beta2B\rProtoBufProtoP\001ZCcloud.google.co" + + "m/go/bigquery/storage/apiv1beta2/storage" + + "pb;storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageProto.java index 99df1607ee..59abc99bc1 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageProto.java @@ -273,11 +273,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "apis.com\322A\213\001https://www.googleapis.com/a" + "uth/bigquery,https://www.googleapis.com/" + "auth/bigquery.insertdata,https://www.goo" - + "gleapis.com/auth/cloud-platformB\211\001\n)com." + + "gleapis.com/auth/cloud-platformB\200\001\n)com." + "google.cloud.bigquery.storage.v1beta2B\014S" - + "torageProtoP\001ZLgoogle.golang.org/genprot" - + "o/googleapis/cloud/bigquery/storage/v1be" - + "ta2;storageb\006proto3" + + "torageProtoP\001ZCcloud.google.com/go/bigqu" + + "ery/storage/apiv1beta2/storagepb;storage" + + "pbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamProto.java index c4a2531dcf..a18e4269cb 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamProto.java @@ -107,13 +107,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "eStream\022Eprojects/{project}/datasets/{da" + "taset}/tables/{table}/streams/{stream}*>" + "\n\nDataFormat\022\033\n\027DATA_FORMAT_UNSPECIFIED\020" - + "\000\022\010\n\004AVRO\020\001\022\t\n\005ARROW\020\002B\340\001\n)com.google.cl" + + "\000\022\010\n\004AVRO\020\001\022\t\n\005ARROW\020\002B\327\001\n)com.google.cl" + "oud.bigquery.storage.v1beta2B\013StreamProt" - + "oP\001ZLgoogle.golang.org/genproto/googleap" - + "is/cloud/bigquery/storage/v1beta2;storag" - + "e\352AU\n\035bigquery.googleapis.com/Table\0224pro" - + "jects/{project}/datasets/{dataset}/table" - + "s/{table}b\006proto3" + + "oP\001ZCcloud.google.com/go/bigquery/storag" + + "e/apiv1beta2/storagepb;storagepb\352AU\n\035big" + + "query.googleapis.com/Table\0224projects/{pr" + + "oject}/datasets/{dataset}/tables/{table}" + + "b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableProto.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableProto.java index 29abed0789..9b661d9ea1 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableProto.java @@ -64,10 +64,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\022\013\n\007NUMERIC\020\014\022\016\n\nBIGNUMERIC\020\r\022\014\n\010INTERVA" + "L\020\016\022\010\n\004JSON\020\017\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIE" + "D\020\000\022\014\n\010NULLABLE\020\001\022\014\n\010REQUIRED\020\002\022\014\n\010REPEA" - + "TED\020\003B\207\001\n)com.google.cloud.bigquery.stor" - + "age.v1beta2B\nTableProtoP\001ZLgoogle.golang" - + ".org/genproto/googleapis/cloud/bigquery/" - + "storage/v1beta2;storageb\006proto3" + + "TED\020\003B~\n)com.google.cloud.bigquery.stora" + + "ge.v1beta2B\nTableProtoP\001ZCcloud.google.c" + + "om/go/bigquery/storage/apiv1beta2/storag" + + "epb;storagepbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/arrow.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/arrow.proto index 74fe927b7e..8da53dc7bb 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/arrow.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/arrow.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1beta2; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "ArrowProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/avro.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/avro.proto index 495132ec14..702b34a8e0 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/avro.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/avro.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package google.cloud.bigquery.storage.v1beta2; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "AvroProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/protobuf.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/protobuf.proto index 11e851be44..359b8b7d17 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/protobuf.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/protobuf.proto @@ -18,7 +18,7 @@ package google.cloud.bigquery.storage.v1beta2; import "google/protobuf/descriptor.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "ProtoBufProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/storage.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/storage.proto index f7d2c341cb..b8fca3af5f 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/storage.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/storage.proto @@ -29,7 +29,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; import "google/rpc/status.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "StorageProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/stream.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/stream.proto index d166e98754..e8191af84e 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/stream.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/stream.proto @@ -23,7 +23,7 @@ import "google/cloud/bigquery/storage/v1beta2/avro.proto"; import "google/cloud/bigquery/storage/v1beta2/table.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "StreamProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/table.proto b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/table.proto index 77ca829a4f..4ef3360d55 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/table.proto +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/proto/google/cloud/bigquery/storage/v1beta2/table.proto @@ -18,7 +18,7 @@ package google.cloud.bigquery.storage.v1beta2; import "google/api/field_behavior.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/storage/v1beta2;storage"; +option go_package = "cloud.google.com/go/bigquery/storage/apiv1beta2/storagepb;storagepb"; option java_multiple_files = true; option java_outer_classname = "TableProto"; option java_package = "com.google.cloud.bigquery.storage.v1beta2"; diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index c3345d4ee1..bd112f28dd 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -21,7 +21,7 @@ 1.8 1.8 UTF-8 - 10.0.1 + 11.0.0 @@ -30,14 +30,14 @@ com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.30.0 com.google.cloud google-cloud-bigquery - 2.20.2 + 2.21.0 org.apache.avro diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 983c145761..98a212b6e1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -21,7 +21,7 @@ 1.8 1.8 UTF-8 - 10.0.1 + 11.0.0 @@ -29,14 +29,14 @@ com.google.cloud google-cloud-bigquerystorage - 2.30.0 + 2.31.0 com.google.cloud google-cloud-bigquery - 2.20.2 + 2.21.0 org.apache.avro diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 2e77fdb494..d046b33feb 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -21,7 +21,7 @@ 1.8 1.8 UTF-8 - 10.0.1 + 11.0.0 @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 26.4.0 + 26.6.0 pom import @@ -48,7 +48,7 @@ com.google.cloud google-cloud-bigquery - 2.20.2 + 2.21.0 org.apache.avro diff --git a/samples/snippets/src/main/java/com/example/bigquerystorage/BqToBqStorageSchemaConverter.java b/samples/snippets/src/main/java/com/example/bigquerystorage/BqToBqStorageSchemaConverter.java deleted file mode 100644 index 27c5d1dbcb..0000000000 --- a/samples/snippets/src/main/java/com/example/bigquerystorage/BqToBqStorageSchemaConverter.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.bigquerystorage; - -import com.google.cloud.bigquery.Field; -import com.google.cloud.bigquery.Schema; -import com.google.cloud.bigquery.StandardSQLTypeName; -import com.google.cloud.bigquery.storage.v1.TableFieldSchema; -import com.google.cloud.bigquery.storage.v1.TableSchema; -import com.google.common.collect.ImmutableMap; - -/** Converts structure from BigQuery client to BigQueryStorage client */ -public class BqToBqStorageSchemaConverter { - private static ImmutableMap BQTableSchemaModeMap = - ImmutableMap.of( - Field.Mode.NULLABLE, TableFieldSchema.Mode.NULLABLE, - Field.Mode.REPEATED, TableFieldSchema.Mode.REPEATED, - Field.Mode.REQUIRED, TableFieldSchema.Mode.REQUIRED); - - private static ImmutableMap BQTableSchemaTypeMap = - new ImmutableMap.Builder() - .put(StandardSQLTypeName.BOOL, TableFieldSchema.Type.BOOL) - .put(StandardSQLTypeName.BYTES, TableFieldSchema.Type.BYTES) - .put(StandardSQLTypeName.DATE, TableFieldSchema.Type.DATE) - .put(StandardSQLTypeName.DATETIME, TableFieldSchema.Type.DATETIME) - .put(StandardSQLTypeName.FLOAT64, TableFieldSchema.Type.DOUBLE) - .put(StandardSQLTypeName.GEOGRAPHY, TableFieldSchema.Type.GEOGRAPHY) - .put(StandardSQLTypeName.INT64, TableFieldSchema.Type.INT64) - .put(StandardSQLTypeName.NUMERIC, TableFieldSchema.Type.NUMERIC) - .put(StandardSQLTypeName.STRING, TableFieldSchema.Type.STRING) - .put(StandardSQLTypeName.STRUCT, TableFieldSchema.Type.STRUCT) - .put(StandardSQLTypeName.TIME, TableFieldSchema.Type.TIME) - .put(StandardSQLTypeName.TIMESTAMP, TableFieldSchema.Type.TIMESTAMP) - .build(); - - /** - * Converts from BigQuery client Table Schema to bigquery storage API Table Schema. - * - * @param schema the BigQuery client Table Schema - * @return the bigquery storage API Table Schema - */ - public static TableSchema convertTableSchema(Schema schema) { - TableSchema.Builder result = TableSchema.newBuilder(); - for (int i = 0; i < schema.getFields().size(); i++) { - result.addFields(i, convertFieldSchema(schema.getFields().get(i))); - } - return result.build(); - } - - /** - * Converts from bigquery v2 Field Schema to bigquery storage API Field Schema. - * - * @param field the BigQuery client Field Schema - * @return the bigquery storage API Field Schema - */ - public static TableFieldSchema convertFieldSchema(Field field) { - TableFieldSchema.Builder result = TableFieldSchema.newBuilder(); - if (field.getMode() == null) { - field = field.toBuilder().setMode(Field.Mode.NULLABLE).build(); - } - result.setMode(BQTableSchemaModeMap.get(field.getMode())); - result.setName(field.getName()); - result.setType(BQTableSchemaTypeMap.get(field.getType().getStandardType())); - if (field.getDescription() != null) { - result.setDescription(field.getDescription()); - } - if (field.getSubFields() != null) { - for (int i = 0; i < field.getSubFields().size(); i++) { - result.addFields(i, convertFieldSchema(field.getSubFields().get(i))); - } - } - return result.build(); - } -} diff --git a/tutorials/JsonWriterDefaultStream/pom.xml b/tutorials/JsonWriterDefaultStream/pom.xml index d84a1aa14c..0ed22ee454 100644 --- a/tutorials/JsonWriterDefaultStream/pom.xml +++ b/tutorials/JsonWriterDefaultStream/pom.xml @@ -19,12 +19,12 @@ com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.30.0 com.google.cloud google-cloud-bigquery - 2.20.2 + 2.21.0 org.apache.avro @@ -34,12 +34,12 @@ org.apache.arrow arrow-vector - 10.0.1 + 11.0.0 org.apache.arrow arrow-memory-netty - 10.0.1 + 11.0.0 diff --git a/versions.txt b/versions.txt index c38dd1c1fb..1aaf4ac285 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.30.0:2.30.0 -grpc-google-cloud-bigquerystorage-v1beta1:0.154.0:0.154.0 -grpc-google-cloud-bigquerystorage-v1beta2:0.154.0:0.154.0 -grpc-google-cloud-bigquerystorage-v1:2.30.0:2.30.0 -proto-google-cloud-bigquerystorage-v1beta1:0.154.0:0.154.0 -proto-google-cloud-bigquerystorage-v1beta2:0.154.0:0.154.0 -proto-google-cloud-bigquerystorage-v1:2.30.0:2.30.0 +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