Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
3595d06a
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3595d06a
编写于
8月 17, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-1165 fix defects found by coverity scan
上级
e89ab2c7
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
35 addition
and
18 deletion
+35
-18
src/balance/src/balance.c
src/balance/src/balance.c
+2
-1
src/common/src/ttimezone.c
src/common/src/ttimezone.c
+3
-1
src/dnode/src/dnodeMgmt.c
src/dnode/src/dnodeMgmt.c
+4
-4
src/mnode/src/mnodeDb.c
src/mnode/src/mnodeDb.c
+2
-2
src/os/src/detail/osSysinfo.c
src/os/src/detail/osSysinfo.c
+1
-0
src/plugins/mqtt/src/mqttSystem.c
src/plugins/mqtt/src/mqttSystem.c
+21
-8
src/util/src/tsocket.c
src/util/src/tsocket.c
+2
-2
未找到文件。
src/balance/src/balance.c
浏览文件 @
3595d06a
...
...
@@ -118,6 +118,7 @@ static void balanceSwapVnodeGid(SVnodeGid *pVnodeGid1, SVnodeGid *pVnodeGid2) {
}
int32_t
balanceAllocVnodes
(
SVgObj
*
pVgroup
)
{
static
int32_t
randIndex
=
0
;
int32_t
dnode
=
0
;
int32_t
vnodes
=
0
;
...
...
@@ -160,7 +161,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) {
*/
if
(
pVgroup
->
numOfVnodes
==
1
)
{
}
else
if
(
pVgroup
->
numOfVnodes
==
2
)
{
if
(
rand
()
%
2
==
0
)
{
if
(
rand
Index
++
%
2
==
0
)
{
balanceSwapVnodeGid
(
pVgroup
->
vnodeGid
,
pVgroup
->
vnodeGid
+
1
);
}
}
else
{
...
...
src/common/src/ttimezone.c
浏览文件 @
3595d06a
...
...
@@ -23,7 +23,9 @@
// TODO refactor to set the tz value through parameter
void
tsSetTimeZone
()
{
SGlobalCfg
*
cfg_timezone
=
taosGetConfigOption
(
"timezone"
);
if
(
cfg_timezone
!=
NULL
)
{
uInfo
(
"timezone is set to %s by %s"
,
tsTimezone
,
tsCfgStatusStr
[
cfg_timezone
->
cfgStatus
]);
}
#ifdef WINDOWS
char
winStr
[
TSDB_LOCALE_LEN
*
2
];
...
...
src/dnode/src/dnodeMgmt.c
浏览文件 @
3595d06a
...
...
@@ -710,10 +710,10 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
pStatus
->
clusterCfg
.
statusInterval
=
htonl
(
tsStatusInterval
);
pStatus
->
clusterCfg
.
maxtablesPerVnode
=
htonl
(
tsMaxTablePerVnode
);
pStatus
->
clusterCfg
.
maxVgroupsPerDb
=
htonl
(
tsMaxVgroupsPerDb
);
strcpy
(
pStatus
->
clusterCfg
.
arbitrator
,
tsArbitrator
);
strcpy
(
pStatus
->
clusterCfg
.
timezone
,
tsTimezone
);
strcpy
(
pStatus
->
clusterCfg
.
locale
,
tsLocale
);
strcpy
(
pStatus
->
clusterCfg
.
charset
,
tsCharset
);
tstrncpy
(
pStatus
->
clusterCfg
.
arbitrator
,
tsArbitrator
,
TSDB_EP_LEN
);
tstrncpy
(
pStatus
->
clusterCfg
.
timezone
,
tsTimezone
,
64
);
tstrncpy
(
pStatus
->
clusterCfg
.
locale
,
tsLocale
,
TSDB_LOCALE_LEN
);
tstrncpy
(
pStatus
->
clusterCfg
.
charset
,
tsCharset
,
TSDB_LOCALE_LEN
);
vnodeBuildStatusMsg
(
pStatus
);
contLen
=
sizeof
(
SDMStatusMsg
)
+
pStatus
->
openVnodes
*
sizeof
(
SVnodeLoad
);
...
...
src/mnode/src/mnodeDb.c
浏览文件 @
3595d06a
...
...
@@ -73,9 +73,9 @@ static int32_t mnodeDbActionInsert(SSdbOper *pOper) {
pthread_mutex_lock
(
&
pDb
->
mutex
);
pDb
->
vgListSize
=
VG_LIST_SIZE
;
pDb
->
vgList
=
calloc
(
pDb
->
vgListSize
,
sizeof
(
SVgObj
*
));
pDb
->
numOfVgroups
=
0
;
pthread_mutex_unlock
(
&
pDb
->
mutex
);
pDb
->
numOfVgroups
=
0
;
pDb
->
numOfTables
=
0
;
pDb
->
numOfSuperTables
=
0
;
...
...
@@ -927,7 +927,7 @@ static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
if
(
quorum
>=
0
&&
quorum
!=
pDb
->
cfg
.
quorum
)
{
mDebug
(
"db:%s, quorum:%d change to %d"
,
pDb
->
name
,
pDb
->
cfg
.
quorum
,
quorum
);
newCfg
.
compression
=
quorum
;
newCfg
.
quorum
=
quorum
;
}
return
newCfg
;
...
...
src/os/src/detail/osSysinfo.c
浏览文件 @
3595d06a
...
...
@@ -170,6 +170,7 @@ static void taosGetSystemTimezone() {
fclose
(
f
);
buf
[
sizeof
(
buf
)
-
1
]
=
0
;
char
*
lineEnd
=
strstr
(
buf
,
"
\n
"
);
if
(
lineEnd
!=
NULL
)
{
*
lineEnd
=
0
;
...
...
src/plugins/mqtt/src/mqttSystem.c
浏览文件 @
3595d06a
...
...
@@ -70,14 +70,27 @@ int32_t mqttInitSystem() {
recntStatus
.
port
=
strbetween
(
"'1883'"
,
"'"
,
"'"
);
}
topicPath
=
strbetween
(
strstr
(
url
,
strstr
(
_begin_hostname
,
":"
)
!=
NULL
?
recntStatus
.
port
:
recntStatus
.
hostname
),
"/"
,
"/"
);
char
*
portStr
=
recntStatus
.
hostname
;
if
(
_begin_hostname
!=
NULL
)
{
char
*
colonStr
=
strstr
(
_begin_hostname
,
":"
);
if
(
colonStr
!=
NULL
)
{
portStr
=
recntStatus
.
port
;
}
}
char
*
topicStr
=
strstr
(
url
,
portStr
);
if
(
topicStr
!=
NULL
)
{
topicPath
=
strbetween
(
topicStr
,
"/"
,
"/"
);
char
*
_topic
=
"+/+/+/"
;
int
_tpsize
=
strlen
(
topicPath
)
+
strlen
(
_topic
)
+
1
;
recntStatus
.
topic
=
calloc
(
1
,
_tpsize
);
sprintf
(
recntStatus
.
topic
,
"/%s/%s"
,
topicPath
,
_topic
);
recntStatus
.
client_id
=
strlen
(
tsMqttBrokerClientId
)
<
3
?
tsMqttBrokerClientId
:
"taos_mqtt"
;
mqttConnect
=
NULL
;
}
else
{
topicPath
=
NULL
;
}
return
rc
;
}
...
...
src/util/src/tsocket.c
浏览文件 @
3595d06a
...
...
@@ -371,7 +371,7 @@ SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port) {
serverAdd
.
sin_addr
.
s_addr
=
ip
;
serverAdd
.
sin_port
=
(
uint16_t
)
htons
(
port
);
if
((
sockFd
=
(
int
)
socket
(
AF_INET
,
SOCK_STREAM
,
IPPROTO_TCP
))
<
0
)
{
if
((
sockFd
=
(
int
)
socket
(
AF_INET
,
SOCK_STREAM
,
IPPROTO_TCP
))
<
2
)
{
uError
(
"failed to open TCP socket: %d (%s)"
,
errno
,
strerror
(
errno
));
return
-
1
;
}
...
...
@@ -382,7 +382,7 @@ SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port) {
uError
(
"setsockopt SO_REUSEADDR failed: %d (%s)"
,
errno
,
strerror
(
errno
));
taosCloseSocket
(
sockFd
);
return
-
1
;
}
;
}
/* bind socket to server address */
if
(
bind
(
sockFd
,
(
struct
sockaddr
*
)
&
serverAdd
,
sizeof
(
serverAdd
))
<
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录