mihaibudiu commented on code in PR #3801:
URL: https://github.com/apache/calcite/pull/3801#discussion_r1685010516
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -630,6 +630,11 @@ public int regexpInstr(String value, String regex, int
position,
return matchIndex;
}
+ /** SQL {@code REGEXP_REPLACE} function with 2 arguments. */
+ public String regexpReplace(String s, String regex) {
+ return regexpReplace(s, regex, "", 1, 0, null);
Review Comment:
This is all predicated on regexpReplace doing the right thing.
I guess that is not in the scope of this PR, but all these regular
expression languages have slight differences from each other, so it's not
obvious to me that regexpReplace implements faithfully what each of these
databases expects.
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlLibraryOperators.java:
##########
@@ -563,11 +563,86 @@ static RelDataType deriveTypeSplit(SqlOperatorBinding
operatorBinding,
OperandTypes.STRING_STRING_OPTIONAL_INTEGER_OPTIONAL_INTEGER_OPTIONAL_INTEGER,
SqlFunctionCategory.STRING);
- /** The "REGEXP_REPLACE(value, regexp, rep [, pos [, occurrence [,
matchType]]])"
+ /** The "REGEXP_REPLACE(value, regexp)"
* function. Replaces all substrings of value that match regexp with
* {@code rep} and returns modified value. */
- @LibraryOperator(libraries = {BIG_QUERY, MYSQL, ORACLE, REDSHIFT})
- public static final SqlFunction REGEXP_REPLACE = new
SqlRegexpReplaceFunction();
+ @LibraryOperator(libraries = {POSTGRESQL})
+ public static final SqlFunction REGEXP_REPLACE_2 =
+ new SqlBasicFunction("REGEXP_REPLACE", SqlKind.OTHER_FUNCTION,
+ SqlSyntax.FUNCTION, true, ReturnTypes.VARCHAR_NULLABLE, null,
+ OperandHandlers.DEFAULT, OperandTypes.STRING_STRING, 0,
+ SqlFunctionCategory.STRING, call -> SqlMonotonicity.NOT_MONOTONIC,
false) { };
+
+ /** The "REGEXP_REPLACE(value, regexp, rep)"
+ * function. Replaces all substrings of value that match regexp with
+ * {@code rep} and returns modified value. */
+ @LibraryOperator(libraries = {MYSQL, ORACLE, REDSHIFT})
+ public static final SqlFunction REGEXP_REPLACE_3 =
+ SqlBasicFunction.create("REGEXP_REPLACE", ReturnTypes.VARCHAR_NULLABLE,
+ OperandTypes.STRING_STRING_STRING, SqlFunctionCategory.STRING);
+
+ /** The "REGEXP_REPLACE(value, regexp, rep, pos)"
+ * function. Replaces all substrings of value that match regexp with
Review Comment:
what is pos?
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlLibraryOperators.java:
##########
@@ -563,11 +563,86 @@ static RelDataType deriveTypeSplit(SqlOperatorBinding
operatorBinding,
OperandTypes.STRING_STRING_OPTIONAL_INTEGER_OPTIONAL_INTEGER_OPTIONAL_INTEGER,
SqlFunctionCategory.STRING);
- /** The "REGEXP_REPLACE(value, regexp, rep [, pos [, occurrence [,
matchType]]])"
+ /** The "REGEXP_REPLACE(value, regexp)"
Review Comment:
this comment cannot be right, since there is no "rep"
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlLibraryOperators.java:
##########
@@ -563,11 +563,86 @@ static RelDataType deriveTypeSplit(SqlOperatorBinding
operatorBinding,
OperandTypes.STRING_STRING_OPTIONAL_INTEGER_OPTIONAL_INTEGER_OPTIONAL_INTEGER,
SqlFunctionCategory.STRING);
- /** The "REGEXP_REPLACE(value, regexp, rep [, pos [, occurrence [,
matchType]]])"
+ /** The "REGEXP_REPLACE(value, regexp)"
* function. Replaces all substrings of value that match regexp with
* {@code rep} and returns modified value. */
- @LibraryOperator(libraries = {BIG_QUERY, MYSQL, ORACLE, REDSHIFT})
- public static final SqlFunction REGEXP_REPLACE = new
SqlRegexpReplaceFunction();
+ @LibraryOperator(libraries = {POSTGRESQL})
+ public static final SqlFunction REGEXP_REPLACE_2 =
+ new SqlBasicFunction("REGEXP_REPLACE", SqlKind.OTHER_FUNCTION,
+ SqlSyntax.FUNCTION, true, ReturnTypes.VARCHAR_NULLABLE, null,
+ OperandHandlers.DEFAULT, OperandTypes.STRING_STRING, 0,
+ SqlFunctionCategory.STRING, call -> SqlMonotonicity.NOT_MONOTONIC,
false) { };
+
+ /** The "REGEXP_REPLACE(value, regexp, rep)"
+ * function. Replaces all substrings of value that match regexp with
+ * {@code rep} and returns modified value. */
+ @LibraryOperator(libraries = {MYSQL, ORACLE, REDSHIFT})
+ public static final SqlFunction REGEXP_REPLACE_3 =
+ SqlBasicFunction.create("REGEXP_REPLACE", ReturnTypes.VARCHAR_NULLABLE,
+ OperandTypes.STRING_STRING_STRING, SqlFunctionCategory.STRING);
+
+ /** The "REGEXP_REPLACE(value, regexp, rep, pos)"
+ * function. Replaces all substrings of value that match regexp with
+ * {@code rep} and returns modified value. */
+ @LibraryOperator(libraries = {MYSQL, ORACLE, REDSHIFT})
+ public static final SqlFunction REGEXP_REPLACE_4 =
+ new SqlBasicFunction("REGEXP_REPLACE", SqlKind.OTHER_FUNCTION,
+ SqlSyntax.FUNCTION, true, ReturnTypes.VARCHAR_NULLABLE, null,
+ OperandHandlers.DEFAULT, OperandTypes.family(SqlTypeFamily.STRING,
SqlTypeFamily.STRING,
+ SqlTypeFamily.STRING, SqlTypeFamily.INTEGER),
+ 0, SqlFunctionCategory.STRING, call ->
SqlMonotonicity.NOT_MONOTONIC, false) { };
+
+ /** The "REGEXP_REPLACE(value, regexp, rep, pos, occurrence)"
+ * function. Replaces all substrings of value that match regexp with
Review Comment:
please document all arguments in these comments
##########
testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java:
##########
@@ -5727,10 +5727,32 @@ private static void checkIf(SqlOperatorFixture f) {
f.checkQuery("select regexp_instr('a9cadca5c4aecghi', 'a[0-9]c', 1, 3)");
}
- @Test void testRegexpReplaceFunc() {
+ @Test void testRegexpReplace2Func() {
final SqlOperatorFixture f0 = fixture();
final Consumer<SqlOperatorFixture> consumer = f -> {
- f.setFor(SqlLibraryOperators.REGEXP_REPLACE);
+ f.setFor(SqlLibraryOperators.REGEXP_REPLACE_2);
Review Comment:
I am assuming these were validated against postgres. If true, please add a
comment.
##########
core/src/main/java/org/apache/calcite/sql/validate/SqlAbstractConformance.java:
##########
@@ -105,10 +105,6 @@ public abstract class SqlAbstractConformance implements
SqlConformance {
return SqlConformanceEnum.DEFAULT.isOffsetLimitAllowed();
}
- @Override public boolean isRegexReplaceCaptureGroupDollarIndexed() {
Review Comment:
where did the functionality of this move?
##########
core/src/main/java/org/apache/calcite/sql/fun/SqlPgRegexpReplaceFunction.java:
##########
@@ -0,0 +1,81 @@
+/*
+ * 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.calcite.sql.fun;
+
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.type.OperandTypes;
+import org.apache.calcite.sql.type.SqlTypeFamily;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The PostgreSQL
+ * REGEXP_REPLACE(source_string, pattern, replacement [, pos, [, occurrence]]
[, match_type])
+ * searches for a regular expression pattern and replaces every occurrence of
the pattern
+ * with the specified string. It differs from the standard REGEXP_REPLACE in
that there is
Review Comment:
And here too
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
