-
Notifications
You must be signed in to change notification settings - Fork 13.8k
[FLINK-20767][table planner] Support filter push down on nested fields #23313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a8c3b23
Support for nested field filter push down to table source
venkata91 3186606
changes based on FLIP to use NestedFieldReferenceExpression
venkata91 b2a7c61
Add more tests and don't push filters on nested fields inside an arra…
venkata91 0229780
more changes
venkata91 f5b7234
More changes based on the FLIP discussions
venkata91 fbc35d2
some changes
venkata91 0803862
Simplify the changes
venkata91 c6825fd
Need to check whether this change for other cases like DeletePushDown…
venkata91 428d884
Add fieldIndices to the NestedFieldReferenceExpression
venkata91 c26c780
Quote the nested field name
venkata91 8924b93
Address review comments
venkata91 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
126 changes: 126 additions & 0 deletions
126
...mmon/src/main/java/org/apache/flink/table/expressions/NestedFieldReferenceExpression.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.table.expressions; | ||
|
|
||
| import org.apache.flink.annotation.PublicEvolving; | ||
| import org.apache.flink.table.types.DataType; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * A reference to a nested field in an input. The reference contains: | ||
| * | ||
| * <ul> | ||
| * <li>nested field names to traverse from the top level column to the nested leaf column. | ||
| * <li>nested field indices to traverse from the top level column to the nested leaf column. | ||
| * <li>type | ||
| * </ul> | ||
| */ | ||
| @PublicEvolving | ||
| public class NestedFieldReferenceExpression implements ResolvedExpression { | ||
|
|
||
| /** Nested field names to traverse from the top level column to the nested leaf column. */ | ||
| private final String[] fieldNames; | ||
|
|
||
| /** Nested field index to traverse from the top level column to the nested leaf column. */ | ||
| private final int[] fieldIndices; | ||
|
|
||
| private final DataType dataType; | ||
|
|
||
| public NestedFieldReferenceExpression( | ||
| String[] fieldNames, int[] fieldIndices, DataType dataType) { | ||
| this.fieldNames = fieldNames; | ||
| this.fieldIndices = fieldIndices; | ||
| this.dataType = dataType; | ||
| } | ||
|
|
||
| public String[] getFieldNames() { | ||
| return fieldNames; | ||
| } | ||
|
|
||
| public int[] getFieldIndices() { | ||
| return fieldIndices; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return String.format( | ||
| "`%s`", | ||
| String.join( | ||
| ".", | ||
| Arrays.stream(fieldNames) | ||
| .map(this::quoteIdentifier) | ||
| .toArray(String[]::new))); | ||
| } | ||
|
|
||
| @Override | ||
| public DataType getOutputDataType() { | ||
| return dataType; | ||
| } | ||
|
|
||
| @Override | ||
| public List<ResolvedExpression> getResolvedChildren() { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public String asSummaryString() { | ||
| return getName(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Expression> getChildren() { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public <R> R accept(ExpressionVisitor<R> visitor) { | ||
| return visitor.visit(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| NestedFieldReferenceExpression that = (NestedFieldReferenceExpression) o; | ||
| return Arrays.equals(fieldNames, that.fieldNames) | ||
| && Arrays.equals(fieldIndices, that.fieldIndices) | ||
| && dataType.equals(that.dataType); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(Arrays.hashCode(fieldNames), Arrays.hashCode(fieldIndices), dataType); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return asSummaryString(); | ||
| } | ||
|
|
||
| private String quoteIdentifier(String identifier) { | ||
| return identifier.replace("`", "``"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.