diff --git a/cmake/define.inc b/cmake/define.inc index 7894e6dab5d4ddd44e69f77702004183f431d3a6..a5fbd8abe959fb8530dd8cc26c79eefd47ec6b9f 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -124,6 +124,10 @@ IF (TD_APLHINE) MESSAGE(STATUS "aplhine is defined") ENDIF () +IF (TD_BUILD_HTTP) + ADD_DEFINITIONS(-DHTTP_EMBEDDED) +ENDIF () + IF (TD_LINUX) ADD_DEFINITIONS(-DLINUX) ADD_DEFINITIONS(-D_LINUX) diff --git a/cmake/input.inc b/cmake/input.inc index d746cf52f6eb016795d6fa6d01f408925159c710..ed8788922c8026cbc4c6b90ef477dcbd21cf8ba0 100755 --- a/cmake/input.inc +++ b/cmake/input.inc @@ -90,6 +90,12 @@ IF (${BUILD_JDBC} MATCHES "false") SET(TD_BUILD_JDBC FALSE) ENDIF () +SET(TD_BUILD_HTTP TRUE) + +IF (${BUILD_HTTP} MATCHES "false") + SET(TD_BUILD_HTTP FALSE) +ENDIF () + SET(TD_MEMORY_SANITIZER FALSE) IF (${MEMORY_SANITIZER} MATCHES "true") SET(TD_MEMORY_SANITIZER TRUE) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index cf53977103c3a9760286e70447d826f7026d7e53..4eb0d2b2bfdd1d42ec93a85083c2f0fc0382af5a 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -5,7 +5,11 @@ INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(jni) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc) -INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/plugins/http/inc) + +IF (TD_BUILD_HTTP) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/plugins/http/inc) +ENDIF () + AUX_SOURCE_DIRECTORY(src SRC) IF (TD_LINUX) diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 60a6e241ccdfd48c7eb5a68f2dd7a251f76097a5..04d1472bb0101e903aa697ccc443d60e386c4ba2 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -29,7 +29,10 @@ #include "tsclient.h" #include "ttimer.h" #include "ttokendef.h" + +#ifdef HTTP_EMBEDDED #include "httpInt.h" +#endif static void freeQueryInfoImpl(SQueryInfo* pQueryInfo); @@ -5118,11 +5121,14 @@ void tscRemoveCachedTableMeta(STableMetaInfo* pTableMetaInfo, uint64_t id) { char* cloneCurrentDBName(SSqlObj* pSql) { char *p = NULL; +#ifdef HTTP_EMBEDDED HttpContext *pCtx = NULL; +#endif pthread_mutex_lock(&pSql->pTscObj->mutex); STscObj *pTscObj = pSql->pTscObj; switch (pTscObj->from) { +#ifdef HTTP_EMBEDDED case TAOS_REQ_FROM_HTTP: pCtx = pSql->param; if (pCtx && pCtx->db[0] != '\0') { @@ -5133,6 +5139,7 @@ char* cloneCurrentDBName(SSqlObj* pSql) { p = strdup(db); } break; +#endif default: break; } diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt index 47186130ead0d1ee3f4593b7ef346f8cc47f7cba..a009448c822ca651fd91583277ed92b183f155d2 100644 --- a/src/dnode/CMakeLists.txt +++ b/src/dnode/CMakeLists.txt @@ -18,7 +18,12 @@ ELSE () ENDIF () ADD_EXECUTABLE(taosd ${SRC}) + +IF (TD_BUILD_HTTP) TARGET_LINK_LIBRARIES(taosd mnode monitor http tsdb twal vnode cJson lua lz4 balance sync ${LINK_JEMALLOC}) +ELSE () +TARGET_LINK_LIBRARIES(taosd mnode monitor tsdb twal vnode cJson lua lz4 balance sync ${LINK_JEMALLOC}) +ENDIF () IF (TD_SOMODE_STATIC) TARGET_LINK_LIBRARIES(taosd taos_static) diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c index a661585b3b39df986ac7866a255472e47e789fe6..39f9e352793ffcab885438309980c0c530e048ad 100644 --- a/src/dnode/src/dnodeModule.c +++ b/src/dnode/src/dnodeModule.c @@ -49,6 +49,7 @@ static void dnodeAllocModules() { tsModule[TSDB_MOD_MNODE].startFp = mnodeStartSystem; tsModule[TSDB_MOD_MNODE].stopFp = mnodeStopSystem; +#ifdef HTTP_EMBEDDED tsModule[TSDB_MOD_HTTP].enable = (tsEnableHttpModule == 1); tsModule[TSDB_MOD_HTTP].name = "http"; tsModule[TSDB_MOD_HTTP].initFp = httpInitSystem; @@ -58,6 +59,7 @@ static void dnodeAllocModules() { if (tsEnableHttpModule) { dnodeSetModuleStatus(TSDB_MOD_HTTP); } +#endif #ifdef _MQTT tsModule[TSDB_MOD_MQTT].enable = (tsEnableMqttModule == 1); diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c index 5606681f0f931070e9cbf21d6b98b0d2eb51bdfa..98bbbf8f73b26535030c5096f128a7f84c2b9f61 100644 --- a/src/dnode/src/dnodeShell.c +++ b/src/dnode/src/dnodeShell.c @@ -240,7 +240,9 @@ void *dnodeSendCfgTableToRecv(int32_t vgId, int32_t tid) { SStatisInfo dnodeGetStatisInfo() { SStatisInfo info = {0}; if (dnodeGetRunStatus() == TSDB_RUN_STATUS_RUNING) { +#ifdef HTTP_EMBEDDED info.httpReqNum = httpGetReqCount(); +#endif info.queryReqNum = atomic_exchange_32(&tsQueryReqNum, 0); info.submitReqNum = atomic_exchange_32(&tsSubmitReqNum, 0); } diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 320445f7f784884f8aa009e37182fc57a38bb96f..33f8c81a6d82f3573d15f74b7c24fe801d89a6a3 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -2,7 +2,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20) PROJECT(TDengine) ADD_SUBDIRECTORY(monitor) -ADD_SUBDIRECTORY(http) + +IF (TD_BUILD_HTTP) + ADD_SUBDIRECTORY(http) +ENDIF () + IF (TD_LINUX AND TD_MQTT) ADD_SUBDIRECTORY(mqtt) -ENDIF () \ No newline at end of file +ENDIF ()