From 938d87f6019b3aea60c9c600a1d29c4c10d2f758 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 31 May 2023 09:02:50 +0800
Subject: [PATCH] more code

---
 .../dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h  |  1 +
 .../vnode/src/tsdb/dev/inc/tsdbSttFileRW.h    |  2 +-
 source/dnode/vnode/src/tsdb/dev/tsdbMerge.c   | 31 ++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h
index 05d93f5e4e..9fe7f3d9b7 100644
--- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h
+++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h
@@ -15,6 +15,7 @@
 
 #include "tsdbDataFileRW.h"
 #include "tsdbFS.h"
+#include "tsdbIter.h"
 #include "tsdbSttFileRW.h"
 #include "tsdbUtil.h"
 
diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h
index 604a137aae..6bb116c188 100644
--- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h
+++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h
@@ -71,7 +71,7 @@ struct SSttFileWriterConfig {
   int32_t   maxRow;
   int32_t   szPage;
   int8_t    cmprAlg;
-  int64_t   compVer;  // compact version
+  int64_t   compactVersion;  // compact version
   SSkmInfo *skmTb;
   SSkmInfo *skmRow;
   uint8_t **aBuf;
diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c b/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
index 40b9e4f251..177af3ed27 100644
--- a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
+++ b/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
@@ -16,7 +16,16 @@
 #include "inc/tsdbMerge.h"
 
 typedef struct {
-  STsdb *tsdb;
+  STsdb   *tsdb;
+  int32_t  maxRow;
+  int32_t  minRow;
+  int32_t  szPage;
+  int8_t   cmprAlg;
+  int64_t  compactVersion;
+  int64_t  cid;
+  SSkmInfo skmTb;
+  SSkmInfo skmRow;
+  uint8_t *aBuf[5];
   // context
   struct {
     bool       opened;
@@ -26,18 +35,11 @@ typedef struct {
     SRowInfo  *row;
     SBlockData bData;
   } ctx[1];
-  // config
-  int32_t  maxRow;
-  int32_t  minRow;
-  int32_t  szPage;
-  int8_t   cmprAlg;
-  int64_t  cid;
-  SSkmInfo skmTb;
-  SSkmInfo skmRow;
-  uint8_t *aBuf[5];
   // reader
-  TARRAY2(SSttFileReader *) sttReaderArr;
+  TARRAY2(SSttFileReader *) sttReaderArr[1];
   SDataFileReader *dataReader;
+  TTsdbIterArray   iterArr[1];
+  SIterMerger     *iterMerger;
   // writer
   SSttFileWriter  *sttWriter;
   SDataFileWriter *dataWriter;
@@ -203,7 +205,7 @@ static int32_t tsdbMergeFileSetBegin(SMerger *merger) {
       code = tsdbSttFReaderOpen(fobj->fname, &config, &reader);
       TSDB_CHECK_CODE(code, lino, _exit);
 
-      code = TARRAY2_APPEND(&merger->sttReaderArr, reader);
+      code = TARRAY2_APPEND(merger->sttReaderArr, reader);
       TSDB_CHECK_CODE(code, lino, _exit);
 
       // add the operation
@@ -334,12 +336,11 @@ int32_t tsdbMerge(STsdb *tsdb) {
   int32_t code = 0;
   int32_t lino;
 
-  SVnode       *vnode = tsdb->pVnode;
-  int32_t       vid = TD_VID(vnode);
+  int32_t       vid = TD_VID(tsdb->pVnode);
   STFileSystem *fs = tsdb->pFS;
   STFileSet    *fset;
   STFileObj    *fobj;
-  int32_t       sttTrigger = vnode->config.sttTrigger;
+  int32_t       sttTrigger = tsdb->pVnode->config.sttTrigger;
 
   SMerger merger[1];
   merger->tsdb = tsdb;