-
Notifications
You must be signed in to change notification settings - Fork 3.9k
[opt](nereids) infer result column name in ctas and query stmt #26055
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
morrySnow
merged 7 commits into
apache:master
from
seawinde:infer_expr_name_when_query_and_ddl_nereids
Nov 8, 2023
+2,181
−29
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
80e7e4a
[improvement](nereids) Support to infer name if it is an expression a…
seawinde 15f51ad
fix regression test assert
seawinde 90bda77
improve some logical and change param name
seawinde b920f48
Merge branch 'master' into infer_expr_name_when_query_and_ddl_nereids
seawinde 97f9371
old optimizer also infer name when select
seawinde e0aa5e0
Merge branch 'master' into infer_expr_name_when_query_and_ddl_nereids
seawinde 12997b8
old optimizer also infer name when select
seawinde 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
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
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
76 changes: 76 additions & 0 deletions
76
...core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/InferPlanOutputAlias.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,76 @@ | ||
| // 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.doris.nereids.trees.plans.visitor; | ||
|
|
||
| import org.apache.doris.nereids.trees.expressions.Alias; | ||
| import org.apache.doris.nereids.trees.expressions.ExprId; | ||
| import org.apache.doris.nereids.trees.expressions.NamedExpression; | ||
| import org.apache.doris.nereids.trees.expressions.Slot; | ||
| import org.apache.doris.nereids.trees.plans.Plan; | ||
|
|
||
| import com.google.common.collect.ImmutableCollection; | ||
| import com.google.common.collect.ImmutableMultimap; | ||
| import com.google.common.collect.ImmutableSet; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Infer output column name when it refers an expression and not has an alias manually. | ||
| */ | ||
| public class InferPlanOutputAlias extends DefaultPlanVisitor<Void, ImmutableMultimap<ExprId, Integer>> { | ||
|
|
||
| private final List<Slot> currentOutputs; | ||
| private final List<NamedExpression> finalOutputs; | ||
|
|
||
| public InferPlanOutputAlias(List<Slot> currentOutputs) { | ||
| this.currentOutputs = currentOutputs; | ||
| this.finalOutputs = new ArrayList<>(currentOutputs); | ||
| } | ||
|
|
||
| @Override | ||
| public Void visit(Plan plan, ImmutableMultimap<ExprId, Integer> currentExprIdAndIndexMap) { | ||
|
|
||
| List<Alias> aliasProjects = plan.getExpressions().stream() | ||
| .filter(expression -> expression instanceof Alias) | ||
| .map(Alias.class::cast) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| ImmutableSet<ExprId> currentOutputExprIdSet = currentExprIdAndIndexMap.keySet(); | ||
| for (Alias projectItem : aliasProjects) { | ||
| ExprId exprId = projectItem.getExprId(); | ||
| // Infer name when alias child is expression and alias's name is from child | ||
| if (currentOutputExprIdSet.contains(projectItem.getExprId()) | ||
| && projectItem.isNameFromChild()) { | ||
| String inferredAliasName = projectItem.child().getExpressionName(); | ||
| ImmutableCollection<Integer> outPutExprIndexes = currentExprIdAndIndexMap.get(exprId); | ||
| // replace output name by inferred name | ||
| outPutExprIndexes.forEach(index -> { | ||
| Slot slot = currentOutputs.get(index); | ||
| finalOutputs.set(index, slot.withName("__" + inferredAliasName + "_" + index)); | ||
| }); | ||
| } | ||
| } | ||
| return super.visit(plan, currentExprIdAndIndexMap); | ||
| } | ||
|
|
||
| public List<NamedExpression> getOutputs() { | ||
| return finalOutputs; | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not see how to process ctas
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ctas stmt is supported in nereids now and it's also call the method
org.apache.doris.nereids.NereidsPlanner#plan, this pr is also useful. the old and new optimizer should keep consistency when query and ddl