Skip to content

[fix](planner) remove input slot for aggregate slot which is not materialized (#32092) #32133

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
morrySnow merged 1 commit into from
Mar 12, 2024
Merged

[fix](planner) remove input slot for aggregate slot which is not materialized (#32092) #32133

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: 11 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.doris.analysis.Analyzer;
import org.apache.doris.analysis.Expr;
import org.apache.doris.analysis.FunctionCallExpr;
import org.apache.doris.analysis.SlotDescriptor;
import org.apache.doris.analysis.SlotId;
import org.apache.doris.analysis.TupleDescriptor;
import org.apache.doris.common.NotImplementedException;
Expand Down Expand Up @@ -363,6 +364,16 @@ public Set<SlotId> computeInputSlotIds(Analyzer analyzer) throws NotImplementedE
result.add(tupleDesc.getMaterializedSlots().get(0).getId());
}
}
// if some input slot for aggregate slot which is not materialized, we need to remove it from the result
TupleDescriptor tupleDescriptor = aggInfo.getOutputTupleDesc();
ArrayList<SlotDescriptor> slots = tupleDescriptor.getSlots();
for (SlotDescriptor slot : slots) {
if (!slot.isMaterialized()) {
List<SlotId> unRequestIds = Lists.newArrayList();
Expr.getIds(slot.getSourceExprs(), null, unRequestIds);
unRequestIds.forEach(result::remove);
}
}
return result;
}

Expand Down
10 changes: 10 additions & 0 deletions regression-test/data/correctness_p0/test_inlineview_with_project.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,13 @@
-- !select5 --
3

-- !select5 --
1
2
3

-- !select5 --
1
2
3

44 changes: 44 additions & 0 deletions regression-test/suites/correctness_p0/test_inlineview_with_project.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,50 @@ suite("test_inlineview_with_project") {
FROM test_01 ) TOTAL;
"""

qt_select5 """
SELECT
caseId
FROM
(
SELECT
caseId,
count(judgementDateId)
FROM
(
SELECT
abs(caseId) AS caseId,
id as judgementDateId
FROM
dr_user_test_t2
) AGG_RESULT
GROUP BY
caseId
) TOTAL
order by 1;
"""

qt_select5 """
SELECT
caseId
FROM
(
SELECT
caseId,
count(judgementDateId)
FROM
(
SELECT
caseId AS caseId,
abs(id) as judgementDateId
FROM
dr_user_test_t2
) AGG_RESULT
GROUP BY
caseId
) TOTAL
order by 1;
"""

sql """DROP TABLE IF EXISTS `dr_user_test_t1`;"""
sql """DROP TABLE IF EXISTS `dr_user_test_t2`;"""
}