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

feat: add support for byte and short in JSONStreamWriter #2789

Merged
merged 1 commit into from
Dec 5, 2024
Merged

feat: add support for byte and short in JSONStreamWriter #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,9 @@ private FieldDescriptorAndFieldTableSchema computeDescriptorAndSchema(
* Fills a non-repetaed protoField with the json data.
*
* @param protoMsg The protocol buffer message being constructed
* @param fieldDescriptor
* @param fieldSchema
* @param fieldDescriptor Proto format to be transmitted over the wire (derived from table schema
* via BQTableSchemaToProtoDescriptor.BQTableSchemaModeMap)
* @param fieldSchema Actual table column schema type if available
* @param json
* @param exactJsonKeyName Exact key name in JSONObject instead of lowercased version
* @param currentScope Debugging purposes
Expand Down Expand Up @@ -649,6 +650,12 @@ private void fillField(
} else if (val instanceof Long) {
protoMsg.setField(fieldDescriptor, val);
return;
} else if (val instanceof Byte) {
protoMsg.setField(fieldDescriptor, Long.valueOf((Byte) val));
return;
} else if (val instanceof Short) {
protoMsg.setField(fieldDescriptor, Long.valueOf((Short) val));
return;
}
if (val instanceof String) {
Long parsed = Longs.tryParse((String) val);
Expand Down Expand Up @@ -729,8 +736,9 @@ private void fillField(
* Fills a repeated protoField with the json data.
*
* @param protoMsg The protocol buffer message being constructed
* @param fieldDescriptor
* @param fieldSchema
* @param fieldDescriptor Proto format to be transmitted over the wire (derived from table schema
* via BQTableSchemaToProtoDescriptor.BQTableSchemaModeMap)
* @param fieldSchema Actual table column schema type if available
* @param json If root level has no matching fields, throws exception.
* @param exactJsonKeyName Exact key name in JSONObject instead of lowercased version
* @param currentScope Debugging purposes
Expand Down Expand Up @@ -913,6 +921,10 @@ private void fillRepeatedField(
protoMsg.addRepeatedField(fieldDescriptor, Long.valueOf((Integer) val));
} else if (val instanceof Long) {
protoMsg.addRepeatedField(fieldDescriptor, val);
} else if (val instanceof Byte) {
protoMsg.addRepeatedField(fieldDescriptor, Long.valueOf((Byte) val));
} else if (val instanceof Short) {
protoMsg.addRepeatedField(fieldDescriptor, Long.valueOf((Short) val));
} else if (val instanceof String) {
Long parsed = Longs.tryParse((String) val);
if (parsed != null) {
Expand Down
46 changes: 44 additions & 2 deletions ...erystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
import com.google.protobuf.Message;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
Expand Down Expand Up @@ -579,8 +581,8 @@ public void testInt64() throws Exception {
TestInt64 expectedProto =
TestInt64.newBuilder().setByte(1).setShort(1).setInt(1).setLong(1).setString(1).build();
JSONObject json = new JSONObject();
json.put("byte", (byte) 1);
json.put("short", (short) 1);
json.put("byte", (byte) 1); // This does NOT actually verify byte as it is converted to int
json.put("short", (short) 1); // This does NOT actually verify short as it is converted to int
json.put("int", 1);
json.put("long", 1L);
json.put("string", "1");
Expand All @@ -589,6 +591,46 @@ public void testInt64() throws Exception {
assertEquals(expectedProto, protoMsg);
}

@Test
public void testInt64Extended() throws Exception {
TestInt64 expectedProto =
TestInt64.newBuilder().setByte(1).setShort(1).setInt(1).setLong(1).setString(1).build();
Map map = new HashMap();
map.put("byte", (byte) 1);
map.put("short", (short) 1);
map.put("int", (int) 1);
map.put("long", (long) 1);
map.put("string", "1");
JSONObject json = new JSONObject(map);
DynamicMessage protoMsg =
JsonToProtoMessage.INSTANCE.convertToProtoMessage(TestInt64.getDescriptor(), json);
assertEquals(expectedProto, protoMsg);
}

@Test
public void testInt64Repeated() throws Exception {
RepeatedInt64 expectedProto =
RepeatedInt64.newBuilder()
.addTestRepeated(1)
.addTestRepeated(1)
.addTestRepeated(1)
.addTestRepeated(1)
.addTestRepeated(1)
.build();
Collection collection = new ArrayList();
collection.add((byte) 1);
collection.add((short) 1);
collection.add((int) 1);
collection.add((long) 1);
collection.add("1");
JSONArray array = new JSONArray(collection);
JSONObject json = new JSONObject();
json.put("test_repeated", array);
DynamicMessage protoMsg =
JsonToProtoMessage.INSTANCE.convertToProtoMessage(RepeatedInt64.getDescriptor(), json);
assertEquals(expectedProto, protoMsg);
}

@Test
public void testInt32() throws Exception {
TestInt32 expectedProto =
Expand Down
Loading