diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java index f47ce285fd512..b13ab251eb4f6 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java @@ -27,42 +27,42 @@ @Internal public abstract class ApiExpressionDefaultVisitor extends ApiExpressionVisitor { @Override - public T visitCall(CallExpression call) { + public T visit(CallExpression call) { return defaultMethod(call); } @Override - public T visitValueLiteral(ValueLiteralExpression valueLiteralExpression) { + public T visit(ValueLiteralExpression valueLiteralExpression) { return defaultMethod(valueLiteralExpression); } @Override - public T visitFieldReference(FieldReferenceExpression fieldReference) { + public T visit(FieldReferenceExpression fieldReference) { return defaultMethod(fieldReference); } @Override - public T visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public T visit(UnresolvedReferenceExpression unresolvedReference) { return defaultMethod(unresolvedReference); } @Override - public T visitLocalReference(LocalReferenceExpression localReference) { + public T visit(LocalReferenceExpression localReference) { return defaultMethod(localReference); } @Override - public T visitTypeLiteral(TypeLiteralExpression typeLiteral) { + public T visit(TypeLiteralExpression typeLiteral) { return defaultMethod(typeLiteral); } @Override - public T visitTableReference(TableReferenceExpression tableReference) { + public T visit(TableReferenceExpression tableReference) { return defaultMethod(tableReference); } @Override - public T visitLookupCall(LookupCallExpression lookupCall) { + public T visit(LookupCallExpression lookupCall) { return defaultMethod(lookupCall); } diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java index f5ab190960b2c..64bef70c6839e 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java @@ -26,23 +26,23 @@ @Internal public abstract class ApiExpressionVisitor implements ExpressionVisitor { - public abstract R visitTableReference(TableReferenceExpression tableReference); + public abstract R visit(TableReferenceExpression tableReference); - public abstract R visitLocalReference(LocalReferenceExpression localReference); + public abstract R visit(LocalReferenceExpression localReference); - public abstract R visitLookupCall(LookupCallExpression lookupCall); + public abstract R visit(LookupCallExpression lookupCall); - public abstract R visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference); + public abstract R visit(UnresolvedReferenceExpression unresolvedReference); public final R visit(Expression other) { if (other instanceof TableReferenceExpression) { - return visitTableReference((TableReferenceExpression) other); + return visit((TableReferenceExpression) other); } else if (other instanceof LocalReferenceExpression) { - return visitLocalReference((LocalReferenceExpression) other); + return visit((LocalReferenceExpression) other); } else if (other instanceof LookupCallExpression) { - return visitLookupCall((LookupCallExpression) other); + return visit((LookupCallExpression) other); } else if (other instanceof UnresolvedReferenceExpression) { - return visitUnresolvedReference((UnresolvedReferenceExpression) other); + return visit((UnresolvedReferenceExpression) other); } return visitNonApiExpression(other); } diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/LookupCallResolver.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/LookupCallResolver.java index 4c707e9569b54..816c3bc092d10 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/LookupCallResolver.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/expressions/LookupCallResolver.java @@ -39,14 +39,14 @@ public LookupCallResolver(FunctionLookup functionLookup) { this.functionLookup = functionLookup; } - public Expression visitLookupCall(LookupCallExpression lookupCall) { + public Expression visit(LookupCallExpression lookupCall) { final FunctionLookup.Result result = functionLookup.lookupFunction(lookupCall.getUnresolvedName()) .orElseThrow(() -> new ValidationException("Undefined function: " + lookupCall.getUnresolvedName())); return createResolvedCall(result.getFunctionDefinition(), lookupCall.getChildren()); } - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { return createResolvedCall(call.getFunctionDefinition(), call.getChildren()); } diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/OperationExpressionsUtils.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/OperationExpressionsUtils.java index 6578c482f1395..8b18b603522e0 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/OperationExpressionsUtils.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/OperationExpressionsUtils.java @@ -151,12 +151,12 @@ private static class AggregationAndPropertiesSplitter extends ApiExpressionDefau private final Map properties = new LinkedHashMap<>(); @Override - public Void visitLookupCall(LookupCallExpression unresolvedCall) { + public Void visit(LookupCallExpression unresolvedCall) { throw new IllegalStateException("All calls should be resolved by now. Got: " + unresolvedCall); } @Override - public Void visitCall(CallExpression call) { + public Void visit(CallExpression call) { FunctionDefinition functionDefinition = call.getFunctionDefinition(); if (isFunctionOfKind(call, AGGREGATE)) { aggregates.computeIfAbsent(call, expr -> "EXPR$" + uniqueId++); @@ -187,12 +187,12 @@ private AggregationAndPropertiesReplacer( } @Override - public Expression visitLookupCall(LookupCallExpression unresolvedCall) { + public Expression visit(LookupCallExpression unresolvedCall) { throw new IllegalStateException("All calls should be resolved by now. Got: " + unresolvedCall); } @Override - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { if (aggregates.get(call) != null) { return unresolvedRef(aggregates.get(call)); } else if (properties.get(call) != null) { @@ -214,7 +214,7 @@ protected Expression defaultMethod(Expression expression) { private static class ExtractNameVisitor extends ApiExpressionDefaultVisitor> { @Override - public Optional visitCall(CallExpression call) { + public Optional visit(CallExpression call) { if (call.getFunctionDefinition().equals(AS)) { return extractValue(call.getChildren().get(1), String.class); } else { @@ -223,17 +223,17 @@ public Optional visitCall(CallExpression call) { } @Override - public Optional visitLocalReference(LocalReferenceExpression localReference) { + public Optional visit(LocalReferenceExpression localReference) { return Optional.of(localReference.getName()); } @Override - public Optional visitTableReference(TableReferenceExpression tableReference) { + public Optional visit(TableReferenceExpression tableReference) { return Optional.of(tableReference.getName()); } @Override - public Optional visitFieldReference(FieldReferenceExpression fieldReference) { + public Optional visit(FieldReferenceExpression fieldReference) { return Optional.of(fieldReference.getName()); } diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/typeutils/FieldInfoUtils.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/typeutils/FieldInfoUtils.java index ea564fdc89fcb..d785ede1f2a56 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/typeutils/FieldInfoUtils.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/typeutils/FieldInfoUtils.java @@ -458,13 +458,13 @@ private IndexedExprToFieldInfo(CompositeType inputType, int index) { } @Override - public FieldInfo visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public FieldInfo visit(UnresolvedReferenceExpression unresolvedReference) { String fieldName = unresolvedReference.getName(); return new FieldInfo(fieldName, index, fromLegacyInfoToDataType(getTypeAt(unresolvedReference))); } @Override - public FieldInfo visitCall(CallExpression call) { + public FieldInfo visit(CallExpression call) { if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.AS) { return visitAlias(call); } else if (isRowTimeExpression(call)) { @@ -541,12 +541,12 @@ private ValidationException fieldNotFound(String name) { } @Override - public FieldInfo visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public FieldInfo visit(UnresolvedReferenceExpression unresolvedReference) { return createFieldInfo(unresolvedReference, null); } @Override - public FieldInfo visitCall(CallExpression call) { + public FieldInfo visit(CallExpression call) { if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.AS) { return visitAlias(call); } else if (isRowTimeExpression(call)) { 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 acaa5e318c536..c954cba3fe440 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 @@ -56,7 +56,7 @@ public FunctionDefinition getFunctionDefinition() { @Override public R accept(ExpressionVisitor visitor) { - return visitor.visitCall(this); + return visitor.visit(this); } @Override diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java index b5636eb6c23b0..727554ec1a0ae 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java @@ -28,22 +28,22 @@ public abstract class ExpressionDefaultVisitor implements ExpressionVisitor { @Override - public T visitCall(CallExpression call) { + public T visit(CallExpression call) { return defaultMethod(call); } @Override - public T visitValueLiteral(ValueLiteralExpression valueLiteralExpression) { + public T visit(ValueLiteralExpression valueLiteralExpression) { return defaultMethod(valueLiteralExpression); } @Override - public T visitFieldReference(FieldReferenceExpression fieldReference) { + public T visit(FieldReferenceExpression fieldReference) { return defaultMethod(fieldReference); } @Override - public T visitTypeLiteral(TypeLiteralExpression typeLiteral) { + public T visit(TypeLiteralExpression typeLiteral) { return defaultMethod(typeLiteral); } diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java index f135332c71bad..e23a6183ee648 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java @@ -27,13 +27,13 @@ @PublicEvolving public interface ExpressionVisitor { - R visitCall(CallExpression call); + R visit(CallExpression call); - R visitValueLiteral(ValueLiteralExpression valueLiteralExpression); + R visit(ValueLiteralExpression valueLiteralExpression); - R visitFieldReference(FieldReferenceExpression fieldReference); + R visit(FieldReferenceExpression fieldReference); - R visitTypeLiteral(TypeLiteralExpression typeLiteral); + R visit(TypeLiteralExpression typeLiteral); R visit(Expression other); } diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java index cbedf40116150..eefb897bf4ee9 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java @@ -88,7 +88,7 @@ public List getChildren() { @Override public R accept(ExpressionVisitor visitor) { - return visitor.visitFieldReference(this); + return visitor.visit(this); } @Override diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java index 3343bfe6b6c16..f27e0a1f99aef 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java @@ -53,7 +53,7 @@ public List getChildren() { @Override public R accept(ExpressionVisitor visitor) { - return visitor.visitTypeLiteral(this); + return visitor.visit(this); } @Override diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java index 6ec25fa99fd20..32edfcb55460e 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java @@ -79,7 +79,7 @@ public List getChildren() { @Override public R accept(ExpressionVisitor visitor) { - return visitor.visitValueLiteral(this); + return visitor.visit(this); } @Override diff --git a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/expressions/RexNodeConverter.java b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/expressions/RexNodeConverter.java index b299ebbb8eef9..b8599f9e8f58c 100644 --- a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/expressions/RexNodeConverter.java +++ b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/expressions/RexNodeConverter.java @@ -79,7 +79,7 @@ public RexNodeConverter(RelBuilder relBuilder) { } @Override - public RexNode visitCall(CallExpression call) { + public RexNode visit(CallExpression call) { switch (call.getFunctionDefinition().getKind()) { case SCALAR: return visitScalarFunc(call); @@ -174,7 +174,7 @@ && isTemporal(toLogicalType(child.get(1).getType()))) { } @Override - public RexNode visitValueLiteral(ValueLiteralExpression expr) { + public RexNode visit(ValueLiteralExpression expr) { LogicalType type = fromDataTypeToLogicalType(expr.getOutputDataType()); RexBuilder rexBuilder = relBuilder.getRexBuilder(); FlinkTypeFactory typeFactory = (FlinkTypeFactory) relBuilder.getTypeFactory(); @@ -269,12 +269,12 @@ private static Calendar valueAsCalendar(Object value) { } @Override - public RexNode visitFieldReference(FieldReferenceExpression fieldReference) { + public RexNode visit(FieldReferenceExpression fieldReference) { return relBuilder.field(fieldReference.getName()); } @Override - public RexNode visitTypeLiteral(TypeLiteralExpression typeLiteral) { + public RexNode visit(TypeLiteralExpression typeLiteral) { throw new UnsupportedOperationException(); } diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/DeclarativeAggCodeGen.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/DeclarativeAggCodeGen.scala index 57b12f5d141fc..0773e7416b286 100644 --- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/DeclarativeAggCodeGen.scala +++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/DeclarativeAggCodeGen.scala @@ -216,21 +216,21 @@ class DeclarativeAggCodeGen( isMerge: Boolean = false, isDistinctMerge: Boolean = false) extends ExpressionVisitor[Expression] { - override def visitCall(call: CallExpression): Expression = { + override def visit(call: CallExpression): Expression = { ApiExpressionUtils.call( call.getFunctionDefinition, call.getChildren.asScala.map(_.accept(this)): _*) } - override def visitValueLiteral(valueLiteralExpression: ValueLiteralExpression): Expression = { + override def visit(valueLiteralExpression: ValueLiteralExpression): Expression = { valueLiteralExpression } - override def visitFieldReference(input: FieldReferenceExpression): Expression = { + override def visit(input: FieldReferenceExpression): Expression = { input } - override def visitTypeLiteral(typeLiteral: TypeLiteralExpression): Expression = { + override def visit(typeLiteral: TypeLiteralExpression): Expression = { typeLiteral } diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/AggCodeGenHelper.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/AggCodeGenHelper.scala index b0a5cd522638f..9bf1ff77157ba 100644 --- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/AggCodeGenHelper.scala +++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/AggCodeGenHelper.scala @@ -256,21 +256,21 @@ object AggCodeGenHelper { argsMapping: Array[Array[(Int, LogicalType)]], aggBufferTypes: Array[Array[LogicalType]]) extends ExpressionVisitor[Expression] { - override def visitCall(call: CallExpression): Expression = { + override def visit(call: CallExpression): Expression = { ApiExpressionUtils.call( call.getFunctionDefinition, call.getChildren.asScala.map(_.accept(this)): _*) } - override def visitValueLiteral(valueLiteralExpression: ValueLiteralExpression): Expression = { + override def visit(valueLiteralExpression: ValueLiteralExpression): Expression = { valueLiteralExpression } - override def visitFieldReference(input: FieldReferenceExpression): Expression = { + override def visit(input: FieldReferenceExpression): Expression = { input } - override def visitTypeLiteral(typeLiteral: TypeLiteralExpression): Expression = { + override def visit(typeLiteral: TypeLiteralExpression): Expression = { typeLiteral } diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/HashAggCodeGenHelper.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/HashAggCodeGenHelper.scala index 470ef86b69190..4b187ada4f233 100644 --- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/HashAggCodeGenHelper.scala +++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/HashAggCodeGenHelper.scala @@ -332,21 +332,21 @@ object HashAggCodeGenHelper { argsMapping: Array[Array[(Int, LogicalType)]], aggBuffMapping: Array[Array[(Int, LogicalType)]]) extends ExpressionVisitor[Expression] { - override def visitCall(call: CallExpression): Expression = { + override def visit(call: CallExpression): Expression = { ApiExpressionUtils.call( call.getFunctionDefinition, call.getChildren.map(_.accept(this)): _*) } - override def visitValueLiteral(valueLiteralExpression: ValueLiteralExpression): Expression = { + override def visit(valueLiteralExpression: ValueLiteralExpression): Expression = { valueLiteralExpression } - override def visitFieldReference(input: FieldReferenceExpression): Expression = { + override def visit(input: FieldReferenceExpression): Expression = { input } - override def visitTypeLiteral(typeLiteral: TypeLiteralExpression): Expression = { + override def visit(typeLiteral: TypeLiteralExpression): Expression = { typeLiteral } diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ExpandColumnFunctionsRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ExpandColumnFunctionsRule.java index 98e2c6b401d2f..2a0d3b51e6fad 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ExpandColumnFunctionsRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ExpandColumnFunctionsRule.java @@ -77,7 +77,7 @@ public ColumnFunctionsExpander(List inputFieldRef } @Override - public List visitCall(CallExpression call) { + public List visit(CallExpression call) { List result; @@ -149,14 +149,14 @@ public ColumnsExpressionExpander(List inputFieldR } @Override - public List visitValueLiteral(ValueLiteralExpression valueLiteralExpression) { + public List visit(ValueLiteralExpression valueLiteralExpression) { return ExpressionUtils.extractValue(valueLiteralExpression, Integer.class) .map(i -> Collections.singletonList(inputFieldReferences.get(i - 1))) .orElseGet(() -> defaultMethod(valueLiteralExpression)); } @Override - public List visitUnresolvedReference( + public List visit( UnresolvedReferenceExpression unresolvedReference) { if (unresolvedReference.getName().equals("*")) { return inputFieldReferences; @@ -166,7 +166,7 @@ public List visitUnresolvedReference( } @Override - public List visitCall(CallExpression call) { + public List visit(CallExpression call) { if (isIndexRangeCall(call)) { int start = ExpressionUtils.extractValue(call.getChildren().get(0), Integer.class) .orElseThrow(() -> new ValidationException("Constant integer value expected.")); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/FlattenCallRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/FlattenCallRule.java index 7ca9d2663222b..89a3c54a39140 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/FlattenCallRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/FlattenCallRule.java @@ -56,7 +56,7 @@ private class FlatteningCallVisitor extends RuleExpressionVisitor visitCall(CallExpression call) { + public List visit(CallExpression call) { if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.FLATTEN) { return executeFlatten(call); } diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/OverWindowResolverRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/OverWindowResolverRule.java index 30d18c4d5c5dd..f2a028a20e6ef 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/OverWindowResolverRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/OverWindowResolverRule.java @@ -55,7 +55,7 @@ private class ExpressionResolverVisitor extends RuleExpressionVisitor children = call.getChildren(); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ReferenceResolverRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ReferenceResolverRule.java index 8281afd36d44b..a6e49db525c12 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ReferenceResolverRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ReferenceResolverRule.java @@ -54,7 +54,7 @@ private class ExpressionResolverVisitor extends RuleExpressionVisitor expr.accept(this)) @@ -64,7 +64,7 @@ public Expression visitCall(CallExpression call) { } @Override - public Expression visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public Expression visit(UnresolvedReferenceExpression unresolvedReference) { return resolutionContext.referenceLookup().lookupField(unresolvedReference.getName()) .map(expr -> (Expression) expr) .orElseGet(() -> diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ResolveCallByArgumentsRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ResolveCallByArgumentsRule.java index 39f8f91ba21fb..aed8126f49227 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ResolveCallByArgumentsRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/ResolveCallByArgumentsRule.java @@ -63,7 +63,7 @@ private class CallArgumentsCastingVisitor extends RuleExpressionVisitor> expectedTypes = toJava(((InputTypeSpec) plannerCall).expectedTypes()); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/StarReferenceFlatteningRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/StarReferenceFlatteningRule.java index 86ff7c6492d22..5283aed3fa672 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/StarReferenceFlatteningRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/StarReferenceFlatteningRule.java @@ -49,7 +49,7 @@ private static class FieldFlatteningVisitor extends RuleExpressionVisitor visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public List visit(UnresolvedReferenceExpression unresolvedReference) { if (unresolvedReference.getName().equals("*")) { return new ArrayList<>(resolutionContext.referenceLookup().getAllInputFields()); } else { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/VerifyNoUnresolvedExpressionsRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/VerifyNoUnresolvedExpressionsRule.java index 81b549818bab3..176a3711468ed 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/VerifyNoUnresolvedExpressionsRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/expressions/rules/VerifyNoUnresolvedExpressionsRule.java @@ -56,17 +56,17 @@ public List apply(List expression, ResolutionContext con private static class NoUnresolvedCallsChecker extends ApiExpressionDefaultVisitor { @Override - public Void visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public Void visit(UnresolvedReferenceExpression unresolvedReference) { throw getException("reference", unresolvedReference); } @Override - public Void visitLookupCall(LookupCallExpression lookupCall) { + public Void visit(LookupCallExpression lookupCall) { throw getException("lookup call", lookupCall); } @Override - public Void visitCall(CallExpression call) { + public Void visit(CallExpression call) { if (call.getFunctionDefinition() == OVER && call.getChildren().size() <= 2) { throw getException("OVER call", call); } else if (call.getFunctionDefinition() == FLATTEN) { 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 d8f71de3679d5..585cb98241887 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 @@ -417,7 +417,7 @@ private void validateAggregates(List aggregates) { private class AggregationExpressionValidator extends ApiExpressionDefaultVisitor { @Override - public Void visitCall(CallExpression call) { + public Void visit(CallExpression call) { FunctionDefinition functionDefinition = call.getFunctionDefinition(); if (isFunctionOfKind(call, AGGREGATE) || isFunctionOfKind(call, TABLE_AGGREGATE)) { if (functionDefinition == BuiltInFunctionDefinitions.DISTINCT) { @@ -460,7 +460,7 @@ protected void failExpression(Expression expression) { private class ValidateDistinct extends ApiExpressionDefaultVisitor { @Override - public Void visitCall(CallExpression call) { + public Void visit(CallExpression call) { if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.DISTINCT) { throw new ValidationException("It's not allowed to use an aggregate function as " + "input of another aggregate function"); @@ -481,7 +481,7 @@ protected Void defaultMethod(Expression expression) { private class NoNestedAggregates extends ApiExpressionDefaultVisitor { @Override - public Void visitCall(CallExpression call) { + public Void visit(CallExpression call) { if (isFunctionOfKind(call, AGGREGATE) || isFunctionOfKind(call, TABLE_AGGREGATE)) { throw new ValidationException("It's not allowed to use an aggregate function as " + "input of another aggregate function"); @@ -526,7 +526,7 @@ public List getAlias() { } @Override - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { FunctionDefinition definition = call.getFunctionDefinition(); if (definition == BuiltInFunctionDefinitions.AS) { return unwrapFromAlias(call); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java index 4d6cea7954e34..b0613b84a8856 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java @@ -80,7 +80,7 @@ public static List createAliasList(List aliases, QueryOp private static class AliasLiteralValidator extends ApiExpressionDefaultVisitor { @Override - public ValueLiteralExpression visitValueLiteral(ValueLiteralExpression valueLiteralExpression) { + public ValueLiteralExpression visit(ValueLiteralExpression valueLiteralExpression) { String name = ExpressionUtils.extractValue(valueLiteralExpression, String.class) .orElseThrow(() -> new ValidationException( "Alias accepts only names that are not '*' reference.")); @@ -97,7 +97,7 @@ protected ValueLiteralExpression defaultMethod(Expression expression) { } @Override - public ValueLiteralExpression visitUnresolvedReference(UnresolvedReferenceExpression unresolvedReference) { + public ValueLiteralExpression visit(UnresolvedReferenceExpression unresolvedReference) { if (unresolvedReference.getName().equals(ALL_REFERENCE)) { throw new ValidationException("Alias can not accept '*' as name."); 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 0847ab2b668ce..8829649c24e57 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 @@ -65,7 +65,7 @@ public FunctionTableCallVisitor(String[] leftTableFieldNames) { } @Override - public CalculatedQueryOperation visitCall(CallExpression call) { + public CalculatedQueryOperation visit(CallExpression call) { FunctionDefinition definition = call.getFunctionDefinition(); if (definition.equals(AS)) { return unwrapFromAlias(call); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java index ffc9ad91aca1b..6a710cc786bd5 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java @@ -118,7 +118,7 @@ public static List dropFields(List inputFields, List { @Override - public String visitFieldReference(FieldReferenceExpression fieldReference) { + public String visit(FieldReferenceExpression fieldReference) { return fieldReference.getName(); } @@ -130,7 +130,7 @@ protected String defaultMethod(Expression expression) { private static class RenameColumnExtractor extends ApiExpressionDefaultVisitor { @Override - public String visitCall(CallExpression call) { + public String visit(CallExpression call) { if (call.getFunctionDefinition() == AS && call.getChildren().get(0) instanceof FieldReferenceExpression) { FieldReferenceExpression resolvedFieldReference = (FieldReferenceExpression) call.getChildren() diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java index 757600432d017..5548a8f854622 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java @@ -119,7 +119,7 @@ private void validateNamesAmbiguity(QueryOperation left, QueryOperation right) { private class EquiJoinExistsChecker extends ApiExpressionDefaultVisitor { @Override - public Boolean visitCall(CallExpression call) { + public Boolean visit(CallExpression call) { if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.EQUALS) { return isJoinCondition(call.getChildren().get(0), call.getChildren().get(1)); } else if (call.getFunctionDefinition() == BuiltInFunctionDefinitions.OR) { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java index 7843ad5809ee0..155e231ec3106 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java @@ -139,7 +139,7 @@ private List nameExpressions(List expression) { private class NamingVisitor extends ApiExpressionDefaultVisitor { @Override - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { FunctionDefinition functionDefinition = call.getFunctionDefinition(); final Optional rename; if (functionDefinition.equals(CAST)) { @@ -168,7 +168,7 @@ private Optional nameForCast(CallExpression call) { } @Override - public Expression visitValueLiteral(ValueLiteralExpression valueLiteralExpression) { + public Expression visit(ValueLiteralExpression valueLiteralExpression) { return call(AS, valueLiteralExpression, valueLiteral(getUniqueName())); } @@ -181,7 +181,7 @@ protected Expression defaultMethod(Expression expression) { private class StripAliases extends ApiExpressionDefaultVisitor { @Override - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { if (call.getFunctionDefinition().equals(AS)) { return call.getChildren().get(0).accept(this); } else { @@ -198,7 +198,7 @@ protected Expression defaultMethod(Expression expression) { private class TransitiveExtractNameVisitor extends ApiExpressionDefaultVisitor> { @Override - public Optional visitCall(CallExpression call) { + public Optional visit(CallExpression call) { if (call.getFunctionDefinition().equals(GET)) { return extractNameFromGet(call); } else { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java index 286e3e93ee755..b939720e9678e 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java @@ -129,7 +129,7 @@ private void failIfStreaming() { private class OrderWrapper extends ApiExpressionDefaultVisitor { @Override - public Expression visitCall(CallExpression call) { + public Expression visit(CallExpression call) { if (ORDERING.contains(call.getFunctionDefinition())) { return call; } else { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/plan/QueryOperationConverter.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/plan/QueryOperationConverter.java index c10900eb55c93..1bf4e8fb6f2d0 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/plan/QueryOperationConverter.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/plan/QueryOperationConverter.java @@ -387,7 +387,7 @@ private class JoinExpressionVisitor extends ExpressionDefaultVisitor { private static final int numberOfJoinInputs = 2; @Override - public RexNode visitCall(CallExpression call) { + public RexNode visit(CallExpression call) { final Expression[] newChildren = call.getChildren().stream().map(expr -> { RexNode convertedNode = expr.accept(this); return (Expression) new RexPlannerExpression(convertedNode); @@ -398,7 +398,7 @@ public RexNode visitCall(CallExpression call) { } @Override - public RexNode visitFieldReference(FieldReferenceExpression fieldReference) { + public RexNode visit(FieldReferenceExpression fieldReference) { return relBuilder.field(numberOfJoinInputs, fieldReference.getInputIndex(), fieldReference.getFieldIndex()); } @@ -411,7 +411,7 @@ protected RexNode defaultMethod(Expression expression) { private class AggregateVisitor extends ExpressionDefaultVisitor { @Override - public AggCall visitCall(CallExpression call) { + public AggCall visit(CallExpression call) { if (call.getFunctionDefinition() == AS) { String aggregateName = extractValue(call.getChildren().get(1), String.class) .orElseThrow(() -> new TableException("Unexpected name.")); @@ -433,7 +433,7 @@ protected AggCall defaultMethod(Expression expression) { private class TableAggregateVisitor extends AggregateVisitor { @Override - public AggCall visitCall(CallExpression call) { + public AggCall visit(CallExpression call) { if (isFunctionOfKind(call, TABLE_AGGREGATE)) { AggFunctionCall aggFunctionCall = (AggFunctionCall) expressionBridge.bridge(call); return aggFunctionCall.toAggCall(aggFunctionCall.toString(), false, relBuilder); diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvImpl.scala index e9b4d85b43370..0f4969b726ee2 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvImpl.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/BatchTableEnvImpl.scala @@ -232,7 +232,7 @@ abstract class BatchTableEnvImpl( if (f.exists(f => f.accept(new ExpressionDefaultVisitor[Boolean] { - override def visitCall(call: CallExpression): Boolean = { + override def visit(call: CallExpression): Boolean = { TIME_ATTRIBUTES.contains(call.getFunctionDefinition) || call.getChildren.asScala.exists(_.accept(this)) } diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala index b607473de3e70..05e8e557d0dab 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala @@ -34,7 +34,7 @@ import _root_.scala.collection.JavaConverters._ */ class PlannerExpressionConverter private extends ApiExpressionVisitor[PlannerExpression] { - override def visitCall(call: CallExpression): PlannerExpression = { + override def visit(call: CallExpression): PlannerExpression = { val func = call.getFunctionDefinition val children = call.getChildren.asScala @@ -680,7 +680,7 @@ class PlannerExpressionConverter private extends ApiExpressionVisitor[PlannerExp } } - override def visitValueLiteral(literal: ValueLiteralExpression): PlannerExpression = { + override def visit(literal: ValueLiteralExpression): PlannerExpression = { if (hasRoot(literal.getOutputDataType.getLogicalType, SYMBOL)) { val plannerSymbol = getSymbol(literal.getValueAs(classOf[TableSymbol]).get()) return SymbolPlannerExpression(plannerSymbol) @@ -762,33 +762,33 @@ class PlannerExpressionConverter private extends ApiExpressionVisitor[PlannerExp throw new TableException("Unsupported symbol: " + symbol) } - override def visitFieldReference(fieldReference: FieldReferenceExpression): PlannerExpression = { + override def visit(fieldReference: FieldReferenceExpression): PlannerExpression = { PlannerResolvedFieldReference( fieldReference.getName, fromDataTypeToLegacyInfo(fieldReference.getOutputDataType)) } - override def visitUnresolvedReference(fieldReference: UnresolvedReferenceExpression) + override def visit(fieldReference: UnresolvedReferenceExpression) : PlannerExpression = { UnresolvedFieldReference(fieldReference.getName) } - override def visitTypeLiteral(typeLiteral: TypeLiteralExpression): PlannerExpression = { + override def visit(typeLiteral: TypeLiteralExpression): PlannerExpression = { throw new TableException("Unsupported type literal expression: " + typeLiteral) } - override def visitTableReference(tableRef: TableReferenceExpression): PlannerExpression = { + override def visit(tableRef: TableReferenceExpression): PlannerExpression = { TableReference( tableRef.asInstanceOf[TableReferenceExpression].getName, tableRef.asInstanceOf[TableReferenceExpression].getQueryOperation ) } - override def visitLocalReference(localReference: LocalReferenceExpression): PlannerExpression = + override def visit(localReference: LocalReferenceExpression): PlannerExpression = throw new TableException( "Local reference should be handled individually by a call: " + localReference) - override def visitLookupCall(lookupCall: LookupCallExpression): PlannerExpression = + override def visit(lookupCall: LookupCallExpression): PlannerExpression = throw new TableException("Unsupported function call: " + lookupCall) override def visitNonApiExpression(other: Expression): PlannerExpression = { diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilder.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilder.scala index 0d65a2f14389c..050caf0b2df03 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilder.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilder.scala @@ -570,7 +570,7 @@ class OperationTreeBuilder(private val tableEnv: TableEnvImpl) { class NoWindowPropertyChecker(val exceptionMessage: String) extends ApiExpressionDefaultVisitor[Void] { - override def visitCall(call: CallExpression): Void = { + override def visit(call: CallExpression): Void = { val functionDefinition = call.getFunctionDefinition if (BuiltInFunctionDefinitions.WINDOW_PROPERTIES .contains(functionDefinition)) {