diff --git a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c index 678a1f502ebeeb7db9ba9363b6b01c82b09bdb05..f21b9abab3eb810bc332a19e3cd01570d55a3899 100644 --- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c +++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c @@ -195,7 +195,7 @@ static int32_t tsdbSnapReadFileSetOpenIter(STsdbSnapReader* reader) { code = tsdbIterMergerOpen(reader->dataIterArr, &reader->dataIterMerger, false); TSDB_CHECK_CODE(code, lino, _exit); - code = tsdbIterMergerOpen(reader->tombIterArr, &reader->dataIterMerger, true); + code = tsdbIterMergerOpen(reader->tombIterArr, &reader->tombIterMerger, true); TSDB_CHECK_CODE(code, lino, _exit); _exit: diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c index e298e06f2e5b13e192f7e6c5ce9211bc5db72170..d7ea93569192b6cb4da2e1b2012245a955fed450 100644 --- a/source/dnode/vnode/src/vnd/vnodeSvr.c +++ b/source/dnode/vnode/src/vnd/vnodeSvr.c @@ -677,7 +677,6 @@ void vnodeUpdateMetaRsp(SVnode *pVnode, STableMetaRsp *pMetaRsp) { pMetaRsp->precision = pVnode->config.tsdbCfg.precision; } -extern int32_t vnodeAsyncRetention(SVnode *pVnode, int64_t now); extern int32_t vnodeSyncRetention(SVnode *pVnode, int64_t now); static int32_t vnodeProcessTrimReq(SVnode *pVnode, int64_t ver, void *pReq, int32_t len, SRpcMsg *pRsp) { @@ -717,7 +716,7 @@ static int32_t vnodeProcessDropTtlTbReq(SVnode *pVnode, int64_t ver, void *pReq, tqUpdateTbUidList(pVnode->pTq, tbUids, false); } - vnodeAsyncRetention(pVnode, ttlReq.timestampSec); + vnodeSyncRetention(pVnode, ttlReq.timestampSec); end: taosArrayDestroy(tbUids);