From 8ffc7e9f3e42c3242f746d1d7a51e1f475718189 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 21 Sep 2022 11:28:20 +0800
Subject: [PATCH] more code

---
 source/dnode/vnode/src/tsdb/tsdbDiskData.c | 8 ++++++--
 source/dnode/vnode/src/tsdb/tsdbUtil.c     | 3 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbDiskData.c b/source/dnode/vnode/src/tsdb/tsdbDiskData.c
index c20a598b6c..3904012988 100644
--- a/source/dnode/vnode/src/tsdb/tsdbDiskData.c
+++ b/source/dnode/vnode/src/tsdb/tsdbDiskData.c
@@ -342,6 +342,7 @@ static int32_t (*tDiskColAddValImpl[])(SDiskCol *pDiskCol, SColVal *pColVal) = {
 struct SDiskData {
   int64_t      suid;
   int64_t      uid;
+  int32_t      nRow;
   uint8_t      cmprAlg;
   SCompressor *pUidC;
   SCompressor *pVerC;
@@ -355,6 +356,7 @@ int32_t tDiskDataInit(SDiskData *pDiskData, STSchema *pTSchema, TABLEID *pId, ui
 
   pDiskData->suid = pId->suid;
   pDiskData->uid = pId->uid;
+  pDiskData->nRow = 0;
   pDiskData->cmprAlg = cmprAlg;
 
   if (pDiskData->pUidC == NULL) {
@@ -443,7 +445,7 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
 
   // TSKEY
   TSKEY ts = TSDBROW_TS(pRow);
-  code = tCompress(pDiskData->pVerC, &ts, sizeof(int64_t));
+  code = tCompress(pDiskData->pKeyC, &ts, sizeof(int64_t));
   if (code) goto _exit;
 
   SRowIter iter = {0};
@@ -458,7 +460,8 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
     }
 
     if (pColVal == NULL || pColVal->cid > pDiskCol->cid) {
-      code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, &COL_VAL_NONE(pDiskCol->cid, pDiskCol->type));
+      SColVal cv = COL_VAL_NONE(pDiskCol->cid, pDiskCol->type);
+      code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, &cv);
       if (code) goto _exit;
     } else {
       code = tDiskColAddValImpl[pDiskCol->flag](pDiskCol, pColVal);
@@ -466,6 +469,7 @@ int32_t tDiskDataAddRow(SDiskData *pDiskData, TSDBROW *pRow, STSchema *pTSchema,
       pColVal = tRowIterNext(&iter);
     }
   }
+  pDiskData->nRow++;
 
 _exit:
   return code;
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 64c150484b..4e6e1f2f7f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -1082,9 +1082,8 @@ int32_t tBlockDataAppendRow(SBlockData *pBlockData, TSDBROW *pRow, STSchema *pTS
       pColVal = tRowIterNext(&rIter);
     }
   }
-
-_exit:
   pBlockData->nRow++;
+
   return code;
 
 _err: