From c372aacb3bdf1ee210e55aa952a8cfc44592f3ae Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 3 Mar 2022 17:42:26 +0800
Subject: [PATCH] fix order useless logic

---
 src/client/src/tscSQLParser.c | 24 +++++++++++++++++-------
 src/query/src/qExecutor.c     |  5 +++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index cd4d53941e..6c1921472f 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -6713,6 +6713,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
   const char* msg5 = "only primary timestamp/column in top/bottom function allowed as order column";
   const char* msg6 = "only primary timestamp allowed as the second order column";
   const char* msg7 = "only primary timestamp/column in groupby clause allowed as order column";
+  const char* msg8 = "only column in groupby clause allowed as order column";
   const char* msg10 = "not support distinct mixed with order by";
   const char* msg11 = "not support order with udf";
   const char* msg12 = "order by tags not supported with diff/derivative/csum/mavg";
@@ -6935,15 +6936,24 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
     }
 
     if (isTopBottomUniqueQuery(pQueryInfo)) {
-      int32_t pos = tscExprTopBottomIndex(pQueryInfo);
-      assert(pos > 0);
-      SExprInfo* pExpr = tscExprGet(pQueryInfo, pos - 1);
-      assert(pExpr->base.functionId == TSDB_FUNC_TS);
+      SArray *columnInfo = pQueryInfo->groupbyExpr.columnInfo;
+      if (columnInfo != NULL && taosArrayGetSize(columnInfo) > 0) {
+        SColIndex* pColIndex = taosArrayGet(columnInfo, 0);
 
-      pExpr = tscExprGet(pQueryInfo, pos);
+        if (pColIndex->colIndex != index.columnIndex) {
+          return invalidOperationMsg(pMsgBuf, msg8);
+        }
+      } else {
+        int32_t pos = tscExprTopBottomIndex(pQueryInfo);
+        assert(pos > 0);
+        SExprInfo* pExpr = tscExprGet(pQueryInfo, pos - 1);
+        assert(pExpr->base.functionId == TSDB_FUNC_TS);
 
-      if (pExpr->base.colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-        return invalidOperationMsg(pMsgBuf, msg5);
+        pExpr = tscExprGet(pQueryInfo, pos);
+
+        if (pExpr->base.colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+          return invalidOperationMsg(pMsgBuf, msg5);
+        }
       }
     }
 
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index dee771d528..fff9420999 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -287,6 +287,11 @@ static void sortGroupResByOrderList(SGroupResInfo *pGroupResInfo, SQueryRuntimeE
   if (pRuntimeEnv->pQueryAttr->pGroupbyExpr == NULL || pRuntimeEnv->pQueryAttr->pGroupbyExpr->numOfGroupCols <= 0){
     return;
   }
+
+  if (pRuntimeEnv->pQueryAttr->order.orderColId <= 0){
+    return;
+  }
+  
   SColIndex* pColIndex = taosArrayGet(pRuntimeEnv->pQueryAttr->pGroupbyExpr->columnInfo, 0);
 
   int16_t dataOffset = 0;
-- 
GitLab