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 2019/06/07 08:53:08 UTC
[flink] 03/04: [hotfix][table-api] Renamed methods of
TableOperationsVisitor
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 891075aefcfd702142c90cab51759b40765c5a5d
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Mon Jun 3 11:16:06 2019 +0200
[hotfix][table-api] Renamed methods of TableOperationsVisitor
---
.../table/operations/DataSetQueryOperation.java | 2 +-
.../table/operations/DataStreamQueryOperation.java | 2 +-
.../table/operations/AggregateQueryOperation.java | 2 +-
.../table/operations/CalculatedQueryOperation.java | 2 +-
.../table/operations/CatalogQueryOperation.java | 2 +-
.../table/operations/DistinctQueryOperation.java | 2 +-
.../table/operations/FilterQueryOperation.java | 2 +-
.../flink/table/operations/JoinQueryOperation.java | 2 +-
.../table/operations/ProjectQueryOperation.java | 2 +-
.../flink/table/operations/QueryOperation.java | 2 +-
.../operations/QueryOperationDefaultVisitor.java | 24 +++++++++++-----------
.../table/operations/QueryOperationVisitor.java | 24 +++++++++++-----------
.../flink/table/operations/SetQueryOperation.java | 2 +-
.../flink/table/operations/SortQueryOperation.java | 2 +-
.../operations/TableSourceQueryOperation.java | 2 +-
.../operations/WindowAggregateQueryOperation.java | 2 +-
.../flink/table/plan/QueryOperationConverter.java | 24 +++++++++++-----------
.../table/operations/PlannerQueryOperation.java | 2 +-
18 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataSetQueryOperation.java b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataSetQueryOperation.java
index 7968981..1887d3f 100644
--- a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataSetQueryOperation.java
+++ b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataSetQueryOperation.java
@@ -79,6 +79,6 @@ public class DataSetQueryOperation<E> implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitOther(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataStreamQueryOperation.java b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataStreamQueryOperation.java
index b239915..5106dec 100644
--- a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataStreamQueryOperation.java
+++ b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/operations/DataStreamQueryOperation.java
@@ -80,6 +80,6 @@ public class DataStreamQueryOperation<E> implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitOther(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/AggregateQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/AggregateQueryOperation.java
index ff45324..a47b929 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/AggregateQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/AggregateQueryOperation.java
@@ -79,6 +79,6 @@ public class AggregateQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitAggregate(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CalculatedQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CalculatedQueryOperation.java
index c2d1e8b..b44795e 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CalculatedQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CalculatedQueryOperation.java
@@ -84,6 +84,6 @@ public class CalculatedQueryOperation<T> implements QueryOperation {
@Override
public <U> U accept(QueryOperationVisitor<U> visitor) {
- return visitor.visitCalculatedTable(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CatalogQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CatalogQueryOperation.java
index 3f90e73..28b8e46 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CatalogQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/CatalogQueryOperation.java
@@ -65,6 +65,6 @@ public class CatalogQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitCatalogTable(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/DistinctQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/DistinctQueryOperation.java
index 2283f52..ca24892 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/DistinctQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/DistinctQueryOperation.java
@@ -57,6 +57,6 @@ public class DistinctQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitDistinct(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/FilterQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/FilterQueryOperation.java
index 18e526e..1b2d365 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/FilterQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/FilterQueryOperation.java
@@ -65,7 +65,7 @@ public class FilterQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitFilter(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/JoinQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/JoinQueryOperation.java
index 83c79ac..46fb7cd 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/JoinQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/JoinQueryOperation.java
@@ -124,6 +124,6 @@ public class JoinQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitJoin(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ProjectQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ProjectQueryOperation.java
index 519219f..ad3243a 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ProjectQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ProjectQueryOperation.java
@@ -71,6 +71,6 @@ public class ProjectQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitProject(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperation.java
index 7f10099..a4cd72e 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperation.java
@@ -52,7 +52,7 @@ public interface QueryOperation extends Operation {
List<QueryOperation> getChildren();
default <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitOther(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationDefaultVisitor.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationDefaultVisitor.java
index b2fd379..b1c2edc 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationDefaultVisitor.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationDefaultVisitor.java
@@ -29,62 +29,62 @@ import org.apache.flink.annotation.Internal;
public abstract class QueryOperationDefaultVisitor<T> implements QueryOperationVisitor<T> {
@Override
- public T visitProject(ProjectQueryOperation projection) {
+ public T visit(ProjectQueryOperation projection) {
return defaultMethod(projection);
}
@Override
- public T visitAggregate(AggregateQueryOperation aggregation) {
+ public T visit(AggregateQueryOperation aggregation) {
return defaultMethod(aggregation);
}
@Override
- public T visitWindowAggregate(WindowAggregateQueryOperation windowAggregate) {
+ public T visit(WindowAggregateQueryOperation windowAggregate) {
return defaultMethod(windowAggregate);
}
@Override
- public T visitJoin(JoinQueryOperation join) {
+ public T visit(JoinQueryOperation join) {
return defaultMethod(join);
}
@Override
- public T visitSetOperation(SetQueryOperation setOperation) {
+ public T visit(SetQueryOperation setOperation) {
return defaultMethod(setOperation);
}
@Override
- public T visitFilter(FilterQueryOperation filter) {
+ public T visit(FilterQueryOperation filter) {
return defaultMethod(filter);
}
@Override
- public T visitDistinct(DistinctQueryOperation distinct) {
+ public T visit(DistinctQueryOperation distinct) {
return defaultMethod(distinct);
}
@Override
- public T visitSort(SortQueryOperation sort) {
+ public T visit(SortQueryOperation sort) {
return defaultMethod(sort);
}
@Override
- public T visitCalculatedTable(CalculatedQueryOperation calculatedTable) {
+ public T visit(CalculatedQueryOperation calculatedTable) {
return defaultMethod(calculatedTable);
}
@Override
- public T visitCatalogTable(CatalogQueryOperation catalogTable) {
+ public T visit(CatalogQueryOperation catalogTable) {
return defaultMethod(catalogTable);
}
@Override
- public <U> T visitTableSourceTable(TableSourceQueryOperation<U> tableSourceTable) {
+ public <U> T visit(TableSourceQueryOperation<U> tableSourceTable) {
return defaultMethod(tableSourceTable);
}
@Override
- public T visitOther(QueryOperation other) {
+ public T visit(QueryOperation other) {
return defaultMethod(other);
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationVisitor.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationVisitor.java
index 671872e..3673a96 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationVisitor.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/QueryOperationVisitor.java
@@ -27,27 +27,27 @@ import org.apache.flink.annotation.Internal;
@Internal
public interface QueryOperationVisitor<T> {
- T visitProject(ProjectQueryOperation projection);
+ T visit(ProjectQueryOperation projection);
- T visitAggregate(AggregateQueryOperation aggregation);
+ T visit(AggregateQueryOperation aggregation);
- T visitWindowAggregate(WindowAggregateQueryOperation windowAggregate);
+ T visit(WindowAggregateQueryOperation windowAggregate);
- T visitJoin(JoinQueryOperation join);
+ T visit(JoinQueryOperation join);
- T visitSetOperation(SetQueryOperation setOperation);
+ T visit(SetQueryOperation setOperation);
- T visitFilter(FilterQueryOperation filter);
+ T visit(FilterQueryOperation filter);
- T visitDistinct(DistinctQueryOperation distinct);
+ T visit(DistinctQueryOperation distinct);
- T visitSort(SortQueryOperation sort);
+ T visit(SortQueryOperation sort);
- <U> T visitCalculatedTable(CalculatedQueryOperation<U> calculatedTable);
+ <U> T visit(CalculatedQueryOperation<U> calculatedTable);
- T visitCatalogTable(CatalogQueryOperation catalogTable);
+ T visit(CatalogQueryOperation catalogTable);
- <U> T visitTableSourceTable(TableSourceQueryOperation<U> tableSourceTable);
+ <U> T visit(TableSourceQueryOperation<U> tableSourceTable);
- T visitOther(QueryOperation other);
+ T visit(QueryOperation other);
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SetQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SetQueryOperation.java
index 8671a3e..6505cc4 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SetQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SetQueryOperation.java
@@ -92,7 +92,7 @@ public class SetQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitSetOperation(this);
+ return visitor.visit(this);
}
@Override
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SortQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SortQueryOperation.java
index 109e145..e591440 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SortQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/SortQueryOperation.java
@@ -90,6 +90,6 @@ public class SortQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitSort(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/TableSourceQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/TableSourceQueryOperation.java
index 3c5dead..097e92e 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/TableSourceQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/TableSourceQueryOperation.java
@@ -70,6 +70,6 @@ public class TableSourceQueryOperation<T> implements QueryOperation {
@Override
public <R> R accept(QueryOperationVisitor<R> visitor) {
- return visitor.visitTableSourceTable(this);
+ return visitor.visit(this);
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/WindowAggregateQueryOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/WindowAggregateQueryOperation.java
index 67e4a56..9872b3b 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/WindowAggregateQueryOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/WindowAggregateQueryOperation.java
@@ -107,7 +107,7 @@ public class WindowAggregateQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitWindowAggregate(this);
+ return visitor.visit(this);
}
/**
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 85914a0..bfcd468 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
@@ -126,14 +126,14 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
private class SingleRelVisitor implements QueryOperationVisitor<RelNode> {
@Override
- public RelNode visitProject(ProjectQueryOperation projection) {
+ public RelNode visit(ProjectQueryOperation projection) {
List<RexNode> rexNodes = convertToRexNodes(projection.getProjectList());
return relBuilder.project(rexNodes, asList(projection.getTableSchema().getFieldNames()), true).build();
}
@Override
- public RelNode visitAggregate(AggregateQueryOperation aggregate) {
+ public RelNode visit(AggregateQueryOperation aggregate) {
List<AggCall> aggregations = aggregate.getAggregateExpressions()
.stream()
.map(this::getAggCall)
@@ -145,7 +145,7 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public RelNode visitWindowAggregate(WindowAggregateQueryOperation windowAggregate) {
+ public RelNode visit(WindowAggregateQueryOperation windowAggregate) {
List<AggCall> aggregations = windowAggregate.getAggregateExpressions()
.stream()
.map(this::getAggCall)
@@ -173,7 +173,7 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public RelNode visitJoin(JoinQueryOperation join) {
+ public RelNode visit(JoinQueryOperation join) {
final Set<CorrelationId> corSet;
if (join.isCorrelated()) {
corSet = Collections.singleton(relBuilder.peek().getCluster().createCorrel());
@@ -189,7 +189,7 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public RelNode visitSetOperation(SetQueryOperation setOperation) {
+ public RelNode visit(SetQueryOperation setOperation) {
switch (setOperation.getType()) {
case INTERSECT:
relBuilder.intersect(setOperation.isAll());
@@ -205,25 +205,25 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public RelNode visitFilter(FilterQueryOperation filter) {
+ public RelNode visit(FilterQueryOperation filter) {
RexNode rexNode = convertToRexNode(filter.getCondition());
return relBuilder.filter(rexNode).build();
}
@Override
- public RelNode visitDistinct(DistinctQueryOperation distinct) {
+ public RelNode visit(DistinctQueryOperation distinct) {
return relBuilder.distinct().build();
}
@Override
- public RelNode visitSort(SortQueryOperation sort) {
+ public RelNode visit(SortQueryOperation sort) {
List<RexNode> rexNodes = convertToRexNodes(sort.getOrder());
return relBuilder.sortLimit(sort.getOffset(), sort.getFetch(), rexNodes)
.build();
}
@Override
- public <U> RelNode visitCalculatedTable(CalculatedQueryOperation<U> calculatedTable) {
+ public <U> RelNode visit(CalculatedQueryOperation<U> calculatedTable) {
String[] fieldNames = calculatedTable.getTableSchema().getFieldNames();
int[] fieldIndices = IntStream.range(0, fieldNames.length).toArray();
TypeInformation<U> resultType = calculatedTable.getResultType();
@@ -255,12 +255,12 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public RelNode visitCatalogTable(CatalogQueryOperation catalogTable) {
+ public RelNode visit(CatalogQueryOperation catalogTable) {
return relBuilder.scan(catalogTable.getTablePath()).build();
}
@Override
- public RelNode visitOther(QueryOperation other) {
+ public RelNode visit(QueryOperation other) {
if (other instanceof PlannerQueryOperation) {
return ((PlannerQueryOperation) other).getCalciteTree();
} else if (other instanceof DataStreamQueryOperation) {
@@ -273,7 +273,7 @@ public class QueryOperationConverter extends QueryOperationDefaultVisitor<RelNod
}
@Override
- public <U> RelNode visitTableSourceTable(TableSourceQueryOperation<U> tableSourceTable) {
+ public <U> RelNode visit(TableSourceQueryOperation<U> tableSourceTable) {
final Table relTable = new TableSourceTable<>(
tableSourceTable.getTableSource(),
!tableSourceTable.isBatch(),
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/PlannerQueryOperation.java b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/PlannerQueryOperation.java
index 4573440..c30d741 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/PlannerQueryOperation.java
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/PlannerQueryOperation.java
@@ -75,6 +75,6 @@ public class PlannerQueryOperation implements QueryOperation {
@Override
public <T> T accept(QueryOperationVisitor<T> visitor) {
- return visitor.visitOther(this);
+ return visitor.visit(this);
}
}