diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index d846cb93af6a2c16fd21d2f954b8393e426aa27a..1122ba395ea19e5809c1bb9c84e1102ac1e90dc0 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -934,7 +934,7 @@ void launchAsyncQuery(SRequestObj* pRequest, SQuery* pQuery, SMetaData* pResultM
   int32_t code = 0;
 
   pRequest->body.execMode = pQuery->execMode;
-  
+
   switch (pQuery->execMode) {
     case QUERY_EXEC_MODE_LOCAL:
       asyncExecLocalCmd(pRequest, pQuery);
@@ -1006,10 +1006,6 @@ void launchAsyncQuery(SRequestObj* pRequest, SQuery* pQuery, SMetaData* pResultM
       break;
   }
 
-  //    if (!keepQuery) {
-  //      qDestroyQuery(pQuery);
-  //    }
-
   if (NULL != pRequest && TSDB_CODE_SUCCESS != code) {
     pRequest->code = terrno;
   }
@@ -1479,7 +1475,7 @@ void* doAsyncFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertU
     tsem_wait(&pParam->sem);
   }
 
-  if (pResultInfo->numOfRows == 0  || pRequest->code != TSDB_CODE_SUCCESS) {
+  if (pResultInfo->numOfRows == 0 || pRequest->code != TSDB_CODE_SUCCESS) {
     return NULL;
   } else {
     if (setupOneRowPtr) {
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 14a431feabab2934aed0a7eee46f85dbdae2009c..6ab16b722e79dcdabc26cdf7c0bad25c6d3e6326 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -688,8 +688,10 @@ void retrieveMetaCallback(SMetaData *pResultMeta, void *param, int32_t code) {
     tscDebug("0x%" PRIx64 " analysis semantics completed, start async query, reqId:0x%" PRIx64, pRequest->self,
              pRequest->requestId);
     launchAsyncQuery(pRequest, pQuery, pResultMeta);
+    qDestroyQuery(pQuery);
   } else {
     destorySqlParseWrapper(pWrapper);
+    qDestroyQuery(pQuery);
     if (NEED_CLIENT_HANDLE_ERROR(code)) {
       tscDebug("0x%" PRIx64 " client retry to handle the error, code:%d - %s, tryCount:%d, reqId:0x%" PRIx64,
                pRequest->self, code, tstrerror(code), pRequest->retry, pRequest->requestId);
@@ -867,7 +869,7 @@ void taos_fetch_rows_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
     } else {
       pResultInfo->numOfRows = 0;
     }
-    
+
     pRequest->body.fetchFp(param, pRequest, pResultInfo->numOfRows);
     return;
   }
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 7915f4a138f587e89304c2fedb7f8471389029b1..a843eb80a931f82ecbc27c6552cc78242fb22246 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -124,9 +124,11 @@ static bool scanPathOptMayBeOptimized(SLogicNode* pNode) {
                                  QUERY_NODE_LOGIC_PLAN_PARTITION != nodeType(pNode->pParent))) {
     return false;
   }
-  if ((QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent) && WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType) ||
+  if ((QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent) &&
+       WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType) ||
       (QUERY_NODE_LOGIC_PLAN_PARTITION == nodeType(pNode->pParent) && pNode->pParent->pParent &&
-       QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent->pParent) && WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType)) {
+       QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent->pParent) &&
+       WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType)) {
     return true;
   }
   if (QUERY_NODE_LOGIC_PLAN_AGG == nodeType(pNode->pParent)) {
@@ -2010,7 +2012,10 @@ static int32_t lastRowScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogic
     SFunctionNode* pFunc = (SFunctionNode*)pNode;
     int32_t        len = snprintf(pFunc->functionName, sizeof(pFunc->functionName), "_cache_last_row");
     pFunc->functionName[len] = '\0';
-    fmGetFuncInfo(pFunc, NULL, 0);
+    int32_t code = fmGetFuncInfo(pFunc, NULL, 0);
+    if (TSDB_CODE_SUCCESS != code) {
+      return code;
+    }
   }
   pAgg->hasLastRow = false;
 
diff --git a/source/libs/planner/test/planBasicTest.cpp b/source/libs/planner/test/planBasicTest.cpp
index 8482698cd358bf4ad076aa34d8adc173349e2c73..0cff13634959bf39f826a693cb8ef1207d3d5261 100644
--- a/source/libs/planner/test/planBasicTest.cpp
+++ b/source/libs/planner/test/planBasicTest.cpp
@@ -106,6 +106,8 @@ TEST_F(PlanBasicTest, lastRowFunc) {
 
   run("SELECT LAST_ROW(c1, c2) FROM t1");
 
+  run("SELECT LAST_ROW(c1), c2 FROM t1");
+
   run("SELECT LAST_ROW(c1) FROM st1");
 
   run("SELECT LAST_ROW(c1) FROM st1 PARTITION BY TBNAME");