From ac767f91e33324399fe25c1a167a38aaecd7689e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 6 Oct 2021 17:06:21 +0000 Subject: [PATCH 1/5] chore: release 2.3.4-SNAPSHOT (#1348) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.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 c8ab885c13..4bf982f5c7 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.3.3 + 2.3.4-SNAPSHOT pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.3.3 + 2.3.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.3.3 + 2.3.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index 1a7de66fb8..a0d5d775da 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.3.3 + 2.3.4-SNAPSHOT jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT google-cloud-bigquerystorage diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index 3a6f5c673c..a41dbace5e 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.3.3 + 2.3.4-SNAPSHOT grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index b9005919fa..65ec5187f0 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.127.3 + 0.127.4-SNAPSHOT grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index b488f9ca41..dd2888fd1a 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.127.3 + 0.127.4-SNAPSHOT grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 75aa0f64e8..5094fe4608 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.3.3 + 2.3.4-SNAPSHOT BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -83,37 +83,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.3.3 + 2.3.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.127.3 + 0.127.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.3.3 + 2.3.4-SNAPSHOT com.google.cloud google-cloud-bigquerystorage - 2.3.3 + 2.3.4-SNAPSHOT org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index 4b75ce11ac..a0c8ddbbc5 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.3.3 + 2.3.4-SNAPSHOT proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 63a287f4e2..9f863a4434 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.127.3 + 0.127.4-SNAPSHOT proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index 59d0ec0e36..d71f0cf854 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.127.3 + 0.127.4-SNAPSHOT proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f51dd99c32..2015702c08 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.3.3 + 2.3.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 0e9e27573b..c17529bb9e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.3.3:2.3.3 -grpc-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.3 -grpc-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.3 -grpc-google-cloud-bigquerystorage-v1:2.3.3:2.3.3 -proto-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.3 -proto-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.3 -proto-google-cloud-bigquerystorage-v1:2.3.3:2.3.3 +google-cloud-bigquerystorage:2.3.3:2.3.4-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.4-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.4-SNAPSHOT +grpc-google-cloud-bigquerystorage-v1:2.3.3:2.3.4-SNAPSHOT +proto-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.4-SNAPSHOT +proto-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.4-SNAPSHOT +proto-google-cloud-bigquerystorage-v1:2.3.3:2.3.4-SNAPSHOT From 7cd6b85820fdfae1e432c5aefe4267510a66c252 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Oct 2021 23:53:46 +0200 Subject: [PATCH 2/5] chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage to v2.3.3 (#1349) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage to v2.3.3 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 6 +++--- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d6df72db17..5882162fb6 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigquerystorage - 2.3.2 + 2.3.3 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigquerystorage' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.3.2' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.3.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.3.2" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.3.3" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 500d1bc3d5..b55231e682 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.3.2 + 2.3.3 From ada370a141107c81f6cedbda218e861a7a15140f Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 7 Oct 2021 10:44:59 -0700 Subject: [PATCH 3/5] chore: update repo-metadata.json client_documentation link (#1350) --- .repo-metadata.json | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.repo-metadata.json b/.repo-metadata.json index 58d4a7ac0c..5ef53ffc70 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -2,7 +2,7 @@ "name": "bigquerystorage", "name_pretty": "BigQuery Storage", "product_documentation": "https://cloud.google.com/bigquery/docs/reference/storage/", - "client_documentation": "https://googleapis.dev/java/google-cloud-bigquerystorage/latest", + "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-bigquerystorage/latest/history", "api_description": "is an API for reading data stored in BigQuery. This API provides direct, high-throughput read\naccess to existing BigQuery tables, supports parallel access with automatic liquid sharding, and allows fine-grained\ncontrol over what data is returned.", "issue_tracker": "https://issuetracker.google.com/savedsearches/559654", "release_level": "ga", diff --git a/README.md b/README.md index 5882162fb6..b3cd39b583 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. [product-docs]: https://cloud.google.com/bigquery/docs/reference/storage/ -[javadocs]: https://googleapis.dev/java/google-cloud-bigquerystorage/latest +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-bigquerystorage/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigquerystorage/java8.svg From f2121a796fa04d153124d87bd0d1041a401c0a42 Mon Sep 17 00:00:00 2001 From: Yiru Tang Date: Tue, 12 Oct 2021 12:14:58 -0700 Subject: [PATCH 4/5] feat: Add INTERVAL and JSON type support to JsonStreamWriter (#1351) * fix: update code comment to reflect max size change * feat: Add JSON and INTERVAL type support to JsonStreamWriter --- .../v1/BQTableSchemaToProtoDescriptor.java | 2 ++ .../BQTableSchemaToProtoDescriptor.java | 2 ++ .../v1/BQTableSchemaToProtoDescriptorTest.java | 14 ++++++++++++++ .../storage/v1/JsonToProtoMessageTest.java | 18 ++++++++++++++++++ .../BQTableSchemaToProtoDescriptorTest.java | 14 ++++++++++++++ .../v1beta2/JsonToProtoMessageTest.java | 18 ++++++++++++++++++ .../src/test/proto/jsonTest.proto | 2 ++ 7 files changed, 70 insertions(+) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java index cfb34a3f8e..6c2a3dfebc 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java @@ -56,6 +56,8 @@ public class BQTableSchemaToProtoDescriptor { .put(TableFieldSchema.Type.STRUCT, FieldDescriptorProto.Type.TYPE_MESSAGE) .put(TableFieldSchema.Type.TIME, FieldDescriptorProto.Type.TYPE_INT64) .put(TableFieldSchema.Type.TIMESTAMP, FieldDescriptorProto.Type.TYPE_INT64) + .put(TableFieldSchema.Type.JSON, FieldDescriptorProto.Type.TYPE_STRING) + .put(TableFieldSchema.Type.INTERVAL, FieldDescriptorProto.Type.TYPE_STRING) .build(); /** diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptor.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptor.java index ec9083fefa..99128101a5 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptor.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptor.java @@ -56,6 +56,8 @@ public class BQTableSchemaToProtoDescriptor { .put(TableFieldSchema.Type.STRUCT, FieldDescriptorProto.Type.TYPE_MESSAGE) .put(TableFieldSchema.Type.TIME, FieldDescriptorProto.Type.TYPE_INT64) .put(TableFieldSchema.Type.TIMESTAMP, FieldDescriptorProto.Type.TYPE_INT64) + .put(TableFieldSchema.Type.JSON, FieldDescriptorProto.Type.TYPE_STRING) + .put(TableFieldSchema.Type.INTERVAL, FieldDescriptorProto.Type.TYPE_STRING) .build(); /** diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptorTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptorTest.java index 3ef5f87d02..35b9944735 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptorTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptorTest.java @@ -245,6 +245,18 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + final TableFieldSchema TEST_INTERVAL = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.INTERVAL) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_interval") + .build(); + final TableFieldSchema TEST_JSON = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.JSON) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("test_json") + .build(); final TableSchema tableSchema = TableSchema.newBuilder() .addFields(0, test_int) @@ -266,6 +278,8 @@ public void testStructComplex() throws Exception { .addFields(16, TEST_NUMERIC_STR) .addFields(17, TEST_BIGNUMERIC) .addFields(18, TEST_BIGNUMERIC_STR) + .addFields(19, TEST_INTERVAL) + .addFields(20, TEST_JSON) .build(); final Descriptor descriptor = BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema); diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java index db5b14f73d..47285f8e0f 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java @@ -394,6 +394,18 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + final TableFieldSchema TEST_INTERVAL = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.INTERVAL) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_interval") + .build(); + final TableFieldSchema TEST_JSON = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.JSON) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("test_json") + .build(); private final TableSchema COMPLEX_TABLE_SCHEMA = TableSchema.newBuilder() .addFields(0, TEST_INT) @@ -415,6 +427,8 @@ public class JsonToProtoMessageTest { .addFields(16, TEST_NUMERIC_STR) .addFields(17, TEST_BIGNUMERIC) .addFields(18, TEST_BIGNUMERIC_STR) + .addFields(19, TEST_INTERVAL) + .addFields(20, TEST_JSON) .build(); @Test @@ -743,6 +757,8 @@ public void testStructComplex() throws Exception { BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("2.3"))) .addTestBignumericStr( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("1.23"))) + .setTestInterval("0-0 0 0:0:0.000005") + .addTestJson("{'a':'b'}") .build(); JSONObject complex_lvl2 = new JSONObject(); complex_lvl2.put("test_int", 3); @@ -789,6 +805,8 @@ public void testStructComplex() throws Exception { "test_bignumeric", BigDecimalByteStringEncoder.encodeToNumericByteString(BigDecimal.valueOf(2.3))); json.put("test_bignumeric_str", new JSONArray(new String[] {"1.23"})); + json.put("test_interval", "0-0 0 0:0:0.000005"); + json.put("test_json", new JSONArray(new String[] {"{'a':'b'}"})); DynamicMessage protoMsg = JsonToProtoMessage.convertJsonToProtoMessage( ComplexRoot.getDescriptor(), COMPLEX_TABLE_SCHEMA, json); diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptorTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptorTest.java index c6e0973d58..bedba1ebb8 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptorTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptorTest.java @@ -245,6 +245,18 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + final TableFieldSchema TEST_INTERVAL = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.INTERVAL) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_interval") + .build(); + final TableFieldSchema TEST_JSON = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.JSON) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("test_json") + .build(); final TableSchema tableSchema = TableSchema.newBuilder() .addFields(0, test_int) @@ -266,6 +278,8 @@ public void testStructComplex() throws Exception { .addFields(16, TEST_NUMERIC_STR) .addFields(17, TEST_BIGNUMERIC) .addFields(18, TEST_BIGNUMERIC_STR) + .addFields(19, TEST_INTERVAL) + .addFields(20, TEST_JSON) .build(); final Descriptor descriptor = BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema); diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java index 89848b0e61..5a84b5da47 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java @@ -395,6 +395,18 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + private final TableFieldSchema TEST_INTERVAL = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.INTERVAL) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_interval") + .build(); + private final TableFieldSchema TEST_JSON = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.JSON) + .setMode(TableFieldSchema.Mode.REPEATED) + .setName("test_json") + .build(); private final TableSchema COMPLEX_TABLE_SCHEMA = TableSchema.newBuilder() .addFields(0, TEST_INT) @@ -416,6 +428,8 @@ public class JsonToProtoMessageTest { .addFields(16, TEST_NUMERIC_STR) .addFields(17, TEST_BIGNUMERIC) .addFields(18, TEST_BIGNUMERIC_STR) + .addFields(19, TEST_INTERVAL) + .addFields(20, TEST_JSON) .build(); @Test @@ -744,6 +758,8 @@ public void testStructComplex() throws Exception { BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("2.3"))) .addTestBignumericStr( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("1.23"))) + .setTestInterval("0-0 0 0:0:0.000005") + .addTestJson("{'a':'b'}") .build(); JSONObject complex_lvl2 = new JSONObject(); complex_lvl2.put("test_int", 3); @@ -790,6 +806,8 @@ public void testStructComplex() throws Exception { "test_bignumeric", BigDecimalByteStringEncoder.encodeToNumericByteString(BigDecimal.valueOf(2.3))); json.put("test_bignumeric_str", new JSONArray(new String[] {"1.23"})); + json.put("test_interval", "0-0 0 0:0:0.000005"); + json.put("test_json", new JSONArray(new String[] {"{'a':'b'}"})); DynamicMessage protoMsg = JsonToProtoMessage.convertJsonToProtoMessage( ComplexRoot.getDescriptor(), COMPLEX_TABLE_SCHEMA, json); diff --git a/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto b/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto index b929604004..c08dd7648f 100644 --- a/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto +++ b/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto @@ -23,6 +23,8 @@ message ComplexRoot { optional bytes test_numeric_str = 17; optional bytes test_bignumeric = 18; repeated bytes test_bignumeric_str = 19; + optional string test_interval = 20; + repeated string test_json = 21; } message CasingComplex { From 41731b4d701b8214b5d7c36896e964061c8cdd22 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 01:56:12 +0000 Subject: [PATCH 5/5] chore: release 2.4.0 (#1352) :robot: I have created a release \*beep\* \*boop\* --- ## [2.4.0](https://www.github.com/googleapis/java-bigquerystorage/compare/v2.3.3...v2.4.0) (2021-10-12) ### Features * Add INTERVAL and JSON type support to JsonStreamWriter ([#1351](https://www.github.com/googleapis/java-bigquerystorage/issues/1351)) ([f2121a7](https://www.github.com/googleapis/java-bigquerystorage/commit/f2121a796fa04d153124d87bd0d1041a401c0a42)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ 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 +++++++------- 12 files changed, 45 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a591e5091..d949cbb4cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.4.0](https://www.github.com/googleapis/java-bigquerystorage/compare/v2.3.3...v2.4.0) (2021-10-12) + + +### Features + +* Add INTERVAL and JSON type support to JsonStreamWriter ([#1351](https://www.github.com/googleapis/java-bigquerystorage/issues/1351)) ([f2121a7](https://www.github.com/googleapis/java-bigquerystorage/commit/f2121a796fa04d153124d87bd0d1041a401c0a42)) + ### [2.3.3](https://www.github.com/googleapis/java-bigquerystorage/compare/v2.3.2...v2.3.3) (2021-10-05) diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index 4bf982f5c7..ceab25074f 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.3.4-SNAPSHOT + 2.4.0 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.3.4-SNAPSHOT + 2.4.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.3.4-SNAPSHOT + 2.4.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index a0d5d775da..1f9401f891 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.3.4-SNAPSHOT + 2.4.0 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 google-cloud-bigquerystorage diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index a41dbace5e..2e0e3e552c 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.3.4-SNAPSHOT + 2.4.0 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index 65ec5187f0..ddca1039e6 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.127.4-SNAPSHOT + 0.128.0 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index dd2888fd1a..537f3a24bd 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.127.4-SNAPSHOT + 0.128.0 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/pom.xml b/pom.xml index 5094fe4608..c50d9a25bb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.3.4-SNAPSHOT + 2.4.0 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -83,37 +83,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.3.4-SNAPSHOT + 2.4.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.127.4-SNAPSHOT + 0.128.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.3.4-SNAPSHOT + 2.4.0 com.google.cloud google-cloud-bigquerystorage - 2.3.4-SNAPSHOT + 2.4.0 org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index a0c8ddbbc5..7eea184497 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.3.4-SNAPSHOT + 2.4.0 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 9f863a4434..46f170f12b 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.127.4-SNAPSHOT + 0.128.0 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index d71f0cf854..1c325b3e41 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.127.4-SNAPSHOT + 0.128.0 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2015702c08..37027d807a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.3.4-SNAPSHOT + 2.4.0 diff --git a/versions.txt b/versions.txt index c17529bb9e..809c78b7b8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.3.3:2.3.4-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.4-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.4-SNAPSHOT -grpc-google-cloud-bigquerystorage-v1:2.3.3:2.3.4-SNAPSHOT -proto-google-cloud-bigquerystorage-v1beta1:0.127.3:0.127.4-SNAPSHOT -proto-google-cloud-bigquerystorage-v1beta2:0.127.3:0.127.4-SNAPSHOT -proto-google-cloud-bigquerystorage-v1:2.3.3:2.3.4-SNAPSHOT +google-cloud-bigquerystorage:2.4.0:2.4.0 +grpc-google-cloud-bigquerystorage-v1beta1:0.128.0:0.128.0 +grpc-google-cloud-bigquerystorage-v1beta2:0.128.0:0.128.0 +grpc-google-cloud-bigquerystorage-v1:2.4.0:2.4.0 +proto-google-cloud-bigquerystorage-v1beta1:0.128.0:0.128.0 +proto-google-cloud-bigquerystorage-v1beta2:0.128.0:0.128.0 +proto-google-cloud-bigquerystorage-v1:2.4.0:2.4.0