suneet-s commented on a change in pull request #10350:
URL: https://github.com/apache/druid/pull/10350#discussion_r486712620
##########
File path:
sql/src/test/java/org/apache/druid/sql/calcite/expression/ExpressionsTest.java
##########
@@ -1072,6 +1075,221 @@ public void testPad()
);
}
+ @Test
+ public void testContains()
+ {
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseSensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeInputRef("spacey"),
+ testHelper.makeLiteral("there")
+ ),
+ DruidExpression.fromExpression("contains_string(\"spacey\",'there')"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseSensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeInputRef("spacey"),
+ testHelper.makeLiteral("There")
+ ),
+ DruidExpression.fromExpression("contains_string(\"spacey\",'There')"),
+ 0L
+ );
+
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseInsensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeInputRef("spacey"),
+ testHelper.makeLiteral("There")
+ ),
+ DruidExpression.fromExpression("icontains_string(\"spacey\",'There')"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseSensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeCall(
+ SqlStdOperatorTable.CONCAT,
+ testHelper.makeLiteral("what is"),
+ testHelper.makeInputRef("spacey")
+ ),
+ testHelper.makeLiteral("what")
+ ),
+ DruidExpression.fromExpression("contains_string(concat('what
is',\"spacey\"),'what')"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseSensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeCall(
+ SqlStdOperatorTable.CONCAT,
+ testHelper.makeLiteral("what is"),
+ testHelper.makeInputRef("spacey")
+ ),
+ testHelper.makeLiteral("there")
+ ),
+ DruidExpression.fromExpression("contains_string(concat('what
is',\"spacey\"),'there')"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ ContainsOperatorConversion.caseInsensitive().calciteOperator(),
+ ImmutableList.of(
+ testHelper.makeCall(
+ SqlStdOperatorTable.CONCAT,
+ testHelper.makeLiteral("what is"),
+ testHelper.makeInputRef("spacey")
+ ),
+ testHelper.makeLiteral("There")
+ ),
+ DruidExpression.fromExpression("icontains_string(concat('what
is',\"spacey\"),'There')"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ SqlStdOperatorTable.AND,
+ ImmutableList.of(
+ testHelper.makeCall(
+ ContainsOperatorConversion.caseSensitive().calciteOperator(),
+ testHelper.makeInputRef("spacey"),
+ testHelper.makeLiteral("there")
+ ),
+ testHelper.makeCall(
+ SqlStdOperatorTable.EQUALS,
+ testHelper.makeLiteral("yes"),
+ testHelper.makeLiteral("yes")
+ )
+ ),
+ DruidExpression.fromExpression("(contains_string(\"spacey\",'there')
&& ('yes' == 'yes'))"),
+ 1L
+ );
+
+ testHelper.testExpression(
+ SqlStdOperatorTable.AND,
+ ImmutableList.of(
+ testHelper.makeCall(
+ ContainsOperatorConversion.caseInsensitive().calciteOperator(),
+ testHelper.makeInputRef("spacey"),
+ testHelper.makeLiteral("There")
+ ),
+ testHelper.makeCall(
+ SqlStdOperatorTable.EQUALS,
+ testHelper.makeLiteral("yes"),
+ testHelper.makeLiteral("yes")
+ )
+ ),
+ DruidExpression.fromExpression("(icontains_string(\"spacey\",'There')
&& ('yes' == 'yes'))"),
Review comment:
Can you add some tests for how the function deals with nulls and empty
strings - these tend to surface some issues because we need to support 2 modes
- default mode and sql compatible mode, and sometimes the behavior of these
functions may be slightly different than we expect. I remember finding issues
when I changed the behavior of lpad / rpad functions -
https://github.com/apache/druid/pull/10006/files#diff-fd48c48432e4977332aa9806d2d308faR150-R151
##########
File path:
processing/src/main/java/org/apache/druid/query/expression/ContainsExprMacro.java
##########
@@ -0,0 +1,66 @@
+/*
+ * 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.druid.query.expression;
+
+import org.apache.druid.java.util.common.IAE;
+import org.apache.druid.math.expr.Expr;
+import org.apache.druid.math.expr.ExprMacroTable;
+
+import java.util.List;
+
+/**
+ * This class implements a function that checks if one string contains another
string. It is required that second
+ * string be a literal. This expression is case-sensitive.
+ * signature:
+ * long contains_string(string, string)
+ * <p>
+ * Examples:
+ * - {@code contains_string("foobar", "bar") - 1 }
+ * - {@code contains_string("foobar", "car") - 0 }
+ * - {@code contains_string("foobar", "Bar") - 0 }
+ * <p>
+ * See {@link CaseInsensitiveContainsExprMacro} for the case-insensitive
version.
+ */
Review comment:
Thanks for the awesome javadocs 🤘
##########
File path:
processing/src/main/java/org/apache/druid/query/expression/ContainsExpr.java
##########
@@ -0,0 +1,91 @@
+/*
+ * 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.druid.query.expression;
+
+import org.apache.druid.common.config.NullHandling;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.math.expr.Expr;
+import org.apache.druid.math.expr.ExprEval;
+import org.apache.druid.math.expr.ExprMacroTable;
+import org.apache.druid.math.expr.ExprType;
+
+import javax.annotation.Nonnull;
+import java.util.function.Function;
+
+/**
+ * {@link Expr} class returned by {@link ContainsExprMacro} and {@link
CaseInsensitiveContainsExprMacro} for
+ * evaluating the expression.
+ */
+class ContainsExpr extends ExprMacroTable.BaseScalarUnivariateMacroFunctionExpr
+{
+ private final Function<String, Boolean> searchFunction;
+ private final Expr searchStrExpr;
Review comment:
Since ContainsExpr always expects this to be a literal value, should
this class just accept a String instead?
##########
File path:
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ContainsOperatorConversion.java
##########
@@ -0,0 +1,161 @@
+/*
+ * 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.druid.sql.calcite.expression.builtin;
+
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.expression.CaseInsensitiveContainsExprMacro;
+import org.apache.druid.query.expression.ContainsExprMacro;
+import org.apache.druid.query.filter.DimFilter;
+import org.apache.druid.query.filter.SearchQueryDimFilter;
+import org.apache.druid.query.search.ContainsSearchQuerySpec;
+import org.apache.druid.query.search.SearchQuerySpec;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.RowSignature;
+import org.apache.druid.sql.calcite.expression.DruidExpression;
+import org.apache.druid.sql.calcite.expression.Expressions;
+import org.apache.druid.sql.calcite.expression.OperatorConversions;
+import org.apache.druid.sql.calcite.expression.SqlOperatorConversion;
+import org.apache.druid.sql.calcite.planner.PlannerContext;
+import org.apache.druid.sql.calcite.rel.VirtualColumnRegistry;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+/**
+ * Register {@code contains_string} and {@code icontains_string} functions
with calcite that internally
+ * translate these functions into {@link SearchQueryDimFilter} with {@link
ContainsSearchQuerySpec} as
+ * search query spec.
+ */
+public class ContainsOperatorConversion implements SqlOperatorConversion
+{
+ private final SqlOperator operator;
+ private final boolean caseSensitive;
+
+ public ContainsOperatorConversion(
Review comment:
super nit
```suggestion
private ContainsOperatorConversion(
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
