From f8b18c4f18f1976e8e5d4f40bc574110401bfc16 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 1 Dec 2022 20:48:55 +0800
Subject: [PATCH] fix some code

---
 source/dnode/vnode/src/tsdb/tsdbRead.c |  5 +++--
 source/dnode/vnode/src/tsdb/tsdbUtil.c | 15 ++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index e2cd73e52b..472211b536 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -3178,7 +3178,8 @@ TSDBROW* getValidMemRow(SIterInfo* pIter, const SArray* pDelList, STsdbReader* p
   }
 
   TSDBROW* pRow = tsdbTbDataIterGet(pIter->iter);
-  TSDBKEY  key = {.ts = pRow->pTSRow->ts, .version = pRow->version};
+  TSDBKEY  key = TSDBROW_KEY(pRow);
+
   if (outOfTimeWindow(key.ts, &pReader->window)) {
     pIter->hasVal = false;
     return NULL;
@@ -3377,7 +3378,7 @@ int32_t doMergeMemTableMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter,
         return TSDB_CODE_SUCCESS;
       }
 
-      if (current.pTSRow->ts != pNextRow->pTSRow->ts) {
+      if (TSDBROW_TS(&current) != TSDBROW_TS(pNextRow)) {
         *pTSRow = current.pTSRow;
         *freeTSRow = false;
         return TSDB_CODE_SUCCESS;
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 57fcc5011d..05dd007471 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -1036,17 +1036,13 @@ static int32_t tBlockDataAppendBlockRow(SBlockData *pBlockData, SBlockData *pBlo
 
   SColVal   cv = {0};
   int32_t   iColDataFrom = 0;
-  SColData *pColDataFrom =
-      (iColDataFrom < pBlockDataFrom->nColData) ? &((SColData *)pBlockDataFrom->aColData->pData)[iColDataFrom] : NULL;
+  SColData *pColDataFrom = (iColDataFrom < pBlockDataFrom->nColData) ? &pBlockDataFrom->aColData[iColDataFrom] : NULL;
 
   for (int32_t iColDataTo = 0; iColDataTo < pBlockData->nColData; iColDataTo++) {
-    SColData *pColDataTo = &((SColData *)pBlockData->aColData->pData)[iColDataTo];
+    SColData *pColDataTo = &pBlockData->aColData[iColDataTo];
 
     while (pColDataFrom && pColDataFrom->cid < pColDataTo->cid) {
-      iColDataFrom++;
-      pColDataFrom = (iColDataFrom < pBlockDataFrom->nColData)
-                         ? &((SColData *)pBlockDataFrom->aColData->pData)[iColDataFrom]
-                         : NULL;
+      pColDataFrom = (++iColDataFrom < pBlockDataFrom->nColData) ? &pBlockDataFrom->aColData[iColDataFrom] : NULL;
     }
 
     if (pColDataFrom == NULL || pColDataFrom->cid > pColDataTo->cid) {
@@ -1058,10 +1054,7 @@ static int32_t tBlockDataAppendBlockRow(SBlockData *pBlockData, SBlockData *pBlo
       code = tColDataAppendValue(pColDataTo, &cv);
       if (code) goto _exit;
 
-      iColDataFrom++;
-      pColDataFrom = (iColDataFrom < pBlockDataFrom->nColData)
-                         ? &((SColData *)pBlockDataFrom->aColData->pData)[iColDataFrom]
-                         : NULL;
+      pColDataFrom = (++iColDataFrom < pBlockDataFrom->nColData) ? &pBlockDataFrom->aColData[iColDataFrom] : NULL;
     }
   }
 
-- 
GitLab