[hotfix][table] Refactor expression visitors to common naming scheme

apache · Jun 19, 2019 · 93e0c68 · 93e0c68
1 parent 9bc00bf
commit 93e0c68
Show file tree

Hide file tree

Showing 33 changed files with 100 additions and 100 deletions.
diff --git a/...pi-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java b/...pi-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionDefaultVisitor.java
@@ -27,42 +27,42 @@
 @Internal
 public abstract class ApiExpressionDefaultVisitor<T> extends ApiExpressionVisitor<T> {
 	@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/...table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java b/...table-api-java/src/main/java/org/apache/flink/table/expressions/ApiExpressionVisitor.java
@@ -26,23 +26,23 @@
 @Internal
 public abstract class ApiExpressionVisitor<R> implements ExpressionVisitor<R> {
 
-	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/...k-table-api-java/src/main/java/org/apache/flink/table/expressions/LookupCallResolver.java b/...k-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/...e-api-java/src/main/java/org/apache/flink/table/operations/OperationExpressionsUtils.java b/...e-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<Expression, String> 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<Optional<String>> {
 		@Override
-		public Optional<String> visitCall(CallExpression call) {
+		public Optional<String> visit(CallExpression call) {
 			if (call.getFunctionDefinition().equals(AS)) {
 				return extractValue(call.getChildren().get(1), String.class);
 			} else {
@@ -223,17 +223,17 @@ public Optional<String> visitCall(CallExpression call) {
 		}
 
 		@Override
-		public Optional<String> visitLocalReference(LocalReferenceExpression localReference) {
+		public Optional<String> visit(LocalReferenceExpression localReference) {
 			return Optional.of(localReference.getName());
 		}
 
 		@Override
-		public Optional<String> visitTableReference(TableReferenceExpression tableReference) {
+		public Optional<String> visit(TableReferenceExpression tableReference) {
 			return Optional.of(tableReference.getName());
 		}
 
 		@Override
-		public Optional<String> visitFieldReference(FieldReferenceExpression fieldReference) {
+		public Optional<String> visit(FieldReferenceExpression fieldReference) {
 			return Optional.of(fieldReference.getName());
 		}
 

diff --git a/...e/flink-table-api-java/src/main/java/org/apache/flink/table/typeutils/FieldInfoUtils.java b/...e/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/...e/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java b/...e/flink-table-common/src/main/java/org/apache/flink/table/expressions/CallExpression.java
@@ -56,7 +56,7 @@ public FunctionDefinition getFunctionDefinition() {
 
 	@Override
 	public <R> R accept(ExpressionVisitor<R> visitor) {
-		return visitor.visitCall(this);
+		return visitor.visit(this);
 	}
 
 	@Override

diff --git a/...ble-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java b/...ble-common/src/main/java/org/apache/flink/table/expressions/ExpressionDefaultVisitor.java
@@ -28,22 +28,22 @@
 public abstract class ExpressionDefaultVisitor<T> implements ExpressionVisitor<T> {
 
 	@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/...link-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java b/...link-table-common/src/main/java/org/apache/flink/table/expressions/ExpressionVisitor.java
@@ -27,13 +27,13 @@
 @PublicEvolving
 public interface ExpressionVisitor<R> {
 
-	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/...ble-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java b/...ble-common/src/main/java/org/apache/flink/table/expressions/FieldReferenceExpression.java
@@ -88,7 +88,7 @@ public List<Expression> getChildren() {
 
 	@Override
 	public <R> R accept(ExpressionVisitor<R> visitor) {
-		return visitor.visitFieldReference(this);
+		return visitor.visit(this);
 	}
 
 	@Override

diff --git a/...-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java b/...-table-common/src/main/java/org/apache/flink/table/expressions/TypeLiteralExpression.java
@@ -53,7 +53,7 @@ public List<Expression> getChildren() {
 
 	@Override
 	public <R> R accept(ExpressionVisitor<R> visitor) {
-		return visitor.visitTypeLiteral(this);
+		return visitor.visit(this);
 	}
 
 	@Override

diff --git a/...table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java b/...table-common/src/main/java/org/apache/flink/table/expressions/ValueLiteralExpression.java
@@ -79,7 +79,7 @@ public List<Expression> getChildren() {
 
 	@Override
 	public <R> R accept(ExpressionVisitor<R> visitor) {
-		return visitor.visitValueLiteral(this);
+		return visitor.visit(this);
 	}
 
 	@Override

diff --git a/...able-planner-blink/src/main/java/org/apache/flink/table/expressions/RexNodeConverter.java b/...able-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/...anner-blink/src/main/scala/org/apache/flink/table/codegen/agg/DeclarativeAggCodeGen.scala b/...anner-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/...nner-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/AggCodeGenHelper.scala b/...nner-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/...-blink/src/main/scala/org/apache/flink/table/codegen/agg/batch/HashAggCodeGenHelper.scala b/...-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
     }