From f81d1027478f5c6eac6581b3b62d5f8bbb15257a Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 6 Jun 2022 01:24:14 +0000
Subject: [PATCH] refact

---
 source/dnode/vnode/src/inc/tsdb.h          | 19 ++++++++++---------
 source/dnode/vnode/src/tsdb/tsdbMemTable.c |  8 ++++----
 source/dnode/vnode/src/tsdb/tsdbRead.c     |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index 228d9ffa90..9ab50ad62f 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -206,12 +206,18 @@ struct SDFileSet {
   SDFile   files[TSDB_FILE_MAX];
 };
 
+struct TSDBKEY {
+  int64_t version;
+  TSKEY   ts;
+};
+
 struct STbData {
+  tb_uid_t   suid;
   tb_uid_t   uid;
-  TSKEY      keyMin;
-  TSKEY      keyMax;
-  int64_t    minVer;
-  int64_t    maxVer;
+  TSDBKEY    minKey;
+  TSDBKEY    maxKey;
+  SDelOp    *pHead;
+  SDelOp    *pTail;
   int64_t    nrows;
   SSkipList *pData;
 };
@@ -313,11 +319,6 @@ static FORCE_INLINE TSKEY tsdbNextIterKey(SSkipListIterator *pIter) {
 // tsdbReadImpl
 typedef struct SReadH SReadH;
 
-struct TSDBKEY {
-  int64_t version;
-  TSKEY   ts;
-};
-
 typedef struct {
   uint64_t suid;
   uint64_t uid;
diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
index d683c7df27..26f750a774 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@@ -305,8 +305,8 @@ int tsdbInsertTableData(STsdb *pTsdb, SSubmitMsgIter *pMsgIter, SSubmitBlk *pBlo
   keyMax = TD_ROW_KEY(blkIter.row);
 
   pTbData->nrows += pMsgIter->numOfRows;
-  if (pTbData->keyMin > keyMin) pTbData->keyMin = keyMin;
-  if (pTbData->keyMax < keyMax) pTbData->keyMax = keyMax;
+  if (pTbData->minKey.ts > keyMin) pTbData->minKey.ts = keyMin;
+  if (pTbData->maxKey.ts < keyMax) pTbData->maxKey.ts = keyMax;
 
   pMemTable->nRow += pMsgIter->numOfRows;
   if (pMemTable->keyMin > keyMin) pMemTable->keyMin = keyMin;
@@ -326,8 +326,8 @@ static STbData *tsdbNewTbData(tb_uid_t uid) {
   }
 
   pTbData->uid = uid;
-  pTbData->keyMin = TSKEY_MAX;
-  pTbData->keyMax = TSKEY_MIN;
+  pTbData->minKey.ts = TSKEY_MAX;
+  pTbData->maxKey.ts = TSKEY_MIN;
   pTbData->nrows = 0;
 #if 0
   pTbData->pData = tSkipListCreate(5, TSDB_DATA_TYPE_TIMESTAMP, sizeof(int64_t), tkeyComparFn, SL_DISCARD_DUP_KEY,
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 7693e2bce1..6a9f2dc9a0 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -791,7 +791,7 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
     TSKEY   key = TD_ROW_KEY(row);  // first timestamp in buffer
     tsdbDebug("%p uid:%" PRId64 ", check data in mem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
               "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%" PRId64 ", %s",
-              pHandle, pCheckInfo->tableId, key, order, (*pMem)->keyMin, (*pMem)->keyMax, pCheckInfo->lastKey,
+              pHandle, pCheckInfo->tableId, key, order, (*pMem)->minKey.ts, (*pMem)->maxKey.ts, pCheckInfo->lastKey,
               (*pMem)->nrows, pHandle->idStr);
 
     if (ASCENDING_TRAVERSE(order)) {
@@ -812,7 +812,7 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe
     TSKEY   key = TD_ROW_KEY(row);  // first timestamp in buffer
     tsdbDebug("%p uid:%" PRId64 ", check data in imem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
               "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%" PRId64 ", %s",
-              pHandle, pCheckInfo->tableId, key, order, (*pIMem)->keyMin, (*pIMem)->keyMax, pCheckInfo->lastKey,
+              pHandle, pCheckInfo->tableId, key, order, (*pIMem)->minKey.ts, (*pIMem)->maxKey.ts, pCheckInfo->lastKey,
               (*pIMem)->nrows, pHandle->idStr);
 
     if (ASCENDING_TRAVERSE(order)) {