From 4fa90e97a4109b04561cb6a3f43f65035e920940 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Mon, 6 Dec 2021 16:58:31 +0800 Subject: [PATCH] minimize the code changes --- src/tsdb/src/tsdbMain.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c index c270a10f4b..9cd3993ea8 100644 --- a/src/tsdb/src/tsdbMain.c +++ b/src/tsdb/src/tsdbMain.c @@ -506,26 +506,26 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) { // Check keep #if 0 // already checked and set in mnodeSetDefaultDbCfg - // if (pCfg->keep == -1) { - // pCfg->keep = TSDB_DEFAULT_KEEP; - // } else { - // if (pCfg->keep < TSDB_MIN_KEEP || pCfg->keep > TSDB_MAX_KEEP) { - // tsdbError( - // "vgId:%d invalid keep configuration! keep %d TSDB_MIN_KEEP %d " - // "TSDB_MAX_KEEP %d", - // pCfg->tsdbId, pCfg->keep, TSDB_MIN_KEEP, TSDB_MAX_KEEP); - // terrno = TSDB_CODE_TDB_INVALID_CONFIG; - // return -1; - // } - // } + if (pCfg->keep == -1) { + pCfg->keep = TSDB_DEFAULT_KEEP; + } else { + if (pCfg->keep < TSDB_MIN_KEEP || pCfg->keep > TSDB_MAX_KEEP) { + tsdbError( + "vgId:%d invalid keep configuration! keep %d TSDB_MIN_KEEP %d " + "TSDB_MAX_KEEP %d", + pCfg->tsdbId, pCfg->keep, TSDB_MIN_KEEP, TSDB_MAX_KEEP); + terrno = TSDB_CODE_TDB_INVALID_CONFIG; + return -1; + } + } - // if (pCfg->keep1 == 0) { - // pCfg->keep1 = pCfg->keep; - // } + if (pCfg->keep1 == 0) { + pCfg->keep1 = pCfg->keep; + } - // if (pCfg->keep2 == 0) { - // pCfg->keep2 = pCfg->keep; - // } + if (pCfg->keep2 == 0) { + pCfg->keep2 = pCfg->keep; + } #endif int32_t keepMin = pCfg->keep1; -- GitLab