From 0732786632e4451f69c4a03d9ac808f9d547ccd5 Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 17 Apr 2020 12:18:28 +0800 Subject: [PATCH] [TD-52] refactor interface --- cmake/define.inc | 2 +- cmake/input.inc | 8 ----- src/dnode/inc/dnodeMClient.h | 2 +- src/dnode/src/dnodeMClient.c | 2 +- src/inc/mnode.h | 3 -- src/inc/tadmin.h | 11 ++----- src/mnode/src/mgmtAcct.c | 6 ++-- src/mnode/src/mgmtMnode.c | 2 +- src/mnode/src/mgmtReplica.c | 3 ++ src/plugins/http/CMakeLists.txt | 4 +-- src/plugins/http/inc/httpHandle.h | 29 +++++++++++++++-- src/plugins/http/src/httpSystem.c | 27 +++++----------- src/plugins/monitor/src/monitorSystem.c | 24 ++++++++++++-- src/util/CMakeLists.txt | 4 --- src/util/inc/tlog.h | 42 ------------------------- src/vnode/src/vnodeMain.c | 6 ---- 16 files changed, 70 insertions(+), 105 deletions(-) diff --git a/cmake/define.inc b/cmake/define.inc index 9f56dc654d..da100f4260 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -6,7 +6,7 @@ IF (TD_SYNC) ENDIF () IF (TD_ACCOUNT) - ADD_DEFINITIONS(-D_ACCOUNT) + ADD_DEFINITIONS(-D_ACCT) ENDIF () IF (TD_ADMIN) diff --git a/cmake/input.inc b/cmake/input.inc index d29b7c5ff8..5a17e0319c 100755 --- a/cmake/input.inc +++ b/cmake/input.inc @@ -1,14 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) -IF (${CLUSTER} MATCHES "true") - SET(TD_CLUSTER TRUE) - MESSAGE(STATUS "Build with cluster plugins") -ELSEIF (${CLUSTER} MATCHES "false") - SET(TD_CLUSTER FALSE) - MESSAGE(STATUS "Build without cluster plugins") -ENDIF () - IF (${ACCOUNT} MATCHES "true") SET(TD_ACCOUNT TRUE) MESSAGE(STATUS "Build with account plugins") diff --git a/src/dnode/inc/dnodeMClient.h b/src/dnode/inc/dnodeMClient.h index a8e97dd9de..fdaf54e0e5 100644 --- a/src/dnode/inc/dnodeMClient.h +++ b/src/dnode/inc/dnodeMClient.h @@ -23,7 +23,7 @@ extern "C" { int32_t dnodeInitMClient(); void dnodeCleanupMClient(); void dnodeSendMsgToMnode(SRpcMsg *rpcMsg); -void * dnodeGetMpeerInfos(); +void * dnodeGetMnodeList(); int32_t dnodeGetDnodeId(); #ifdef __cplusplus diff --git a/src/dnode/src/dnodeMClient.c b/src/dnode/src/dnodeMClient.c index 42f947588b..90a093560f 100644 --- a/src/dnode/src/dnodeMClient.c +++ b/src/dnode/src/dnodeMClient.c @@ -332,7 +332,7 @@ uint32_t dnodeGetMnodeMasteIp() { return tsMnodeIpList.ip[tsMnodeIpList.inUse]; } -void* dnodeGetMpeerInfos() { +void* dnodeGetMnodeList() { return &tsMnodeInfos; } diff --git a/src/inc/mnode.h b/src/inc/mnode.h index c30e1e37ba..e7ad88d6b6 100644 --- a/src/inc/mnode.h +++ b/src/inc/mnode.h @@ -25,9 +25,6 @@ int32_t mgmtStartSystem(); void mgmtCleanUpSystem(); void mgmtStopSystem(); -extern char version[]; -extern char tsMnodeDir[]; - #ifdef __cplusplus } #endif diff --git a/src/inc/tadmin.h b/src/inc/tadmin.h index 4a883965f4..b7de33576a 100644 --- a/src/inc/tadmin.h +++ b/src/inc/tadmin.h @@ -20,15 +20,10 @@ extern "C" { #endif -#include -#include +struct HttpServer; -void adminInit(); - -struct _http_server_obj_; - -extern void (*adminInitHandleFp)(struct _http_server_obj_* pServer); -extern void (*opInitHandleFp)(struct _http_server_obj_* pServer); +void adminInitHandle(struct HttpServer* pServer); +void opInitHandle(struct HttpServer* pServer); #ifdef __cplusplus } diff --git a/src/mnode/src/mgmtAcct.c b/src/mnode/src/mgmtAcct.c index 792d5fa9b8..3a52715274 100644 --- a/src/mnode/src/mgmtAcct.c +++ b/src/mnode/src/mgmtAcct.c @@ -26,9 +26,9 @@ #include "mgmtSdb.h" #include "mgmtUser.h" -static void * tsAcctSdb = NULL; -static int32_t tsAcctUpdateSize; -static void mgmtCreateRootAcct(); +void * tsAcctSdb = NULL; +int32_t tsAcctUpdateSize; +static void mgmtCreateRootAcct(); static int32_t mgmtActionAcctDestroy(SSdbOperDesc *pOper) { SAcctObj *pAcct = pOper->pObj; diff --git a/src/mnode/src/mgmtMnode.c b/src/mnode/src/mgmtMnode.c index ec3030f85e..491fcb5302 100644 --- a/src/mnode/src/mgmtMnode.c +++ b/src/mnode/src/mgmtMnode.c @@ -30,9 +30,9 @@ #include "mgmtShell.h" #include "mgmtUser.h" +int32_t tsMnodeIsMaster = true; static void * tsMnodeSdb = NULL; static int32_t tsMnodeUpdateSize = 0; -static int32_t tsMnodeIsMaster = true; static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); diff --git a/src/mnode/src/mgmtReplica.c b/src/mnode/src/mgmtReplica.c index 05a303a69b..4ce9a79572 100644 --- a/src/mnode/src/mgmtReplica.c +++ b/src/mnode/src/mgmtReplica.c @@ -64,4 +64,7 @@ int32_t replicaAllocVnodes(SVgObj *pVgroup) { return TSDB_CODE_SUCCESS; } +tsync_h syncStart(const SSyncInfo *info) { return NULL; } +int syncForwardToPeer(tsync_h shandle, void *pHead, void *mhandle) { return 0; } + #endif diff --git a/src/plugins/http/CMakeLists.txt b/src/plugins/http/CMakeLists.txt index 9b36f4029a..40dee94117 100644 --- a/src/plugins/http/CMakeLists.txt +++ b/src/plugins/http/CMakeLists.txt @@ -15,7 +15,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ADD_LIBRARY(http ${SRC}) TARGET_LINK_LIBRARIES(http taos_static z) - IF (TD_CLUSTER) - TARGET_LINK_LIBRARIES(http) + IF (TD_ADMIN) + TARGET_LINK_LIBRARIES(http admin) ENDIF () ENDIF () diff --git a/src/plugins/http/inc/httpHandle.h b/src/plugins/http/inc/httpHandle.h index 9c6a263c5b..ad5a28e10e 100644 --- a/src/plugins/http/inc/httpHandle.h +++ b/src/plugins/http/inc/httpHandle.h @@ -23,7 +23,7 @@ #include "taosdef.h" #include "tutil.h" #include "zlib.h" - +#include "tlog.h" #include "http.h" #include "httpJson.h" @@ -206,10 +206,10 @@ typedef struct HttpThread { int threadId; char label[HTTP_LABEL_SIZE]; bool (*processData)(HttpContext *pContext); - struct _http_server_obj_ *pServer; // handle passed by upper layer during pServer initialization + struct HttpServer *pServer; // handle passed by upper layer during pServer initialization } HttpThread; -typedef struct _http_server_obj_ { +typedef struct HttpServer { char label[HTTP_LABEL_SIZE]; char serverIp[16]; uint16_t serverPort; @@ -313,4 +313,27 @@ const char* httpContextStateStr(HttpContextState state); bool httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState); void httpRemoveContextFromEpoll(HttpThread *pThread, HttpContext *pContext); +#define httpError(...) \ + if (httpDebugFlag & DEBUG_ERROR) { \ + tprintf("ERROR HTP ", 255, __VA_ARGS__); \ + } +#define httpWarn(...) \ + if (httpDebugFlag & DEBUG_WARN) { \ + tprintf("WARN HTP ", httpDebugFlag, __VA_ARGS__); \ + } +#define httpTrace(...) \ + if (httpDebugFlag & DEBUG_TRACE) { \ + tprintf("HTP ", httpDebugFlag, __VA_ARGS__); \ + } +#define httpDump(...) \ + if (httpDebugFlag & DEBUG_TRACE) { \ + taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); \ + } +#define httpPrint(...) \ + { tprintf("HTP ", 255, __VA_ARGS__); } + +#define httpLError(...) taosLogError(__VA_ARGS__) httpError(__VA_ARGS__) +#define httpLWarn(...) taosLogWarn(__VA_ARGS__) httpWarn(__VA_ARGS__) +#define httpLPrint(...) taosLogPrint(__VA_ARGS__) httpPrint(__VA_ARGS__) + #endif diff --git a/src/plugins/http/src/httpSystem.c b/src/plugins/http/src/httpSystem.c index 2a118cc2b1..52910cb1db 100644 --- a/src/plugins/http/src/httpSystem.c +++ b/src/plugins/http/src/httpSystem.c @@ -13,11 +13,9 @@ * along with this program. If not, see . */ -#include -#include -#include -#include - +#define _DEFAULT_SOURCE +#include "os.h" +#include "tadmin.h" #include "http.h" #include "httpCode.h" #include "httpHandle.h" @@ -27,28 +25,17 @@ #include "tglobalcfg.h" #include "tsocket.h" #include "ttimer.h" - #include "gcHandle.h" #include "httpHandle.h" #include "restHandle.h" #include "tgHandle.h" -#include "tlog.h" +#ifndef _ADMIN -void (*adminInitHandleFp)(HttpServer* pServer) = NULL; -void (*opInitHandleFp)(HttpServer* pServer) = NULL; - -void adminInitHandle(HttpServer* pServer) { - if (adminInitHandleFp) { - (*adminInitHandleFp)(pServer); - } -} +void adminInitHandle(HttpServer* pServer) {} +void opInitHandle(HttpServer* pServer) {} -void opInitHandle(HttpServer* pServer) { - if (opInitHandleFp) { - (*opInitHandleFp)(pServer); - } -} +#endif static HttpServer *httpServer = NULL; void taosInitNote(int numOfNoteLines, int maxNotes, char* lable); diff --git a/src/plugins/monitor/src/monitorSystem.c b/src/plugins/monitor/src/monitorSystem.c index 4fb3ba2f5b..a547d13545 100644 --- a/src/plugins/monitor/src/monitorSystem.c +++ b/src/plugins/monitor/src/monitorSystem.c @@ -13,17 +13,37 @@ * along with this program. If not, see . */ +#define _DEFAULT_SOURCE #include "os.h" - +#include "tlog.h" #include "monitor.h" #include "dnode.h" -#include "monitorSystem.h" #include "tsclient.h" #include "taosdef.h" #include "tsystem.h" #include "ttime.h" #include "ttimer.h" #include "tutil.h" +#include "monitorSystem.h" + +#define monitorError(...) \ + if (monitorDebugFlag & DEBUG_ERROR) { \ + tprintf("ERROR MON ", 255, __VA_ARGS__); \ + } +#define monitorWarn(...) \ + if (monitorDebugFlag & DEBUG_WARN) { \ + tprintf("WARN MON ", monitorDebugFlag, __VA_ARGS__); \ + } +#define monitorTrace(...) \ + if (monitorDebugFlag & DEBUG_TRACE) { \ + tprintf("MON ", monitorDebugFlag, __VA_ARGS__); \ + } +#define monitorPrint(...) \ + { tprintf("MON ", 255, __VA_ARGS__); } + +#define monitorLError(...) taosLogError(__VA_ARGS__) monitorError(__VA_ARGS__) +#define monitorLWarn(...) taosLogWarn(__VA_ARGS__) monitorWarn(__VA_ARGS__) +#define monitorLPrint(...) taosLogPrint(__VA_ARGS__) monitorPrint(__VA_ARGS__) #define SQL_LENGTH 1024 #define LOG_LEN_STR 80 diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index a814bf52ab..f875cfff94 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -107,8 +107,4 @@ ELSEIF(TD_DARWIN_64) TARGET_LINK_LIBRARIES(tutil iconv pthread os) ENDIF() -#IF (TD_CLUSTER) # TARGET_LINK_LIBRARIES(tutil mstorage) -#ENDIF () - - diff --git a/src/util/inc/tlog.h b/src/util/inc/tlog.h index 591f53f410..485f8644d3 100644 --- a/src/util/inc/tlog.h +++ b/src/util/inc/tlog.h @@ -177,48 +177,6 @@ extern uint32_t cdebugFlag; tprintf("DND QRY ", qdebugFlag, __VA_ARGS__); \ } -#define httpError(...) \ - if (httpDebugFlag & DEBUG_ERROR) { \ - tprintf("ERROR HTP ", 255, __VA_ARGS__); \ - } -#define httpWarn(...) \ - if (httpDebugFlag & DEBUG_WARN) { \ - tprintf("WARN HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpTrace(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - tprintf("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpDump(...) \ - if (httpDebugFlag & DEBUG_TRACE) { \ - taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); \ - } -#define httpPrint(...) \ - { tprintf("HTP ", 255, __VA_ARGS__); } - -#define httpLError(...) taosLogError(__VA_ARGS__) httpError(__VA_ARGS__) -#define httpLWarn(...) taosLogWarn(__VA_ARGS__) httpWarn(__VA_ARGS__) -#define httpLPrint(...) taosLogPrint(__VA_ARGS__) httpPrint(__VA_ARGS__) - -#define monitorError(...) \ - if (monitorDebugFlag & DEBUG_ERROR) { \ - tprintf("ERROR MON ", 255, __VA_ARGS__); \ - } -#define monitorWarn(...) \ - if (monitorDebugFlag & DEBUG_WARN) { \ - tprintf("WARN MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorTrace(...) \ - if (monitorDebugFlag & DEBUG_TRACE) { \ - tprintf("MON ", monitorDebugFlag, __VA_ARGS__); \ - } -#define monitorPrint(...) \ - { tprintf("MON ", 255, __VA_ARGS__); } - -#define monitorLError(...) taosLogError(__VA_ARGS__) monitorError(__VA_ARGS__) -#define monitorLWarn(...) taosLogWarn(__VA_ARGS__) monitorWarn(__VA_ARGS__) -#define monitorLPrint(...) taosLogPrint(__VA_ARGS__) monitorPrint(__VA_ARGS__) - #ifdef __cplusplus } #endif diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 7ec9b0fef7..a7c53d1258 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -41,12 +41,6 @@ static int vnodeGetWalInfo(void *ahandle, char *name, uint32_t *index); static void vnodeNotifyRole(void *ahandle, int8_t role); static pthread_once_t vnodeModuleInit = PTHREAD_ONCE_INIT; - -#ifndef _VPEER -tsync_h syncStart(const SSyncInfo *info) { return NULL; } -int syncForwardToPeer(tsync_h shandle, void *pHead, void *mhandle) { return 0; } -#endif - static void vnodeInit() { vnodeInitWriteFp(); vnodeInitReadFp(); -- GitLab