fix(tmq): do some internal refactor.

source/dnode/vnode/src/tq/tq.c

@@ -531,44 +531,15 @@ static int32_t doPollDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* p
       return 0;
     }
   } else { // use the consumer specified offset
+    // the offset value can not be monotonious increase??
     offset = reqOffset;
   }
 
   // this is a normal subscribe requirement
   if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
     return extractDataAndRspForNormalSubscribe(pTq, pHandle, pRequest, pMsg, &offset);
-//    SMqDataRsp dataRsp = {0};
-//    tqInitDataRsp(&dataRsp, pRequest, pHandle->execHandle.subType);
-//
-//    // lock
-//    taosWLockLatch(&pTq->lock);
-//
-//    qSetTaskId(pHandle->execHandle.task, consumerId, pRequest->reqId);
-//    code = tqScanData(pTq, pHandle, &dataRsp, &offset);
-//
-//    // till now, all data has been transferred to consumer, new data needs to push client once arrived.
-//    if (dataRsp.blockNum == 0 && dataRsp.reqOffset.type == TMQ_OFFSET__LOG &&
-//        dataRsp.reqOffset.version == dataRsp.rspOffset.version && pHandle->consumerId == pRequest->consumerId) {
-//      code = tqRegisterPushEntry(pTq, pHandle, pRequest, pMsg, &dataRsp, TMQ_MSG_TYPE__POLL_RSP);
-//      taosWUnLockLatch(&pTq->lock);
-//      return code;
-//    }
-//
-//    taosWUnLockLatch(&pTq->lock);
-//    code = tqSendDataRsp(pTq, pMsg, pRequest, (SMqDataRsp*)&dataRsp, TMQ_MSG_TYPE__POLL_RSP);
-//
-//    // NOTE: this pHandle->consumerId may have been changed already.
-//    tqDebug("tmq poll: consumer:0x%" PRIx64 ", subkey %s, vgId:%d, rsp block:%d, offset type:%d, uid/version:%" PRId64
-//            ", ts:%" PRId64", reqId:0x%"PRIx64,
-//            consumerId, pHandle->subKey, vgId, dataRsp.blockNum, dataRsp.rspOffset.type, dataRsp.rspOffset.uid,
-//            dataRsp.rspOffset.ts, pRequest->reqId);
-//
-//    tDeleteSMqDataRsp(&dataRsp);
-//    return code;
-  }
-
+  } else { // for taosX
     // todo handle the case where re-balance occurs.
-  // for taosx
     SMqMetaRsp metaRsp = {0};
     STaosxRsp  taosxRsp = {0};
     tqInitTaosxRsp(&taosxRsp, pRequest);
@@ -582,8 +553,7 @@ static int32_t doPollDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* p
         code = tqSendMetaPollRsp(pTq, pMsg, pRequest, &metaRsp);
         tqDebug("tmq poll: consumer:0x%" PRIx64 " subkey:%s vgId:%d, send meta offset type:%d,uid:%" PRId64
                 ",ts:%" PRId64,
-              consumerId, pHandle->subKey, vgId, metaRsp.rspOffset.type, metaRsp.rspOffset.uid,
-              metaRsp.rspOffset.ts);
+                consumerId, pHandle->subKey, vgId, metaRsp.rspOffset.type, metaRsp.rspOffset.uid, metaRsp.rspOffset.ts);
         taosMemoryFree(metaRsp.metaRsp);
         tDeleteSTaosxRsp(&taosxRsp);
         return code;
@@ -602,8 +572,7 @@ static int32_t doPollDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* p
               consumerId, pHandle->subKey, vgId, taosxRsp.blockNum, taosxRsp.rspOffset.type, taosxRsp.rspOffset.uid,
               taosxRsp.rspOffset.version);
     } else {
-
-//  if (offset.type == TMQ_OFFSET__LOG) {
+      //  if (offset.type == TMQ_OFFSET__LOG) {
       int64_t fetchVer = offset.version + 1;
       pCkHead = taosMemoryMalloc(sizeof(SWalCkHead) + 2048);
       if (pCkHead == NULL) {
@@ -633,8 +602,8 @@ static int32_t doPollDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* p
         }
 
         SWalCont* pHead = &pCkHead->head;
-      tqDebug("tmq poll: consumer:0x%" PRIx64 " (epoch %d) iter log, vgId:%d offset %" PRId64 " msgType %d", consumerId,
-              pRequest->epoch, vgId, fetchVer, pHead->msgType);
+        tqDebug("tmq poll: consumer:0x%" PRIx64 " (epoch %d) iter log, vgId:%d offset %" PRId64 " msgType %d",
+                consumerId, pRequest->epoch, vgId, fetchVer, pHead->msgType);
 
         if (pHead->msgType == TDMT_VND_SUBMIT) {
           SPackedData submit = {
@@ -684,6 +653,7 @@ static int32_t doPollDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* p
     tDeleteSTaosxRsp(&taosxRsp);
     taosMemoryFreeClear(pCkHead);
     return 0;
+  }
 }
 
 int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {