From 646731b5dd033b3b85e56b0d4248204b5b392bf5 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Wed, 17 Jul 2024 15:58:37 +0800 Subject: [PATCH] opti:[TS-4593] transform offset from file to tdb in tmq --- source/dnode/vnode/src/tq/tqMeta.c | 2 ++ source/dnode/vnode/src/tq/tqOffset.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c index 622ba786ab..94311c0fbb 100644 --- a/source/dnode/vnode/src/tq/tqMeta.c +++ b/source/dnode/vnode/src/tq/tqMeta.c @@ -413,6 +413,7 @@ int32_t tqMetaOpen(STQ* pTq) { TQ_ERR_GO_TO_END(tqMetaOpenTdb(pTq)); }else{ TQ_ERR_GO_TO_END(tqMetaTransform(pTq)); + taosRemoveFile(maindb); } TQ_ERR_GO_TO_END(tqMetaRestoreCheckInfo(pTq)); @@ -447,6 +448,7 @@ int32_t tqMetaTransform(STQ* pTq) { TQ_ERR_GO_TO_END(tqMetaTransformOffsetInfo(pTq, offsetNew)); (void)taosRemoveFile(offset); + (void)taosRemoveFile(offsetNew); END: taosMemoryFree(offset); diff --git a/source/dnode/vnode/src/tq/tqOffset.c b/source/dnode/vnode/src/tq/tqOffset.c index 8295ec4824..e37cdfc697 100644 --- a/source/dnode/vnode/src/tq/tqOffset.c +++ b/source/dnode/vnode/src/tq/tqOffset.c @@ -39,7 +39,7 @@ int32_t tqOffsetRestoreFromFile(SHashObj* pOffset, char* name) { TdFilePtr pFile = taosOpenFile(name, TD_FILE_READ); if (pFile == NULL) { - code = TAOS_SYSTEM_ERROR(errno); + code = TDB_CODE_SUCCESS; goto END; }