Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c976aeb2
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
c976aeb2
编写于
9月 27, 2021
作者:
sangshuduo
提交者:
GitHub
9月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-10469]<feature>: use blm to replace httpd (#8079)
上级
6ef532bd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
37 addition
and
3 deletion
+37
-3
cmake/define.inc
cmake/define.inc
+4
-0
cmake/input.inc
cmake/input.inc
+6
-0
src/client/CMakeLists.txt
src/client/CMakeLists.txt
+5
-1
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+7
-0
src/dnode/CMakeLists.txt
src/dnode/CMakeLists.txt
+5
-0
src/dnode/src/dnodeModule.c
src/dnode/src/dnodeModule.c
+2
-0
src/dnode/src/dnodeShell.c
src/dnode/src/dnodeShell.c
+2
-0
src/plugins/CMakeLists.txt
src/plugins/CMakeLists.txt
+6
-2
未找到文件。
cmake/define.inc
浏览文件 @
c976aeb2
...
...
@@ -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
)
...
...
cmake/input.inc
浏览文件 @
c976aeb2
...
...
@@ -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
)
...
...
src/client/CMakeLists.txt
浏览文件 @
c976aeb2
...
...
@@ -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
)
...
...
src/client/src/tscUtil.c
浏览文件 @
c976aeb2
...
...
@@ -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
;
}
...
...
src/dnode/CMakeLists.txt
浏览文件 @
c976aeb2
...
...
@@ -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
)
...
...
src/dnode/src/dnodeModule.c
浏览文件 @
c976aeb2
...
...
@@ -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
);
...
...
src/dnode/src/dnodeShell.c
浏览文件 @
c976aeb2
...
...
@@ -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
);
}
...
...
src/plugins/CMakeLists.txt
浏览文件 @
c976aeb2
...
...
@@ -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
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录