From 3ac7f05f98fdf9e27caf26dd28c3de01eb9640e5 Mon Sep 17 00:00:00 2001 From: lichuang Date: Mon, 31 May 2021 15:12:52 +0800 Subject: [PATCH 1/2] [TD-3963]add community version macro in cmakefile,change keep option base on version --- CMakeLists.txt | 2 ++ src/mnode/src/mnodeDb.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f50aca079..b34d995d30 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,8 @@ IF (TD_WINDOWS OR TD_DARWIN) SET(TD_SOMODE_STATIC TRUE) ENDIF () +ADD_DEFINITIONS(-D_TD_COMMUNITY_VERSION) + INCLUDE(cmake/define.inc) INCLUDE(cmake/env.inc) INCLUDE(cmake/version.inc) diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index 5e06faaad9..e6d82a6530 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -1060,6 +1060,13 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) { newCfg.partitions = partitions; } +// community version can only change daysToKeep +// but enterprise version can change all daysToKeep options +#if defined(_TD_COMMUNITY_VERSION) && !defined(_TD_ENTERPRISE_VERSION) + newCfg.daysToKeep1 = newCfg.daysToKeep; + newCfg.daysToKeep2 = newCfg.daysToKeep; +#endif + return newCfg; } From 122241014aebdf8833d3163ff7245a6571f19c9b Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Mon, 31 May 2021 18:53:51 +0800 Subject: [PATCH 2/2] change D_TD_COMMUNITY_VERSION to _STORAGE --- CMakeLists.txt | 2 -- src/mnode/src/mnodeDb.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b34d995d30..6f50aca079 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,6 @@ IF (TD_WINDOWS OR TD_DARWIN) SET(TD_SOMODE_STATIC TRUE) ENDIF () -ADD_DEFINITIONS(-D_TD_COMMUNITY_VERSION) - INCLUDE(cmake/define.inc) INCLUDE(cmake/env.inc) INCLUDE(cmake/version.inc) diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index e6d82a6530..b0ac1192bb 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -1062,7 +1062,7 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SAlterDbMsg *pAlter) { // community version can only change daysToKeep // but enterprise version can change all daysToKeep options -#if defined(_TD_COMMUNITY_VERSION) && !defined(_TD_ENTERPRISE_VERSION) +#ifndef _STORAGE newCfg.daysToKeep1 = newCfg.daysToKeep; newCfg.daysToKeep2 = newCfg.daysToKeep; #endif