From 936d21c7533fc5fd431f04f6bfbdb325fb019c06 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Tue, 24 May 2022 22:50:18 +0800
Subject: [PATCH] fix(query): stable with join order by limit not work well

---
 src/client/src/tscServer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 67c7d2b1e8..e42f73fb32 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1964,6 +1964,11 @@ int tscProcessRetrieveGlobalMergeRsp(SSqlObj *pSql) {
 
   // global aggregation may be the upstream for parent query
   SQueryInfo *pQueryInfo = tscGetQueryInfo(pCmd);
+  if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+    pQueryInfo->limit.limit = pQueryInfo->clauseLimit;
+    pQueryInfo->limit.offset = pQueryInfo->prjOffset;
+  }
+  
   if (pQueryInfo->pQInfo == NULL) {
     STableGroupInfo tableGroupInfo = {.numOfTables = 1, .pGroupList = taosArrayInit(1, POINTER_BYTES),};
 
-- 
GitLab