From 1227d6aed222be463c9b83b2c7a27f4e7682ed28 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Mon, 13 Jun 2022 19:39:40 +0800
Subject: [PATCH] other: adjust debug logs

---
 source/common/src/trow.c                 | 15 ---------------
 source/dnode/vnode/src/tsdb/tsdbCommit.c | 18 ------------------
 source/dnode/vnode/src/vnd/vnodeSvr.c    |  6 +-----
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index fb4413478d..b1ca406a4a 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -527,20 +527,6 @@ static int32_t tdAppendTpRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
         return terrno;
       }
 
-      if (pRowCol->colId == 2) {
-        ASSERT(sVal.valType == 0);
-        int32_t val = *(int32_t *)sVal.val;
-        ASSERT(val == 7);
-      } else if (pRowCol->colId == 3) {
-        ASSERT(sVal.valType == 0);
-        int64_t val = *(int64_t *)sVal.val;
-        ASSERT(val == 77777);
-      } else if (pRowCol->colId == 4) {
-        ASSERT(sVal.valType == 0);
-        int16_t val = *(int16_t *)sVal.val;
-        ASSERT(val == 777);
-      }
-
       tdAppendValToDataCol(pDataCol, sVal.valType, sVal.val, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode,
                            isMerge);
       ++dcol;
@@ -551,7 +537,6 @@ static int32_t tdAppendTpRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols
       tdAppendValToDataCol(pDataCol, TD_VTYPE_NULL, NULL, pCols->numOfRows, pCols->maxPoints, pCols->bitmapMode,
                            isMerge);
       ++dcol;
-      ASSERT(0);
     }
   }
 #if 0  
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 4dae9bdeab..fe89321ae9 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -1350,24 +1350,6 @@ static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLi
       isLast = true;
     }
 
-    SDataCols *pCols = pCommith->pDataCols;
-    SDataCol   pCol_1 = pCols->cols[1];
-    SDataCol   pCol_2 = pCols->cols[2];
-    SDataCol   pCol_3 = pCols->cols[3];
-    SCellVal   sVal = {0};
-    tdGetColDataOfRow(&sVal, &pCol_1, 0, pCols->bitmapMode);
-    ASSERT(sVal.valType == 0);
-    int32_t val1 = *(int32_t *)sVal.val;
-    ASSERT(val1 == 7);
-    tdGetColDataOfRow(&sVal, &pCol_2, 0, pCols->bitmapMode);
-    ASSERT(sVal.valType == 0);
-    int64_t val2 = *(int64_t *)sVal.val;
-    ASSERT(val2 == 77777);
-    tdGetColDataOfRow(&sVal, &pCol_3, 0, pCols->bitmapMode);
-    ASSERT(sVal.valType == 0);
-    int16_t val3 = *(int16_t *)sVal.val;
-    ASSERT(val3 == 777);
-
     if (tsdbWriteBlock(pCommith, pDFile, pCommith->pDataCols, &block, isLast, true) < 0) return -1;
 
     if (tsdbCommitAddBlock(pCommith, &block, NULL, 0) < 0) {
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 9bb0834547..ab2efa4791 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -15,8 +15,6 @@
 
 #include "vnd.h"
 
-int32_t        gForceCommit = 1;
-
 static int32_t vnodeProcessCreateStbReq(SVnode *pVnode, int64_t version, void *pReq, int32_t len, SRpcMsg *pRsp);
 static int32_t vnodeProcessAlterStbReq(SVnode *pVnode, int64_t version, void *pReq, int32_t len, SRpcMsg *pRsp);
 static int32_t vnodeProcessDropStbReq(SVnode *pVnode, int64_t version, void *pReq, int32_t len, SRpcMsg *pRsp);
@@ -184,8 +182,7 @@ int32_t vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp
   }
 
   // commit if need
-  if ((gForceCommit == 1) || vnodeShouldCommit(pVnode)) {
-    gForceCommit = 0;
+  if (vnodeShouldCommit(pVnode)) {
     vInfo("vgId:%d, commit at version %" PRId64, TD_VID(pVnode), version);
     // commit current change
     vnodeCommit(pVnode);
@@ -722,7 +719,6 @@ static int32_t vnodeDebugPrintSubmitMsg(SVnode *pVnode, SSubmitReq *pMsg, const
 }
 
 static int32_t vnodeProcessSubmitReq(SVnode *pVnode, int64_t version, void *pReq, int32_t len, SRpcMsg *pRsp) {
-  gForceCommit = 1;
   SSubmitReq    *pSubmitReq = (SSubmitReq *)pReq;
   SSubmitRsp     submitRsp = {0};
   SSubmitMsgIter msgIter = {0};