[
https://issues.apache.org/jira/browse/BEAM-5210?focusedWorklogId=138650&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-138650
]
ASF GitHub Bot logged work on BEAM-5210:
----------------------------------------
Author: ASF GitHub Bot
Created on: 28/Aug/18 04:29
Start Date: 28/Aug/18 04:29
Worklog Time Spent: 10m
Work Description: XuMingmin closed pull request #6270: [BEAM-5210]
Support VARBINARY in BeamSqlPrimitive
URL: https://github.com/apache/beam/pull/6270
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/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java
index b6942913c41..3e442fe7c11 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitive.java
@@ -24,6 +24,7 @@
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionEnvironment;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.values.Row;
+import org.apache.calcite.avatica.util.ByteString;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.util.NlsString;
import org.joda.time.ReadableInstant;
@@ -131,6 +132,8 @@ public boolean accept() {
case CHAR:
case VARCHAR:
return value instanceof String || value instanceof NlsString;
+ case VARBINARY:
+ return value instanceof byte[] || value instanceof ByteString;
case TIME:
case TIMESTAMP:
case DATE:
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java
index dcf1fbf0fdb..040fc262db0 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlPrimitiveTest.java
@@ -19,6 +19,7 @@
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionEnvironments;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutorTestBase;
+import org.apache.calcite.avatica.util.ByteString;
import org.apache.calcite.sql.type.SqlTypeName;
import org.junit.Assert;
import org.junit.Test;
@@ -34,6 +35,24 @@ public void testPrimitiveInt() {
expInt.evaluate(row, null,
BeamSqlExpressionEnvironments.empty()).getValue());
}
+ @Test
+ public void testPrimitiveBytes1() {
+ BeamSqlPrimitive<byte[]> expBytes =
+ BeamSqlPrimitive.of(SqlTypeName.VARBINARY, new byte[] {1, 2, 3});
+ Assert.assertEquals(
+ expBytes.getValue(),
+ expBytes.evaluate(row, null,
BeamSqlExpressionEnvironments.empty()).getValue());
+ }
+
+ @Test
+ public void testPrimitiveBytes2() {
+ BeamSqlPrimitive<ByteString> expBytes =
+ BeamSqlPrimitive.of(SqlTypeName.VARBINARY, ByteString.of("123ABC",
16));
+ Assert.assertEquals(
+ expBytes.getValue(),
+ expBytes.evaluate(row, null,
BeamSqlExpressionEnvironments.empty()).getValue());
+ }
+
@Test(expected = IllegalArgumentException.class)
public void testPrimitiveTypeUnMatch1() {
BeamSqlPrimitive expInt = BeamSqlPrimitive.of(SqlTypeName.INTEGER, 100L);
@@ -65,4 +84,12 @@ public void testPrimitiveTypeUnMatch4() {
expInt.getValue(),
expInt.evaluate(row, null,
BeamSqlExpressionEnvironments.empty()).getValue());
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testPrimitiveTypeUnMatch5() {
+ BeamSqlPrimitive expBytes = BeamSqlPrimitive.of(SqlTypeName.VARBINARY,
100L);
+ Assert.assertEquals(
+ expBytes.getValue(),
+ expBytes.evaluate(row, null,
BeamSqlExpressionEnvironments.empty()).getValue());
+ }
}
----------------------------------------------------------------
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:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 138650)
Time Spent: 3h 20m (was: 3h 10m)
> VARBINARY is not supported in BeamSqlPrimitive
> ----------------------------------------------
>
> Key: BEAM-5210
> URL: https://issues.apache.org/jira/browse/BEAM-5210
> Project: Beam
> Issue Type: Bug
> Components: dsl-sql
> Reporter: Xu Mingmin
> Assignee: Xu Mingmin
> Priority: Major
> Time Spent: 3h 20m
> Remaining Estimate: 0h
>
> See error as below
> {code}
> Caused by: java.lang.UnsupportedOperationException: Unsupported Beam SQL type
> in expression: VARBINARY
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive.accept(BeamSqlPrimitive.java:158)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive.<init>(BeamSqlPrimitive.java:44)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive.of(BeamSqlPrimitive.java:56)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlInputRefExpression.evaluate(BeamSqlInputRefExpression.java:42)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlExpressionEnvironments$ListEnvironment.getLocalRef(BeamSqlExpressionEnvironments.java:92)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlLocalRefExpression.evaluate(BeamSqlLocalRefExpression.java:44)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutor.lambda$execute$0(BeamSqlFnExecutor.java:557)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at
> java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1374)
> at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
> at
> java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
> at
> java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
> at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
> at
> java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
> at
> org.apache.beam.sdk.extensions.sql.impl.interpreter.BeamSqlFnExecutor.execute(BeamSqlFnExecutor.java:558)
> at
> org.apache.beam.sdk.extensions.sql.impl.rel.BeamCalcRel$CalcFn.processElement(BeamCalcRel.java:116)
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
