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 39e4ad2097506f646a1c8a78f753628ad1debb82 Author: Dawid Wysakowicz <[email protected]> AuthorDate: Tue Jul 2 14:55:29 2019 +0200 [hotfix][table-planner][table-api-java] Move QueryOperation factories to table-api-java --- .../operations/utils/factories}/AggregateOperationFactory.java | 5 ++++- .../table/operations/utils/factories}/AliasOperationUtils.java | 3 ++- .../table/operations/utils/factories}/CalculatedTableFactory.java | 4 +++- .../table/operations/utils/factories}/ColumnOperationUtils.java | 2 +- .../table/operations/utils/factories}/JoinOperationFactory.java | 5 ++++- .../operations/utils/factories}/ProjectionOperationFactory.java | 4 +++- .../table/operations/utils/factories}/SetOperationFactory.java | 4 +++- .../table/operations/utils/factories}/SortOperationFactory.java | 4 +++- .../apache/flink/table/operations/OperationTreeBuilderImpl.scala | 7 ++++--- 9 files changed, 27 insertions(+), 11 deletions(-) diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AggregateOperationFactory.java similarity index 98% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AggregateOperationFactory.java index ac6ee30..8fef793 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AggregateOperationFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AggregateOperationFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; @@ -45,6 +45,9 @@ import org.apache.flink.table.functions.BuiltInFunctionDefinitions; import org.apache.flink.table.functions.FunctionDefinition; import org.apache.flink.table.functions.FunctionRequirement; import org.apache.flink.table.functions.TableAggregateFunctionDefinition; +import org.apache.flink.table.operations.AggregateQueryOperation; +import org.apache.flink.table.operations.QueryOperation; +import org.apache.flink.table.operations.WindowAggregateQueryOperation; import org.apache.flink.table.operations.WindowAggregateQueryOperation.ResolvedGroupWindow; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LegacyTypeInformationType; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AliasOperationUtils.java similarity index 97% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AliasOperationUtils.java index c73ca47..a9a45d0 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/AliasOperationUtils.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/AliasOperationUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.TableSchema; @@ -27,6 +27,7 @@ import org.apache.flink.table.expressions.UnresolvedReferenceExpression; import org.apache.flink.table.expressions.ValueLiteralExpression; import org.apache.flink.table.expressions.utils.ApiExpressionDefaultVisitor; import org.apache.flink.table.functions.BuiltInFunctionDefinitions; +import org.apache.flink.table.operations.QueryOperation; import java.util.List; import java.util.stream.Collectors; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/CalculatedTableFactory.java similarity index 96% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/CalculatedTableFactory.java index 2e10ee8..fe01128 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/CalculatedTableFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/CalculatedTableFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -29,6 +29,8 @@ 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.TableFunctionDefinition; +import org.apache.flink.table.operations.CalculatedQueryOperation; +import org.apache.flink.table.operations.QueryOperation; import org.apache.flink.table.typeutils.FieldInfoUtils; import java.util.Arrays; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ColumnOperationUtils.java similarity index 98% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ColumnOperationUtils.java index b84d33a..12e12c99 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ColumnOperationUtils.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ColumnOperationUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.ValidationException; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/JoinOperationFactory.java similarity index 95% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/JoinOperationFactory.java index 5816c00..8c4f98a 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/JoinOperationFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/JoinOperationFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.ValidationException; @@ -26,7 +26,10 @@ import org.apache.flink.table.expressions.FieldReferenceExpression; import org.apache.flink.table.expressions.ResolvedExpression; import org.apache.flink.table.expressions.utils.ResolvedExpressionDefaultVisitor; import org.apache.flink.table.functions.BuiltInFunctionDefinitions; +import org.apache.flink.table.operations.CalculatedQueryOperation; +import org.apache.flink.table.operations.JoinQueryOperation; import org.apache.flink.table.operations.JoinQueryOperation.JoinType; +import org.apache.flink.table.operations.QueryOperation; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.LogicalTypeRoot; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ProjectionOperationFactory.java similarity index 97% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ProjectionOperationFactory.java index 56a34ff..fffceb1 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/ProjectionOperationFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/ProjectionOperationFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.TableException; @@ -33,6 +33,8 @@ import org.apache.flink.table.expressions.resolver.ExpressionResolver; import org.apache.flink.table.expressions.utils.ResolvedExpressionDefaultVisitor; import org.apache.flink.table.functions.BuiltInFunctionDefinitions; import org.apache.flink.table.functions.FunctionDefinition; +import org.apache.flink.table.operations.ProjectQueryOperation; +import org.apache.flink.table.operations.QueryOperation; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SetOperationFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SetOperationFactory.java similarity index 95% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SetOperationFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SetOperationFactory.java index bc791c6..9b54b78 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SetOperationFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SetOperationFactory.java @@ -16,12 +16,14 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.api.ValidationException; +import org.apache.flink.table.operations.QueryOperation; +import org.apache.flink.table.operations.SetQueryOperation; import org.apache.flink.table.operations.SetQueryOperation.SetQueryOperationType; import java.util.stream.IntStream; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SortOperationFactory.java similarity index 96% rename from flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java rename to flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SortOperationFactory.java index e2d86e8..765fe4f 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/operations/SortOperationFactory.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/utils/factories/SortOperationFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.operations; +package org.apache.flink.table.operations.utils.factories; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.ValidationException; @@ -24,6 +24,8 @@ import org.apache.flink.table.expressions.CallExpression; import org.apache.flink.table.expressions.ResolvedExpression; import org.apache.flink.table.expressions.resolver.ExpressionResolver; import org.apache.flink.table.expressions.utils.ResolvedExpressionDefaultVisitor; +import org.apache.flink.table.operations.QueryOperation; +import org.apache.flink.table.operations.SortQueryOperation; import java.util.List; import java.util.stream.Collectors; diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilderImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilderImpl.scala index 6b60c38..03a9bc3 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilderImpl.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/operations/OperationTreeBuilderImpl.scala @@ -21,19 +21,20 @@ package org.apache.flink.table.operations import java.util.{Collections, Optional, List => JList} import org.apache.flink.table.api._ import org.apache.flink.table.catalog.FunctionLookup -import org.apache.flink.table.expressions.utils.ApiExpressionUtils.{isFunctionOfKind, unresolvedCall, unresolvedRef, valueLiteral} -import org.apache.flink.table.expressions.resolver.ExpressionResolver.resolverFor import org.apache.flink.table.expressions._ +import org.apache.flink.table.expressions.resolver.ExpressionResolver.resolverFor import org.apache.flink.table.expressions.resolver.lookups.TableReferenceLookup import org.apache.flink.table.expressions.resolver.{ExpressionResolver, LookupCallResolver} +import org.apache.flink.table.expressions.utils.ApiExpressionUtils.{isFunctionOfKind, unresolvedCall, unresolvedRef, valueLiteral} import org.apache.flink.table.expressions.utils.{ApiExpressionDefaultVisitor, ApiExpressionUtils} import org.apache.flink.table.functions.FunctionKind.{SCALAR, TABLE} import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils import org.apache.flink.table.functions.{AggregateFunctionDefinition, BuiltInFunctionDefinitions, TableFunctionDefinition} -import org.apache.flink.table.operations.AliasOperationUtils.createAliasList import org.apache.flink.table.operations.JoinQueryOperation.JoinType import org.apache.flink.table.operations.OperationExpressionsUtils.extractAggregationsAndProperties import org.apache.flink.table.operations.SetQueryOperation.SetQueryOperationType._ +import org.apache.flink.table.operations.utils.factories.AliasOperationUtils.createAliasList +import org.apache.flink.table.operations.utils.factories._ import org.apache.flink.table.types.logical.LogicalTypeRoot import org.apache.flink.table.types.logical.utils.LogicalTypeChecks import org.apache.flink.table.util.JavaScalaConversionUtil.toScala
