From 822f1051d2815b4a1ecc177d468427eaad855095 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 25 Jan 2021 16:05:34 +0800 Subject: [PATCH] implement backward compatibility --- src/tsdb/src/tsdbFS.c | 1 + src/tsdb/src/tsdbFile.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/tsdb/src/tsdbFS.c b/src/tsdb/src/tsdbFS.c index 3b883d74b3..6cfa8b4db6 100644 --- a/src/tsdb/src/tsdbFS.c +++ b/src/tsdb/src/tsdbFS.c @@ -1132,6 +1132,7 @@ static int tsdbRestoreDFileSet(STsdbRepo *pRepo) { } tsdbCloseDFile(pDFile); + index++; } taosArrayPush(pfs->cstatus->df, &fset); diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c index c80bdd8c24..493c71bdfd 100644 --- a/src/tsdb/src/tsdbFile.c +++ b/src/tsdb/src/tsdbFile.c @@ -16,11 +16,11 @@ #include "tsdbint.h" static const char *TSDB_FNAME_SUFFIX[] = { - ".head", // TSDB_FILE_HEAD - ".data", // TSDB_FILE_DATA - ".last", // TSDB_FILE_LAST - "", // TSDB_FILE_MAX - "meta" // TSDB_FILE_META + "head", // TSDB_FILE_HEAD + "data", // TSDB_FILE_DATA + "last", // TSDB_FILE_LAST + "", // TSDB_FILE_MAX + "meta" // TSDB_FILE_META }; static void tsdbGetFilename(int vid, int fid, uint32_t ver, TSDB_FILE_T ftype, char *fname); @@ -590,9 +590,9 @@ static void tsdbGetFilename(int vid, int fid, uint32_t ver, TSDB_FILE_T ftype, c if (ftype < TSDB_FILE_MAX) { if (ver == 0) { - snprintf(fname, TSDB_FILENAME_LEN, "vnode/vnode%d/tsdb/data/v%df%d%s", vid, vid, fid, TSDB_FNAME_SUFFIX[ftype]); + snprintf(fname, TSDB_FILENAME_LEN, "vnode/vnode%d/tsdb/data/v%df%d.%s", vid, vid, fid, TSDB_FNAME_SUFFIX[ftype]); } else { - snprintf(fname, TSDB_FILENAME_LEN, "vnode/vnode%d/tsdb/data/v%df%d%s-ver%" PRIu32, vid, vid, fid, + snprintf(fname, TSDB_FILENAME_LEN, "vnode/vnode%d/tsdb/data/v%df%d.%s-ver%" PRIu32, vid, vid, fid, TSDB_FNAME_SUFFIX[ftype], ver); } } else {