From 6d95ab05eb9a22148f8e81e09f672cb83a8fc38f Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 13 Jan 2022 16:35:16 +0800
Subject: [PATCH] [TS-575]<fix>(query):client allow stable query have limit

---
 src/client/src/tscSQLParser.c | 2 +-
 src/client/src/tscSubquery.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index c917d60eb6..2c3c161ffc 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7513,7 +7513,7 @@ int32_t validateLimitNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlN
        */
       if (pQueryInfo->limit.limit > 0) {
         pQueryInfo->vgroupLimit = pQueryInfo->limit.limit + pQueryInfo->limit.offset;
-        pQueryInfo->limit.limit = -1;
+        //pQueryInfo->limit.limit = -1;
       }
 
       pQueryInfo->limit.offset = 0;
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index b64184ea0b..0eddfb78e3 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -3176,7 +3176,7 @@ static SSqlObj *tscCreateSTableSubquery(SSqlObj *pSql, SRetrieveSupport *trsuppo
     pQueryInfo->type |= TSDB_QUERY_TYPE_STABLE_SUBQUERY;
 
     // clear the limit/offset info, since it should not be sent to vnode to be executed.
-    pQueryInfo->limit.limit = -1;
+    // pQueryInfo->limit.limit = -1; // alexduan subquery limit is same with parent is ok
     pQueryInfo->limit.offset = 0;
 
     assert(trsupport->subqueryIndex < pSql->subState.numOfSub);
-- 
GitLab