This commit is contained in:
Hongze Cheng 2022-01-07 02:33:18 +00:00
parent ef3102baf6
commit 79dafa10ca
1 changed files with 11 additions and 11 deletions

View File

@ -43,7 +43,7 @@ typedef struct {
#define TSDB_COMPACT_COMP_BUF(pComph) TSDB_READ_COMP_BUF(&((pComph)->readh)) #define TSDB_COMPACT_COMP_BUF(pComph) TSDB_READ_COMP_BUF(&((pComph)->readh))
#define TSDB_COMPACT_EXBUF(pComph) TSDB_READ_EXBUF(&((pComph)->readh)) #define TSDB_COMPACT_EXBUF(pComph) TSDB_READ_EXBUF(&((pComph)->readh))
static int tsdbAsyncCompact(STsdb *pRepo); // static int tsdbAsyncCompact(STsdb *pRepo);
static void tsdbStartCompact(STsdb *pRepo); static void tsdbStartCompact(STsdb *pRepo);
static void tsdbEndCompact(STsdb *pRepo, int eno); static void tsdbEndCompact(STsdb *pRepo, int eno);
static int tsdbCompactMeta(STsdb *pRepo); static int tsdbCompactMeta(STsdb *pRepo);
@ -62,7 +62,7 @@ static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCo
void **ppCBuf, void **ppExBuf); void **ppCBuf, void **ppExBuf);
enum { TSDB_NO_COMPACT, TSDB_IN_COMPACT, TSDB_WAITING_COMPACT}; enum { TSDB_NO_COMPACT, TSDB_IN_COMPACT, TSDB_WAITING_COMPACT};
int tsdbCompact(STsdb *pRepo) { return tsdbAsyncCompact(pRepo); } // int tsdbCompact(STsdb *pRepo) { return tsdbAsyncCompact(pRepo); }
void *tsdbCompactImpl(STsdb *pRepo) { void *tsdbCompactImpl(STsdb *pRepo) {
// Check if there are files in TSDB FS to compact // Check if there are files in TSDB FS to compact
@ -94,15 +94,15 @@ _err:
return NULL; return NULL;
} }
static int tsdbAsyncCompact(STsdb *pRepo) { // static int tsdbAsyncCompact(STsdb *pRepo) {
if (pRepo->compactState != TSDB_NO_COMPACT) { // if (pRepo->compactState != TSDB_NO_COMPACT) {
tsdbInfo("vgId:%d not compact tsdb again ", REPO_ID(pRepo)); // tsdbInfo("vgId:%d not compact tsdb again ", REPO_ID(pRepo));
return 0; // return 0;
} // }
pRepo->compactState = TSDB_WAITING_COMPACT; // pRepo->compactState = TSDB_WAITING_COMPACT;
tsem_wait(&(pRepo->readyToCommit)); // tsem_wait(&(pRepo->readyToCommit));
return tsdbScheduleCommit(pRepo, COMPACT_REQ); // return tsdbScheduleCommit(pRepo, COMPACT_REQ);
} // }
static void tsdbStartCompact(STsdb *pRepo) { static void tsdbStartCompact(STsdb *pRepo) {
assert(pRepo->compactState != TSDB_IN_COMPACT); assert(pRepo->compactState != TSDB_IN_COMPACT);