From 4c9c6d68816c22f2c15cea57e4d5ae0b79c7a049 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Fri, 16 Sep 2022 08:36:24 +0800
Subject: [PATCH] fix: fix error during merge

---
 src/query/src/qExecutor.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 01b5f740af..bb9ded8e40 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6332,19 +6332,17 @@ SOperatorInfo* createOrderOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI
       goto _clean;
     }
 
-
-      bool found = false;
-      for (int32_t i = 0; i < numOfOutput; ++i) {
-        SColumnInfoData col = {{0}};
-        col.info.colId = pExpr[i].base.colInfo.colId;
-        col.info.bytes = pExpr[i].base.resBytes;
-        col.info.type  = pExpr[i].base.resType;
-        taosArrayPush(pDataBlock->pDataBlock, &col);
-
-        if (!found && col.info.colId == pOrderVal->orderColId) {
-          pInfo->colIndex = i;
-          found = true;
-        }
+    bool found = false;
+    for (int32_t i = 0; i < numOfOutput; ++i) {
+      SColumnInfoData col = {{0}};
+      col.info.colId = pExpr[i].base.colInfo.colId;
+      col.info.bytes = pExpr[i].base.resBytes;
+      col.info.type  = pExpr[i].base.resType;
+      taosArrayPush(pDataBlock->pDataBlock, &col);
+
+      if (!found && col.info.colId == pOrderVal->orderColId) {
+        pInfo->colIndex = i;
+        found = true;
       }
     }
 
-- 
GitLab