You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by di...@apache.org on 2022/07/18 05:40:16 UTC
[flink] branch master updated: [FLINK-28509][table][python] Support REVERSE built-in function in Table API (#20278)
This is an automated email from the ASF dual-hosted git repository.
dianfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new e1d93566365 [FLINK-28509][table][python] Support REVERSE built-in function in Table API (#20278)
e1d93566365 is described below
commit e1d93566365e6fe6a8f780c88fc73df2b4466c29
Author: Luning (Lucas) Wang <wa...@gmail.com>
AuthorDate: Mon Jul 18 13:40:09 2022 +0800
[FLINK-28509][table][python] Support REVERSE built-in function in Table API (#20278)
---
docs/data/sql_functions.yml | 1 +
docs/data/sql_functions_zh.yml | 1 +
flink-python/pyflink/table/expression.py | 7 +++++++
flink-python/pyflink/table/tests/test_expression.py | 1 +
.../org/apache/flink/table/api/internal/BaseExpressions.java | 10 ++++++++++
.../flink/table/functions/BuiltInFunctionDefinitions.java | 8 ++++++++
.../table/planner/expressions/converter/DirectConvertRule.java | 2 ++
.../flink/table/planner/expressions/ScalarFunctionsTest.scala | 4 ++--
8 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/docs/data/sql_functions.yml b/docs/data/sql_functions.yml
index 35ab90cec49..9589f76edec 100644
--- a/docs/data/sql_functions.yml
+++ b/docs/data/sql_functions.yml
@@ -364,6 +364,7 @@ string:
table: STRING1.regexp(STRING2)
description: Returns TRUE if any (possibly empty) substring of string1 matches the Java regular expression string2, otherwise FALSE. Returns NULL if any of arguments is NULL.
- sql: REVERSE(string)
+ table: STRING.reverse()
description: Returns the reversed string. Returns NULL if string is NULL.
- sql: SPLIT_INDEX(string1, string2, integer1)
table: STRING1.splitIndex(STRING2, INTEGER1)
diff --git a/docs/data/sql_functions_zh.yml b/docs/data/sql_functions_zh.yml
index ce0f9549459..2f63d985857 100644
--- a/docs/data/sql_functions_zh.yml
+++ b/docs/data/sql_functions_zh.yml
@@ -462,6 +462,7 @@ string:
如果 string1 的任何（可能为空）子字符串与 Java 正则表达式 string2 匹配，则返回 TRUE，否则返回 FALSE。
如果有任一参数为 `NULL`，则返回 `NULL`。
- sql: REVERSE(string)
+ table: STRING.reverse()
description: 返回反转的字符串。如果字符串为 `NULL`，则返回 `NULL`。
- sql: SPLIT_INDEX(string1, string2, integer1)
table: STRING1.splitIndex(STRING2, INTEGER1)
diff --git a/flink-python/pyflink/table/expression.py b/flink-python/pyflink/table/expression.py
index fe48674f5b0..db1cc1f2d78 100644
--- a/flink-python/pyflink/table/expression.py
+++ b/flink-python/pyflink/table/expression.py
@@ -1307,6 +1307,13 @@ class Expression(Generic[T]):
"""
return _binary_op("over")(self, alias)
+ @property
+ def reverse(self) -> 'Expression[str]':
+ """
+ Reverse each character in current string.
+ """
+ return _unary_op("reverse")(self)
+
def split_index(self, separator: Union[str, 'Expression[str]'],
index: Union[int, 'Expression[int]']) -> 'Expression[str]':
"""
diff --git a/flink-python/pyflink/table/tests/test_expression.py b/flink-python/pyflink/table/tests/test_expression.py
index bb201dcf22c..07c5f2b6943 100644
--- a/flink-python/pyflink/table/tests/test_expression.py
+++ b/flink-python/pyflink/table/tests/test_expression.py
@@ -162,6 +162,7 @@ class PyFlinkBatchExpressionTests(PyFlinkTestCase):
self.assertEqual('rtrim(a)', str(expr1.rtrim))
self.assertEqual('repeat(a, 3)', str(expr1.repeat(3)))
self.assertEqual("over(a, 'w')", str(expr1.over('w')))
+ self.assertEqual('reverse(a)', str(expr1.reverse))
self.assertEqual("splitIndex(a, ',', 3)", str(expr1.split_index(',', 3)))
self.assertEqual("strToMap(a)", str(expr1.str_to_map()))
self.assertEqual("strToMap(a, ';', ':')", str(expr1.str_to_map(';', ':')))
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/BaseExpressions.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/BaseExpressions.java
index bcd69ba1ce5..125f19c3633 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/BaseExpressions.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/BaseExpressions.java
@@ -140,6 +140,7 @@ import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.REGEXP
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.REGEXP_REPLACE;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.REPEAT;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.REPLACE;
+import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.REVERSE;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.RIGHT;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.ROUND;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.ROWTIME;
@@ -1151,6 +1152,15 @@ public abstract class BaseExpressions<InType, OutType> {
return toApiSpecificExpression(unresolvedCall(REPEAT, toExpr(), objectToExpression(n)));
}
+ /**
+ * Reverse each character in current string.
+ *
+ * @return a new string which character order is reverse to current string.
+ */
+ public OutType reverse() {
+ return toApiSpecificExpression(unresolvedCall(REVERSE, toExpr()));
+ }
+
/**
* Split target string with custom separator and pick the index-th(start with 0) result.
*
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/BuiltInFunctionDefinitions.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/BuiltInFunctionDefinitions.java
index b2c00f432c5..5703e268ebf 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/BuiltInFunctionDefinitions.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/BuiltInFunctionDefinitions.java
@@ -910,6 +910,14 @@ public final class BuiltInFunctionDefinitions {
.outputTypeStrategy(nullableIfArgs(explicit(DataTypes.STRING())))
.build();
+ public static final BuiltInFunctionDefinition REVERSE =
+ BuiltInFunctionDefinition.newBuilder()
+ .name("reverse")
+ .kind(SCALAR)
+ .inputTypeStrategy(sequence(logical(LogicalTypeFamily.CHARACTER_STRING)))
+ .outputTypeStrategy(nullableIfArgs(explicit(DataTypes.STRING())))
+ .build();
+
public static final BuiltInFunctionDefinition SPLIT_INDEX =
BuiltInFunctionDefinition.newBuilder()
.name("splitIndex")
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/expressions/converter/DirectConvertRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/expressions/converter/DirectConvertRule.java
index ba62cca0261..47aad8acb16 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/expressions/converter/DirectConvertRule.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/expressions/converter/DirectConvertRule.java
@@ -134,6 +134,8 @@ public class DirectConvertRule implements CallExpressionConvertRule {
BuiltInFunctionDefinitions.REGEXP, FlinkSqlOperatorTable.REGEXP);
DEFINITION_OPERATOR_MAP.put(
BuiltInFunctionDefinitions.REGEXP_REPLACE, FlinkSqlOperatorTable.REGEXP_REPLACE);
+ DEFINITION_OPERATOR_MAP.put(
+ BuiltInFunctionDefinitions.REVERSE, FlinkSqlOperatorTable.REVERSE);
DEFINITION_OPERATOR_MAP.put(
BuiltInFunctionDefinitions.SPLIT_INDEX, FlinkSqlOperatorTable.SPLIT_INDEX);
DEFINITION_OPERATOR_MAP.put(
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
index 761996663a9..7edb65f4398 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/expressions/ScalarFunctionsTest.scala
@@ -850,8 +850,8 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
@Test
def testReverse(): Unit = {
- testSqlApi("reverse(f38)", "==ABDIQA")
- testSqlApi("reverse(f40)", "NULL")
+ testAllApis('f38.reverse(), "reverse(f38)", "==ABDIQA")
+ testAllApis('f40.reverse(), "reverse(f40)", "NULL")
testSqlApi("reverse('hi')", "ih")
testSqlApi("reverse('hhhi')", "ihhh")
testSqlApi("reverse(CAST(null as VARCHAR))", "NULL")