Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
453590e2
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
提交
453590e2
编写于
5月 28, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-335] sort include file
上级
966fb020
变更
31
显示空白变更内容
内联
并排
Showing
31 changed file
with
52 addition
and
75 deletion
+52
-75
src/client/src/TSDBJNIConnector.c
src/client/src/TSDBJNIConnector.c
+1
-1
src/common/inc/tulog.h
src/common/inc/tulog.h
+1
-1
src/dnode/inc/dnodeInt.h
src/dnode/inc/dnodeInt.h
+1
-1
src/dnode/inc/dnodeMain.h
src/dnode/inc/dnodeMain.h
+1
-1
src/dnode/inc/dnodeMgmt.h
src/dnode/inc/dnodeMgmt.h
+1
-1
src/dnode/inc/dnodePeer.h
src/dnode/inc/dnodePeer.h
+2
-2
src/dnode/src/dnodeMPeer.c
src/dnode/src/dnodeMPeer.c
+0
-1
src/dnode/src/dnodeMRead.c
src/dnode/src/dnodeMRead.c
+0
-1
src/dnode/src/dnodeMWrite.c
src/dnode/src/dnodeMWrite.c
+0
-1
src/dnode/src/dnodeMgmt.c
src/dnode/src/dnodeMgmt.c
+0
-1
src/dnode/src/dnodeModule.c
src/dnode/src/dnodeModule.c
+0
-1
src/dnode/src/dnodePeer.c
src/dnode/src/dnodePeer.c
+0
-1
src/dnode/src/dnodeShell.c
src/dnode/src/dnodeShell.c
+0
-1
src/dnode/src/dnodeVRead.c
src/dnode/src/dnodeVRead.c
+2
-3
src/dnode/src/dnodeVWrite.c
src/dnode/src/dnodeVWrite.c
+5
-5
src/inc/dnode.h
src/inc/dnode.h
+13
-14
src/inc/mnode.h
src/inc/mnode.h
+5
-4
src/mnode/inc/mnodeInt.h
src/mnode/inc/mnodeInt.h
+2
-2
src/mnode/src/mnodeDnode.c
src/mnode/src/mnodeDnode.c
+0
-1
src/mnode/src/mnodePeer.c
src/mnode/src/mnodePeer.c
+0
-1
src/mnode/src/mnodeRead.c
src/mnode/src/mnodeRead.c
+0
-1
src/mnode/src/mnodeSdb.c
src/mnode/src/mnodeSdb.c
+0
-1
src/mnode/src/mnodeShow.c
src/mnode/src/mnodeShow.c
+0
-1
src/plugins/http/inc/httpLog.h
src/plugins/http/inc/httpLog.h
+1
-1
src/plugins/monitor/src/monitorMain.c
src/plugins/monitor/src/monitorMain.c
+1
-1
src/plugins/mqtt/inc/mqttLog.h
src/plugins/mqtt/inc/mqttLog.h
+1
-1
src/rpc/inc/rpcLog.h
src/rpc/inc/rpcLog.h
+1
-1
src/util/src/ttimer.c
src/util/src/ttimer.c
+1
-1
src/vnode/inc/vnodeInt.h
src/vnode/inc/vnodeInt.h
+4
-4
src/vnode/inc/vnodeLog.h
src/vnode/inc/vnodeLog.h
+4
-14
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+5
-5
未找到文件。
src/client/src/TSDBJNIConnector.c
浏览文件 @
453590e2
src/common/inc/tulog.h
浏览文件 @
453590e2
src/dnode/inc/dnodeInt.h
浏览文件 @
453590e2
src/dnode/inc/dnodeMain.h
浏览文件 @
453590e2
src/dnode/inc/dnodeMgmt.h
浏览文件 @
453590e2
...
...
@@ -34,7 +34,7 @@ void dnodeReleaseVnode(void *pVnode);
void
dnodeSendRedirectMsg
(
SRpcMsg
*
rpcMsg
,
bool
forShell
);
void
dnodeGetMnodeIpSetForPeer
(
void
*
ipSet
);
void
dnodeGetMnodeIpSetForShell
(
void
*
ipSe
);
void
dnodeGetMnodeIpSetForShell
(
void
*
ipSe
t
);
#ifdef __cplusplus
}
...
...
src/dnode/inc/dnodePeer.h
浏览文件 @
453590e2
...
...
@@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TDENGINE_DNODE_
DNODE
_H
#define TDENGINE_DNODE_
DNODE
_H
#ifndef TDENGINE_DNODE_
PEER
_H
#define TDENGINE_DNODE_
PEER
_H
#ifdef __cplusplus
extern
"C"
{
...
...
src/dnode/src/dnodeMPeer.c
浏览文件 @
453590e2
...
...
@@ -19,7 +19,6 @@
#include "taosmsg.h"
#include "tutil.h"
#include "tqueue.h"
#include "trpc.h"
#include "twal.h"
#include "tglobal.h"
#include "mnode.h"
...
...
src/dnode/src/dnodeMRead.c
浏览文件 @
453590e2
...
...
@@ -19,7 +19,6 @@
#include "taosmsg.h"
#include "tutil.h"
#include "tqueue.h"
#include "trpc.h"
#include "twal.h"
#include "tglobal.h"
#include "mnode.h"
...
...
src/dnode/src/dnodeMWrite.c
浏览文件 @
453590e2
...
...
@@ -20,7 +20,6 @@
#include "tutil.h"
#include "ttimer.h"
#include "tqueue.h"
#include "trpc.h"
#include "twal.h"
#include "tglobal.h"
#include "mnode.h"
...
...
src/dnode/src/dnodeMgmt.c
浏览文件 @
453590e2
...
...
@@ -20,7 +20,6 @@
#include "taosmsg.h"
#include "ttime.h"
#include "ttimer.h"
#include "trpc.h"
#include "tsdb.h"
#include "twal.h"
#include "tsync.h"
...
...
src/dnode/src/dnodeModule.c
浏览文件 @
453590e2
...
...
@@ -17,7 +17,6 @@
#include "os.h"
#include "taosdef.h"
#include "tglobal.h"
#include "trpc.h"
#include "mnode.h"
#include "http.h"
#include "mqtt.h"
...
...
src/dnode/src/dnodePeer.c
浏览文件 @
453590e2
...
...
@@ -22,7 +22,6 @@
#include "os.h"
#include "taosmsg.h"
#include "tglobal.h"
#include "trpc.h"
#include "mnode.h"
#include "dnode.h"
#include "dnodeInt.h"
...
...
src/dnode/src/dnodeShell.c
浏览文件 @
453590e2
...
...
@@ -18,7 +18,6 @@
#include "taoserror.h"
#include "taosdef.h"
#include "taosmsg.h"
#include "trpc.h"
#include "tglobal.h"
#include "http.h"
#include "mnode.h"
...
...
src/dnode/src/dnodeVRead.c
浏览文件 @
453590e2
...
...
@@ -19,7 +19,6 @@
#include "taosmsg.h"
#include "tutil.h"
#include "tqueue.h"
#include "trpc.h"
#include "twal.h"
#include "tglobal.h"
#include "dnodeInt.h"
...
...
@@ -142,7 +141,7 @@ void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) {
}
}
void
*
dnodeAllocateRqueue
(
void
*
pVnode
)
{
void
*
dnodeAllocate
Vnode
Rqueue
(
void
*
pVnode
)
{
taos_queue
queue
=
taosOpenQueue
();
if
(
queue
==
NULL
)
return
NULL
;
...
...
@@ -172,7 +171,7 @@ void *dnodeAllocateRqueue(void *pVnode) {
return
queue
;
}
void
dnodeFreeRqueue
(
void
*
rqueue
)
{
void
dnodeFree
Vnode
Rqueue
(
void
*
rqueue
)
{
taosCloseQueue
(
rqueue
);
// dynamically adjust the number of threads
...
...
src/dnode/src/dnodeVWrite.c
浏览文件 @
453590e2
...
...
@@ -22,9 +22,9 @@
#include "trpc.h"
#include "tsdb.h"
#include "twal.h"
#include "tdataformat.h"
#include "tglobal.h"
#include "vnode.h"
#include "tdataformat.h"
#include "dnodeInt.h"
#include "dnodeVWrite.h"
#include "dnodeMgmt.h"
...
...
@@ -122,7 +122,7 @@ void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
}
}
void
*
dnodeAllocateWqueue
(
void
*
pVnode
)
{
void
*
dnodeAllocate
Vnode
Wqueue
(
void
*
pVnode
)
{
SWriteWorker
*
pWorker
=
wWorkerPool
.
writeWorker
+
wWorkerPool
.
nextId
;
void
*
queue
=
taosOpenQueue
();
if
(
queue
==
NULL
)
return
NULL
;
...
...
@@ -157,13 +157,13 @@ void *dnodeAllocateWqueue(void *pVnode) {
return
queue
;
}
void
dnodeFreeWqueue
(
void
*
wqueue
)
{
void
dnodeFree
Vnode
Wqueue
(
void
*
wqueue
)
{
taosCloseQueue
(
wqueue
);
// dynamically adjust the number of threads
}
void
dnodeSendRpcWriteRsp
(
void
*
pVnode
,
void
*
param
,
int32_t
code
)
{
void
dnodeSendRpc
Vnode
WriteRsp
(
void
*
pVnode
,
void
*
param
,
int32_t
code
)
{
SWriteMsg
*
pWrite
=
(
SWriteMsg
*
)
param
;
if
(
code
>
0
)
return
;
...
...
@@ -223,7 +223,7 @@ static void *dnodeProcessWriteQueue(void *param) {
taosGetQitem
(
pWorker
->
qall
,
&
type
,
&
item
);
if
(
type
==
TAOS_QTYPE_RPC
)
{
pWrite
=
(
SWriteMsg
*
)
item
;
dnodeSendRpcWriteRsp
(
pVnode
,
item
,
pWrite
->
rpcMsg
.
code
);
dnodeSendRpc
Vnode
WriteRsp
(
pVnode
,
item
,
pWrite
->
rpcMsg
.
code
);
}
else
{
taosFreeQitem
(
item
);
vnodeRelease
(
pVnode
);
...
...
src/inc/dnode.h
浏览文件 @
453590e2
...
...
@@ -37,12 +37,6 @@ typedef enum {
SDnodeRunStatus
dnodeGetRunStatus
();
SDnodeStatisInfo
dnodeGetStatisInfo
();
void
*
dnodeAllocateWqueue
(
void
*
pVnode
);
void
dnodeFreeWqueue
(
void
*
queue
);
void
*
dnodeAllocateRqueue
(
void
*
pVnode
);
void
dnodeFreeRqueue
(
void
*
rqueue
);
void
dnodeSendRpcWriteRsp
(
void
*
pVnode
,
void
*
param
,
int32_t
code
);
bool
dnodeIsFirstDeploy
();
char
*
dnodeGetMnodeMasterEp
();
void
dnodeGetMnodeIpSetForPeer
(
void
*
ipSet
);
...
...
@@ -54,13 +48,18 @@ void dnodeAddClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
void
dnodeSendMsgToDnode
(
SRpcIpSet
*
ipSet
,
SRpcMsg
*
rpcMsg
);
void
dnodeSendMsgToDnodeRecv
(
SRpcMsg
*
rpcMsg
,
SRpcMsg
*
rpcRsp
);
int32_t
dnodeAllocateMnodeWqueue
();
void
dnodeFreeMnodeWqueue
();
int32_t
dnodeAllocateMnodeRqueue
();
void
dnodeFreeMnodeRqueue
();
void
*
dnodeAllocateVnodeWqueue
(
void
*
pVnode
);
void
dnodeFreeVnodeWqueue
(
void
*
queue
);
void
*
dnodeAllocateVnodeRqueue
(
void
*
pVnode
);
void
dnodeFreeVnodeRqueue
(
void
*
rqueue
);
void
dnodeSendRpcVnodeWriteRsp
(
void
*
pVnode
,
void
*
param
,
int32_t
code
);
int32_t
dnodeAllocateMnodePqueue
();
void
dnodeFreeMnodePqueue
();
int32_t
dnodeAllocateMnodeRqueue
();
void
dnodeFreeMnodeRqueue
();
int32_t
dnodeAllocateMnodeWqueue
();
void
dnodeFreeMnodeWqueue
();
void
dnodeSendRpcMnodeWriteRsp
(
void
*
pMsg
,
int32_t
code
);
void
dnodeReprocessMnodeWriteMsg
(
void
*
pMsg
);
void
dnodeDelayReprocessMnodeWriteMsg
(
void
*
pMsg
);
...
...
src/inc/mnode.h
浏览文件 @
453590e2
...
...
@@ -20,13 +20,14 @@
extern
"C"
{
#endif
#include "trpc.h"
struct
SAcctObj
;
struct
SDnodeObj
;
struct
SUserObj
;
struct
SDbObj
;
struct
SVgObj
;
struct
STableObj
;
struct
SRpcMsg
;
typedef
struct
{
int32_t
len
;
...
...
@@ -34,13 +35,13 @@ typedef struct {
}
SMnodeRsp
;
typedef
struct
SMnodeMsg
{
SRpcMsg
rpcMsg
;
SMnodeRsp
rpcRsp
;
int8_t
received
;
int8_t
successed
;
int8_t
expected
;
int8_t
retry
;
int32_t
code
;
struct
SRpcMsg
rpcMsg
;
struct
SAcctObj
*
pAcct
;
struct
SDnodeObj
*
pDnode
;
struct
SUserObj
*
pUser
;
...
...
@@ -49,7 +50,7 @@ typedef struct SMnodeMsg {
struct
STableObj
*
pTable
;
}
SMnodeMsg
;
void
mnodeCreateMsg
(
SMnodeMsg
*
pMsg
,
struct
SRpcMsg
*
rpcMsg
);
void
mnodeCreateMsg
(
SMnodeMsg
*
pMsg
,
SRpcMsg
*
rpcMsg
);
int32_t
mnodeInitMsg
(
SMnodeMsg
*
pMsg
);
void
mnodeCleanupMsg
(
SMnodeMsg
*
pMsg
);
...
...
@@ -62,7 +63,7 @@ bool mnodeIsRunning();
int32_t
mnodeProcessRead
(
SMnodeMsg
*
pMsg
);
int32_t
mnodeProcessWrite
(
SMnodeMsg
*
pMsg
);
int32_t
mnodeProcessPeerReq
(
SMnodeMsg
*
pMsg
);
void
mnodeProcessPeerRsp
(
struct
SRpcMsg
*
pMsg
);
void
mnodeProcessPeerRsp
(
SRpcMsg
*
pMsg
);
int32_t
mnodeRetriveAuth
(
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
);
#ifdef __cplusplus
...
...
src/mnode/inc/mnodeInt.h
浏览文件 @
453590e2
src/mnode/src/mnodeDnode.c
浏览文件 @
453590e2
...
...
@@ -15,7 +15,6 @@
#define _DEFAULT_SOURCE
#include "os.h"
#include "trpc.h"
#include "tgrant.h"
#include "tbalance.h"
#include "tglobal.h"
...
...
src/mnode/src/mnodePeer.c
浏览文件 @
453590e2
...
...
@@ -16,7 +16,6 @@
#define _DEFAULT_SOURCE
#include "os.h"
#include "taoserror.h"
#include "trpc.h"
#include "tsched.h"
#include "tsystem.h"
#include "tutil.h"
...
...
src/mnode/src/mnodeRead.c
浏览文件 @
453590e2
...
...
@@ -15,7 +15,6 @@
#define _DEFAULT_SOURCE
#include "os.h"
#include "trpc.h"
#include "taosdef.h"
#include "tsched.h"
#include "tbalance.h"
...
...
src/mnode/src/mnodeSdb.c
浏览文件 @
453590e2
...
...
@@ -17,7 +17,6 @@
#include "os.h"
#include "taoserror.h"
#include "hash.h"
#include "trpc.h"
#include "tutil.h"
#include "tbalance.h"
#include "tqueue.h"
...
...
src/mnode/src/mnodeShow.c
浏览文件 @
453590e2
...
...
@@ -17,7 +17,6 @@
#include "os.h"
#include "taosmsg.h"
#include "taoserror.h"
#include "trpc.h"
#include "tsched.h"
#include "tutil.h"
#include "ttimer.h"
...
...
src/plugins/http/inc/httpLog.h
浏览文件 @
453590e2
src/plugins/monitor/src/monitorMain.c
浏览文件 @
453590e2
src/plugins/mqtt/inc/mqttLog.h
浏览文件 @
453590e2
src/rpc/inc/rpcLog.h
浏览文件 @
453590e2
src/util/src/ttimer.c
浏览文件 @
453590e2
src/vnode/inc/vnodeInt.h
浏览文件 @
453590e2
...
...
@@ -27,10 +27,10 @@ extern "C" {
extern
int32_t
vDebugFlag
;
#define vError(...)
if (vDebugFlag & DEBUG_ERROR) {taosPrintLog("ERROR VND ", 255, __VA_ARGS__);
}
#define vWarn(...)
if (vDebugFlag & DEBUG_WARN) {taosPrintLog("WARN VND ", vDebugFlag, __VA_ARGS__);
}
#define vTrace(...)
if (vDebugFlag & DEBUG_TRACE) {taosPrintLog("VND ", vDebugFlag, __VA_ARGS__);
}
#define vPrint(...) {taosPrintLog("VND ", 255, __VA_ARGS__); }
#define vError(...)
{ if (vDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR VND ", 255, __VA_ARGS__); }
}
#define vWarn(...)
{ if (vDebugFlag & DEBUG_WARN) { taosPrintLog("WARN VND ", vDebugFlag, __VA_ARGS__); }
}
#define vTrace(...)
{ if (vDebugFlag & DEBUG_TRACE) { taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }
}
#define vPrint(...) {
taosPrintLog("VND ", 255, __VA_ARGS__); }
typedef
struct
{
int32_t
vgId
;
// global vnode group ID
...
...
src/vnode/inc/vnodeLog.h
浏览文件 @
453590e2
...
...
@@ -24,20 +24,10 @@ extern "C" {
extern
int32_t
dDebugFlag
;
#define dError(...) \
if (dDebugFlag & DEBUG_ERROR) { \
taosPrintLog("ERROR DND ", 255, __VA_ARGS__); \
}
#define dWarn(...) \
if (dDebugFlag & DEBUG_WARN) { \
taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); \
}
#define dTrace(...) \
if (dDebugFlag & DEBUG_TRACE) { \
taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); \
}
#define dPrint(...) \
{ taosPrintLog("DND ", 255, __VA_ARGS__); }
#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR DND ", 255, __VA_ARGS__); }}
#define dWarn(...) { if (dDebugFlag & DEBUG_WARN) { taosPrintLog("WARN DND ", dDebugFlag, __VA_ARGS__); }}
#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
#define dPrint(...) { taosPrintLog("DND ", 255, __VA_ARGS__); }
#ifdef __cplusplus
}
...
...
src/vnode/src/vnodeMain.c
浏览文件 @
453590e2
...
...
@@ -198,8 +198,8 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
pVnode
->
fversion
=
pVnode
->
version
;
pVnode
->
wqueue
=
dnodeAllocateWqueue
(
pVnode
);
pVnode
->
rqueue
=
dnodeAllocateRqueue
(
pVnode
);
pVnode
->
wqueue
=
dnodeAllocate
Vnode
Wqueue
(
pVnode
);
pVnode
->
rqueue
=
dnodeAllocate
Vnode
Rqueue
(
pVnode
);
if
(
pVnode
->
wqueue
==
NULL
||
pVnode
->
rqueue
==
NULL
)
{
vnodeCleanUp
(
pVnode
);
return
terrno
;
...
...
@@ -245,7 +245,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
syncInfo
.
getWalInfo
=
vnodeGetWalInfo
;
syncInfo
.
getFileInfo
=
vnodeGetFileInfo
;
syncInfo
.
writeToCache
=
vnodeWriteToQueue
;
syncInfo
.
confirmForward
=
dnodeSendRpcWriteRsp
;
syncInfo
.
confirmForward
=
dnodeSendRpc
Vnode
WriteRsp
;
syncInfo
.
notifyRole
=
vnodeNotifyRole
;
syncInfo
.
notifyFileSynced
=
vnodeNotifyFileSynced
;
pVnode
->
sync
=
syncStart
(
&
syncInfo
);
...
...
@@ -404,11 +404,11 @@ static void vnodeCleanUp(SVnodeObj *pVnode) {
pVnode
->
cq
=
NULL
;
if
(
pVnode
->
wqueue
)
dnodeFreeWqueue
(
pVnode
->
wqueue
);
dnodeFree
Vnode
Wqueue
(
pVnode
->
wqueue
);
pVnode
->
wqueue
=
NULL
;
if
(
pVnode
->
rqueue
)
dnodeFreeRqueue
(
pVnode
->
rqueue
);
dnodeFree
Vnode
Rqueue
(
pVnode
->
rqueue
);
pVnode
->
rqueue
=
NULL
;
vnodeRelease
(
pVnode
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录