Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add INTERVAL and JSON type support to JsonStreamWriter #1351

Merged
merged 8 commits into from Oct 12, 2021
Merged

feat: Add INTERVAL and JSON type support to JsonStreamWriter #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2990214
fix: update code comment to reflect max size change
yirutang Sep 3, 2021
25da6ed
Merge remote-tracking branch 'upstream/master'
yirutang Sep 8, 2021
8e1ddb9
Merge remote-tracking branch 'upstream/master'
yirutang Sep 9, 2021
fa9710b
Merge remote-tracking branch 'upstream/master'
yirutang Sep 23, 2021
7164815
Merge branch 'googleapis:main' into master
yirutang Sep 30, 2021
fcfd1ca
Merge remote-tracking branch 'upstream/main'
yirutang Oct 1, 2021
aef5a59
Merge remote-tracking branch 'upstream/main'
yirutang Oct 8, 2021
4640172
feat: Add JSON and INTERVAL type support to JsonStreamWriter
yirutang Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ge/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java
View file
Open in desktop
Expand Up @@ -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();

/**
Expand Down
2 changes: 2 additions & 0 deletions ...c/main/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptor.java
View file
Open in desktop
Expand Up @@ -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();

/**
Expand Down
14 changes: 14 additions & 0 deletions ...rc/test/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptorTest.java
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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);
Expand Down
18 changes: 18 additions & 0 deletions ...erystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 14 additions & 0 deletions ...st/java/com/google/cloud/bigquery/storage/v1beta2/BQTableSchemaToProtoDescriptorTest.java
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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);
Expand Down
18 changes: 18 additions & 0 deletions ...orage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions google-cloud-bigquerystorage/src/test/proto/jsonTest.proto
View file
Open in desktop
Expand Up @@ -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 {
Expand Down