diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 48cc71bc9f9b9b47203f2838e9982618cc8d18ac..c5e3cb727f85dafd2b51efe741cd635394908cfd 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -307,8 +307,6 @@ typedef struct {
   int32_t        row;
   int16_t        numOfCols;
   int16_t        precision;
-  int32_t        sVersion;
-  int32_t        tVersion;
   bool           completed;
   int32_t        code;
   char *         data;
diff --git a/src/query/src/queryMain.c b/src/query/src/queryMain.c
index 73d0b341d65dcaa31e62eb288b806bb1b39fbf8d..a8448d3cea13829e06f24fcdc1258be84a1085b2 100644
--- a/src/query/src/queryMain.c
+++ b/src/query/src/queryMain.c
@@ -420,6 +420,9 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
     setQueryStatus(pRuntimeEnv, QUERY_OVER);
   }
 
+  RESET_NUM_OF_RESULTS(&(pQInfo->runtimeEnv));
+  pQInfo->lastRetrieveTs = taosGetTimestampMs();
+  
   if ((*pRsp)->compressed && compLen != 0) {
     int32_t numOfCols = pQueryAttr->pExpr2 ? pQueryAttr->numOfExpr2 : pQueryAttr->numOfOutput;
     int32_t origSize  = pQueryAttr->resultRowSize * s;