From b0e028b76a6fcd4dddf17db9f0a1673558dd5db3 Mon Sep 17 00:00:00 2001 From: dark0dave Date: Thu, 9 Jun 2022 14:09:42 +0100 Subject: [PATCH 1/2] feat(shortsAndBigDecimals): add shorts and big decimals Signed-off-by: dark0dave --- .../storage/v1/JsonToProtoMessage.java | 28 ++++++- .../BQTableSchemaToProtoDescriptorTest.java | 38 ++++++--- .../storage/v1/JsonToProtoMessageTest.java | 76 +++++++++++------- .../BQTableSchemaToProtoDescriptorTest.java | 39 +++++++--- .../v1beta2/JsonToProtoMessageTest.java | 77 ++++++++++++------- .../src/test/proto/jsonTest.proto | 26 ++++--- 6 files changed, 188 insertions(+), 96 deletions(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java index fd0257a740..dc0b8e320b 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java @@ -290,7 +290,7 @@ private static void fillField( BigDecimalByteStringEncoder.encodeToNumericByteString( new BigDecimal((String) val))); return; - } else if (val instanceof Integer || val instanceof Long) { + } else if (val instanceof Short || val instanceof Integer || val instanceof Long) { protoMsg.setField( fieldDescriptor, BigDecimalByteStringEncoder.encodeToNumericByteString( @@ -302,6 +302,11 @@ private static void fillField( BigDecimalByteStringEncoder.encodeToNumericByteString( new BigDecimal(((Number) val).doubleValue()))); return; + } else if (val instanceof BigDecimal) { + protoMsg.setField( + fieldDescriptor, + BigDecimalByteStringEncoder.encodeToNumericByteString((BigDecimal) val)); + return; } } else if (fieldSchema.getType() == TableFieldSchema.Type.BIGNUMERIC) { if (val instanceof String) { @@ -310,7 +315,7 @@ private static void fillField( BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal((String) val))); return; - } else if (val instanceof Integer || val instanceof Long) { + } else if (val instanceof Short || val instanceof Integer || val instanceof Long) { protoMsg.setField( fieldDescriptor, BigDecimalByteStringEncoder.encodeToBigNumericByteString( @@ -322,6 +327,11 @@ private static void fillField( BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal(((Number) val).doubleValue()))); return; + } else if (val instanceof BigDecimal) { + protoMsg.setField( + fieldDescriptor, + BigDecimalByteStringEncoder.encodeToNumericByteString((BigDecimal) val)); + return; } } } @@ -528,7 +538,7 @@ private static void fillRepeatedField( BigDecimalByteStringEncoder.encodeToNumericByteString( new BigDecimal((String) val))); added = true; - } else if (val instanceof Integer || val instanceof Long) { + } else if (val instanceof Short || val instanceof Integer || val instanceof Long) { protoMsg.addRepeatedField( fieldDescriptor, BigDecimalByteStringEncoder.encodeToNumericByteString( @@ -540,6 +550,11 @@ private static void fillRepeatedField( BigDecimalByteStringEncoder.encodeToNumericByteString( new BigDecimal(((Number) val).doubleValue()))); added = true; + } else if (val instanceof BigDecimal) { + protoMsg.addRepeatedField( + fieldDescriptor, + BigDecimalByteStringEncoder.encodeToNumericByteString((BigDecimal) val)); + added = true; } } else if (fieldSchema != null && fieldSchema.getType() == TableFieldSchema.Type.BIGNUMERIC) { @@ -549,7 +564,7 @@ private static void fillRepeatedField( BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal((String) val))); added = true; - } else if (val instanceof Integer || val instanceof Long) { + } else if (val instanceof Short || val instanceof Integer || val instanceof Long) { protoMsg.addRepeatedField( fieldDescriptor, BigDecimalByteStringEncoder.encodeToBigNumericByteString( @@ -561,6 +576,11 @@ private static void fillRepeatedField( BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal(((Number) val).doubleValue()))); added = true; + } else if (val instanceof BigDecimal) { + protoMsg.addRepeatedField( + fieldDescriptor, + BigDecimalByteStringEncoder.encodeToNumericByteString((BigDecimal) val)); + added = true; } } if (!added) { 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 2d55ddf3d6..f7201b38ab 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 @@ -233,6 +233,12 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.NULLABLE) .setName("test_numeric_str") .build(); + final TableFieldSchema TEST_NUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_numeric_short") + .build(); final TableFieldSchema TEST_NUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -269,6 +275,12 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + final TableFieldSchema TEST_BIGNUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BIGNUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_bignumeric_short") + .build(); final TableFieldSchema TEST_BIGNUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.BIGNUMERIC) @@ -324,18 +336,20 @@ public void testStructComplex() throws Exception { .addFields(14, TEST_TIME_STR) .addFields(15, TEST_NUMERIC_REPEATED) .addFields(16, TEST_NUMERIC_STR) - .addFields(17, TEST_NUMERIC_INT) - .addFields(18, TEST_NUMERIC_LONG) - .addFields(19, TEST_NUMERIC_FLOAT) - .addFields(20, TEST_NUMERIC_DOUBLE) - .addFields(21, TEST_BIGNUMERIC) - .addFields(22, TEST_BIGNUMERIC_STR) - .addFields(23, TEST_BIGNUMERIC_INT) - .addFields(24, TEST_BIGNUMERIC_LONG) - .addFields(25, TEST_BIGNUMERIC_FLOAT) - .addFields(26, TEST_BIGNUMERIC_DOUBLE) - .addFields(27, TEST_INTERVAL) - .addFields(28, TEST_JSON) + .addFields(17, TEST_NUMERIC_SHORT) + .addFields(18, TEST_NUMERIC_INT) + .addFields(19, TEST_NUMERIC_LONG) + .addFields(20, TEST_NUMERIC_FLOAT) + .addFields(21, TEST_NUMERIC_DOUBLE) + .addFields(22, TEST_BIGNUMERIC) + .addFields(23, TEST_BIGNUMERIC_STR) + .addFields(24, TEST_BIGNUMERIC_SHORT) + .addFields(25, TEST_BIGNUMERIC_INT) + .addFields(26, TEST_BIGNUMERIC_LONG) + .addFields(27, TEST_BIGNUMERIC_FLOAT) + .addFields(28, TEST_BIGNUMERIC_DOUBLE) + .addFields(29, TEST_INTERVAL) + .addFields(30, 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 ef9dd9f063..ccf0a09972 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 @@ -409,6 +409,12 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.NULLABLE) .setName("test_numeric_str") .build(); + private final TableFieldSchema TEST_NUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_numeric_short") + .build(); private final TableFieldSchema TEST_NUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -445,6 +451,12 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + private final TableFieldSchema TEST_BIGNUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.BIGNUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_bignumeric_short") + .build(); private final TableFieldSchema TEST_BIGNUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.BIGNUMERIC) @@ -500,18 +512,20 @@ public class JsonToProtoMessageTest { .addFields(14, TEST_TIME_STR) .addFields(15, TEST_NUMERIC_REPEATED) .addFields(16, TEST_NUMERIC_STR) - .addFields(17, TEST_NUMERIC_INT) - .addFields(18, TEST_NUMERIC_LONG) - .addFields(19, TEST_NUMERIC_FLOAT) - .addFields(20, TEST_NUMERIC_DOUBLE) - .addFields(21, TEST_BIGNUMERIC) - .addFields(22, TEST_BIGNUMERIC_STR) - .addFields(23, TEST_BIGNUMERIC_INT) - .addFields(24, TEST_BIGNUMERIC_LONG) - .addFields(25, TEST_BIGNUMERIC_FLOAT) - .addFields(26, TEST_BIGNUMERIC_DOUBLE) - .addFields(27, TEST_INTERVAL) - .addFields(28, TEST_JSON) + .addFields(17, TEST_NUMERIC_SHORT) + .addFields(18, TEST_NUMERIC_INT) + .addFields(19, TEST_NUMERIC_LONG) + .addFields(20, TEST_NUMERIC_FLOAT) + .addFields(21, TEST_NUMERIC_DOUBLE) + .addFields(22, TEST_BIGNUMERIC) + .addFields(23, TEST_BIGNUMERIC_STR) + .addFields(24, TEST_BIGNUMERIC_SHORT) + .addFields(25, TEST_BIGNUMERIC_INT) + .addFields(26, TEST_BIGNUMERIC_LONG) + .addFields(27, TEST_BIGNUMERIC_FLOAT) + .addFields(28, TEST_BIGNUMERIC_DOUBLE) + .addFields(29, TEST_INTERVAL) + .addFields(30, TEST_JSON) .build(); @Test @@ -902,27 +916,31 @@ public void testStructComplex() throws Exception { new BigDecimal("-99999999999999999999999999999.999999999"))) .setTestNumericStr( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("12.4"))) - .setTestNumericInt( + .setTestNumericShort( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1))) + .setTestNumericInt( + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(2))) .setTestNumericLong( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1L))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(3L))) .setTestNumericFloat( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1f))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(4f))) .setTestNumericDouble( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1D))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(5D))) .setTestBignumeric( BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal("578960446186580977117854925043439539266.3"))) .addTestBignumericStr( BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal("1.23"))) - .setTestBignumericInt( + .setTestBignumericShort( BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(1))) + .setTestBignumericInt( + BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(2))) .setTestBignumericLong( - BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(1L))) + BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(3L))) .setTestBignumericFloat( - BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(1f))) + BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(4f))) .setTestBignumericDouble( - BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(1D))) + BigDecimalByteStringEncoder.encodeToBigNumericByteString(new BigDecimal(5D))) .setTestInterval("0-0 0 0:0:0.000005") .addTestJson("{'a':'b'}") .build(); @@ -967,19 +985,21 @@ public void testStructComplex() throws Exception { json.put("test_time", CivilTimeEncoder.encodePacked64TimeMicros(LocalTime.of(1, 0, 1))); json.put("test_time_str", "20:51:10.1234"); json.put("test_numeric_str", "12.4"); - json.put("test_numeric_int", 1); - json.put("test_numeric_long", 1L); - json.put("test_numeric_float", 1f); - json.put("test_numeric_double", 1D); + json.put("test_numeric_short", 1); + json.put("test_numeric_int", 2); + json.put("test_numeric_long", 3L); + json.put("test_numeric_float", 4f); + json.put("test_numeric_double", 5D); json.put( "test_bignumeric", BigDecimalByteStringEncoder.encodeToBigNumericByteString( new BigDecimal("578960446186580977117854925043439539266.3"))); json.put("test_bignumeric_str", new JSONArray(new String[] {"1.23"})); - json.put("test_bignumeric_int", 1); - json.put("test_bignumeric_long", 1L); - json.put("test_bignumeric_float", 1f); - json.put("test_bignumeric_double", 1D); + json.put("test_bignumeric_short", 1); + json.put("test_bignumeric_int", 2); + json.put("test_bignumeric_long", 3L); + json.put("test_bignumeric_float", 4f); + json.put("test_bignumeric_double", 5D); json.put("test_interval", "0-0 0 0:0:0.000005"); json.put("test_json", new JSONArray(new String[] {"{'a':'b'}"})); DynamicMessage protoMsg = 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 ec92606cb2..8e08418237 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 @@ -233,6 +233,12 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.NULLABLE) .setName("test_numeric_str") .build(); + final TableFieldSchema TEST_NUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_numeric_short") + .build(); final TableFieldSchema TEST_NUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -269,6 +275,13 @@ public void testStructComplex() throws Exception { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + + final TableFieldSchema TEST_BIGNUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_bignumeric_short") + .build(); final TableFieldSchema TEST_BIGNUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -324,18 +337,20 @@ public void testStructComplex() throws Exception { .addFields(14, TEST_TIME_STR) .addFields(15, TEST_NUMERIC_REPEATED) .addFields(16, TEST_NUMERIC_STR) - .addFields(17, TEST_NUMERIC_INT) - .addFields(18, TEST_NUMERIC_LONG) - .addFields(19, TEST_NUMERIC_FLOAT) - .addFields(20, TEST_NUMERIC_DOUBLE) - .addFields(21, TEST_BIGNUMERIC) - .addFields(22, TEST_BIGNUMERIC_STR) - .addFields(23, TEST_BIGNUMERIC_INT) - .addFields(24, TEST_BIGNUMERIC_FLOAT) - .addFields(25, TEST_BIGNUMERIC_DOUBLE) - .addFields(26, TEST_BIGNUMERIC_LONG) - .addFields(27, TEST_INTERVAL) - .addFields(28, TEST_JSON) + .addFields(17, TEST_NUMERIC_SHORT) + .addFields(18, TEST_NUMERIC_INT) + .addFields(19, TEST_NUMERIC_LONG) + .addFields(20, TEST_NUMERIC_FLOAT) + .addFields(21, TEST_NUMERIC_DOUBLE) + .addFields(22, TEST_BIGNUMERIC) + .addFields(23, TEST_BIGNUMERIC_STR) + .addFields(24, TEST_BIGNUMERIC_SHORT) + .addFields(25, TEST_BIGNUMERIC_INT) + .addFields(26, TEST_BIGNUMERIC_FLOAT) + .addFields(27, TEST_BIGNUMERIC_DOUBLE) + .addFields(28, TEST_BIGNUMERIC_LONG) + .addFields(29, TEST_INTERVAL) + .addFields(30, 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 f6f20323cc..bcdeda813b 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 @@ -386,6 +386,12 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.NULLABLE) .setName("test_numeric_str") .build(); + private final TableFieldSchema TEST_NUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_numeric_short") + .build(); private final TableFieldSchema TEST_NUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -422,6 +428,13 @@ public class JsonToProtoMessageTest { .setMode(TableFieldSchema.Mode.REPEATED) .setName("test_bignumeric_str") .build(); + + private final TableFieldSchema TEST_BIGNUMERIC_SHORT = + TableFieldSchema.newBuilder() + .setType(TableFieldSchema.Type.NUMERIC) + .setMode(TableFieldSchema.Mode.NULLABLE) + .setName("test_bignumeric_short") + .build(); private final TableFieldSchema TEST_BIGNUMERIC_INT = TableFieldSchema.newBuilder() .setType(TableFieldSchema.Type.NUMERIC) @@ -477,18 +490,20 @@ public class JsonToProtoMessageTest { .addFields(14, TEST_TIME_STR) .addFields(15, TEST_NUMERIC_REPEATED) .addFields(16, TEST_NUMERIC_STR) - .addFields(17, TEST_NUMERIC_INT) - .addFields(18, TEST_NUMERIC_LONG) - .addFields(19, TEST_NUMERIC_FLOAT) - .addFields(20, TEST_NUMERIC_DOUBLE) - .addFields(21, TEST_BIGNUMERIC) - .addFields(22, TEST_BIGNUMERIC_STR) - .addFields(23, TEST_BIGNUMERIC_INT) - .addFields(24, TEST_BIGNUMERIC_LONG) - .addFields(25, TEST_BIGNUMERIC_FLOAT) - .addFields(26, TEST_BIGNUMERIC_DOUBLE) - .addFields(27, TEST_INTERVAL) - .addFields(28, TEST_JSON) + .addFields(17, TEST_NUMERIC_SHORT) + .addFields(18, TEST_NUMERIC_INT) + .addFields(19, TEST_NUMERIC_LONG) + .addFields(20, TEST_NUMERIC_FLOAT) + .addFields(21, TEST_NUMERIC_DOUBLE) + .addFields(22, TEST_BIGNUMERIC) + .addFields(23, TEST_BIGNUMERIC_STR) + .addFields(24, TEST_BIGNUMERIC_SHORT) + .addFields(25, TEST_BIGNUMERIC_INT) + .addFields(26, TEST_BIGNUMERIC_LONG) + .addFields(27, TEST_BIGNUMERIC_FLOAT) + .addFields(28, TEST_BIGNUMERIC_DOUBLE) + .addFields(29, TEST_INTERVAL) + .addFields(30, TEST_JSON) .build(); @Test @@ -791,26 +806,30 @@ public void testStructComplex() throws Exception { new BigDecimal("-99999999999999999999999999999.999999999"))) .setTestNumericStr( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("12.4"))) - .setTestNumericInt( + .setTestNumericShort( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1))) + .setTestNumericInt( + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(2))) .setTestNumericLong( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1L))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(3L))) .setTestNumericFloat( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1f))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(4f))) .setTestNumericDouble( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1D))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(5D))) .setTestBignumeric( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("2.3"))) .addTestBignumericStr( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal("1.23"))) - .setTestBignumericInt( + .setTestBignumericShort( BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1))) + .setTestBignumericInt( + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(2))) .setTestBignumericLong( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1L))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(3L))) .setTestBignumericFloat( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1f))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(4f))) .setTestBignumericDouble( - BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(1D))) + BigDecimalByteStringEncoder.encodeToNumericByteString(new BigDecimal(5D))) .setTestInterval("0-0 0 0:0:0.000005") .addTestJson("{'a':'b'}") .build(); @@ -855,18 +874,20 @@ public void testStructComplex() throws Exception { json.put("test_time", CivilTimeEncoder.encodePacked64TimeMicros(LocalTime.of(1, 0, 1))); json.put("test_time_str", "20:51:10.1234"); json.put("test_numeric_str", "12.4"); - json.put("test_numeric_int", 1); - json.put("test_numeric_long", 1L); - json.put("test_numeric_float", 1f); - json.put("test_numeric_double", 1D); + json.put("test_numeric_short", 1); + json.put("test_numeric_int", 2); + json.put("test_numeric_long", 3L); + json.put("test_numeric_float", 4f); + json.put("test_numeric_double", 5D); json.put( "test_bignumeric", BigDecimalByteStringEncoder.encodeToNumericByteString(BigDecimal.valueOf(2.3))); json.put("test_bignumeric_str", new JSONArray(new String[] {"1.23"})); - json.put("test_bignumeric_int", 1); - json.put("test_bignumeric_long", 1L); - json.put("test_bignumeric_float", 1f); - json.put("test_bignumeric_double", 1D); + json.put("test_bignumeric_short", 1); + json.put("test_bignumeric_int", 2); + json.put("test_bignumeric_long", 3L); + json.put("test_bignumeric_float", 4f); + json.put("test_bignumeric_double", 5D); json.put("test_interval", "0-0 0 0:0:0.000005"); json.put("test_json", new JSONArray(new String[] {"{'a':'b'}"})); DynamicMessage protoMsg = diff --git a/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto b/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto index 4eca3d901b..9cd3a646d2 100644 --- a/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto +++ b/google-cloud-bigquerystorage/src/test/proto/jsonTest.proto @@ -21,18 +21,20 @@ message ComplexRoot { optional int64 test_time_str = 15; repeated bytes test_numeric_repeated = 16; optional bytes test_numeric_str = 17; - optional bytes test_numeric_int = 18; - optional bytes test_numeric_long = 19; - optional bytes test_numeric_float = 20; - optional bytes test_numeric_double = 21; - optional bytes test_bignumeric = 22; - repeated bytes test_bignumeric_str = 23; - optional bytes test_bignumeric_int = 24; - optional bytes test_bignumeric_long = 25; - optional bytes test_bignumeric_float = 26; - optional bytes test_bignumeric_double = 27; - optional string test_interval = 28; - repeated string test_json = 29; + optional bytes test_numeric_short = 18; + optional bytes test_numeric_int = 19; + optional bytes test_numeric_long = 20; + optional bytes test_numeric_float = 21; + optional bytes test_numeric_double = 22; + optional bytes test_bignumeric = 23; + repeated bytes test_bignumeric_str = 24; + optional bytes test_bignumeric_short = 25; + optional bytes test_bignumeric_int = 26; + optional bytes test_bignumeric_long = 27; + optional bytes test_bignumeric_float = 28; + optional bytes test_bignumeric_double = 29; + optional string test_interval = 30; + repeated string test_json = 31; } message CasingComplex { From c3e58adef6e5f5833c7c709fba8f78957858b749 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 29 Aug 2022 18:41:01 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8ca122629..162ae51281 100644 --- a/README.md +++ b/README.md @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.0.0') +implementation platform('com.google.cloud:libraries-bom:26.1.0') implementation 'com.google.cloud:google-cloud-bigquerystorage' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.19.1' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.20.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.19.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.20.1" ``` ## Authentication