Skip to content

[fix](nereids)add visitMarkJoinReference method in ExpressionDeepCopier #26688

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.

Sign up for GitHub

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
xiaokang merged 1 commit into from
Nov 9, 2023
Merged

[fix](nereids)add visitMarkJoinReference method in ExpressionDeepCopier #26688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/copier/ExpressionDeepCopier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,14 @@ public Expression visitAlias(Alias alias, DeepCopierContext context) {
@Override
public Expression visitSlotReference(SlotReference slotReference, DeepCopierContext context) {
Map<ExprId, ExprId> exprIdReplaceMap = context.exprIdReplaceMap;
ExprId newExprId;
if (exprIdReplaceMap.containsKey(slotReference.getExprId())) {
ExprId newExprId = exprIdReplaceMap.get(slotReference.getExprId());
return slotReference.withExprId(newExprId);
newExprId = exprIdReplaceMap.get(slotReference.getExprId());
} else {
SlotReference newOne = new SlotReference(slotReference.getName(), slotReference.getDataType(),
slotReference.nullable(), slotReference.getQualifier());
exprIdReplaceMap.put(slotReference.getExprId(), newOne.getExprId());
return newOne;
newExprId = StatementScopeIdGenerator.newExprId();
exprIdReplaceMap.put(slotReference.getExprId(), newExprId);
}
return slotReference.withExprId(newExprId);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ExpressionVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ public R visitGroupingScalarFunction(GroupingScalarFunction groupingScalarFuncti
}

public R visitVirtualReference(VirtualSlotReference virtualSlotReference, C context) {
return visit(virtualSlotReference, context);
return visitSlotReference(virtualSlotReference, context);
}

public R visitVariableDesc(VariableDesc variableDesc, C context) {
Expand Down
3 changes: 3 additions & 0 deletions regression-test/data/nereids_p0/subquery/test_subquery.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ true 15 1992 3021 11011920 0.000 true 9999-12-12 2015-04-02T00:00 3.141592653 2
-- !sql_subquery_one_row_relation --
1

-- !sql_mark_join --
1

2 changes: 2 additions & 0 deletions regression-test/suites/nereids_p0/subquery/test_subquery.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,7 @@ suite("test_subquery") {

qt_sql_subquery_one_row_relation """select * from test_one_row_relation;"""

qt_sql_mark_join """with A as (select count(*) n1 from test_one_row_relation where exists (select 1 from test_one_row_relation t where t.user_id = test_one_row_relation.user_id) or 1 = 1) select * from A;"""

sql """drop table if exists test_one_row_relation;"""
}