From a5144f0ba214893cffb76d3994809f5cee5690be Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Mon, 20 Mar 2023 10:10:07 +0800
Subject: [PATCH] fix:set offset if read wal none

---
 include/common/tcommon.h                |  2 +-
 source/dnode/vnode/src/tq/tq.c          | 11 -----------
 source/libs/executor/src/scanoperator.c |  3 ++-
 source/libs/parser/src/parInsertUtil.c  |  6 +++---
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index ce242be7f5..691aae5593 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -208,7 +208,7 @@ typedef struct SSDataBlock {
 } SSDataBlock;
 
 enum {
-  FETCH_TYPE__DATA = 1,
+  FETCH_TYPE__DATA = 0,
   FETCH_TYPE__NONE,
 };
 
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index ba18cb4ff8..8082e74d34 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -336,17 +336,6 @@ static int32_t tqInitDataRsp(SMqDataRsp* pRsp, const SMqPollReq* pReq, int8_t su
   }
 
   pRsp->withTbName = 0;
-#if 0
-  pRsp->withTbName = pReq->withTbName;
-  if (pRsp->withTbName) {
-    pRsp->blockTbName = taosArrayInit(0, sizeof(void*));
-    if (pRsp->blockTbName == NULL) {
-      // TODO free
-      return -1;
-    }
-  }
-#endif
-
   pRsp->withSchema = false;
   return 0;
 }
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 2989410b2e..f467921937 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1623,13 +1623,14 @@ static SSDataBlock* doQueueScan(SOperatorInfo* pOperator) {
     while (1) {
       SFetchRet ret = {0};
       tqNextBlock(pInfo->tqReader, &ret);
-      pTaskInfo->streamInfo.currentOffset = ret.offset;
 
       if (ret.fetchType == FETCH_TYPE__DATA) {
         blockDataCleanup(pInfo->pRes);
         setBlockIntoRes(pInfo, &ret.data, true);
         qDebug("queue scan log return %d rows", pInfo->pRes->info.rows);
         return pInfo->pRes;
+      }else{
+        pTaskInfo->streamInfo.currentOffset = ret.offset;
       }
       return NULL;
     }
diff --git a/source/libs/parser/src/parInsertUtil.c b/source/libs/parser/src/parInsertUtil.c
index 52d3569dcd..66977f206a 100644
--- a/source/libs/parser/src/parInsertUtil.c
+++ b/source/libs/parser/src/parInsertUtil.c
@@ -469,11 +469,11 @@ int32_t insMergeTableDataCxt(SHashObj* pTableHash, SArray** pVgDataBlocks) {
     if (TSDB_CODE_SUCCESS == code) {
       SVgroupDataCxt* pVgCxt = NULL;
       int32_t         vgId = pTableCxt->pMeta->vgId;
-      void**          p = taosHashGet(pVgroupHash, &vgId, sizeof(vgId));
-      if (NULL == p) {
+      void**          pp = taosHashGet(pVgroupHash, &vgId, sizeof(vgId));
+      if (NULL == pp) {
         code = createVgroupDataCxt(pTableCxt, pVgroupHash, pVgroupList, &pVgCxt);
       } else {
-        pVgCxt = *(SVgroupDataCxt**)p;
+        pVgCxt = *(SVgroupDataCxt**)pp;
       }
       if (TSDB_CODE_SUCCESS == code) {
         code = fillVgroupDataCxt(pTableCxt, pVgCxt);