From d6ed76059b4ec74fbb1c05be2a285086c54b0f63 Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 7 Feb 2020 08:07:08 +0800 Subject: [PATCH] #1177 --- src/mnode/CMakeLists.txt | 22 ++++++- src/mnode/detail/CMakeLists.txt | 23 ------- src/mnode/{detail => }/inc/mgmt.h | 0 src/mnode/{detail => }/inc/mgmtBalance.h | 0 src/mnode/{detail => }/inc/mgmtProfile.h | 0 src/mnode/{detail => }/inc/mgmtSystem.h | 0 src/mnode/{detail => }/inc/mgmtUtil.h | 0 src/mnode/lite/src/mgmtAcct.spec.c | 52 ---------------- src/mnode/{detail => }/src/mgmtAcct.c | 60 +++++++++++++++++++ src/mnode/{detail => }/src/mgmtConn.c | 0 src/mnode/{detail => }/src/mgmtDb.c | 0 src/mnode/{detail => }/src/mgmtDnode.c | 0 src/mnode/{detail => }/src/mgmtDnodeInt.c | 0 src/mnode/{detail => }/src/mgmtMeter.c | 0 src/mnode/{detail => }/src/mgmtProfile.c | 0 src/mnode/{detail => }/src/mgmtShell.c | 0 .../{detail => }/src/mgmtSupertableQuery.c | 0 src/mnode/{detail => }/src/mgmtSystem.c | 0 src/mnode/{detail => }/src/mgmtUser.c | 0 src/mnode/{detail => }/src/mgmtUtil.c | 0 src/mnode/{detail => }/src/mgmtVgroup.c | 0 21 files changed, 80 insertions(+), 77 deletions(-) delete mode 100644 src/mnode/detail/CMakeLists.txt rename src/mnode/{detail => }/inc/mgmt.h (100%) rename src/mnode/{detail => }/inc/mgmtBalance.h (100%) rename src/mnode/{detail => }/inc/mgmtProfile.h (100%) rename src/mnode/{detail => }/inc/mgmtSystem.h (100%) rename src/mnode/{detail => }/inc/mgmtUtil.h (100%) rename src/mnode/{detail => }/src/mgmtAcct.c (67%) rename src/mnode/{detail => }/src/mgmtConn.c (100%) rename src/mnode/{detail => }/src/mgmtDb.c (100%) rename src/mnode/{detail => }/src/mgmtDnode.c (100%) rename src/mnode/{detail => }/src/mgmtDnodeInt.c (100%) rename src/mnode/{detail => }/src/mgmtMeter.c (100%) rename src/mnode/{detail => }/src/mgmtProfile.c (100%) rename src/mnode/{detail => }/src/mgmtShell.c (100%) rename src/mnode/{detail => }/src/mgmtSupertableQuery.c (100%) rename src/mnode/{detail => }/src/mgmtSystem.c (100%) rename src/mnode/{detail => }/src/mgmtUser.c (100%) rename src/mnode/{detail => }/src/mgmtUtil.c (100%) rename src/mnode/{detail => }/src/mgmtVgroup.c (100%) diff --git a/src/mnode/CMakeLists.txt b/src/mnode/CMakeLists.txt index ca14d807b6..f94d1e8d1c 100644 --- a/src/mnode/CMakeLists.txt +++ b/src/mnode/CMakeLists.txt @@ -1,5 +1,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) -ADD_SUBDIRECTORY(detail) -ADD_SUBDIRECTORY(lite) \ No newline at end of file +IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/detail/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/detail/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) + INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) + INCLUDE_DIRECTORIES(inc) + AUX_SOURCE_DIRECTORY(src SRC) + ADD_LIBRARY(mnode ${SRC}) + TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread) + + IF (TD_CLUSTER) + TARGET_LINK_LIBRARIES(mnode mcluster) + ELSEIF (TD_LITE) + TARGET_LINK_LIBRARIES(mnode mlite) + ENDIF () +ENDIF () + + diff --git a/src/mnode/detail/CMakeLists.txt b/src/mnode/detail/CMakeLists.txt deleted file mode 100644 index f94d1e8d1c..0000000000 --- a/src/mnode/detail/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -PROJECT(TDengine) - -IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) - INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) - INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/detail/inc) - INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/detail/inc) - INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc) - INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) - INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) - INCLUDE_DIRECTORIES(inc) - AUX_SOURCE_DIRECTORY(src SRC) - ADD_LIBRARY(mnode ${SRC}) - TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread) - - IF (TD_CLUSTER) - TARGET_LINK_LIBRARIES(mnode mcluster) - ELSEIF (TD_LITE) - TARGET_LINK_LIBRARIES(mnode mlite) - ENDIF () -ENDIF () - - diff --git a/src/mnode/detail/inc/mgmt.h b/src/mnode/inc/mgmt.h similarity index 100% rename from src/mnode/detail/inc/mgmt.h rename to src/mnode/inc/mgmt.h diff --git a/src/mnode/detail/inc/mgmtBalance.h b/src/mnode/inc/mgmtBalance.h similarity index 100% rename from src/mnode/detail/inc/mgmtBalance.h rename to src/mnode/inc/mgmtBalance.h diff --git a/src/mnode/detail/inc/mgmtProfile.h b/src/mnode/inc/mgmtProfile.h similarity index 100% rename from src/mnode/detail/inc/mgmtProfile.h rename to src/mnode/inc/mgmtProfile.h diff --git a/src/mnode/detail/inc/mgmtSystem.h b/src/mnode/inc/mgmtSystem.h similarity index 100% rename from src/mnode/detail/inc/mgmtSystem.h rename to src/mnode/inc/mgmtSystem.h diff --git a/src/mnode/detail/inc/mgmtUtil.h b/src/mnode/inc/mgmtUtil.h similarity index 100% rename from src/mnode/detail/inc/mgmtUtil.h rename to src/mnode/inc/mgmtUtil.h diff --git a/src/mnode/lite/src/mgmtAcct.spec.c b/src/mnode/lite/src/mgmtAcct.spec.c index 81f83df988..a1b7438f35 100644 --- a/src/mnode/lite/src/mgmtAcct.spec.c +++ b/src/mnode/lite/src/mgmtAcct.spec.c @@ -16,56 +16,4 @@ #define _DEFAULT_SOURCE #include "mgmt.h" -extern void *userSdb; -extern void *dbSdb; -SAcctObj acctObj; -int mgmtInitAccts() { return 0; } - -void mgmtCreateRootAcct() {} - -SAcctObj *mgmtGetAcct(char *name) { return &acctObj; } - -int mgmtCheckUserLimit(SAcctObj *pAcct) { - int numOfUsers = sdbGetNumOfRows(userSdb); - if (numOfUsers >= tsMaxUsers) { - mWarn("numOfUsers:%d, exceed tsMaxUsers:%d", numOfUsers, tsMaxUsers); - return TSDB_CODE_TOO_MANY_USERS; - } - return 0; -} - -int mgmtCheckDbLimit(SAcctObj *pAcct) { - int numOfDbs = sdbGetNumOfRows(dbSdb); - if (numOfDbs >= tsMaxDbs) { - mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs); - return TSDB_CODE_TOO_MANY_DATABSES; - } - return 0; -} - -int mgmtCheckMeterLimit(SAcctObj *pAcct) { return 0; } - -int mgmtCheckUserGrant() { return 0; } - -int mgmtCheckDbGrant() { return 0; } - -int mgmtCheckMeterGrant() { return 0; } - -void grantAddTimeSeries(uint32_t timeSeriesNum) {} - -void mgmtCheckAcct() { - SAcctObj *pAcct = &acctObj; - pAcct->acctId = 0; - strcpy(pAcct->user, "root"); - - mgmtCreateUser(pAcct, "root", "taosdata"); - mgmtCreateUser(pAcct, "monitor", tsInternalPass); - mgmtCreateUser(pAcct, "_root", tsInternalPass); -} - -void mgmtCleanUpAccts() {} - -int mgmtGetAcctMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; } - -int mgmtRetrieveAccts(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; } diff --git a/src/mnode/detail/src/mgmtAcct.c b/src/mnode/src/mgmtAcct.c similarity index 67% rename from src/mnode/detail/src/mgmtAcct.c rename to src/mnode/src/mgmtAcct.c index e5f52b17f9..1605db3c2a 100644 --- a/src/mnode/detail/src/mgmtAcct.c +++ b/src/mnode/src/mgmtAcct.c @@ -19,6 +19,11 @@ #include "mgmt.h" #include "tschemautil.h" +extern void *userSdb; +extern void *dbSdb; +SAcctObj acctObj; + + int mgmtGetAcctsNum(); SShowObj *mgmtGetNextAcct(SShowObj *pShow, SAcctObj **pAcct); @@ -126,3 +131,58 @@ int mgmtRemoveConnFromAcct(SConnObj *pConn) { return 0; } + +/* + * Edge Version Implementation + */ + +int mgmtInitAcctsImp() { return 0; } +int (*mgmtInitAccts)() = mgmtInitAcctsImp; + +void mgmtCreateRootAcct() {} + +SAcctObj *mgmtGetAcct(char *name) { return &acctObj; } + +int mgmtCheckUserLimit(SAcctObj *pAcct) { + int numOfUsers = sdbGetNumOfRows(userSdb); + if (numOfUsers >= tsMaxUsers) { + mWarn("numOfUsers:%d, exceed tsMaxUsers:%d", numOfUsers, tsMaxUsers); + return TSDB_CODE_TOO_MANY_USERS; + } + return 0; +} + +int mgmtCheckDbLimit(SAcctObj *pAcct) { + int numOfDbs = sdbGetNumOfRows(dbSdb); + if (numOfDbs >= tsMaxDbs) { + mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs); + return TSDB_CODE_TOO_MANY_DATABSES; + } + return 0; +} + +int mgmtCheckMeterLimit(SAcctObj *pAcct) { return 0; } + +int mgmtCheckUserGrant() { return 0; } + +int mgmtCheckDbGrant() { return 0; } + +int mgmtCheckMeterGrant() { return 0; } + +void grantAddTimeSeries(uint32_t timeSeriesNum) {} + +void mgmtCheckAcct() { + SAcctObj *pAcct = &acctObj; + pAcct->acctId = 0; + strcpy(pAcct->user, "root"); + + mgmtCreateUser(pAcct, "root", "taosdata"); + mgmtCreateUser(pAcct, "monitor", tsInternalPass); + mgmtCreateUser(pAcct, "_root", tsInternalPass); +} + +void mgmtCleanUpAccts() {} + +int mgmtGetAcctMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; } + +int mgmtRetrieveAccts(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; } diff --git a/src/mnode/detail/src/mgmtConn.c b/src/mnode/src/mgmtConn.c similarity index 100% rename from src/mnode/detail/src/mgmtConn.c rename to src/mnode/src/mgmtConn.c diff --git a/src/mnode/detail/src/mgmtDb.c b/src/mnode/src/mgmtDb.c similarity index 100% rename from src/mnode/detail/src/mgmtDb.c rename to src/mnode/src/mgmtDb.c diff --git a/src/mnode/detail/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c similarity index 100% rename from src/mnode/detail/src/mgmtDnode.c rename to src/mnode/src/mgmtDnode.c diff --git a/src/mnode/detail/src/mgmtDnodeInt.c b/src/mnode/src/mgmtDnodeInt.c similarity index 100% rename from src/mnode/detail/src/mgmtDnodeInt.c rename to src/mnode/src/mgmtDnodeInt.c diff --git a/src/mnode/detail/src/mgmtMeter.c b/src/mnode/src/mgmtMeter.c similarity index 100% rename from src/mnode/detail/src/mgmtMeter.c rename to src/mnode/src/mgmtMeter.c diff --git a/src/mnode/detail/src/mgmtProfile.c b/src/mnode/src/mgmtProfile.c similarity index 100% rename from src/mnode/detail/src/mgmtProfile.c rename to src/mnode/src/mgmtProfile.c diff --git a/src/mnode/detail/src/mgmtShell.c b/src/mnode/src/mgmtShell.c similarity index 100% rename from src/mnode/detail/src/mgmtShell.c rename to src/mnode/src/mgmtShell.c diff --git a/src/mnode/detail/src/mgmtSupertableQuery.c b/src/mnode/src/mgmtSupertableQuery.c similarity index 100% rename from src/mnode/detail/src/mgmtSupertableQuery.c rename to src/mnode/src/mgmtSupertableQuery.c diff --git a/src/mnode/detail/src/mgmtSystem.c b/src/mnode/src/mgmtSystem.c similarity index 100% rename from src/mnode/detail/src/mgmtSystem.c rename to src/mnode/src/mgmtSystem.c diff --git a/src/mnode/detail/src/mgmtUser.c b/src/mnode/src/mgmtUser.c similarity index 100% rename from src/mnode/detail/src/mgmtUser.c rename to src/mnode/src/mgmtUser.c diff --git a/src/mnode/detail/src/mgmtUtil.c b/src/mnode/src/mgmtUtil.c similarity index 100% rename from src/mnode/detail/src/mgmtUtil.c rename to src/mnode/src/mgmtUtil.c diff --git a/src/mnode/detail/src/mgmtVgroup.c b/src/mnode/src/mgmtVgroup.c similarity index 100% rename from src/mnode/detail/src/mgmtVgroup.c rename to src/mnode/src/mgmtVgroup.c -- GitLab