diff --git a/src/client/src/tscJoinProcess.c b/src/client/src/tscJoinProcess.c
index 24d8ad902acb683f3b3ae05c10a5ff92181695df..17ea5cf8862f3fdb42f95cc80b84acf9394d26ae 100644
--- a/src/client/src/tscJoinProcess.c
+++ b/src/client/src/tscJoinProcess.c
@@ -1203,16 +1203,20 @@ bool tsBufNextPos(STSBuf* pTSBuf) {
   if (pCur->vnodeIndex == -1) {
     if (pCur->order == TSQL_SO_ASC) {
       tsBufGetBlock(pTSBuf, 0, 0);
-      // list is empty
-      if (pTSBuf->block.numOfElem == 0) {
+      
+      if (pTSBuf->block.numOfElem == 0) { // the whole list is empty, return
         tsBufResetPos(pTSBuf);
         return false;
       } else {
         return true;
       }
-    } else {
+      
+    } else { // get the last timestamp record in the last block of the last vnode
+      assert(pTSBuf->numOfVnodes > 0);
+      
       int32_t vnodeIndex = pTSBuf->numOfVnodes - 1;
-
+      pCur->vnodeIndex = vnodeIndex;
+      
       int32_t            vnodeId = pTSBuf->pData[pCur->vnodeIndex].info.vnode;
       STSVnodeBlockInfo* pBlockInfo = tsBufGetVnodeBlockInfo(pTSBuf, vnodeId);
       int32_t            blockIndex = pBlockInfo->numOfBlocks - 1;
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index f24677c5887de3f149cdb8c82a2078b859ff6750..9707fc6df3d15d0af7e3c3c79d2e562ce43d631d 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -152,7 +152,8 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
   int64_t iv;
   int32_t numType;
   char *  endptr = NULL;
-
+  errno = 0;   // clear the previous existed error information
+  
   switch (pSchema->type) {
     case TSDB_DATA_TYPE_BOOL: {  // bool
       if ((pToken->type == TK_BOOL || pToken->type == TK_STRING) && (pToken->n != 0)) {
diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c
index db0ec24395cbb15fd2bf619e6fe509a4a1b3652d..aaba708c943240b6462b3a61606973754246d53d 100644
--- a/src/system/detail/src/vnodeQueryImpl.c
+++ b/src/system/detail/src/vnodeQueryImpl.c
@@ -1395,7 +1395,7 @@ static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
 
   TSKEY key = *(TSKEY *)(pCtx[0].aInputElemBuf + TSDB_KEYSIZE * offset);
 
-#if 1
+#if defined(_DEBUG_VIEW)
   printf("elem in comp ts file:%lld, key:%lld, tag:%d, id:%s, query order:%d, ts order:%d, traverse:%d, index:%d\n",
          elem.ts, key, elem.tag, pRuntimeEnv->pMeterObj->meterId, pQuery->order.order, pRuntimeEnv->pTSBuf->tsOrder,
          pRuntimeEnv->pTSBuf->cur.order, pRuntimeEnv->pTSBuf->cur.tsIndex);