[doris] branch dev-1.1.2 updated: fix index out of bound exception (#11814)

[yiguolei]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
     new a4979606c7 fix index out of bound exception (#11814)
a4979606c7 is described below

commit a4979606c76e3d03cbde8483ec8b6096ded6c2ff
Author: Kikyou1997 <33112463+kikyou1...@users.noreply.github.com>
AuthorDate: Thu Aug 18 14:19:55 2022 +0800

    fix index out of bound exception (#11814)
---
 .../src/main/java/org/apache/doris/planner/Planner.java      | 12 ++++++------
 .../src/main/java/org/apache/doris/planner/SortNode.java     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java 
b/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
index fda1f82e1c..be8fdabdfb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/Planner.java
@@ -173,12 +173,12 @@ public class Planner {
         }
 
         // disable ProjectPlanner for now because there is some bug to be fixed
-        // if (analyzer.getContext() != null
-        //         && 
analyzer.getContext().getSessionVariable().isEnableProjection()
-        //         && statement instanceof SelectStmt) {
-        //     ProjectPlanner projectPlanner = new ProjectPlanner(analyzer);
-        //     
projectPlanner.projectSingleNodePlan(queryStmt.getResultExprs(), 
singleNodePlan);
-        // }
+         if (analyzer.getContext() != null
+                 && 
analyzer.getContext().getSessionVariable().isEnableProjection()
+                 && statement instanceof SelectStmt) {
+             ProjectPlanner projectPlanner = new ProjectPlanner(analyzer);
+             projectPlanner.projectSingleNodePlan(queryStmt.getResultExprs(), 
singleNodePlan);
+         }
 
         if (statement instanceof InsertStmt) {
             InsertStmt insertStmt = (InsertStmt) statement;
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
index b78c0c3386..0cd5294dd6 100644
--- 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
@@ -156,7 +156,7 @@ public class SortNode extends PlanNode {
     @Override
     public Set<SlotId> computeInputSlotIds(Analyzer analyzer) throws 
NotImplementedException {
         List<SlotDescriptor> slotDescriptorList = 
this.info.getSortTupleDescriptor().getSlots();
-        for (int i = 0; i < slotDescriptorList.size(); i++) {
+        for (int i = slotDescriptorList.size() - 1; i >= 0; i--) {
             if (!slotDescriptorList.get(i).isMaterialized()) {
                 resolvedTupleExprs.remove(i);
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org