From 8ca2b08d5c22475e7a12da7e04b53199f6163052 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 18 Apr 2024 08:48:44 +0800 Subject: [PATCH] cos/multi-writing: fix remove_file with -1 lcn --- source/dnode/vnode/src/tsdb/tsdbFile2.c | 32 ++++++++++--------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbFile2.c b/source/dnode/vnode/src/tsdb/tsdbFile2.c index 041da5ef24..cde74f5e36 100644 --- a/source/dnode/vnode/src/tsdb/tsdbFile2.c +++ b/source/dnode/vnode/src/tsdb/tsdbFile2.c @@ -267,34 +267,26 @@ int32_t tsdbTFileObjUnref(STFileObj *fobj) { } static void tsdbTFileObjRemoveLC(STFileObj *fobj, bool remove_all) { - if (fobj->f->type != TSDB_FTYPE_DATA) { + if (fobj->f->type != TSDB_FTYPE_DATA || fobj->f->lcn < 1) { remove_file(fobj->fname); return; } if (!remove_all) { - if (fobj->f->lcn < 1) { - remove_file(fobj->fname); + // remove local last chunk file + char lc_path[TSDB_FILENAME_LEN]; + tstrncpy(lc_path, fobj->fname, TSDB_FQDN_LEN); + + char *dot = strrchr(lc_path, '.'); + if (!dot) { + tsdbError("unexpected path: %s", lc_path); return; - } else { - // remove local last chunk file - char lc_path[TSDB_FILENAME_LEN]; - tstrncpy(lc_path, fobj->fname, TSDB_FQDN_LEN); - - char *dot = strrchr(lc_path, '.'); - if (!dot) { - tsdbError("unexpected path: %s", lc_path); - return; - } - snprintf(dot + 1, TSDB_FQDN_LEN - (dot + 1 - lc_path), "%d.data", fobj->f->lcn); - - remove_file(lc_path); } + snprintf(dot + 1, TSDB_FQDN_LEN - (dot + 1 - lc_path), "%d.data", fobj->f->lcn); + + remove_file(lc_path); + } else { - if (fobj->f->lcn < 1) { - remove_file(fobj->fname); - return; - } // delete by data file prefix char lc_path[TSDB_FILENAME_LEN]; tstrncpy(lc_path, fobj->fname, TSDB_FQDN_LEN);