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

Improve Integer conversion in BigQueryIO's Storage Write API method. #24366

Merged
merged 9 commits into from
Dec 13, 2022
Merged

Improve Integer conversion in BigQueryIO's Storage Write API method. #24366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ed74144
Improve Integer conversion in BigQueryIO's Storage Write API method.
Nov 27, 2022
370f79e
Improve Integer conversion in BigQueryIO's Storage Write API method. …
Nov 29, 2022
94c17f4
Improve Integer conversion in BigQueryIO's Storage Write API method. …
Nov 29, 2022
74e9833
Fixed a minor typo.
Nov 29, 2022
d6ffa50
Merge remote-tracking branch 'upstream/master'
Nov 30, 2022
52ffd20
Merged PR with new commits.
Nov 27, 2022
8c65aa9
Update sdks/java/io/google-cloud-platform/src/main/java/org/apache/be…
lukecwik Dec 12, 2022
02eade6
Apply suggestions from code review
lukecwik Dec 12, 2022
4026096
Update sdks/java/io/google-cloud-platform/src/main/java/org/apache/be…
lukecwik Dec 12, 2022
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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Apply spotless
  • Loading branch information
@lukecwik
lukecwik committed Dec 12, 2022
commit 02eade68fa08538b75a6eaae6a67c67491d1d82a
13 changes: 12 additions & 1 deletion ...platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowToStorageApiProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,18 @@ public static class SchemaDoesntMatchException extends SchemaConversionException

public static class SingleValueConversionException extends SchemaConversionException {
SingleValueConversionException(Object sourceValue, SchemaInformation schema, Exception e) {
super("Column: " + getPrettyFieldName(schema) + " (" + schema.getType() + "). "
super(
"Column: "
+ getPrettyFieldName(schema)
+ " ("
+ schema.getType()
+ "). "
+ "Value: "
+ sourceValue
+ " ("
+ sourceValue.getClass().getName()
+ "). Reason: "
+ e);
+ "Value: " + sourceValue + " (" + sourceValue.getClass().getName()
+ "). Reason: " + e);
}
Expand Down
112 changes: 67 additions & 45 deletions ...form/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/TableRowToStorageApiProtoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

@RunWith(JUnit4.class)
@SuppressWarnings({
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
})
/** Unit tests for {@link org.apache.beam.sdk.io.gcp.bigquery.TableRowToStorageApiProto}. */
public class TableRowToStorageApiProtoTest {
Expand Down Expand Up @@ -831,69 +831,91 @@ public void testNullRepeatedDescriptorFromTableSchema() throws Exception {
@Test
public void testIntegerTypeConversion() throws DescriptorValidationException {
String intFieldName = "int_field";
TableSchema tableSchema = new TableSchema()
.setFields(
ImmutableList.<TableFieldSchema>builder()
.add(
new TableFieldSchema()
.setType("INTEGER")
.setName(intFieldName)
.setMode("REQUIRED")
)
.build());
TableSchema tableSchema =
new TableSchema()
.setFields(
ImmutableList.<TableFieldSchema>builder()
.add(
new TableFieldSchema()
.setType("INTEGER")
.setName(intFieldName)
.setMode("REQUIRED"))
.build());
TableRowToStorageApiProto.SchemaInformation schemaInformation =
TableRowToStorageApiProto.SchemaInformation.fromTableSchema(tableSchema
);
TableRowToStorageApiProto.SchemaInformation.fromTableSchema(tableSchema);
SchemaInformation fieldSchema = schemaInformation.getSchemaForField(intFieldName);
Descriptor schemaDescriptor =
TableRowToStorageApiProto.getDescriptorFromTableSchema(tableSchema, true);
FieldDescriptor fieldDescriptor = schemaDescriptor.findFieldByName(intFieldName);

Object[][] validIntValues = new Object[][]{
// Source and expected converted values.
{"123", 123L},
{123L, 123L},
{123, 123L},
{new BigDecimal("123"), 123L},
{new BigInteger("123"), 123L}
};
Object[][] validIntValues =
new Object[][] {
// Source and expected converted values.
{"123", 123L},
{123L, 123L},
{123, 123L},
{new BigDecimal("123"), 123L},
{new BigInteger("123"), 123L}
};
for (Object[] validValue : validIntValues) {
Object sourceValue = validValue[0];
Long expectedConvertedValue = (Long) validValue[1];
try {
Object converted = TableRowToStorageApiProto.singularFieldToProtoValue(fieldSchema,
fieldDescriptor, sourceValue, false);
Object converted =
TableRowToStorageApiProto.singularFieldToProtoValue(
fieldSchema, fieldDescriptor, sourceValue, false);
assertEquals(expectedConvertedValue, converted);
} catch (SchemaConversionException e) {
fail("Failed to convert value " + sourceValue + " of type " + validValue.getClass()
+ " to INTEGER: " + e);
fail(
"Failed to convert value "
+ sourceValue
+ " of type "
+ validValue.getClass()
+ " to INTEGER: "
+ e);
}
}

Object[][] invalidIntValues = new Object[][] {
// Value and expected error message
{"12.123", "Column: "
+ intFieldName
+ " (INT64). Value: 12.123 (java.lang.String). Reason: java.lang.NumberFormatException: For input string: \"12.123\""},
{Long.toString(Long.MAX_VALUE) + '0', "Column: "
+ intFieldName
+ " (INT64). Value: 92233720368547758070 (java.lang.String). Reason: java.lang.NumberFormatException: For input string: \"92233720368547758070\""},
{new BigDecimal("12.123"), "Column: "
+ intFieldName
+ " (INT64). Value: 12.123 (java.math.BigDecimal). Reason: java.lang.ArithmeticException: Rounding necessary"},
{new BigInteger(String.valueOf(Long.MAX_VALUE)).add(new BigInteger("10")), "Column: "
+ intFieldName
+ " (INT64). Value: 9223372036854775817 (java.math.BigInteger). Reason: java.lang.ArithmeticException: BigInteger out of long range"}

};
Object[][] invalidIntValues =
new Object[][] {
// Value and expected error message
{
"12.123",
"Column: "
+ intFieldName
+ " (INT64). Value: 12.123 (java.lang.String). Reason: java.lang.NumberFormatException: For input string: \"12.123\""
},
{
Long.toString(Long.MAX_VALUE) + '0',
"Column: "
+ intFieldName
+ " (INT64). Value: 92233720368547758070 (java.lang.String). Reason: java.lang.NumberFormatException: For input string: \"92233720368547758070\""
},
{
new BigDecimal("12.123"),
"Column: "
+ intFieldName
+ " (INT64). Value: 12.123 (java.math.BigDecimal). Reason: java.lang.ArithmeticException: Rounding necessary"
},
{
new BigInteger(String.valueOf(Long.MAX_VALUE)).add(new BigInteger("10")),
"Column: "
+ intFieldName
+ " (INT64). Value: 9223372036854775817 (java.math.BigInteger). Reason: java.lang.ArithmeticException: BigInteger out of long range"
}
};
for (Object[] invalidValue : invalidIntValues) {
Object sourceValue = invalidValue[0];
String expectedError = (String) invalidValue[1];
try {
TableRowToStorageApiProto.singularFieldToProtoValue(fieldSchema, fieldDescriptor,
sourceValue, false);
fail("Expected to throw an exception converting " + sourceValue + " of type "
+ invalidValue.getClass() + " to INTEGER");
TableRowToStorageApiProto.singularFieldToProtoValue(
fieldSchema, fieldDescriptor, sourceValue, false);
fail(
"Expected to throw an exception converting "
+ sourceValue
+ " of type "
+ invalidValue.getClass()
+ " to INTEGER");
} catch (SchemaConversionException e) {
assertEquals("Exception message", expectedError, e.getMessage());
}
Expand Down