[
https://issues.apache.org/jira/browse/BEAM-4713?focusedWorklogId=118574&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-118574
]
ASF GitHub Bot logged work on BEAM-4713:
----------------------------------------
Author: ASF GitHub Bot
Created on: 03/Jul/18 04:27
Start Date: 03/Jul/18 04:27
Worklog Time Spent: 10m
Work Description: kennknowles closed pull request #5867: [BEAM-4713]
DECIMAL support in RowJsonDeserializer
URL: https://github.com/apache/beam/pull/5867
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonDeserializer.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonDeserializer.java
index dfe5a8a8708..33c6b6ec5c6 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonDeserializer.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonDeserializer.java
@@ -20,6 +20,7 @@
import static java.util.stream.Collectors.toList;
import static org.apache.beam.sdk.schemas.Schema.TypeName.BOOLEAN;
import static org.apache.beam.sdk.schemas.Schema.TypeName.BYTE;
+import static org.apache.beam.sdk.schemas.Schema.TypeName.DECIMAL;
import static org.apache.beam.sdk.schemas.Schema.TypeName.DOUBLE;
import static org.apache.beam.sdk.schemas.Schema.TypeName.FLOAT;
import static org.apache.beam.sdk.schemas.Schema.TypeName.INT16;
@@ -28,6 +29,7 @@
import static org.apache.beam.sdk.schemas.Schema.TypeName.STRING;
import static
org.apache.beam.sdk.util.RowJsonValueExtractors.booleanValueExtractor;
import static
org.apache.beam.sdk.util.RowJsonValueExtractors.byteValueExtractor;
+import static
org.apache.beam.sdk.util.RowJsonValueExtractors.decimalValueExtractor;
import static
org.apache.beam.sdk.util.RowJsonValueExtractors.doubleValueExtractor;
import static
org.apache.beam.sdk.util.RowJsonValueExtractors.floatValueExtractor;
import static
org.apache.beam.sdk.util.RowJsonValueExtractors.intValueExtractor;
@@ -83,6 +85,7 @@
.put(DOUBLE, doubleValueExtractor())
.put(BOOLEAN, booleanValueExtractor())
.put(STRING, stringValueExtractor())
+ .put(DECIMAL, decimalValueExtractor())
.build();
private Schema schema;
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValidation.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValidation.java
index 063ccae431e..064bb491178 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValidation.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValidation.java
@@ -19,6 +19,7 @@
import static org.apache.beam.sdk.schemas.Schema.TypeName.BOOLEAN;
import static org.apache.beam.sdk.schemas.Schema.TypeName.BYTE;
+import static org.apache.beam.sdk.schemas.Schema.TypeName.DECIMAL;
import static org.apache.beam.sdk.schemas.Schema.TypeName.DOUBLE;
import static org.apache.beam.sdk.schemas.Schema.TypeName.FLOAT;
import static org.apache.beam.sdk.schemas.Schema.TypeName.INT16;
@@ -37,7 +38,7 @@
class RowJsonValidation {
private static final ImmutableSet<Schema.TypeName> SUPPORTED_TYPES =
- ImmutableSet.of(BYTE, INT16, INT32, INT64, FLOAT, DOUBLE, BOOLEAN,
STRING);
+ ImmutableSet.of(BYTE, INT16, INT32, INT64, FLOAT, DOUBLE, BOOLEAN,
STRING, DECIMAL);
static void verifyFieldTypeSupported(Schema.Field field) {
Schema.FieldType fieldType = field.getType();
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValueExtractors.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValueExtractors.java
index 2b52efc9318..4db0823ed17 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValueExtractors.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJsonValueExtractors.java
@@ -165,6 +165,18 @@
.build();
}
+ /**
+ * Extracts BigDecimal from the JsonNode if it is within bounds.
+ *
+ * <p>Throws {@link UnsupportedRowJsonException} if value is out of bounds.
+ */
+ static ValueExtractor<BigDecimal> decimalValueExtractor() {
+ return ValidatingValueExtractor.<BigDecimal>builder()
+ .setExtractor(JsonNode::decimalValue)
+ .setValidator(jsonNode -> jsonNode.isNumber())
+ .build();
+ }
+
@AutoValue
public abstract static class ValidatingValueExtractor<W> implements
ValueExtractor<W> {
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/RowJsonDeserializerTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/RowJsonDeserializerTest.java
index f18787a1f7f..2bbabc397c0 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/RowJsonDeserializerTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/RowJsonDeserializerTest.java
@@ -24,6 +24,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.math.BigDecimal;
import java.util.Arrays;
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.schemas.Schema.FieldType;
@@ -66,6 +67,7 @@ public void testParsesFlatRow() throws Exception {
.addDoubleField("f_double")
.addBooleanField("f_boolean")
.addStringField("f_string")
+ .addDecimalField("f_decimal")
.build();
String rowString =
@@ -77,7 +79,8 @@ public void testParsesFlatRow() throws Exception {
+ "\"f_float\" : 1.02E5,\n"
+ "\"f_double\" : 62.2,\n"
+ "\"f_boolean\" : true,\n"
- + "\"f_string\" : \"hello\"\n"
+ + "\"f_string\" : \"hello\",\n"
+ + "\"f_decimal\" : 123.12\n"
+ "}";
RowJsonDeserializer deserializer = RowJsonDeserializer.forSchema(schema);
@@ -86,7 +89,16 @@ public void testParsesFlatRow() throws Exception {
Row expectedRow =
Row.withSchema(schema)
- .addValues((byte) 12, (short) 22, 32, (long) 42, 1.02E5f, 62.2d,
true, "hello")
+ .addValues(
+ (byte) 12,
+ (short) 22,
+ 32,
+ (long) 42,
+ 1.02E5f,
+ 62.2d,
+ true,
+ "hello",
+ new BigDecimal("123.12"))
.build();
assertEquals(expectedRow, parsedRow);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 118574)
Time Spent: 1h (was: 50m)
> DECIMAL support in RowJsonDeserializer
> --------------------------------------
>
> Key: BEAM-4713
> URL: https://issues.apache.org/jira/browse/BEAM-4713
> Project: Beam
> Issue Type: New Feature
> Components: dsl-sql
> Reporter: Kenneth Knowles
> Assignee: Rui Wang
> Priority: Major
> Time Spent: 1h
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
