[
https://issues.apache.org/jira/browse/BEAM-4385?focusedWorklogId=109672&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109672
]
ASF GitHub Bot logged work on BEAM-4385:
----------------------------------------
Author: ASF GitHub Bot
Created on: 07/Jun/18 12:28
Start Date: 07/Jun/18 12:28
Worklog Time Spent: 10m
Work Description: kennknowles closed pull request #5528: [BEAM-4385][SQL]
Add LIKE operator to Beam SQL
URL: https://github.com/apache/beam/pull/5528
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/BeamSqlFnExecutor.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java
index a0a057c55be..40d23793852 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutor.java
@@ -50,6 +50,7 @@
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlIsNullExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression;
+import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLikeExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlNotEqualsExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentDateExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimeExpression;
@@ -254,6 +255,9 @@ static BeamSqlExpression buildExpression(RexNode rexNode) {
case "<=":
ret = new BeamSqlLessThanOrEqualsExpression(subExps);
break;
+ case "LIKE":
+ ret = new BeamSqlLikeExpression(subExps);
+ break;
// arithmetic operators
case "+":
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLikeExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLikeExpression.java
new file mode 100644
index 00000000000..b9b95c557ae
--- /dev/null
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlLikeExpression.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison;
+
+import java.util.List;
+import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression;
+import org.apache.calcite.runtime.SqlFunctions;
+
+/** {@code BeamSqlExpression} for 'LIKE' operation. */
+public class BeamSqlLikeExpression extends BeamSqlCompareExpression {
+
+ public BeamSqlLikeExpression(List<BeamSqlExpression> operands) {
+ super(operands);
+ }
+
+ @Override
+ public Boolean compare(CharSequence leftValue, CharSequence rightValue) {
+ return SqlFunctions.like(leftValue.toString(), rightValue.toString());
+ }
+
+ @Override
+ public Boolean compare(Boolean leftValue, Boolean rightValue) {
+ throw new IllegalArgumentException("LIKE is not supported for Boolean.");
+ }
+
+ @Override
+ public Boolean compare(Number leftValue, Number rightValue) {
+ throw new IllegalArgumentException("LIKE is not supported for Number.");
+ }
+}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java
index 8a0a71f92c3..1ae19b1fdf6 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTest.java
@@ -136,11 +136,12 @@ public void testBeamProjectRel() {
BeamSqlFnExecutor executor = new BeamSqlFnExecutor(relNode);
executor.prepare();
- Assert.assertEquals(4, executor.exps.size());
+ Assert.assertEquals(5, executor.exps.size());
assertTrue(executor.exps.get(0) instanceof BeamSqlInputRefExpression);
assertTrue(executor.exps.get(1) instanceof BeamSqlInputRefExpression);
assertTrue(executor.exps.get(2) instanceof BeamSqlInputRefExpression);
assertTrue(executor.exps.get(3) instanceof BeamSqlInputRefExpression);
+ assertTrue(executor.exps.get(4) instanceof BeamSqlInputRefExpression);
}
@Test
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java
index 1c038995747..3ff562acbcf 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/BeamSqlFnExecutorTestBase.java
@@ -62,11 +62,12 @@ public static void prepare() {
.add("site_id", SqlTypeName.INTEGER)
.add("price", SqlTypeName.DOUBLE)
.add("order_time", SqlTypeName.BIGINT)
+ .add("order_info", SqlTypeName.VARCHAR)
.build();
row =
Row.withSchema(CalciteUtils.toBeamSchema(relDataType))
- .addValues(1234567L, 0, 8.9, 1234567L)
+ .addValues(1234567L, 0, 8.9, 1234567L, "This is an order.")
.build();
SchemaPlus schema = Frameworks.createRootSchema(true);
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java
index 9bf55035802..0ec846340d6 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlCompareExpressionTest.java
@@ -26,6 +26,7 @@
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlGreaterThanOrEqualsExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLessThanOrEqualsExpression;
+import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlLikeExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.comparison.BeamSqlNotEqualsExpression;
import org.apache.calcite.sql.type.SqlTypeName;
import org.junit.Assert;
@@ -135,4 +136,21 @@ public void testNotEqual() {
BeamSqlPrimitive.of(SqlTypeName.BIGINT, 0L)));
Assert.assertEquals(true, exp2.evaluate(row, null,
ImmutableMap.of()).getValue());
}
+
+ @Test
+ public void testLike() {
+ BeamSqlLikeExpression exp1 =
+ new BeamSqlLikeExpression(
+ Arrays.asList(
+ new BeamSqlInputRefExpression(SqlTypeName.VARCHAR, 4),
+ BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "This is an
order_")));
+ Assert.assertEquals(true, exp1.evaluate(row, null,
ImmutableMap.of()).getValue());
+
+ BeamSqlLikeExpression exp2 =
+ new BeamSqlLikeExpression(
+ Arrays.asList(
+ new BeamSqlInputRefExpression(SqlTypeName.VARCHAR, 4),
+ BeamSqlPrimitive.of(SqlTypeName.VARCHAR, "This is not%")));
+ Assert.assertEquals(false, exp2.evaluate(row, null,
ImmutableMap.of()).getValue());
+ }
}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java
index 62db54a1d8f..92597f8505f 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/BeamSqlInputRefExpressionTest.java
@@ -43,7 +43,7 @@ public void testRefInRange() {
@Test(expected = IndexOutOfBoundsException.class)
public void testRefOutOfRange() {
- BeamSqlInputRefExpression ref = new
BeamSqlInputRefExpression(SqlTypeName.BIGINT, 4);
+ BeamSqlInputRefExpression ref = new
BeamSqlInputRefExpression(SqlTypeName.BIGINT, 5);
ref.evaluate(row, null, ImmutableMap.of()).getValue();
}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java
index 68948b7e1bc..f4d0aaa12f3 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlComparisonOperatorsIntegrationTest.java
@@ -248,6 +248,49 @@ public void testIsNullAndIsNotNull() throws Exception {
checker.buildRunAndCheck();
}
+ @Test
+ public void testLike() throws Exception {
+ ExpressionChecker checker =
+ new ExpressionChecker()
+ .addExpr("s_string_1 LIKE 'string_true_test'", true)
+ .addExpr("s_string_1 LIKE 'string_false_test'", false)
+ .addExpr("s_string_2 LIKE 'string_false_test'", true)
+ .addExpr("s_string_2 LIKE 'string_true_test'", false)
+ .addExpr("s_string_1 LIKE 'string_true_test%'", true)
+ .addExpr("s_string_1 LIKE 'string_false_test%'", false)
+ .addExpr("s_string_1 LIKE 'string_true%'", true)
+ .addExpr("s_string_1 LIKE 'string_false%'", false)
+ .addExpr("s_string_1 LIKE 'string%test'", true)
+ .addExpr("s_string_1 LIKE '%test'", true)
+ .addExpr("s_string_1 LIKE '%string_true_test'", true)
+ .addExpr("s_string_1 LIKE '%string_false_test'", false)
+ .addExpr("s_string_1 LIKE '%false_test'", false)
+ .addExpr("s_string_2 LIKE '%false_test'", true)
+ .addExpr("s_string_1 LIKE 'string_tr_e_test'", true)
+ .addExpr("s_string_1 LIKE 'string______test'", true)
+ .addExpr("s_string_2 LIKE 'string______test'", false)
+ .addExpr("s_string_2 LIKE 'string_______test'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te__'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te___'", false)
+ .addExpr("s_string_2 LIKE 'string_false_te_'", false)
+ .addExpr("s_string_1 LIKE 'string_true_te__'", true)
+ .addExpr("s_string_1 LIKE '_ring_true_te__'", false)
+ .addExpr("s_string_2 LIKE '__ring_false_te__'", true)
+ .addExpr("s_string_1 LIKE '_%ring_true_te__'", true)
+ .addExpr("s_string_1 LIKE '_%tring_true_te__'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te%__'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te__%'", true)
+ .addExpr("s_string_2 LIKE 'string_false_t%__'", true)
+ .addExpr("s_string_2 LIKE 'string_false_t__%'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te_%'", true)
+ .addExpr("s_string_2 LIKE 'string_false_te%_'", true)
+ .addExpr("s_string_1 LIKE 'string_%test'", true)
+ .addExpr("s_string_1 LIKE 'string%_test'", true)
+ .addExpr("s_string_1 LIKE 'string_%_test'", true);
+
+ checker.buildRunAndCheck();
+ }
+
@Override
protected PCollection<Row> getTestPCollection() {
Schema type =
@@ -278,6 +321,8 @@ public void testIsNullAndIsNotNull() throws Exception {
.addStringField("c_varchar_2")
.addBooleanField("c_boolean_false")
.addBooleanField("c_boolean_true")
+ .addStringField("s_string_1")
+ .addStringField("s_string_2")
.build();
try {
@@ -308,7 +353,9 @@ public void testIsNullAndIsNotNull() throws Exception {
"b",
"c",
false,
- true)
+ true,
+ "string_true_test",
+ "string_false_test")
.buildIOReader(pipeline)
.setCoder(type.getRowCoder());
} catch (Exception e) {
----------------------------------------------------------------
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: 109672)
Time Spent: 1h 40m (was: 1.5h)
> Support LIKE operator
> ---------------------
>
> Key: BEAM-4385
> URL: https://issues.apache.org/jira/browse/BEAM-4385
> Project: Beam
> Issue Type: New Feature
> Components: dsl-sql
> Reporter: Kenneth Knowles
> Assignee: Rui Wang
> Priority: Major
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> Currently the LIKE operator is not supported. It is pretty important.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
