You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2024/09/09 15:47:01 UTC
(flink) branch flink-36241 created (now 4450ccaf7b6)
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a change to branch flink-36241
in repository https://gitbox.apache.org/repos/asf/flink.git
at 4450ccaf7b6 [FLINK-36241] Table API .plus should support string concatenation
This branch includes the following new commits:
new 4450ccaf7b6 [FLINK-36241] Table API .plus should support string concatenation
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(flink) 01/01: [FLINK-36241] Table API .plus should support string concatenation
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a commit to branch flink-36241
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 4450ccaf7b6b29b7280adf1d8b539e2354fbdaab
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Mon Sep 9 17:46:48 2024 +0200
[FLINK-36241] Table API .plus should support string concatenation
---
.../flink/table/api/internal/BaseExpressions.java | 6 +++++
.../functions/BuiltInFunctionDefinitions.java | 2 +-
.../flink/table/functions/SqlCallSyntax.java | 16 ++++++++++++-
.../planner/functions/StringFunctionsITCase.java | 27 +++++++++++++++++++++-
4 files changed, 48 insertions(+), 3 deletions(-)
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 96749905e6a..4a7fd323452 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
@@ -83,6 +83,7 @@ import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.CEIL;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.CHAR_LENGTH;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.CHR;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.COLLECT;
+import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.CONCAT;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.COS;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.COSH;
import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.COT;
@@ -370,6 +371,11 @@ public abstract class BaseExpressions<InType, OutType> {
return toApiSpecificExpression(unresolvedCall(TIMES, toExpr(), objectToExpression(other)));
}
+ /** Concatenates two strings */
+ public OutType concat(InType other) {
+ return toApiSpecificExpression(unresolvedCall(CONCAT, toExpr(), objectToExpression(other)));
+ }
+
/**
* Returns true if the given expression is between lowerBound and upperBound (both inclusive).
* False otherwise. The parameters must be numeric types or identical comparable types.
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 bdc3a8ad6af..5cde27895a9 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
@@ -1559,7 +1559,7 @@ public final class BuiltInFunctionDefinitions {
public static final BuiltInFunctionDefinition PLUS =
BuiltInFunctionDefinition.newBuilder()
.name("plus")
- .callSyntax("+", SqlCallSyntax.BINARY_OP)
+ .callSyntax("+", SqlCallSyntax.PLUS_OP)
.kind(SCALAR)
.inputTypeStrategy(
or(
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/SqlCallSyntax.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/SqlCallSyntax.java
index 6f7f320da7e..821be03c17d 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/SqlCallSyntax.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/functions/SqlCallSyntax.java
@@ -24,6 +24,9 @@ import org.apache.flink.table.expressions.CallExpression;
import org.apache.flink.table.expressions.ResolvedExpression;
import org.apache.flink.table.expressions.TimeIntervalUnit;
import org.apache.flink.table.expressions.ValueLiteralExpression;
+import org.apache.flink.table.types.logical.LogicalTypeFamily;
+import org.apache.flink.table.types.logical.utils.LogicalTypeChecks;
+import org.apache.flink.table.types.utils.DataTypeUtils;
import org.apache.flink.table.utils.EncodingUtils;
import java.util.List;
@@ -100,7 +103,7 @@ public interface SqlCallSyntax {
.map(ResolvedExpression::asSerializableString)
.collect(Collectors.joining(", ")));
- /** Binary operator syntax, as in "x + y". */
+ /** Binary operator syntax, as in "x - y". */
SqlCallSyntax BINARY_OP =
(sqlName, operands) ->
String.format(
@@ -109,6 +112,17 @@ public interface SqlCallSyntax {
sqlName,
CallSyntaxUtils.asSerializableOperand(operands.get(1)));
+ /** Syntax for unparsing '+', Special handling for a plus on string arguments. */
+ SqlCallSyntax PLUS_OP = (sqlName, operands) -> {
+ boolean isString = operands.stream().anyMatch(op -> op.getOutputDataType().getLogicalType()
+ .is(LogicalTypeFamily.CHARACTER_STRING));
+ if (isString) {
+ return FUNCTION.unparse(BuiltInFunctionDefinitions.CONCAT.getSqlName(), operands);
+ } else {
+ return BINARY_OP.unparse(sqlName, operands);
+ }
+ };
+
/**
* Binary operator syntax that in Table API can accept multiple operands, as in "x AND y AND t
* AND w".
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/StringFunctionsITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/StringFunctionsITCase.java
index a6d1190a0a6..e671afcdd3a 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/StringFunctionsITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/StringFunctionsITCase.java
@@ -19,6 +19,7 @@
package org.apache.flink.table.planner.functions;
import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.Expressions;
import org.apache.flink.table.functions.BuiltInFunctionDefinitions;
import java.math.BigDecimal;
@@ -31,6 +32,7 @@ import java.time.temporal.ChronoUnit;
import java.util.stream.Stream;
import static org.apache.flink.table.api.Expressions.$;
+import static org.apache.flink.table.api.Expressions.concat;
import static org.apache.flink.table.api.Expressions.lit;
/** Test String functions correct behaviour. */
@@ -44,10 +46,33 @@ class StringFunctionsITCase extends BuiltInFunctionTestBase {
endsWithTestCases(),
printfTestCases(),
startsWithTestCases(),
- translateTestCases())
+ translateTestCases(),
+ concatenateTestCases())
.flatMap(s -> s);
}
+ private Stream<TestSetSpec> concatenateTestCases() {
+ return Stream.of(
+ TestSetSpec.forFunction(BuiltInFunctionDefinitions.PLUS)
+ .onFieldsWithData("Beginning", " Middle ", "Ending")
+ .andDataTypes(DataTypes.STRING(), DataTypes.STRING(), DataTypes.STRING())
+ .testResult(
+ $("f0").concat($("f1")).concat($("f2")),
+ "concat(concat(f0, f1), f2)",
+ "Beginning Middle Ending" ,
+ DataTypes.STRING())
+ .testResult(
+ concat($("f0"), $("f1"), $("f2")),
+ "concat(f0, f1, f2)",
+ "Beginning Middle Ending" ,
+ DataTypes.STRING())
+ .testResult($("f0").plus($("f1")).plus($("f2")),
+ "concat(concat(f0, f1), f2)",
+ "Beginning Middle Ending" ,
+ DataTypes.STRING())
+ );
+ }
+
private Stream<TestSetSpec> bTrimTestCases() {
return Stream.of(
TestSetSpec.forFunction(BuiltInFunctionDefinitions.BTRIM)