[fix](planner)sort node should materialized required slots for itself a…

…pache#27605 (apache#27620)
eldenmoon · Dec 3, 2023 · 7dfcfbd · 7dfcfbd
1 parent 2956330
commit 7dfcfbd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/JoinNodeBase.java b/fe/fe-core/src/main/java/org/apache/doris/planner/JoinNodeBase.java
@@ -275,9 +275,6 @@ public void initOutputSlotIds(Set<SlotId> requiredSlotIdSet, Analyzer analyzer)
  SlotId firstMaterializedSlotId = null;
  for (TupleDescriptor tupleDescriptor : outputTupleDescList) {
  for (SlotDescriptor slotDescriptor : tupleDescriptor.getSlots()) {
- if ((requiredSlotIdSet != null && requiredSlotIdSet.contains(slotDescriptor.getId()))) {
- slotDescriptor.setIsMaterialized(true);
- }
  if (slotDescriptor.isMaterialized()) {
  if ((requiredSlotIdSet == null || requiredSlotIdSet.contains(slotDescriptor.getId()))) {
  outputSlotIds.add(slotDescriptor.getId());

diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java
@@ -269,6 +269,13 @@ public void getMaterializedIds(Analyzer analyzer, List<SlotId> ids) {
  Expr.getIds(info.getOrderingExprs(), null, ids);
  }
 
+ @Override
+ public void initOutputSlotIds(Set<SlotId> requiredSlotIdSet, Analyzer analyzer) {
+ // need call materializeRequiredSlots again to make sure required slots is materialized by children
+ // requiredSlotIdSet parameter means nothing for sort node, just call materializeRequiredSlots is enough
+ info.materializeRequiredSlots(analyzer, outputSmap);
+ }
+
  private void removeUnusedExprs() {
  if (!isUnusedExprRemoved) {
  if (resolvedTupleExprs != null) {