[
https://issues.apache.org/jira/browse/BEAM-5113?focusedWorklogId=132825&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-132825
]
ASF GitHub Bot logged work on BEAM-5113:
----------------------------------------
Author: ASF GitHub Bot
Created on: 09/Aug/18 04:40
Start Date: 09/Aug/18 04:40
Worklog Time Spent: 10m
Work Description: akedin closed pull request #6186: [BEAM-5113][SQL] Add
NOT LIKE based on LIKE expression
URL: https://github.com/apache/beam/pull/6186
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 228a0df07aa..271798a67f1 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
@@ -56,6 +56,7 @@
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.comparison.BeamSqlNotLikeExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentDateExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimeExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.date.BeamSqlCurrentTimestampExpression;
@@ -278,7 +279,9 @@ private static BeamSqlExpression
getBeamSqlExpression(RexNode rexNode) {
case "LIKE":
ret = new BeamSqlLikeExpression(subExps);
break;
-
+ case "NOT LIKE":
+ ret = new BeamSqlNotLikeExpression(subExps);
+ break;
// arithmetic operators
case "+":
if (SqlTypeName.NUMERIC_TYPES.contains(node.type.getSqlTypeName())) {
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotLikeExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotLikeExpression.java
new file mode 100644
index 00000000000..4a8774ef616
--- /dev/null
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/comparison/BeamSqlNotLikeExpression.java
@@ -0,0 +1,52 @@
+/*
+ * 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.joda.time.DateTime;
+
+/** {@code BeamSqlNotLikeExpression} for {@code <>} operation. */
+public class BeamSqlNotLikeExpression extends BeamSqlCompareExpression {
+ private BeamSqlLikeExpression likeExpression;
+
+ public BeamSqlNotLikeExpression(List<BeamSqlExpression> operands) {
+ super(operands);
+ likeExpression = new BeamSqlLikeExpression(operands);
+ }
+
+ @Override
+ public Boolean compare(CharSequence leftValue, CharSequence rightValue) {
+ return !likeExpression.compare(leftValue, rightValue);
+ }
+
+ @Override
+ public Boolean compare(Boolean leftValue, Boolean rightValue) {
+ return !likeExpression.compare(leftValue, rightValue);
+ }
+
+ @Override
+ public Boolean compare(Number leftValue, Number rightValue) {
+ return !likeExpression.compare(leftValue, rightValue);
+ }
+
+ @Override
+ public Boolean compare(DateTime leftValue, DateTime rightValue) {
+ return !likeExpression.compare(leftValue, rightValue);
+ }
+}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
index a2b558be3c5..6ac19cf2c35 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
@@ -358,6 +358,86 @@ public void testArithmeticOperator() {
checker.buildRunAndCheck();
}
+ @Test
+ @SqlOperatorTest(name = "LIKE", kind = "LIKE")
+ @SqlOperatorTest(name = "NOT LIKE", kind = "LIKE")
+ public void testLikeAndNotLike() {
+ ExpressionChecker checker =
+ new ExpressionChecker()
+ .addExpr("'string_true_test' LIKE 'string_true_test'", true)
+ .addExpr("'string_true_test' LIKE 'string_false_test'", false)
+ .addExpr("'string_false_test' LIKE 'string_false_test'", true)
+ .addExpr("'string_false_test' LIKE 'string_true_test'", false)
+ .addExpr("'string_true_test' LIKE 'string_true_test%'", true)
+ .addExpr("'string_true_test' LIKE 'string_false_test%'", false)
+ .addExpr("'string_true_test' LIKE 'string_true%'", true)
+ .addExpr("'string_true_test' LIKE 'string_false%'", false)
+ .addExpr("'string_true_test' LIKE 'string%test'", true)
+ .addExpr("'string_true_test' LIKE '%test'", true)
+ .addExpr("'string_true_test' LIKE '%string_true_test'", true)
+ .addExpr("'string_true_test' LIKE '%string_false_test'", false)
+ .addExpr("'string_true_test' LIKE '%false_test'", false)
+ .addExpr("'string_false_test' LIKE '%false_test'", true)
+ .addExpr("'string_true_test' LIKE 'string_tr_e_test'", true)
+ .addExpr("'string_true_test' LIKE 'string______test'", true)
+ .addExpr("'string_false_test' LIKE 'string______test'", false)
+ .addExpr("'string_false_test' LIKE 'string_______test'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te__'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te___'", false)
+ .addExpr("'string_false_test' LIKE 'string_false_te_'", false)
+ .addExpr("'string_true_test' LIKE 'string_true_te__'", true)
+ .addExpr("'string_true_test' LIKE '_ring_true_te__'", false)
+ .addExpr("'string_false_test' LIKE '__ring_false_te__'", true)
+ .addExpr("'string_true_test' LIKE '_%ring_true_te__'", true)
+ .addExpr("'string_true_test' LIKE '_%tring_true_te__'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te%__'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te__%'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_t%__'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_t__%'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te_%'", true)
+ .addExpr("'string_false_test' LIKE 'string_false_te%_'", true)
+ .addExpr("'string_true_test' LIKE 'string_%test'", true)
+ .addExpr("'string_true_test' LIKE 'string%_test'", true)
+ .addExpr("'string_true_test' LIKE 'string_%_test'", true)
+ .addExpr("'string_true_test' NOT LIKE 'string_true_test'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_false_test'", true)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_test'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_true_test'", true)
+ .addExpr("'string_true_test' NOT LIKE 'string_true_test%'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_false_test%'", true)
+ .addExpr("'string_true_test' NOT LIKE 'string_true%'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_false%'", true)
+ .addExpr("'string_true_test' NOT LIKE 'string%test'", false)
+ .addExpr("'string_true_test' NOT LIKE '%test'", false)
+ .addExpr("'string_true_test' NOT LIKE '%string_true_test'", false)
+ .addExpr("'string_true_test' NOT LIKE '%string_false_test'", true)
+ .addExpr("'string_true_test' NOT LIKE '%false_test'", true)
+ .addExpr("'string_false_test' NOT LIKE '%false_test'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_tr_e_test'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string______test'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string______test'", true)
+ .addExpr("'string_false_test' NOT LIKE 'string_______test'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te__'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te___'", true)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te_'", true)
+ .addExpr("'string_true_test' NOT LIKE 'string_true_te__'", false)
+ .addExpr("'string_true_test' NOT LIKE '_ring_true_te__'", true)
+ .addExpr("'string_false_test' NOT LIKE '__ring_false_te__'", false)
+ .addExpr("'string_true_test' NOT LIKE '_%ring_true_te__'", false)
+ .addExpr("'string_true_test' NOT LIKE '_%tring_true_te__'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te%__'",
false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te__%'",
false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_t%__'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_t__%'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te_%'", false)
+ .addExpr("'string_false_test' NOT LIKE 'string_false_te%_'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_%test'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string%_test'", false)
+ .addExpr("'string_true_test' NOT LIKE 'string_%_test'", false);
+
+ checker.buildRunAndCheck();
+ }
+
@Test
@SqlOperatorTest(name = "<", kind = "LESS_THAN")
@SqlOperatorTest(name = ">", kind = "GREATER_THAN")
@@ -365,7 +445,6 @@ public void testArithmeticOperator() {
@SqlOperatorTest(name = "<>", kind = "NOT_EQUALS")
@SqlOperatorTest(name = "=", kind = "EQUALS")
@SqlOperatorTest(name = ">=", kind = "GREATER_THAN_OR_EQUAL")
- @SqlOperatorTest(name = "LIKE", kind = "LIKE")
@SqlOperatorTest(name = "IS NOT NULL", kind = "IS_NOT_NULL")
@SqlOperatorTest(name = "IS NULL", kind = "IS_NULL")
@SqlOperatorTest(name = "IS TRUE", kind = "IS_TRUE")
@@ -434,41 +513,6 @@ public void testComparisonOperatorFunction() {
.addExpr("false >= true", false)
.addExpr("true >= false", true)
.addExpr("true >= true", true)
- .addExpr("'string_true_test' LIKE 'string_true_test'", true)
- .addExpr("'string_true_test' LIKE 'string_false_test'", false)
- .addExpr("'string_false_test' LIKE 'string_false_test'", true)
- .addExpr("'string_false_test' LIKE 'string_true_test'", false)
- .addExpr("'string_true_test' LIKE 'string_true_test%'", true)
- .addExpr("'string_true_test' LIKE 'string_false_test%'", false)
- .addExpr("'string_true_test' LIKE 'string_true%'", true)
- .addExpr("'string_true_test' LIKE 'string_false%'", false)
- .addExpr("'string_true_test' LIKE 'string%test'", true)
- .addExpr("'string_true_test' LIKE '%test'", true)
- .addExpr("'string_true_test' LIKE '%string_true_test'", true)
- .addExpr("'string_true_test' LIKE '%string_false_test'", false)
- .addExpr("'string_true_test' LIKE '%false_test'", false)
- .addExpr("'string_false_test' LIKE '%false_test'", true)
- .addExpr("'string_true_test' LIKE 'string_tr_e_test'", true)
- .addExpr("'string_true_test' LIKE 'string______test'", true)
- .addExpr("'string_false_test' LIKE 'string______test'", false)
- .addExpr("'string_false_test' LIKE 'string_______test'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te__'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te___'", false)
- .addExpr("'string_false_test' LIKE 'string_false_te_'", false)
- .addExpr("'string_true_test' LIKE 'string_true_te__'", true)
- .addExpr("'string_true_test' LIKE '_ring_true_te__'", false)
- .addExpr("'string_false_test' LIKE '__ring_false_te__'", true)
- .addExpr("'string_true_test' LIKE '_%ring_true_te__'", true)
- .addExpr("'string_true_test' LIKE '_%tring_true_te__'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te%__'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te__%'", true)
- .addExpr("'string_false_test' LIKE 'string_false_t%__'", true)
- .addExpr("'string_false_test' LIKE 'string_false_t__%'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te_%'", true)
- .addExpr("'string_false_test' LIKE 'string_false_te%_'", true)
- .addExpr("'string_true_test' LIKE 'string_%test'", true)
- .addExpr("'string_true_test' LIKE 'string%_test'", true)
- .addExpr("'string_true_test' LIKE 'string_%_test'", true)
.addExpr("1 IS NOT NULL", true)
.addExpr("true IS NOT NULL", true)
.addExpr("1.0 IS NOT NULL", true)
----------------------------------------------------------------
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: 132825)
Time Spent: 50m (was: 40m)
> Test NOT LIKE
> -------------
>
> Key: BEAM-5113
> URL: https://issues.apache.org/jira/browse/BEAM-5113
> Project: Beam
> Issue Type: Sub-task
> Components: dsl-sql
> Reporter: Rui Wang
> Assignee: Rui Wang
> Priority: Major
> Time Spent: 50m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
