Merge pull request #20117 from taosdata/szhou/fixbugs26-1

fix: fix parent sql object invalid error

src/client/src/tscSubquery.c

@@ -3027,6 +3027,11 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
   }
 
   SSqlObj *pParentSql = trsupport->pParentSql;
+  if (pParentSql->signature != pParentSql) {
+    tscError("query 0x%"PRIx64" parent sql obj %p not valid. parent id: 0x%"PRIx64, pSql->self, pParentSql, pParentSql->self);
+    return;
+  }
+
   int32_t  subqueryIndex = trsupport->subqueryIndex;
   
   assert(pSql != NULL);
@@ -3133,6 +3138,11 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
   int32_t           idx = trsupport->subqueryIndex;
   SSqlObj *         pParentSql = trsupport->pParentSql;
   tOrderDescriptor *pDesc = trsupport->pOrderDescriptor;
+
+  if (pParentSql->signature != pParentSql) {
+    tscError("query 0x%"PRIx64" parent sql obj %p not valid. parent id: 0x%"PRIx64, pSql->self, pParentSql, pParentSql->self);
+    return;
+  }
   
   SSubqueryState* pState = &pParentSql->subState;
   SQueryInfo *pQueryInfo = tscGetQueryInfo(&pSql->cmd);

src/client/src/tscSystem.c

@@ -282,14 +282,15 @@ void taos_cleanup(void) {
     #endif
   }
 
-  int32_t id = tscObjRef;
-  tscObjRef = -1;
-  taosCloseRef(id);
 
   void* p = tscQhandle;
   tscQhandle = NULL;
   taosCleanUpScheduler(p);
 
+  int32_t id = tscObjRef;
+  tscObjRef = -1;
+  taosCloseRef(id);
+
   id = tscRefId;
   tscRefId = -1;
   taosCloseRef(id);