[FLINK-13028][table] Refactor expression package structure

cchepelov · Jul 2, 2019 · 14fe641 · 14fe641
1 parent 8c1968a
commit 14fe641
Show file tree

Hide file tree

Showing 72 changed files with 163 additions and 113 deletions.
diff --git a/...table-api-java/src/main/java/org/apache/flink/table/api/OverWindowPartitionedOrdered.java b/...table-api-java/src/main/java/org/apache/flink/table/api/OverWindowPartitionedOrdered.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.apache.flink.table.expressions.ApiExpressionUtils.unresolvedCall;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.unresolvedCall;
 
 /**
  * Partially defined over window with (optional) partitioning and order.

diff --git a/...able-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java b/...able-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java
@@ -46,7 +46,7 @@
 import org.apache.flink.table.descriptors.StreamTableDescriptor;
 import org.apache.flink.table.descriptors.TableDescriptor;
 import org.apache.flink.table.expressions.TableReferenceExpression;
-import org.apache.flink.table.expressions.lookups.TableReferenceLookup;
+import org.apache.flink.table.expressions.resolver.lookups.TableReferenceLookup;
 import org.apache.flink.table.functions.ScalarFunction;
 import org.apache.flink.table.operations.CatalogQueryOperation;
 import org.apache.flink.table.operations.CatalogSinkModifyOperation;

diff --git a/...ble/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableImpl.java b/...ble/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableImpl.java
@@ -36,7 +36,7 @@
 import org.apache.flink.table.catalog.FunctionLookup;
 import org.apache.flink.table.expressions.Expression;
 import org.apache.flink.table.expressions.ExpressionParser;
-import org.apache.flink.table.expressions.LookupCallResolver;
+import org.apache.flink.table.expressions.resolver.LookupCallResolver;
 import org.apache.flink.table.functions.TemporalTableFunction;
 import org.apache.flink.table.functions.TemporalTableFunctionImpl;
 import org.apache.flink.table.operations.JoinQueryOperation.JoinType;

diff --git a/.../expressions/PlannerExpressionParser.java → ...e/delegation/PlannerExpressionParser.java b/.../expressions/PlannerExpressionParser.java → ...e/delegation/PlannerExpressionParser.java
@@ -16,17 +16,19 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.delegation;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.TableException;
+import org.apache.flink.table.expressions.Expression;
+import org.apache.flink.table.expressions.ExpressionParser;
 
 import java.lang.reflect.Constructor;
 import java.util.List;
 
 /**
- * Parser for expressions inside a String. This parses exactly the same expressions that
- * would be accepted by the Scala Expression DSL.
+ * Temporary utility for parsing expressions inside a String. This parses exactly the same expressions
+ * that would be accepted by the Scala Expression DSL.
  *
  * <p>{@link PlannerExpressionParser} is used by {@link ExpressionParser} to parse expressions.
  */

diff --git a/...ink-table-api-java/src/main/java/org/apache/flink/table/expressions/ExpressionParser.java b/...ink-table-api-java/src/main/java/org/apache/flink/table/expressions/ExpressionParser.java
@@ -19,6 +19,7 @@
 package org.apache.flink.table.expressions;
 
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.table.delegation.PlannerExpressionParser;
 
 import java.util.List;
 

diff --git a/...table/expressions/ExpressionResolver.java → ...ressions/resolver/ExpressionResolver.java b/...table/expressions/ExpressionResolver.java → ...ressions/resolver/ExpressionResolver.java
@@ -16,17 +16,24 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.expressions.resolver;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.GroupWindow;
 import org.apache.flink.table.api.OverWindow;
 import org.apache.flink.table.api.TableException;
 import org.apache.flink.table.catalog.FunctionLookup;
-import org.apache.flink.table.expressions.lookups.FieldReferenceLookup;
-import org.apache.flink.table.expressions.lookups.TableReferenceLookup;
-import org.apache.flink.table.expressions.rules.ResolverRule;
-import org.apache.flink.table.expressions.rules.ResolverRules;
+import org.apache.flink.table.expressions.CallExpression;
+import org.apache.flink.table.expressions.Expression;
+import org.apache.flink.table.expressions.LocalReferenceExpression;
+import org.apache.flink.table.expressions.ResolvedExpression;
+import org.apache.flink.table.expressions.UnresolvedReferenceExpression;
+import org.apache.flink.table.expressions.ValueLiteralExpression;
+import org.apache.flink.table.expressions.resolver.lookups.FieldReferenceLookup;
+import org.apache.flink.table.expressions.resolver.lookups.TableReferenceLookup;
+import org.apache.flink.table.expressions.resolver.rules.ResolverRule;
+import org.apache.flink.table.expressions.resolver.rules.ResolverRules;
+import org.apache.flink.table.expressions.utils.ApiExpressionDefaultVisitor;
 import org.apache.flink.table.functions.BuiltInFunctionDefinition;
 import org.apache.flink.table.functions.BuiltInFunctionDefinitions;
 import org.apache.flink.table.operations.QueryOperation;
@@ -42,8 +49,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.apache.flink.table.expressions.ApiExpressionUtils.typeLiteral;
-import static org.apache.flink.table.expressions.ApiExpressionUtils.valueLiteral;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.typeLiteral;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.valueLiteral;
 
 /**
  * Tries to resolve all unresolved expressions such as {@link UnresolvedReferenceExpression}

diff --git a/...nk/table/expressions/LocalOverWindow.java → ...expressions/resolver/LocalOverWindow.java b/...nk/table/expressions/LocalOverWindow.java → ...expressions/resolver/LocalOverWindow.java
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.expressions.resolver;
 
-import org.apache.flink.annotation.Internal;
+import org.apache.flink.table.expressions.Expression;
 
 import javax.annotation.Nullable;
 
@@ -28,7 +28,6 @@
 /**
  * Local over window created during expression resolution.
  */
-@Internal
 public final class LocalOverWindow {
 
 	private Expression alias;

diff --git a/...table/expressions/LookupCallResolver.java → ...ressions/resolver/LookupCallResolver.java b/...table/expressions/LookupCallResolver.java → ...ressions/resolver/LookupCallResolver.java
@@ -16,11 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.expressions.resolver;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.ValidationException;
 import org.apache.flink.table.catalog.FunctionLookup;
+import org.apache.flink.table.expressions.Expression;
+import org.apache.flink.table.expressions.LookupCallExpression;
+import org.apache.flink.table.expressions.UnresolvedCallExpression;
+import org.apache.flink.table.expressions.utils.ApiExpressionDefaultVisitor;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...essions/lookups/FieldReferenceLookup.java → ...esolver/lookups/FieldReferenceLookup.java b/...essions/lookups/FieldReferenceLookup.java → ...esolver/lookups/FieldReferenceLookup.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.lookups;
+package org.apache.flink.table.expressions.resolver.lookups;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.TableSchema;

diff --git a/...essions/lookups/TableReferenceLookup.java → ...esolver/lookups/TableReferenceLookup.java b/...essions/lookups/TableReferenceLookup.java → ...esolver/lookups/TableReferenceLookup.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.lookups;
+package org.apache.flink.table.expressions.resolver.lookups;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.expressions.TableReferenceExpression;

diff --git a/...ions/rules/ExpandColumnFunctionsRule.java → ...lver/rules/ExpandColumnFunctionsRule.java b/...ions/rules/ExpandColumnFunctionsRule.java → ...lver/rules/ExpandColumnFunctionsRule.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.table.expressions.ApiExpressionDefaultVisitor;
 import org.apache.flink.table.expressions.Expression;
 import org.apache.flink.table.expressions.ExpressionUtils;
 import org.apache.flink.table.expressions.UnresolvedCallExpression;
 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.FunctionDefinition;
 import org.apache.flink.util.Preconditions;
 
@@ -35,8 +35,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.apache.flink.table.expressions.ApiExpressionUtils.unresolvedCall;
-import static org.apache.flink.table.expressions.ApiExpressionUtils.unresolvedRef;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.unresolvedCall;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.unresolvedRef;
 import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.AS;
 import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.RANGE_TO;
 import static org.apache.flink.table.functions.BuiltInFunctionDefinitions.WITHOUT_COLUMNS;

diff --git a/...pressions/rules/LookupCallByNameRule.java → .../resolver/rules/LookupCallByNameRule.java b/...pressions/rules/LookupCallByNameRule.java → .../resolver/rules/LookupCallByNameRule.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.expressions.Expression;
-import org.apache.flink.table.expressions.LookupCallResolver;
+import org.apache.flink.table.expressions.resolver.LookupCallResolver;
 import org.apache.flink.table.functions.FunctionDefinition;
 
 import java.util.List;

diff --git a/...essions/rules/OverWindowResolverRule.java → ...esolver/rules/OverWindowResolverRule.java b/...essions/rules/OverWindowResolverRule.java → ...esolver/rules/OverWindowResolverRule.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.table.expressions.ApiExpressionDefaultVisitor;
 import org.apache.flink.table.expressions.Expression;
-import org.apache.flink.table.expressions.LocalOverWindow;
 import org.apache.flink.table.expressions.UnresolvedCallExpression;
 import org.apache.flink.table.expressions.ValueLiteralExpression;
+import org.apache.flink.table.expressions.resolver.LocalOverWindow;
+import org.apache.flink.table.expressions.utils.ApiExpressionDefaultVisitor;
 import org.apache.flink.table.functions.BuiltInFunctionDefinitions;
 import org.apache.flink.table.functions.FunctionDefinition;
 import org.apache.flink.table.types.logical.LogicalType;
@@ -34,7 +34,7 @@
 import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
-import static org.apache.flink.table.expressions.ApiExpressionUtils.unresolvedCall;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.unresolvedCall;
 import static org.apache.flink.table.types.logical.LogicalTypeRoot.BIGINT;
 import static org.apache.flink.table.types.logical.LogicalTypeRoot.INTERVAL_DAY_TIME;
 import static org.apache.flink.table.types.logical.utils.LogicalTypeChecks.hasRoot;

diff --git a/...ns/rules/QualifyBuiltInFunctionsRule.java → ...er/rules/QualifyBuiltInFunctionsRule.java b/...ns/rules/QualifyBuiltInFunctionsRule.java → ...er/rules/QualifyBuiltInFunctionsRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.catalog.FunctionLookup;

diff --git a/...ressions/rules/ReferenceResolverRule.java → ...resolver/rules/ReferenceResolverRule.java b/...ressions/rules/ReferenceResolverRule.java → ...resolver/rules/ReferenceResolverRule.java
@@ -16,26 +16,27 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.ValidationException;
 import org.apache.flink.table.expressions.Expression;
 import org.apache.flink.table.expressions.FieldReferenceExpression;
+import org.apache.flink.table.expressions.LocalReferenceExpression;
 import org.apache.flink.table.expressions.UnresolvedCallExpression;
 import org.apache.flink.table.expressions.UnresolvedReferenceExpression;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
-import static org.apache.flink.table.expressions.ApiExpressionUtils.unresolvedCall;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.unresolvedCall;
 
 /**
  * Resolves {@link UnresolvedReferenceExpression} to either
  * {@link org.apache.flink.table.expressions.FieldReferenceExpression},
  * {@link org.apache.flink.table.expressions.TableReferenceExpression}, or
- * {@link org.apache.flink.table.expressions.LocalReferenceExpression} in this order.
+ * {@link LocalReferenceExpression} in this order.
  */
 @Internal
 final class ReferenceResolverRule implements ResolverRule {

diff --git a/...ons/rules/ResolveCallByArgumentsRule.java → ...ver/rules/ResolveCallByArgumentsRule.java b/...ons/rules/ResolveCallByArgumentsRule.java → ...ver/rules/ResolveCallByArgumentsRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.TableException;

diff --git a/...essions/rules/ResolveFlattenCallRule.java → ...esolver/rules/ResolveFlattenCallRule.java b/...essions/rules/ResolveFlattenCallRule.java → ...esolver/rules/ResolveFlattenCallRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -32,7 +32,7 @@
 import java.util.stream.IntStream;
 
 import static java.util.Collections.singletonList;
-import static org.apache.flink.table.expressions.ApiExpressionUtils.valueLiteral;
+import static org.apache.flink.table.expressions.utils.ApiExpressionUtils.valueLiteral;
 import static org.apache.flink.table.types.utils.TypeConversions.fromDataTypeToLegacyInfo;
 import static org.apache.flink.table.types.utils.TypeConversions.fromLegacyInfoToDataType;
 

diff --git a/...table/expressions/rules/ResolverRule.java → ...ressions/resolver/rules/ResolverRule.java b/...table/expressions/rules/ResolverRule.java → ...ressions/resolver/rules/ResolverRule.java
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.catalog.FunctionLookup;
 import org.apache.flink.table.expressions.Expression;
-import org.apache.flink.table.expressions.ExpressionResolver;
-import org.apache.flink.table.expressions.LocalOverWindow;
 import org.apache.flink.table.expressions.LocalReferenceExpression;
-import org.apache.flink.table.expressions.lookups.FieldReferenceLookup;
-import org.apache.flink.table.expressions.lookups.TableReferenceLookup;
+import org.apache.flink.table.expressions.resolver.ExpressionResolver;
+import org.apache.flink.table.expressions.resolver.LocalOverWindow;
+import org.apache.flink.table.expressions.resolver.lookups.FieldReferenceLookup;
+import org.apache.flink.table.expressions.resolver.lookups.TableReferenceLookup;
 import org.apache.flink.table.functions.FunctionDefinition;
 
 import java.util.List;

diff --git a/...able/expressions/rules/ResolverRules.java → ...essions/resolver/rules/ResolverRules.java b/...able/expressions/rules/ResolverRules.java → ...essions/resolver/rules/ResolverRules.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.expressions.UnresolvedReferenceExpression;

diff --git a/...ressions/rules/RuleExpressionVisitor.java → ...resolver/rules/RuleExpressionVisitor.java b/...ressions/rules/RuleExpressionVisitor.java → ...resolver/rules/RuleExpressionVisitor.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.table.expressions.ApiExpressionDefaultVisitor;
-import org.apache.flink.table.expressions.rules.ResolverRule.ResolutionContext;
+import org.apache.flink.table.expressions.resolver.rules.ResolverRule.ResolutionContext;
+import org.apache.flink.table.expressions.utils.ApiExpressionDefaultVisitor;
 
 /**
  * Utility class for {@link ResolverRule} specific visitor that unifies access to

diff --git a/...ns/rules/StarReferenceFlatteningRule.java → ...er/rules/StarReferenceFlatteningRule.java b/...ns/rules/StarReferenceFlatteningRule.java → ...er/rules/StarReferenceFlatteningRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions.rules;
+package org.apache.flink.table.expressions.resolver.rules;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.expressions.Expression;

diff --git a/...ressions/ApiExpressionDefaultVisitor.java → ...ns/utils/ApiExpressionDefaultVisitor.java b/...ressions/ApiExpressionDefaultVisitor.java → ...ns/utils/ApiExpressionDefaultVisitor.java
@@ -16,9 +16,20 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.expressions.utils;
 
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.table.expressions.ApiExpressionVisitor;
+import org.apache.flink.table.expressions.CallExpression;
+import org.apache.flink.table.expressions.Expression;
+import org.apache.flink.table.expressions.FieldReferenceExpression;
+import org.apache.flink.table.expressions.LocalReferenceExpression;
+import org.apache.flink.table.expressions.LookupCallExpression;
+import org.apache.flink.table.expressions.TableReferenceExpression;
+import org.apache.flink.table.expressions.TypeLiteralExpression;
+import org.apache.flink.table.expressions.UnresolvedCallExpression;
+import org.apache.flink.table.expressions.UnresolvedReferenceExpression;
+import org.apache.flink.table.expressions.ValueLiteralExpression;
 
 /**
  * A utility {@link ApiExpressionVisitor} that calls {@link #defaultMethod(Expression)} by default,

diff --git a/...table/expressions/ApiExpressionUtils.java → ...expressions/utils/ApiExpressionUtils.java b/...table/expressions/ApiExpressionUtils.java → ...expressions/utils/ApiExpressionUtils.java
@@ -16,12 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.expressions;
+package org.apache.flink.table.expressions.utils;
 
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.Table;
 import org.apache.flink.table.api.ValidationException;
+import org.apache.flink.table.expressions.CallExpression;
+import org.apache.flink.table.expressions.Expression;
+import org.apache.flink.table.expressions.ExpressionUtils;
+import org.apache.flink.table.expressions.LookupCallExpression;
+import org.apache.flink.table.expressions.TableReferenceExpression;
+import org.apache.flink.table.expressions.TypeLiteralExpression;
+import org.apache.flink.table.expressions.UnresolvedCallExpression;
+import org.apache.flink.table.expressions.UnresolvedReferenceExpression;
+import org.apache.flink.table.expressions.ValueLiteralExpression;
 import org.apache.flink.table.functions.FunctionDefinition;
 import org.apache.flink.table.functions.FunctionKind;
 import org.apache.flink.table.types.DataType;