From 3a6ef2530761798f7eedff9ae56ed1d777269b9d Mon Sep 17 00:00:00 2001 From: hzcheng Date: Sat, 18 Apr 2020 21:07:13 +0800 Subject: [PATCH] TD-100 --- src/tsdb/src/tsdbMain.c | 2 ++ src/tsdb/src/tsdbRWHelper.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index d5f703ab0f..7375a35796 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -867,6 +867,8 @@ static void *tsdbCommitData(void *arg) { SRWHelper whelper = {0}; if (pCache->imem == NULL) return NULL; + pRepo->appH.walCallBack(pRepo->appH.appH); + // Create the iterator to read from cache SSkipListIterator **iters = tsdbCreateTableIters(pMeta, pCfg->maxTables); if (iters == NULL) { diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c index da3c55bbf9..9c35ebb40f 100644 --- a/src/tsdb/src/tsdbRWHelper.c +++ b/src/tsdb/src/tsdbRWHelper.c @@ -67,7 +67,7 @@ static void tsdbResetHelperTableImpl(SRWHelper *pHelper) { static void tsdbResetHelperTable(SRWHelper *pHelper) { tsdbResetHelperBlock(pHelper); tsdbResetHelperTableImpl(pHelper); - helperClearState(pHelper, TSDB_HELPER_TABLE_SET); + helperClearState(pHelper, (TSDB_HELPER_TABLE_SET|TSDB_HELPER_INFO_LOAD)); } static void tsdbInitHelperTable(SRWHelper *pHelper) { @@ -83,7 +83,8 @@ static void tsdbResetHelperBlockImpl(SRWHelper *pHelper) { } static void tsdbResetHelperBlock(SRWHelper *pHelper) { - // TODO + tsdbResetHelperBlockImpl(pHelper); + // helperClearState(pHelper, TSDB_HELPER_) } static int tsdbInitHelperBlock(SRWHelper *pHelper) { @@ -264,7 +265,7 @@ void tsdbSetHelperTable(SRWHelper *pHelper, STable *pTable, STsdbRepo *pRepo) { // Clear members and state used by previous table tsdbResetHelperTable(pHelper); - ASSERT(pHelper->state == (TSDB_HELPER_FILE_SET_AND_OPEN | TSDB_HELPER_IDX_LOAD)); + ASSERT(helperHasState(pHelper, (TSDB_HELPER_FILE_SET_AND_OPEN | TSDB_HELPER_IDX_LOAD))); pHelper->tableInfo.tid = pTable->tableId.tid; pHelper->tableInfo.uid = pTable->tableId.uid; -- GitLab