Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5eba0520
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
5eba0520
编写于
5月 29, 2022
作者:
C
Cary Xu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: init buffer to avoid invalid write
上级
f2b4cca2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
9 deletion
+9
-9
contrib/test/craft/raftMain.c
contrib/test/craft/raftMain.c
+2
-2
source/dnode/vnode/src/vnd/vnodeSvr.c
source/dnode/vnode/src/vnd/vnodeSvr.c
+1
-1
source/dnode/vnode/src/vnd/vnodeSync.c
source/dnode/vnode/src/vnd/vnodeSync.c
+3
-3
source/util/src/tlog.c
source/util/src/tlog.c
+1
-1
source/util/src/tstrbuild.c
source/util/src/tstrbuild.c
+2
-2
未找到文件。
contrib/test/craft/raftMain.c
浏览文件 @
5eba0520
...
@@ -243,7 +243,7 @@ void console(SRaftServer *pRaftServer) {
...
@@ -243,7 +243,7 @@ void console(SRaftServer *pRaftServer) {
}
else
if
(
strcmp
(
cmd
,
"dropnode"
)
==
0
)
{
}
else
if
(
strcmp
(
cmd
,
"dropnode"
)
==
0
)
{
char
host
[
HOST_LEN
];
char
host
[
HOST_LEN
]
=
{
0
}
;
uint32_t
port
;
uint32_t
port
;
parseAddr
(
param1
,
host
,
HOST_LEN
,
&
port
);
parseAddr
(
param1
,
host
,
HOST_LEN
,
&
port
);
uint64_t
rid
=
raftId
(
host
,
port
);
uint64_t
rid
=
raftId
(
host
,
port
);
...
@@ -258,7 +258,7 @@ void console(SRaftServer *pRaftServer) {
...
@@ -258,7 +258,7 @@ void console(SRaftServer *pRaftServer) {
}
else
if
(
strcmp
(
cmd
,
"put"
)
==
0
)
{
}
else
if
(
strcmp
(
cmd
,
"put"
)
==
0
)
{
char
buf
[
256
];
char
buf
[
256
]
=
{
0
}
;
snprintf
(
buf
,
sizeof
(
buf
),
"%s--%s"
,
param1
,
param2
);
snprintf
(
buf
,
sizeof
(
buf
),
"%s--%s"
,
param1
,
param2
);
putValue
(
&
pRaftServer
->
raft
,
buf
);
putValue
(
&
pRaftServer
->
raft
,
buf
);
...
...
source/dnode/vnode/src/vnd/vnodeSvr.c
浏览文件 @
5eba0520
...
@@ -260,7 +260,7 @@ int vnodeProcessSyncReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
...
@@ -260,7 +260,7 @@ int vnodeProcessSyncReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
SMsgHead
*
pHead
=
pMsg
->
pCont
;
SMsgHead
*
pHead
=
pMsg
->
pCont
;
char
logBuf
[
512
];
char
logBuf
[
512
]
=
{
0
}
;
char
*
syncNodeStr
=
sync2SimpleStr
(
pVnode
->
sync
);
char
*
syncNodeStr
=
sync2SimpleStr
(
pVnode
->
sync
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==vnodeProcessSyncReq== msgType:%d, syncNode: %s"
,
pMsg
->
msgType
,
syncNodeStr
);
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==vnodeProcessSyncReq== msgType:%d, syncNode: %s"
,
pMsg
->
msgType
,
syncNodeStr
);
syncRpcMsgLog2
(
logBuf
,
pMsg
);
syncRpcMsgLog2
(
logBuf
,
pMsg
);
...
...
source/dnode/vnode/src/vnd/vnodeSync.c
浏览文件 @
5eba0520
...
@@ -115,7 +115,7 @@ void vnodeSyncCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMeta)
...
@@ -115,7 +115,7 @@ void vnodeSyncCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMeta)
tmsgPutToQueue
(
&
(
pVnode
->
msgCb
),
APPLY_QUEUE
,
&
applyMsg
);
tmsgPutToQueue
(
&
(
pVnode
->
msgCb
),
APPLY_QUEUE
,
&
applyMsg
);
}
else
{
}
else
{
char
logBuf
[
256
];
char
logBuf
[
256
]
=
{
0
}
;
snprintf
(
logBuf
,
sizeof
(
logBuf
),
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==callback== ==CommitCb== do not execute, pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s, "
"==callback== ==CommitCb== do not execute, pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s, "
"beginIndex :%ld
\n
"
,
"beginIndex :%ld
\n
"
,
...
@@ -126,7 +126,7 @@ void vnodeSyncCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMeta)
...
@@ -126,7 +126,7 @@ void vnodeSyncCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMeta)
}
}
void
vnodeSyncPreCommitMsg
(
SSyncFSM
*
pFsm
,
const
SRpcMsg
*
pMsg
,
SFsmCbMeta
cbMeta
)
{
void
vnodeSyncPreCommitMsg
(
SSyncFSM
*
pFsm
,
const
SRpcMsg
*
pMsg
,
SFsmCbMeta
cbMeta
)
{
char
logBuf
[
256
];
char
logBuf
[
256
]
=
{
0
}
;
snprintf
(
logBuf
,
sizeof
(
logBuf
),
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==callback== ==PreCommitCb== pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s
\n
"
,
pFsm
,
cbMeta
.
index
,
"==callback== ==PreCommitCb== pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s
\n
"
,
pFsm
,
cbMeta
.
index
,
cbMeta
.
isWeak
,
cbMeta
.
code
,
cbMeta
.
state
,
syncUtilState2String
(
cbMeta
.
state
));
cbMeta
.
isWeak
,
cbMeta
.
code
,
cbMeta
.
state
,
syncUtilState2String
(
cbMeta
.
state
));
...
@@ -134,7 +134,7 @@ void vnodeSyncPreCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMet
...
@@ -134,7 +134,7 @@ void vnodeSyncPreCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMet
}
}
void
vnodeSyncRollBackMsg
(
SSyncFSM
*
pFsm
,
const
SRpcMsg
*
pMsg
,
SFsmCbMeta
cbMeta
)
{
void
vnodeSyncRollBackMsg
(
SSyncFSM
*
pFsm
,
const
SRpcMsg
*
pMsg
,
SFsmCbMeta
cbMeta
)
{
char
logBuf
[
256
];
char
logBuf
[
256
]
=
{
0
}
;
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==callback== ==RollBackCb== pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s
\n
"
,
snprintf
(
logBuf
,
sizeof
(
logBuf
),
"==callback== ==RollBackCb== pFsm:%p, index:%ld, isWeak:%d, code:%d, state:%d %s
\n
"
,
pFsm
,
cbMeta
.
index
,
cbMeta
.
isWeak
,
cbMeta
.
code
,
cbMeta
.
state
,
syncUtilState2String
(
cbMeta
.
state
));
pFsm
,
cbMeta
.
index
,
cbMeta
.
isWeak
,
cbMeta
.
code
,
cbMeta
.
state
,
syncUtilState2String
(
cbMeta
.
state
));
syncRpcMsgLog2
(
logBuf
,
(
SRpcMsg
*
)
pMsg
);
syncRpcMsgLog2
(
logBuf
,
(
SRpcMsg
*
)
pMsg
);
...
...
source/util/src/tlog.c
浏览文件 @
5eba0520
...
@@ -491,7 +491,7 @@ void taosDumpData(unsigned char *msg, int32_t len) {
...
@@ -491,7 +491,7 @@ void taosDumpData(unsigned char *msg, int32_t len) {
if
(
!
osLogSpaceAvailable
())
return
;
if
(
!
osLogSpaceAvailable
())
return
;
taosUpdateLogNums
(
DEBUG_DUMP
);
taosUpdateLogNums
(
DEBUG_DUMP
);
char
temp
[
256
];
char
temp
[
256
]
=
{
0
}
;
int32_t
i
,
pos
=
0
,
c
=
0
;
int32_t
i
,
pos
=
0
,
c
=
0
;
for
(
i
=
0
;
i
<
len
;
++
i
)
{
for
(
i
=
0
;
i
<
len
;
++
i
)
{
...
...
source/util/src/tstrbuild.c
浏览文件 @
5eba0520
...
@@ -69,13 +69,13 @@ void taosStringBuilderAppendString(SStringBuilder* sb, const char* str) {
...
@@ -69,13 +69,13 @@ void taosStringBuilderAppendString(SStringBuilder* sb, const char* str) {
void
taosStringBuilderAppendNull
(
SStringBuilder
*
sb
)
{
taosStringBuilderAppendStringLen
(
sb
,
"null"
,
4
);
}
void
taosStringBuilderAppendNull
(
SStringBuilder
*
sb
)
{
taosStringBuilderAppendStringLen
(
sb
,
"null"
,
4
);
}
void
taosStringBuilderAppendInteger
(
SStringBuilder
*
sb
,
int64_t
v
)
{
void
taosStringBuilderAppendInteger
(
SStringBuilder
*
sb
,
int64_t
v
)
{
char
buf
[
64
];
char
buf
[
64
]
=
{
0
}
;
size_t
len
=
snprintf
(
buf
,
sizeof
(
buf
),
"%"
PRId64
,
v
);
size_t
len
=
snprintf
(
buf
,
sizeof
(
buf
),
"%"
PRId64
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
TMIN
(
len
,
sizeof
(
buf
)));
taosStringBuilderAppendStringLen
(
sb
,
buf
,
TMIN
(
len
,
sizeof
(
buf
)));
}
}
void
taosStringBuilderAppendDouble
(
SStringBuilder
*
sb
,
double
v
)
{
void
taosStringBuilderAppendDouble
(
SStringBuilder
*
sb
,
double
v
)
{
char
buf
[
512
];
char
buf
[
512
]
=
{
0
}
;
size_t
len
=
snprintf
(
buf
,
sizeof
(
buf
),
"%.9lf"
,
v
);
size_t
len
=
snprintf
(
buf
,
sizeof
(
buf
),
"%.9lf"
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
TMIN
(
len
,
sizeof
(
buf
)));
taosStringBuilderAppendStringLen
(
sb
,
buf
,
TMIN
(
len
,
sizeof
(
buf
)));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录