diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c index 1fbdbdad823a969a73f8a8e9ba4c2f6cb0e2a6cb..daba81033daa3b30c0b4ed0af5ada0cca8b54bcf 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 bbe4fead4e69422f9c083b6eaafd42aee77125e9..e975abd4825f22e0a5486ce678461c4a599559a1 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 + 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;