Skip to content

Commit 8852bc7

Browse files
committed
remove duplicated regex match operator alias
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent bde4fc3 commit 8852bc7

3 files changed

Lines changed: 1 addition & 7 deletions

File tree

core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ public RelNode visitRegex(Regex node, CalcitePlanContext context) {
181181

182182
RexNode regexCondition =
183183
context.rexBuilder.makeCall(
184-
org.opensearch.sql.expression.function.PPLBuiltinOperators.REGEX_MATCH,
185-
fieldRex,
186-
patternRex);
184+
org.apache.calcite.sql.fun.SqlLibraryOperators.REGEXP_CONTAINS, fieldRex, patternRex);
187185

188186
if (node.isNegated()) {
189187
regexCondition = context.rexBuilder.makeCall(SqlStdOperatorTable.NOT, regexCondition);

core/src/main/java/org/opensearch/sql/expression/function/PPLBuiltinOperators.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.calcite.linq4j.tree.Expression;
2323
import org.apache.calcite.rex.RexCall;
2424
import org.apache.calcite.sql.SqlOperator;
25-
import org.apache.calcite.sql.fun.SqlLibraryOperators;
2625
import org.apache.calcite.sql.type.ReturnTypes;
2726
import org.apache.calcite.sql.type.SqlTypeTransforms;
2827
import org.apache.calcite.sql.util.ReflectiveSqlOperatorTable;
@@ -381,7 +380,6 @@ public class PPLBuiltinOperators extends ReflectiveSqlOperatorTable {
381380
RELEVANCE_QUERY_FUNCTION_INSTANCE.toUDF("multi_match", false);
382381
public static final SqlOperator NUMBER_TO_STRING =
383382
new NumberToStringFunction().toUDF("NUMBER_TO_STRING");
384-
public static final SqlOperator REGEX_MATCH = SqlLibraryOperators.REGEXP_CONTAINS;
385383

386384
/**
387385
* Returns the PPL specific operator table, creating it if necessary.

core/src/main/java/org/opensearch/sql/expression/function/PPLFuncImpTable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
import static org.opensearch.sql.expression.function.BuiltinFunctionName.RAND;
161161
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REDUCE;
162162
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REGEXP;
163-
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REGEX_MATCH;
164163
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REPLACE;
165164
import static org.opensearch.sql.expression.function.BuiltinFunctionName.REVERSE;
166165
import static org.opensearch.sql.expression.function.BuiltinFunctionName.RIGHT;
@@ -712,7 +711,6 @@ void populate() {
712711
registerOperator(SIMPLE_QUERY_STRING, PPLBuiltinOperators.SIMPLE_QUERY_STRING);
713712
registerOperator(QUERY_STRING, PPLBuiltinOperators.QUERY_STRING);
714713
registerOperator(MULTI_MATCH, PPLBuiltinOperators.MULTI_MATCH);
715-
registerOperator(REGEX_MATCH, PPLBuiltinOperators.REGEX_MATCH);
716714

717715
// Register PPL Datetime UDF operator
718716
registerOperator(TIMESTAMP, PPLBuiltinOperators.TIMESTAMP);

0 commit comments

Comments
 (0)