You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2020/07/29 15:40:47 UTC
[flink] 05/06: [hotfix][table-common] Add
CallExpression.getFunctionName for easier printing
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5bc3c7678c3ea532ec3deecfdcd7a8f98786ebe1
Author: Timo Walther <tw...@apache.org>
AuthorDate: Fri Jul 24 15:45:58 2020 +0200
[hotfix][table-common] Add CallExpression.getFunctionName for easier printing
---
.../operations/utils/CalculatedTableFactory.java | 5 +----
.../flink/table/expressions/CallExpression.java | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/CalculatedTableFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/CalculatedTableFactory.java
index b194a5d..de9989c 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/CalculatedTableFactory.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/CalculatedTableFactory.java
@@ -27,7 +27,6 @@ import org.apache.flink.table.expressions.ExpressionUtils;
import org.apache.flink.table.expressions.ResolvedExpression;
import org.apache.flink.table.expressions.utils.ResolvedExpressionDefaultVisitor;
import org.apache.flink.table.functions.FunctionDefinition;
-import org.apache.flink.table.functions.FunctionIdentifier;
import org.apache.flink.table.operations.CalculatedQueryOperation;
import org.apache.flink.table.operations.QueryOperation;
import org.apache.flink.table.types.DataType;
@@ -101,9 +100,7 @@ final class CalculatedTableFactory {
final TableSchema tableSchema = adjustNames(
extractSchema(callExpression.getOutputDataType()),
aliases,
- callExpression.getFunctionIdentifier()
- .map(FunctionIdentifier::asSummaryString)
- .orElse(functionDefinition.toString()));
+ callExpression.getFunctionName());
return new CalculatedQueryOperation(
functionDefinition,
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java
index e3c5cb9..b3d4103 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java
@@ -86,6 +86,17 @@ public final class CallExpression implements ResolvedExpression {
return functionDefinition;
}
+ /**
+ * Returns a string representation of the call's function for logging or printing to a console.
+ */
+ public String getFunctionName() {
+ if (functionIdentifier == null) {
+ return functionDefinition.toString();
+ } else {
+ return functionIdentifier.asSummaryString();
+ }
+ }
+
@Override
public DataType getOutputDataType() {
return dataType;
@@ -98,18 +109,11 @@ public final class CallExpression implements ResolvedExpression {
@Override
public String asSummaryString() {
- final String functionName;
- if (functionIdentifier == null) {
- functionName = functionDefinition.toString();
- } else {
- functionName = functionIdentifier.asSummaryString();
- }
-
final String argList = args.stream()
.map(Expression::asSummaryString)
.collect(Collectors.joining(", ", "(", ")"));
- return functionName + argList;
+ return getFunctionName() + argList;
}
@Override