From 66177fb9f14612f5772bc4ae1b86c7e518c94c85 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 24 Aug 2022 16:41:09 +0800
Subject: [PATCH] more code

---
 source/dnode/vnode/src/tsdb/tsdbCommit.c |  6 ------
 source/dnode/vnode/src/tsdb/tsdbMerge.c  | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index 1fbdbdad82..daba81033d 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -20,12 +20,6 @@ typedef struct {
   STSchema *pTSchema;
 } SSkmInfo;
 
-typedef struct {
-  int64_t suid;
-  int64_t uid;
-  TSDBROW row;
-} SRowInfo;
-
 typedef struct {
   STsdb *pTsdb;
   int8_t toMerge;
diff --git a/source/dnode/vnode/src/tsdb/tsdbMerge.c b/source/dnode/vnode/src/tsdb/tsdbMerge.c
index bbe4fead4e..e975abd482 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMerge.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMerge.c
@@ -15,6 +15,19 @@
 
 #include "tsdb.h"
 
+typedef struct {
+  int64_t suid;
+  int64_t uid;
+  TSDBROW row;
+} SRowInfo;
+
+typedef struct {
+  SArray    *aBlockL;  // SArray<SBlockL>
+  int32_t    iBlockL;
+  SBlockData bData;
+  int32_t    iRow;
+} SLDataIter;
+
 typedef struct {
   STsdb  *pTsdb;
   int8_t  maxLast;
@@ -29,6 +42,8 @@ typedef struct {
     SDataFWriter *pWriter;
     SArray       *aBlockIdx;
     SArray       *aBlockL;
+    SBlockData    bData;
+    SBlockData    bDatal;
   } dWriter;
 } STsdbMerger;
 
-- 
GitLab