xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more

This commit is contained in:
Hongze Cheng 2022-06-24 01:47:37 +00:00
parent f7c771727a
commit a7ea0bfe73
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dnode/vnode/src/inc/tsdb.h
View File

@ -518,6 +518,12 @@ struct SRowMerger {
SArray *pArray; // SArray<SColVal>
};
struct STsdbFSState {
SDelFile *pDelFile;
SArray *aDFileSet; // SArray<aDFileSet>
SDelFile delFile;
};
struct STsdbFS {
STsdb *pTsdb;
TdThreadRwlock lock;

7
source/dnode/vnode/src/tsdb/tsdbCommit.c
View File

@ -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);

6
source/dnode/vnode/src/tsdb/tsdbFS.c
View File

@ -15,12 +15,6 @@
#include "tsdb.h"
struct STsdbFSState {
SDelFile *pDelFile;
SArray *aDFileSet; // SArray<aDFileSet>
SDelFile delFile;
};
// =================================================================================================
static int32_t tsdbDelFileToJson(const void *pObj, SJson *pJson) {
int32_t code = 0;