Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c6317e67
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c6317e67
编写于
9月 30, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: coverity issues
上级
3be4a2ed
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
48 addition
and
37 deletion
+48
-37
source/dnode/mnode/impl/src/mndCluster.c
source/dnode/mnode/impl/src/mndCluster.c
+1
-0
source/dnode/mnode/impl/src/mndDb.c
source/dnode/mnode/impl/src/mndDb.c
+4
-4
source/dnode/mnode/impl/src/mndDnode.c
source/dnode/mnode/impl/src/mndDnode.c
+8
-6
source/dnode/mnode/impl/src/mndFunc.c
source/dnode/mnode/impl/src/mndFunc.c
+6
-3
source/dnode/mnode/impl/src/mndGrant.c
source/dnode/mnode/impl/src/mndGrant.c
+14
-14
source/dnode/mnode/impl/src/mndMain.c
source/dnode/mnode/impl/src/mndMain.c
+1
-1
source/dnode/mnode/impl/src/mndMnode.c
source/dnode/mnode/impl/src/mndMnode.c
+8
-3
source/dnode/mnode/impl/src/mndPerfSchema.c
source/dnode/mnode/impl/src/mndPerfSchema.c
+3
-3
source/dnode/mnode/impl/src/mndProfile.c
source/dnode/mnode/impl/src/mndProfile.c
+2
-2
source/dnode/mnode/impl/src/mndSubscribe.c
source/dnode/mnode/impl/src/mndSubscribe.c
+1
-1
未找到文件。
source/dnode/mnode/impl/src/mndCluster.c
浏览文件 @
c6317e67
...
@@ -237,6 +237,7 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
...
@@ -237,6 +237,7 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_NOTHING
,
NULL
,
"create-cluster"
);
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_NOTHING
,
NULL
,
"create-cluster"
);
if
(
pTrans
==
NULL
)
{
if
(
pTrans
==
NULL
)
{
sdbFreeRaw
(
pRaw
);
mError
(
"cluster:%"
PRId64
", failed to create since %s"
,
clusterObj
.
id
,
terrstr
());
mError
(
"cluster:%"
PRId64
", failed to create since %s"
,
clusterObj
.
id
,
terrstr
());
return
-
1
;
return
-
1
;
}
}
...
...
source/dnode/mnode/impl/src/mndDb.c
浏览文件 @
c6317e67
...
@@ -1594,7 +1594,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
...
@@ -1594,7 +1594,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
break
;
break
;
}
}
char
precVstr
[
10
]
=
{
0
};
char
precVstr
[
10
]
=
{
0
};
STR_WITH_
SIZE_TO_VARSTR
(
precVstr
,
precStr
,
2
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
precVstr
,
precStr
,
10
);
char
*
statusStr
=
"ready"
;
char
*
statusStr
=
"ready"
;
if
(
objStatus
==
SDB_STATUS_CREATING
)
{
if
(
objStatus
==
SDB_STATUS_CREATING
)
{
...
@@ -1607,7 +1607,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
...
@@ -1607,7 +1607,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
}
}
}
}
char
statusVstr
[
24
]
=
{
0
};
char
statusVstr
[
24
]
=
{
0
};
STR_WITH_
SIZE_TO_VARSTR
(
statusVstr
,
statusStr
,
strlen
(
statusStr
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
statusVstr
,
statusStr
,
24
);
if
(
sysDb
||
!
sysinfo
)
{
if
(
sysDb
||
!
sysinfo
)
{
for
(
int32_t
i
=
0
;
i
<
pShow
->
numOfColumns
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
pShow
->
numOfColumns
;
++
i
)
{
...
@@ -1644,7 +1644,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
...
@@ -1644,7 +1644,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
const
char
*
strictStr
=
pDb
->
cfg
.
strict
?
"on"
:
"off"
;
const
char
*
strictStr
=
pDb
->
cfg
.
strict
?
"on"
:
"off"
;
char
strictVstr
[
24
]
=
{
0
};
char
strictVstr
[
24
]
=
{
0
};
STR_WITH_
SIZE_TO_VARSTR
(
strictVstr
,
strictStr
,
strlen
(
strictStr
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
strictVstr
,
strictStr
,
24
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colDataAppend
(
pColInfo
,
rows
,
(
const
char
*
)
strictVstr
,
false
);
colDataAppend
(
pColInfo
,
rows
,
(
const
char
*
)
strictVstr
,
false
);
...
@@ -1704,7 +1704,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
...
@@ -1704,7 +1704,7 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb,
const
char
*
cacheModelStr
=
getCacheModelStr
(
pDb
->
cfg
.
cacheLast
);
const
char
*
cacheModelStr
=
getCacheModelStr
(
pDb
->
cfg
.
cacheLast
);
char
cacheModelVstr
[
24
]
=
{
0
};
char
cacheModelVstr
[
24
]
=
{
0
};
STR_WITH_
SIZE_TO_VARSTR
(
cacheModelVstr
,
cacheModelStr
,
strlen
(
cacheModelStr
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
cacheModelVstr
,
cacheModelStr
,
24
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colDataAppend
(
pColInfo
,
rows
,
(
const
char
*
)
cacheModelVstr
,
false
);
colDataAppend
(
pColInfo
,
rows
,
(
const
char
*
)
cacheModelVstr
,
false
);
...
...
source/dnode/mnode/impl/src/mndDnode.c
浏览文件 @
c6317e67
...
@@ -102,7 +102,7 @@ static int32_t mndCreateDefaultDnode(SMnode *pMnode) {
...
@@ -102,7 +102,7 @@ static int32_t mndCreateDefaultDnode(SMnode *pMnode) {
dnodeObj
.
updateTime
=
dnodeObj
.
createdTime
;
dnodeObj
.
updateTime
=
dnodeObj
.
createdTime
;
dnodeObj
.
port
=
tsServerPort
;
dnodeObj
.
port
=
tsServerPort
;
memcpy
(
&
dnodeObj
.
fqdn
,
tsLocalFqdn
,
TSDB_FQDN_LEN
);
memcpy
(
&
dnodeObj
.
fqdn
,
tsLocalFqdn
,
TSDB_FQDN_LEN
);
snprintf
(
dnodeObj
.
ep
,
TSDB_EP_LEN
,
"%s:%u"
,
dnodeObj
.
fqdn
,
dnodeObj
.
port
);
snprintf
(
dnodeObj
.
ep
,
TSDB_EP_LEN
-
1
,
"%s:%u"
,
dnodeObj
.
fqdn
,
dnodeObj
.
port
);
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_GLOBAL
,
NULL
,
"create-dnode"
);
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_GLOBAL
,
NULL
,
"create-dnode"
);
if
(
pTrans
==
NULL
)
goto
_OVER
;
if
(
pTrans
==
NULL
)
goto
_OVER
;
...
@@ -190,7 +190,7 @@ _OVER:
...
@@ -190,7 +190,7 @@ _OVER:
static
int32_t
mndDnodeActionInsert
(
SSdb
*
pSdb
,
SDnodeObj
*
pDnode
)
{
static
int32_t
mndDnodeActionInsert
(
SSdb
*
pSdb
,
SDnodeObj
*
pDnode
)
{
mTrace
(
"dnode:%d, perform insert action, row:%p"
,
pDnode
->
id
,
pDnode
);
mTrace
(
"dnode:%d, perform insert action, row:%p"
,
pDnode
->
id
,
pDnode
);
pDnode
->
offlineReason
=
DND_REASON_STATUS_NOT_RECEIVED
;
pDnode
->
offlineReason
=
DND_REASON_STATUS_NOT_RECEIVED
;
snprintf
(
pDnode
->
ep
,
TSDB_EP_LEN
,
"%s:%u"
,
pDnode
->
fqdn
,
pDnode
->
port
);
snprintf
(
pDnode
->
ep
,
TSDB_EP_LEN
-
1
,
"%s:%u"
,
pDnode
->
fqdn
,
pDnode
->
port
);
return
0
;
return
0
;
}
}
...
@@ -253,7 +253,7 @@ int32_t mndGetDnodeSize(SMnode *pMnode) {
...
@@ -253,7 +253,7 @@ int32_t mndGetDnodeSize(SMnode *pMnode) {
bool
mndIsDnodeOnline
(
SDnodeObj
*
pDnode
,
int64_t
curMs
)
{
bool
mndIsDnodeOnline
(
SDnodeObj
*
pDnode
,
int64_t
curMs
)
{
int64_t
interval
=
TABS
(
pDnode
->
lastAccessTime
-
curMs
);
int64_t
interval
=
TABS
(
pDnode
->
lastAccessTime
-
curMs
);
if
(
interval
>
5000
*
tsStatusInterval
)
{
if
(
interval
>
5000
*
(
int64_t
)
tsStatusInterval
)
{
if
(
pDnode
->
rebootTime
>
0
)
{
if
(
pDnode
->
rebootTime
>
0
)
{
pDnode
->
offlineReason
=
DND_REASON_STATUS_MSG_TIMEOUT
;
pDnode
->
offlineReason
=
DND_REASON_STATUS_MSG_TIMEOUT
;
}
}
...
@@ -486,7 +486,7 @@ static int32_t mndCreateDnode(SMnode *pMnode, SRpcMsg *pReq, SCreateDnodeReq *pC
...
@@ -486,7 +486,7 @@ static int32_t mndCreateDnode(SMnode *pMnode, SRpcMsg *pReq, SCreateDnodeReq *pC
dnodeObj
.
updateTime
=
dnodeObj
.
createdTime
;
dnodeObj
.
updateTime
=
dnodeObj
.
createdTime
;
dnodeObj
.
port
=
pCreate
->
port
;
dnodeObj
.
port
=
pCreate
->
port
;
memcpy
(
dnodeObj
.
fqdn
,
pCreate
->
fqdn
,
TSDB_FQDN_LEN
);
memcpy
(
dnodeObj
.
fqdn
,
pCreate
->
fqdn
,
TSDB_FQDN_LEN
);
snprintf
(
dnodeObj
.
ep
,
TSDB_EP_LEN
,
"%s:%u"
,
dnodeObj
.
fqdn
,
dnodeObj
.
port
);
snprintf
(
dnodeObj
.
ep
,
TSDB_EP_LEN
-
1
,
"%s:%u"
,
dnodeObj
.
fqdn
,
dnodeObj
.
port
);
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_ROLLBACK
,
TRN_CONFLICT_GLOBAL
,
pReq
,
"create-dnode"
);
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_ROLLBACK
,
TRN_CONFLICT_GLOBAL
,
pReq
,
"create-dnode"
);
if
(
pTrans
==
NULL
)
goto
_OVER
;
if
(
pTrans
==
NULL
)
goto
_OVER
;
...
@@ -673,12 +673,14 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
...
@@ -673,12 +673,14 @@ static int32_t mndDropDnode(SMnode *pMnode, SRpcMsg *pReq, SDnodeObj *pDnode, SM
mInfo
(
"trans:%d, used to drop dnode:%d"
,
pTrans
->
id
,
pDnode
->
id
);
mInfo
(
"trans:%d, used to drop dnode:%d"
,
pTrans
->
id
,
pDnode
->
id
);
pRaw
=
mndDnodeActionEncode
(
pDnode
);
pRaw
=
mndDnodeActionEncode
(
pDnode
);
if
(
pRaw
==
NULL
||
mndTransAppendRedolog
(
pTrans
,
pRaw
)
!=
0
)
goto
_OVER
;
if
(
pRaw
==
NULL
)
goto
_OVER
;
if
(
mndTransAppendRedolog
(
pTrans
,
pRaw
)
!=
0
)
goto
_OVER
;
sdbSetRawStatus
(
pRaw
,
SDB_STATUS_DROPPING
);
sdbSetRawStatus
(
pRaw
,
SDB_STATUS_DROPPING
);
pRaw
=
NULL
;
pRaw
=
NULL
;
pRaw
=
mndDnodeActionEncode
(
pDnode
);
pRaw
=
mndDnodeActionEncode
(
pDnode
);
if
(
pRaw
==
NULL
||
mndTransAppendCommitlog
(
pTrans
,
pRaw
)
!=
0
)
goto
_OVER
;
if
(
pRaw
==
NULL
)
goto
_OVER
;
if
(
mndTransAppendCommitlog
(
pTrans
,
pRaw
)
!=
0
)
goto
_OVER
;
sdbSetRawStatus
(
pRaw
,
SDB_STATUS_DROPPED
);
sdbSetRawStatus
(
pRaw
,
SDB_STATUS_DROPPED
);
pRaw
=
NULL
;
pRaw
=
NULL
;
...
...
source/dnode/mnode/impl/src/mndFunc.c
浏览文件 @
c6317e67
...
@@ -257,15 +257,18 @@ static int32_t mndDropFunc(SMnode *pMnode, SRpcMsg *pReq, SFuncObj *pFunc) {
...
@@ -257,15 +257,18 @@ static int32_t mndDropFunc(SMnode *pMnode, SRpcMsg *pReq, SFuncObj *pFunc) {
mInfo
(
"trans:%d, used to drop user:%s"
,
pTrans
->
id
,
pFunc
->
name
);
mInfo
(
"trans:%d, used to drop user:%s"
,
pTrans
->
id
,
pFunc
->
name
);
SSdbRaw
*
pRedoRaw
=
mndFuncActionEncode
(
pFunc
);
SSdbRaw
*
pRedoRaw
=
mndFuncActionEncode
(
pFunc
);
if
(
pRedoRaw
==
NULL
||
mndTransAppendRedolog
(
pTrans
,
pRedoRaw
)
!=
0
)
goto
_OVER
;
if
(
pRedoRaw
==
NULL
)
goto
_OVER
;
if
(
mndTransAppendRedolog
(
pTrans
,
pRedoRaw
)
!=
0
)
goto
_OVER
;
sdbSetRawStatus
(
pRedoRaw
,
SDB_STATUS_DROPPING
);
sdbSetRawStatus
(
pRedoRaw
,
SDB_STATUS_DROPPING
);
SSdbRaw
*
pUndoRaw
=
mndFuncActionEncode
(
pFunc
);
SSdbRaw
*
pUndoRaw
=
mndFuncActionEncode
(
pFunc
);
if
(
pUndoRaw
==
NULL
||
mndTransAppendUndolog
(
pTrans
,
pUndoRaw
)
!=
0
)
goto
_OVER
;
if
(
pUndoRaw
==
NULL
)
goto
_OVER
;
if
(
mndTransAppendUndolog
(
pTrans
,
pUndoRaw
)
!=
0
)
goto
_OVER
;
sdbSetRawStatus
(
pUndoRaw
,
SDB_STATUS_READY
);
sdbSetRawStatus
(
pUndoRaw
,
SDB_STATUS_READY
);
SSdbRaw
*
pCommitRaw
=
mndFuncActionEncode
(
pFunc
);
SSdbRaw
*
pCommitRaw
=
mndFuncActionEncode
(
pFunc
);
if
(
pCommitRaw
==
NULL
||
mndTransAppendCommitlog
(
pTrans
,
pCommitRaw
)
!=
0
)
goto
_OVER
;
if
(
pCommitRaw
==
NULL
)
goto
_OVER
;
if
(
mndTransAppendCommitlog
(
pTrans
,
pCommitRaw
)
!=
0
)
goto
_OVER
;
sdbSetRawStatus
(
pCommitRaw
,
SDB_STATUS_DROPPED
);
sdbSetRawStatus
(
pCommitRaw
,
SDB_STATUS_DROPPED
);
if
(
mndTransPrepare
(
pMnode
,
pTrans
)
!=
0
)
goto
_OVER
;
if
(
mndTransPrepare
(
pMnode
,
pTrans
)
!=
0
)
goto
_OVER
;
...
...
source/dnode/mnode/impl/src/mndGrant.c
浏览文件 @
c6317e67
...
@@ -30,85 +30,85 @@ static int32_t mndRetrieveGrant(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
...
@@ -30,85 +30,85 @@ static int32_t mndRetrieveGrant(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
cols
=
0
;
cols
=
0
;
SColumnInfoData
*
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
SColumnInfoData
*
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
const
char
*
src
=
"community"
;
const
char
*
src
=
"community"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"false"
;
src
=
"false"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
cols
++
;
cols
++
;
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
);
src
=
"unlimited"
;
src
=
"unlimited"
;
STR_WITH_
SIZE_TO_VARSTR
(
tmp
,
src
,
strlen
(
src
)
);
STR_WITH_
MAXSIZE_TO_VARSTR
(
tmp
,
src
,
32
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
tmp
,
false
);
numOfRows
++
;
numOfRows
++
;
...
...
source/dnode/mnode/impl/src/mndMain.c
浏览文件 @
c6317e67
...
@@ -649,7 +649,7 @@ int32_t mndProcessRpcMsg(SRpcMsg *pMsg) {
...
@@ -649,7 +649,7 @@ int32_t mndProcessRpcMsg(SRpcMsg *pMsg) {
void
mndSetMsgHandle
(
SMnode
*
pMnode
,
tmsg_t
msgType
,
MndMsgFp
fp
)
{
void
mndSetMsgHandle
(
SMnode
*
pMnode
,
tmsg_t
msgType
,
MndMsgFp
fp
)
{
tmsg_t
type
=
TMSG_INDEX
(
msgType
);
tmsg_t
type
=
TMSG_INDEX
(
msgType
);
if
(
type
>=
0
&&
type
<
TDMT_MAX
)
{
if
(
type
<
TDMT_MAX
)
{
pMnode
->
msgFp
[
type
]
=
fp
;
pMnode
->
msgFp
[
type
]
=
fp
;
}
}
}
}
...
...
source/dnode/mnode/impl/src/mndMnode.c
浏览文件 @
c6317e67
...
@@ -93,6 +93,7 @@ static int32_t mndCreateDefaultMnode(SMnode *pMnode) {
...
@@ -93,6 +93,7 @@ static int32_t mndCreateDefaultMnode(SMnode *pMnode) {
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_GLOBAL
,
NULL
,
"create-mnode"
);
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_GLOBAL
,
NULL
,
"create-mnode"
);
if
(
pTrans
==
NULL
)
{
if
(
pTrans
==
NULL
)
{
sdbFreeRaw
(
pRaw
);
mError
(
"mnode:%d, failed to create since %s"
,
mnodeObj
.
id
,
terrstr
());
mError
(
"mnode:%d, failed to create since %s"
,
mnodeObj
.
id
,
terrstr
());
return
-
1
;
return
-
1
;
}
}
...
@@ -220,8 +221,12 @@ bool mndIsMnode(SMnode *pMnode, int32_t dnodeId) {
...
@@ -220,8 +221,12 @@ bool mndIsMnode(SMnode *pMnode, int32_t dnodeId) {
void
mndGetMnodeEpSet
(
SMnode
*
pMnode
,
SEpSet
*
pEpSet
)
{
void
mndGetMnodeEpSet
(
SMnode
*
pMnode
,
SEpSet
*
pEpSet
)
{
SSdb
*
pSdb
=
pMnode
->
pSdb
;
SSdb
*
pSdb
=
pMnode
->
pSdb
;
int32_t
totalMnodes
=
sdbGetSize
(
pSdb
,
SDB_MNODE
);
int32_t
totalMnodes
=
sdbGetSize
(
pSdb
,
SDB_MNODE
);
void
*
pIter
=
NULL
;
if
(
totalMnodes
==
0
)
{
syncGetRetryEpSet
(
pMnode
->
syncMgmt
.
sync
,
pEpSet
);
return
;
}
void
*
pIter
=
NULL
;
while
(
1
)
{
while
(
1
)
{
SMnodeObj
*
pObj
=
NULL
;
SMnodeObj
*
pObj
=
NULL
;
pIter
=
sdbFetch
(
pSdb
,
SDB_MNODE
,
pIter
,
(
void
**
)
&
pObj
);
pIter
=
sdbFetch
(
pSdb
,
SDB_MNODE
,
pIter
,
(
void
**
)
&
pObj
);
...
@@ -658,7 +663,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
...
@@ -658,7 +663,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
colDataAppend
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
pObj
->
id
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
pObj
->
id
,
false
);
char
b1
[
TSDB_EP_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
char
b1
[
TSDB_EP_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
STR_WITH_MAXSIZE_TO_VARSTR
(
b1
,
pObj
->
pDnode
->
ep
,
pShow
->
pMeta
->
pSchemas
[
cols
].
bytes
);
STR_WITH_MAXSIZE_TO_VARSTR
(
b1
,
pObj
->
pDnode
->
ep
,
TSDB_EP_LEN
+
VARSTR_HEADER_SIZE
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colDataAppend
(
pColInfo
,
numOfRows
,
b1
,
false
);
colDataAppend
(
pColInfo
,
numOfRows
,
b1
,
false
);
...
@@ -667,7 +672,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
...
@@ -667,7 +672,7 @@ static int32_t mndRetrieveMnodes(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
if
(
pObj
->
id
==
pMnode
->
selfDnodeId
)
{
if
(
pObj
->
id
==
pMnode
->
selfDnodeId
)
{
roles
=
syncStr
(
TAOS_SYNC_STATE_LEADER
);
roles
=
syncStr
(
TAOS_SYNC_STATE_LEADER
);
}
}
if
(
pObj
->
pDnode
&&
mndIsDnodeOnline
(
pObj
->
pDnode
,
curMs
))
{
if
(
mndIsDnodeOnline
(
pObj
->
pDnode
,
curMs
))
{
roles
=
syncStr
(
pObj
->
state
);
roles
=
syncStr
(
pObj
->
state
);
if
(
pObj
->
state
==
TAOS_SYNC_STATE_LEADER
&&
pObj
->
id
!=
pMnode
->
selfDnodeId
)
{
if
(
pObj
->
state
==
TAOS_SYNC_STATE_LEADER
&&
pObj
->
id
!=
pMnode
->
selfDnodeId
)
{
roles
=
syncStr
(
TAOS_SYNC_STATE_ERROR
);
roles
=
syncStr
(
TAOS_SYNC_STATE_ERROR
);
...
...
source/dnode/mnode/impl/src/mndPerfSchema.c
浏览文件 @
c6317e67
...
@@ -26,7 +26,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
...
@@ -26,7 +26,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
}
}
for
(
int32_t
i
=
0
;
i
<
colNum
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
colNum
;
++
i
)
{
strcpy
(
schema
[
i
].
name
,
pSrc
[
i
].
name
);
tstrncpy
(
schema
[
i
].
name
,
pSrc
[
i
].
name
,
sizeof
(
schema
[
i
].
name
)
);
schema
[
i
].
type
=
pSrc
[
i
].
type
;
schema
[
i
].
type
=
pSrc
[
i
].
type
;
schema
[
i
].
colId
=
i
+
1
;
schema
[
i
].
colId
=
i
+
1
;
...
@@ -40,7 +40,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
...
@@ -40,7 +40,7 @@ int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, S
int32_t
mndPerfsInitMeta
(
SHashObj
*
hash
)
{
int32_t
mndPerfsInitMeta
(
SHashObj
*
hash
)
{
STableMetaRsp
meta
=
{
0
};
STableMetaRsp
meta
=
{
0
};
strcpy
(
meta
.
dbFName
,
TSDB_INFORMATION_SCHEMA_DB
);
tstrncpy
(
meta
.
dbFName
,
TSDB_INFORMATION_SCHEMA_DB
,
sizeof
(
meta
.
dbFName
)
);
meta
.
tableType
=
TSDB_SYSTEM_TABLE
;
meta
.
tableType
=
TSDB_SYSTEM_TABLE
;
meta
.
sversion
=
1
;
meta
.
sversion
=
1
;
meta
.
tversion
=
1
;
meta
.
tversion
=
1
;
...
@@ -50,7 +50,7 @@ int32_t mndPerfsInitMeta(SHashObj *hash) {
...
@@ -50,7 +50,7 @@ int32_t mndPerfsInitMeta(SHashObj *hash) {
getPerfDbMeta
(
&
pSysDbTableMeta
,
&
size
);
getPerfDbMeta
(
&
pSysDbTableMeta
,
&
size
);
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
strcpy
(
meta
.
tbName
,
pSysDbTableMeta
[
i
].
name
);
tstrncpy
(
meta
.
tbName
,
pSysDbTableMeta
[
i
].
name
,
sizeof
(
meta
.
tbName
)
);
meta
.
numOfColumns
=
pSysDbTableMeta
[
i
].
colNum
;
meta
.
numOfColumns
=
pSysDbTableMeta
[
i
].
colNum
;
if
(
mndInitPerfsTableSchema
(
pSysDbTableMeta
[
i
].
schema
,
pSysDbTableMeta
[
i
].
colNum
,
&
meta
.
pSchemas
))
{
if
(
mndInitPerfsTableSchema
(
pSysDbTableMeta
[
i
].
schema
,
pSysDbTableMeta
[
i
].
colNum
,
&
meta
.
pSchemas
))
{
...
...
source/dnode/mnode/impl/src/mndProfile.c
浏览文件 @
c6317e67
...
@@ -664,7 +664,7 @@ static int32_t mndProcessKillConnReq(SRpcMsg *pReq) {
...
@@ -664,7 +664,7 @@ static int32_t mndProcessKillConnReq(SRpcMsg *pReq) {
static
int32_t
mndProcessSvrVerReq
(
SRpcMsg
*
pReq
)
{
static
int32_t
mndProcessSvrVerReq
(
SRpcMsg
*
pReq
)
{
int32_t
code
=
-
1
;
int32_t
code
=
-
1
;
SServerVerRsp
rsp
=
{
0
};
SServerVerRsp
rsp
=
{
0
};
strcpy
(
rsp
.
ver
,
version
);
tstrncpy
(
rsp
.
ver
,
version
,
sizeof
(
rsp
.
ver
)
);
int32_t
contLen
=
tSerializeSServerVerRsp
(
NULL
,
0
,
&
rsp
);
int32_t
contLen
=
tSerializeSServerVerRsp
(
NULL
,
0
,
&
rsp
);
if
(
contLen
<
0
)
goto
_over
;
if
(
contLen
<
0
)
goto
_over
;
...
@@ -702,7 +702,7 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
...
@@ -702,7 +702,7 @@ static int32_t mndRetrieveConns(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
break
;
break
;
}
}
if
((
taosGetTimestampMs
()
-
pConn
->
lastAccessTimeMs
)
>
(
keepTime
*
1000
))
{
if
((
taosGetTimestampMs
()
-
pConn
->
lastAccessTimeMs
)
>
(
(
int64_t
)
keepTime
*
1000
))
{
continue
;
continue
;
}
}
...
...
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @
c6317e67
...
@@ -123,7 +123,7 @@ static int32_t mndBuildSubChangeReq(void **pBuf, int32_t *pLen, const SMqSubscri
...
@@ -123,7 +123,7 @@ static int32_t mndBuildSubChangeReq(void **pBuf, int32_t *pLen, const SMqSubscri
req
.
subType
=
pSub
->
subType
;
req
.
subType
=
pSub
->
subType
;
req
.
withMeta
=
pSub
->
withMeta
;
req
.
withMeta
=
pSub
->
withMeta
;
req
.
suid
=
pSub
->
stbUid
;
req
.
suid
=
pSub
->
stbUid
;
strncpy
(
req
.
subKey
,
pSub
->
key
,
TSDB_SUBSCRIBE_KEY_LEN
);
t
strncpy
(
req
.
subKey
,
pSub
->
key
,
TSDB_SUBSCRIBE_KEY_LEN
);
int32_t
tlen
=
sizeof
(
SMsgHead
)
+
tEncodeSMqRebVgReq
(
NULL
,
&
req
);
int32_t
tlen
=
sizeof
(
SMsgHead
)
+
tEncodeSMqRebVgReq
(
NULL
,
&
req
);
void
*
buf
=
taosMemoryMalloc
(
tlen
);
void
*
buf
=
taosMemoryMalloc
(
tlen
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录