Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
e9e0165a
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e9e0165a
编写于
10月 23, 2022
作者:
S
Shengliang Guan
提交者:
GitHub
10月 23, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17576 from taosdata/fix/fixConveriyDefeats
fix: fix coverity scan defeats
上级
d22ab18d
17ee66cd
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
14 addition
and
12 deletion
+14
-12
source/dnode/vnode/src/meta/metaQuery.c
source/dnode/vnode/src/meta/metaQuery.c
+2
-1
source/dnode/vnode/src/meta/metaTable.c
source/dnode/vnode/src/meta/metaTable.c
+7
-5
source/libs/index/src/indexJson.c
source/libs/index/src/indexJson.c
+1
-1
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+4
-5
未找到文件。
source/dnode/vnode/src/meta/metaQuery.c
浏览文件 @
e9e0165a
...
@@ -1107,6 +1107,7 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
...
@@ -1107,6 +1107,7 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
break
;
break
;
}
}
STagIdxKey
*
p
=
entryKey
;
STagIdxKey
*
p
=
entryKey
;
if
(
p
==
NULL
)
break
;
if
(
p
->
type
!=
pCursor
->
type
)
{
if
(
p
->
type
!=
pCursor
->
type
)
{
if
(
first
)
{
if
(
first
)
{
valid
=
param
->
reverse
?
tdbTbcMoveToPrev
(
pCursor
->
pCur
)
:
tdbTbcMoveToNext
(
pCursor
->
pCur
);
valid
=
param
->
reverse
?
tdbTbcMoveToPrev
(
pCursor
->
pCur
)
:
tdbTbcMoveToNext
(
pCursor
->
pCur
);
...
@@ -1116,7 +1117,7 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
...
@@ -1116,7 +1117,7 @@ int32_t metaFilterTableIds(SMeta *pMeta, SMetaFltParam *param, SArray *pUids) {
break
;
break
;
}
}
}
}
if
(
p
==
NULL
||
p
->
suid
!=
pKey
->
suid
)
{
if
(
p
->
suid
!=
pKey
->
suid
)
{
break
;
break
;
}
}
first
=
false
;
first
=
false
;
...
...
source/dnode/vnode/src/meta/metaTable.c
浏览文件 @
e9e0165a
...
@@ -1278,12 +1278,14 @@ static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
...
@@ -1278,12 +1278,14 @@ static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
ret
=
metaSaveJsonVarToIdx
(
pMeta
,
pCtbEntry
,
pTagColumn
);
ret
=
metaSaveJsonVarToIdx
(
pMeta
,
pCtbEntry
,
pTagColumn
);
goto
end
;
goto
end
;
}
}
if
(
pTagData
!=
NULL
)
{
if
(
metaCreateTagIdxKey
(
pCtbEntry
->
ctbEntry
.
suid
,
pTagColumn
->
colId
,
pTagData
,
nTagData
,
pTagColumn
->
type
,
if
(
metaCreateTagIdxKey
(
pCtbEntry
->
ctbEntry
.
suid
,
pTagColumn
->
colId
,
pTagData
,
nTagData
,
pTagColumn
->
type
,
pCtbEntry
->
uid
,
&
pTagIdxKey
,
&
nTagIdxKey
)
<
0
)
{
pCtbEntry
->
uid
,
&
pTagIdxKey
,
&
nTagIdxKey
)
<
0
)
{
ret
=
-
1
;
ret
=
-
1
;
goto
end
;
goto
end
;
}
}
tdbTbUpsert
(
pMeta
->
pTagIdx
,
pTagIdxKey
,
nTagIdxKey
,
NULL
,
0
,
&
pMeta
->
txn
);
tdbTbUpsert
(
pMeta
->
pTagIdx
,
pTagIdxKey
,
nTagIdxKey
,
NULL
,
0
,
&
pMeta
->
txn
);
}
end:
end:
metaDestroyTagIdxKey
(
pTagIdxKey
);
metaDestroyTagIdxKey
(
pTagIdxKey
);
tDecoderClear
(
&
dc
);
tDecoderClear
(
&
dc
);
...
...
source/libs/index/src/indexJson.c
浏览文件 @
e9e0165a
...
@@ -30,7 +30,7 @@ int indexJsonPut(SIndexJson *index, SIndexJsonMultiTerm *terms, uint64_t uid) {
...
@@ -30,7 +30,7 @@ int indexJsonPut(SIndexJson *index, SIndexJsonMultiTerm *terms, uint64_t uid) {
}
else
{
}
else
{
p
->
colType
=
TSDB_DATA_TYPE_DOUBLE
;
p
->
colType
=
TSDB_DATA_TYPE_DOUBLE
;
}
}
IDX_TYPE_ADD_EXTERN_TYPE
(
p
->
colType
,
TSDB_DATA_TYPE_JSON
);
IDX_TYPE_ADD_EXTERN_TYPE
(
(
p
->
colType
)
,
TSDB_DATA_TYPE_JSON
);
}
}
// handle put
// handle put
return
indexPut
(
index
,
terms
,
uid
);
return
indexPut
(
index
,
terms
,
uid
);
...
...
source/libs/transport/src/transCli.c
浏览文件 @
e9e0165a
...
@@ -439,12 +439,14 @@ void cliHandleExceptImpl(SCliConn* pConn, int32_t code) {
...
@@ -439,12 +439,14 @@ void cliHandleExceptImpl(SCliConn* pConn, int32_t code) {
tDebug
(
"%s conn %p construct ahandle %p by %s"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
,
transMsg
.
info
.
ahandle
,
tDebug
(
"%s conn %p construct ahandle %p by %s"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
,
transMsg
.
info
.
ahandle
,
TMSG_INFO
(
transMsg
.
msgType
));
TMSG_INFO
(
transMsg
.
msgType
));
if
(
transMsg
.
info
.
ahandle
==
NULL
)
{
if
(
transMsg
.
info
.
ahandle
==
NULL
)
{
transMsg
.
info
.
ahandle
=
transCtxDumpBrokenlinkVal
(
&
pConn
->
ctx
,
(
int32_t
*
)
&
(
transMsg
.
msgType
));
int32_t
msgType
=
0
;
transMsg
.
info
.
ahandle
=
transCtxDumpBrokenlinkVal
(
&
pConn
->
ctx
,
&
msgType
);
transMsg
.
msgType
=
msgType
;
tDebug
(
"%s conn %p construct ahandle %p due to brokenlink"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
,
tDebug
(
"%s conn %p construct ahandle %p due to brokenlink"
,
CONN_GET_INST_LABEL
(
pConn
),
pConn
,
transMsg
.
info
.
ahandle
);
transMsg
.
info
.
ahandle
);
}
}
}
else
{
}
else
{
transMsg
.
info
.
ahandle
=
(
pMsg
->
type
!=
Release
&&
pCtx
)
?
pCtx
->
ahandle
:
NULL
;
transMsg
.
info
.
ahandle
=
(
pMsg
!=
NULL
&&
pMsg
->
type
!=
Release
&&
pCtx
)
?
pCtx
->
ahandle
:
NULL
;
}
}
if
(
pCtx
==
NULL
||
pCtx
->
pSem
==
NULL
)
{
if
(
pCtx
==
NULL
||
pCtx
->
pSem
==
NULL
)
{
...
@@ -1078,9 +1080,6 @@ static void cliPrepareCb(uv_prepare_t* handle) {
...
@@ -1078,9 +1080,6 @@ static void cliPrepareCb(uv_prepare_t* handle) {
QUEUE_REMOVE
(
h
);
QUEUE_REMOVE
(
h
);
SCliMsg
*
pMsg
=
QUEUE_DATA
(
h
,
SCliMsg
,
q
);
SCliMsg
*
pMsg
=
QUEUE_DATA
(
h
,
SCliMsg
,
q
);
if
(
pMsg
==
NULL
)
{
continue
;
}
(
*
cliAsyncHandle
[
pMsg
->
type
])(
pMsg
,
thrd
);
(
*
cliAsyncHandle
[
pMsg
->
type
])(
pMsg
,
thrd
);
count
++
;
count
++
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录