Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
TDengine
提交
cdc3ce72
T
TDengine
项目概览
dgr6878
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cdc3ce72
编写于
2月 19, 2020
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename modules to plugins
上级
3aef011d
变更
44
隐藏空白更改
内联
并排
Showing
44 changed file
with
86 addition
and
74 deletion
+86
-74
src/CMakeLists.txt
src/CMakeLists.txt
+1
-1
src/dnode/inc/dnodeMgmt.h
src/dnode/inc/dnodeMgmt.h
+0
-6
src/dnode/inc/dnodeSystem.h
src/dnode/inc/dnodeSystem.h
+2
-0
src/dnode/src/dnodeMgmt.c
src/dnode/src/dnodeMgmt.c
+3
-3
src/inc/http.h
src/inc/http.h
+0
-22
src/inc/mnode.h
src/inc/mnode.h
+10
-0
src/inc/monitor.h
src/inc/monitor.h
+23
-0
src/mnode/src/mgmtSystem.c
src/mnode/src/mgmtSystem.c
+5
-1
src/modules/monitor/inc/monitor.h
src/modules/monitor/inc/monitor.h
+0
-41
src/plugins/CMakeLists.txt
src/plugins/CMakeLists.txt
+0
-0
src/plugins/http/CMakeLists.txt
src/plugins/http/CMakeLists.txt
+0
-0
src/plugins/http/inc/cJSON.h
src/plugins/http/inc/cJSON.h
+0
-0
src/plugins/http/inc/gcHandle.h
src/plugins/http/inc/gcHandle.h
+0
-0
src/plugins/http/inc/gcJson.h
src/plugins/http/inc/gcJson.h
+0
-0
src/plugins/http/inc/httpCode.h
src/plugins/http/inc/httpCode.h
+0
-0
src/plugins/http/inc/httpHandle.h
src/plugins/http/inc/httpHandle.h
+0
-0
src/plugins/http/inc/httpJson.h
src/plugins/http/inc/httpJson.h
+0
-0
src/plugins/http/inc/httpResp.h
src/plugins/http/inc/httpResp.h
+0
-0
src/plugins/http/inc/httpSystem.h
src/plugins/http/inc/httpSystem.h
+0
-0
src/plugins/http/inc/restHandle.h
src/plugins/http/inc/restHandle.h
+0
-0
src/plugins/http/inc/restJson.h
src/plugins/http/inc/restJson.h
+0
-0
src/plugins/http/inc/tgHandle.h
src/plugins/http/inc/tgHandle.h
+0
-0
src/plugins/http/inc/tgJson.h
src/plugins/http/inc/tgJson.h
+0
-0
src/plugins/http/src/cJSON.c
src/plugins/http/src/cJSON.c
+0
-0
src/plugins/http/src/gcHandle.c
src/plugins/http/src/gcHandle.c
+0
-0
src/plugins/http/src/gcJson.c
src/plugins/http/src/gcJson.c
+0
-0
src/plugins/http/src/httpAuth.c
src/plugins/http/src/httpAuth.c
+0
-0
src/plugins/http/src/httpCode.c
src/plugins/http/src/httpCode.c
+0
-0
src/plugins/http/src/httpHandle.c
src/plugins/http/src/httpHandle.c
+0
-0
src/plugins/http/src/httpJson.c
src/plugins/http/src/httpJson.c
+0
-0
src/plugins/http/src/httpResp.c
src/plugins/http/src/httpResp.c
+0
-0
src/plugins/http/src/httpServer.c
src/plugins/http/src/httpServer.c
+0
-0
src/plugins/http/src/httpSession.c
src/plugins/http/src/httpSession.c
+0
-0
src/plugins/http/src/httpSql.c
src/plugins/http/src/httpSql.c
+0
-0
src/plugins/http/src/httpSystem.c
src/plugins/http/src/httpSystem.c
+0
-0
src/plugins/http/src/httpUtil.c
src/plugins/http/src/httpUtil.c
+0
-0
src/plugins/http/src/restHandle.c
src/plugins/http/src/restHandle.c
+0
-0
src/plugins/http/src/restJson.c
src/plugins/http/src/restJson.c
+0
-0
src/plugins/http/src/tgHandle.c
src/plugins/http/src/tgHandle.c
+0
-0
src/plugins/http/src/tgJson.c
src/plugins/http/src/tgJson.c
+0
-0
src/plugins/monitor/CMakeLists.txt
src/plugins/monitor/CMakeLists.txt
+0
-0
src/plugins/monitor/inc/monitorSystem.h
src/plugins/monitor/inc/monitorSystem.h
+0
-0
src/plugins/monitor/src/monitorSystem.c
src/plugins/monitor/src/monitorSystem.c
+0
-0
src/util/inc/tlog.h
src/util/inc/tlog.h
+42
-0
未找到文件。
src/CMakeLists.txt
浏览文件 @
cdc3ce72
...
...
@@ -6,7 +6,7 @@ ADD_SUBDIRECTORY(util)
ADD_SUBDIRECTORY
(
rpc
)
ADD_SUBDIRECTORY
(
client
)
ADD_SUBDIRECTORY
(
kit
)
ADD_SUBDIRECTORY
(
module
s
)
ADD_SUBDIRECTORY
(
plugin
s
)
ADD_SUBDIRECTORY
(
sdb
)
ADD_SUBDIRECTORY
(
mnode
)
ADD_SUBDIRECTORY
(
dnode
)
...
...
src/dnode/inc/dnodeMgmt.h
浏览文件 @
cdc3ce72
...
...
@@ -22,14 +22,8 @@ extern "C" {
#include <stdint.h>
#include <stdbool.h>
#include "tsched.h"
#include "dnode.h"
void
dnodeProcessMsgFromMgmt
(
int8_t
*
pCont
,
int32_t
contLen
,
int32_t
msgType
,
void
*
pConn
);
extern
void
*
tsDnodeMgmtQhandle
;
void
dnodeSendVpeerCfgMsg
(
int32_t
vnode
);
void
dnodeSendMeterCfgMsg
(
int32_t
vnode
,
int32_t
sid
);
...
...
src/dnode/inc/dnodeSystem.h
浏览文件 @
cdc3ce72
...
...
@@ -39,6 +39,8 @@ extern void (*dnodeParseParameterK)();
extern
int32_t
tsMaxQueues
;
extern
void
**
tsRpcQhandle
;
extern
void
*
tsQueryQhandle
;
extern
void
*
tsDnodeMgmtQhandle
;
int32_t
dnodeInitSystem
();
void
dnodeCleanUpSystem
();
...
...
src/dnode/src/dnodeMgmt.c
浏览文件 @
cdc3ce72
...
...
@@ -83,7 +83,7 @@ void dnodeProcessMsgFromMgmt(int8_t *pCont, int32_t contLen, int32_t msgType, vo
dError
(
"invalid msg type:%d"
,
msgType
);
}
else
{
if
(
dnodeProcessShellMsgFp
[
msgType
])
{
(
*
dnodeProcessShellMsgFp
[
msgType
])(
pCon
n
,
contLen
,
pConn
);
(
*
dnodeProcessShellMsgFp
[
msgType
])(
pCon
t
,
contLen
,
pConn
);
}
else
{
dError
(
"%s is not processed"
,
taosMsg
[
msgType
]);
}
...
...
@@ -190,7 +190,7 @@ void dnodeSendVpeerCfgMsg(int32_t vnode) {
}
cfg
->
vnode
=
htonl
(
vnode
);
dnodeSendMsgToMnode
(
cfg
,
sizeof
(
S
MeterCfgMsg
)
);
dnodeSendMsgToMnode
(
cfg
,
sizeof
(
S
VpeerCfgMsg
),
TSDB_MSG_TYPE_VNODE_CFG
);
}
void
dnodeSendMeterCfgMsg
(
int32_t
vnode
,
int32_t
sid
)
{
...
...
@@ -200,7 +200,7 @@ void dnodeSendMeterCfgMsg(int32_t vnode, int32_t sid) {
}
cfg
->
vnode
=
htonl
(
vnode
);
dnodeSendMsgToMnode
(
cfg
,
sizeof
(
SMeterCfgMsg
));
dnodeSendMsgToMnode
(
cfg
,
sizeof
(
SMeterCfgMsg
)
,
TSDB_MSG_TYPE_TABLE_CFG
);
}
void
dnodeInitProcessShellMsg
()
{
...
...
src/inc/http.h
浏览文件 @
cdc3ce72
...
...
@@ -23,28 +23,6 @@ extern "C" {
#include "tglobalcfg.h"
#include "tlog.h"
#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__)
int32_t
httpGetReqCount
();
...
...
src/inc/mnode.h
浏览文件 @
cdc3ce72
...
...
@@ -335,8 +335,18 @@ typedef struct {
char
payload
[];
/* payload for wildcard match in show tables */
}
SShowObj
;
extern
int32_t
(
*
mgmtInitSystem
)();
extern
void
(
*
mgmtStopSystem
)();
int32_t
mgmtStartSystem
();
void
mgmtCleanUpSystem
();
void
mgmtProcessMsgFromDnode
(
int8_t
*
pCont
,
int32_t
contLen
,
int32_t
msgType
,
void
*
pConn
);
extern
void
(
*
mgmtCleanUpRedirect
)();
#ifdef __cplusplus
}
#endif
...
...
src/inc/monitor.h
0 → 100644
浏览文件 @
cdc3ce72
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MONITOR_H__
#define __MONITOR_H__
#include "tglobalcfg.h"
#include "tlog.h"
#endif
\ No newline at end of file
src/mnode/src/mgmtSystem.c
浏览文件 @
cdc3ce72
...
...
@@ -162,7 +162,10 @@ int mgmtStartSystem() {
return
0
;
}
int32_t
mgmtInitSystemImp
()
{
return
mgmtStartSystem
();
}
int32_t
mgmtInitSystemImp
()
{
return
mgmtStartSystem
();
}
int32_t
(
*
mgmtInitSystem
)()
=
mgmtInitSystemImp
;
int32_t
mgmtCheckMgmtRunningImp
()
{
return
0
;
}
...
...
@@ -177,6 +180,7 @@ void mgmtStartMgmtTimerImp() {
void
(
*
mgmtStartMgmtTimer
)()
=
mgmtStartMgmtTimerImp
;
void
mgmtStopSystemImp
()
{}
void
(
*
mgmtStopSystem
)()
=
mgmtStopSystemImp
;
void
mgmtCleanUpRedirectImp
()
{}
...
...
src/modules/monitor/inc/monitor.h
已删除
100644 → 0
浏览文件 @
3aef011d
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MONITOR_H__
#define __MONITOR_H__
#include "tglobalcfg.h"
#include "tlog.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__)
#endif
\ No newline at end of file
src/
module
s/CMakeLists.txt
→
src/
plugin
s/CMakeLists.txt
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/CMakeLists.txt
→
src/
plugin
s/http/CMakeLists.txt
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/cJSON.h
→
src/
plugin
s/http/inc/cJSON.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/gcHandle.h
→
src/
plugin
s/http/inc/gcHandle.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/gcJson.h
→
src/
plugin
s/http/inc/gcJson.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/httpCode.h
→
src/
plugin
s/http/inc/httpCode.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/httpHandle.h
→
src/
plugin
s/http/inc/httpHandle.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/httpJson.h
→
src/
plugin
s/http/inc/httpJson.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/httpResp.h
→
src/
plugin
s/http/inc/httpResp.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/httpSystem.h
→
src/
plugin
s/http/inc/httpSystem.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/restHandle.h
→
src/
plugin
s/http/inc/restHandle.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/restJson.h
→
src/
plugin
s/http/inc/restJson.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/tgHandle.h
→
src/
plugin
s/http/inc/tgHandle.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/inc/tgJson.h
→
src/
plugin
s/http/inc/tgJson.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/cJSON.c
→
src/
plugin
s/http/src/cJSON.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/gcHandle.c
→
src/
plugin
s/http/src/gcHandle.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/gcJson.c
→
src/
plugin
s/http/src/gcJson.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpAuth.c
→
src/
plugin
s/http/src/httpAuth.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpCode.c
→
src/
plugin
s/http/src/httpCode.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpHandle.c
→
src/
plugin
s/http/src/httpHandle.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpJson.c
→
src/
plugin
s/http/src/httpJson.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpResp.c
→
src/
plugin
s/http/src/httpResp.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpServer.c
→
src/
plugin
s/http/src/httpServer.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpSession.c
→
src/
plugin
s/http/src/httpSession.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpSql.c
→
src/
plugin
s/http/src/httpSql.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpSystem.c
→
src/
plugin
s/http/src/httpSystem.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/httpUtil.c
→
src/
plugin
s/http/src/httpUtil.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/restHandle.c
→
src/
plugin
s/http/src/restHandle.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/restJson.c
→
src/
plugin
s/http/src/restJson.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/tgHandle.c
→
src/
plugin
s/http/src/tgHandle.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/http/src/tgJson.c
→
src/
plugin
s/http/src/tgJson.c
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/monitor/CMakeLists.txt
→
src/
plugin
s/monitor/CMakeLists.txt
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/monitor/inc/monitorSystem.h
→
src/
plugin
s/monitor/inc/monitorSystem.h
浏览文件 @
cdc3ce72
文件已移动
src/
module
s/monitor/src/monitorSystem.c
→
src/
plugin
s/monitor/src/monitorSystem.c
浏览文件 @
cdc3ce72
文件已移动
src/util/inc/tlog.h
浏览文件 @
cdc3ce72
...
...
@@ -197,6 +197,48 @@ extern uint32_t cdebugFlag;
#define mLWarn(...) taosLogWarn(__VA_ARGS__) mWarn(__VA_ARGS__)
#define mLPrint(...) taosLogPrint(__VA_ARGS__) mPrint(__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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录