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 2019/05/16 09:18:20 UTC
[flink] branch master updated: [hotfix][table] Add missing generics
to TableFunctionDefinition
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
The following commit(s) were added to refs/heads/master by this push:
new e0cff08 [hotfix][table] Add missing generics to TableFunctionDefinition
e0cff08 is described below
commit e0cff08261eb03fe77c5580f0cdf9eb99a2d6f45
Author: Timo Walther <tw...@apache.org>
AuthorDate: Thu May 16 10:24:02 2019 +0200
[hotfix][table] Add missing generics to TableFunctionDefinition
---
.../flink/table/expressions/TableFunctionDefinition.java | 12 ++++++------
.../flink/table/operations/AggregateOperationFactory.java | 2 +-
.../flink/table/operations/CalculatedTableFactory.java | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TableFunctionDefinition.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TableFunctionDefinition.java
index 2057251..0f19512 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TableFunctionDefinition.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TableFunctionDefinition.java
@@ -31,23 +31,23 @@ import static org.apache.flink.table.expressions.FunctionDefinition.Type.TABLE_F
@PublicEvolving
public final class TableFunctionDefinition extends FunctionDefinition {
- private final TableFunction tableFunction;
- private final TypeInformation resultType;
+ private final TableFunction<?> tableFunction;
+ private final TypeInformation<?> resultType;
public TableFunctionDefinition(
String name,
- TableFunction tableFunction,
- TypeInformation resultType) {
+ TableFunction<?> tableFunction,
+ TypeInformation<?> resultType) {
super(name, TABLE_FUNCTION);
this.tableFunction = Preconditions.checkNotNull(tableFunction);
this.resultType = Preconditions.checkNotNull(resultType);
}
- public TableFunction getTableFunction() {
+ public TableFunction<?> getTableFunction() {
return tableFunction;
}
- public TypeInformation getResultType() {
+ public TypeInformation<?> getResultType() {
return resultType;
}
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java
index 54ded6b..79fa837 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java
@@ -545,7 +545,7 @@ public class AggregateOperationFactory {
List<String> aliases,
AggregateFunctionDefinition aggFunctionDefinition) {
- TypeInformation resultType = aggFunctionDefinition.getResultTypeInfo();
+ TypeInformation<?> resultType = aggFunctionDefinition.getResultTypeInfo();
int callArity = resultType.getTotalFields();
int aliasesSize = aliases.size();
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java
index f32cb93..3f2953b 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java
@@ -57,10 +57,10 @@ public class CalculatedTableFactory {
return callExpr.accept(calculatedTableCreator);
}
- private class FunctionTableCallVisitor extends ApiExpressionDefaultVisitor<CalculatedTableOperation> {
+ private class FunctionTableCallVisitor extends ApiExpressionDefaultVisitor<CalculatedTableOperation<?>> {
@Override
- public CalculatedTableOperation visitCall(CallExpression call) {
+ public CalculatedTableOperation<?> visitCall(CallExpression call) {
FunctionDefinition definition = call.getFunctionDefinition();
if (definition.equals(AS)) {
return unwrapFromAlias(call);
@@ -74,7 +74,7 @@ public class CalculatedTableFactory {
}
}
- private CalculatedTableOperation unwrapFromAlias(CallExpression call) {
+ private CalculatedTableOperation<?> unwrapFromAlias(CallExpression call) {
List<Expression> children = call.getChildren();
List<String> aliases = children.subList(1, children.size())
.stream()
@@ -92,11 +92,11 @@ public class CalculatedTableFactory {
return createFunctionCall(tableFunctionDefinition, aliases, tableCall.getChildren());
}
- private CalculatedTableOperation createFunctionCall(
+ private CalculatedTableOperation<?> createFunctionCall(
TableFunctionDefinition tableFunctionDefinition,
List<String> aliases,
List<Expression> parameters) {
- TypeInformation resultType = tableFunctionDefinition.getResultType();
+ TypeInformation<?> resultType = tableFunctionDefinition.getResultType();
int callArity = resultType.getTotalFields();
int aliasesSize = aliases.size();
@@ -126,7 +126,7 @@ public class CalculatedTableFactory {
}
@Override
- protected CalculatedTableOperation defaultMethod(Expression expression) {
+ protected CalculatedTableOperation<?> defaultMethod(Expression expression) {
throw fail();
}