diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h index 66f8e304ea..b37d5632dd 100644 --- a/source/dnode/vnode/src/inc/tsdb.h +++ b/source/dnode/vnode/src/inc/tsdb.h @@ -518,6 +518,12 @@ struct SRowMerger { SArray *pArray; // SArray }; +struct STsdbFSState { + SDelFile *pDelFile; + SArray *aDFileSet; // SArray + SDelFile delFile; +}; + struct STsdbFS { STsdb *pTsdb; TdThreadRwlock lock; diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c index c8b198492a..853c950862 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCommit.c +++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c @@ -735,6 +735,9 @@ static int32_t tsdbCommitMemoryData(SCommitter *pCommitter, STbData *pTbData) { code = tBlockDataAppendRow(pBlockData, pRow, NULL); if (code) goto _err; + pBlock->minVersion = TMIN(pBlock->minVersion, tsdbRowKey(pRow).version); + pBlock->maxVersion = TMAX(pBlock->maxVersion, tsdbRowKey(pRow).version); + tsdbTbDataIterNext(pIter); pRow = tsdbTbDataIterGet(pIter); @@ -743,6 +746,10 @@ static int32_t tsdbCommitMemoryData(SCommitter *pCommitter, STbData *pTbData) { } } + if (pBlockData->nRow > 0) { + // write the block to file + } + _exit: if (pRow) { pCommitter->nextKey = TMIN(pCommitter->nextKey, tsdbRowKey(pRow).ts); diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c index f2e01b6baa..77edeab836 100644 --- a/source/dnode/vnode/src/tsdb/tsdbFS.c +++ b/source/dnode/vnode/src/tsdb/tsdbFS.c @@ -15,12 +15,6 @@ #include "tsdb.h" -struct STsdbFSState { - SDelFile *pDelFile; - SArray *aDFileSet; // SArray - SDelFile delFile; -}; - // ================================================================================================= static int32_t tsdbDelFileToJson(const void *pObj, SJson *pJson) { int32_t code = 0;