Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
3206bf96
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,发现更多精彩内容 >>
提交
3206bf96
编写于
6月 17, 2020
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-545] fix bugs in vnode ref management
上级
7649770d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
20 deletion
+29
-20
src/inc/query.h
src/inc/query.h
+10
-7
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+10
-6
src/vnode/src/vnodeRead.c
src/vnode/src/vnodeRead.c
+9
-7
未找到文件。
src/inc/query.h
浏览文件 @
3206bf96
...
...
@@ -32,11 +32,11 @@ int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryTableMs
/**
* Destroy QInfo object
*
* @param
qinfo
* @
return
*
@param qinfo qhandle
* @param
fp destroy callback function, while the qhandle is destoried, invoke the fp
* @
param param free callback params
*/
void
qDestroyQueryInfo
(
qinfo_t
qinfo
);
void
qDestroyQueryInfo
(
qinfo_t
qinfo
,
void
(
*
fp
)(
void
*
),
void
*
param
);
/**
* the main query execution function, including query on both table and multitables,
...
...
@@ -45,7 +45,7 @@ void qDestroyQueryInfo(qinfo_t qinfo);
* @param qinfo
* @return
*/
void
qTableQuery
(
qinfo_t
qinfo
);
void
qTableQuery
(
qinfo_t
qinfo
,
void
(
*
fp
)(
void
*
),
void
*
param
);
/**
* Retrieve the produced results information, if current query is not paused or completed,
...
...
@@ -80,9 +80,12 @@ bool qHasMoreResultsToRetrieve(qinfo_t qinfo);
/**
* kill current ongoing query and free query handle automatically
* @param qinfo
* @param qinfo qhandle
* @param fp destroy callback function, while the qhandle is destoried, invoke the fp
* @param param free callback params
* @return
*/
int32_t
qKillQuery
(
qinfo_t
qinfo
);
int32_t
qKillQuery
(
qinfo_t
qinfo
,
void
(
*
fp
)(
void
*
),
void
*
param
);
#ifdef __cplusplus
}
...
...
src/query/src/qExecutor.c
浏览文件 @
3206bf96
...
...
@@ -5981,7 +5981,7 @@ static void doDestoryQueryInfo(SQInfo* pQInfo) {
freeQInfo
(
pQInfo
);
}
void
qDestroyQueryInfo
(
qinfo_t
qHandle
)
{
void
qDestroyQueryInfo
(
qinfo_t
qHandle
,
void
(
*
fp
)(
void
*
),
void
*
param
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qHandle
;
if
(
!
isValidQInfo
(
pQInfo
))
{
return
;
...
...
@@ -5992,10 +5992,14 @@ void qDestroyQueryInfo(qinfo_t qHandle) {
if
(
ref
==
0
)
{
doDestoryQueryInfo
(
pQInfo
);
if
(
fp
!=
NULL
)
{
fp
(
param
);
}
}
}
void
qTableQuery
(
qinfo_t
qinfo
)
{
void
qTableQuery
(
qinfo_t
qinfo
,
void
(
*
fp
)(
void
*
),
void
*
param
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qinfo
;
if
(
pQInfo
==
NULL
||
pQInfo
->
signature
!=
pQInfo
)
{
...
...
@@ -6005,7 +6009,7 @@ void qTableQuery(qinfo_t qinfo) {
if
(
isQueryKilled
(
pQInfo
))
{
qTrace
(
"QInfo:%p it is already killed, abort"
,
pQInfo
);
qDestroyQueryInfo
(
pQInfo
);
qDestroyQueryInfo
(
pQInfo
,
fp
,
param
);
return
;
}
...
...
@@ -6021,7 +6025,7 @@ void qTableQuery(qinfo_t qinfo) {
}
sem_post
(
&
pQInfo
->
dataReady
);
qDestroyQueryInfo
(
pQInfo
);
qDestroyQueryInfo
(
pQInfo
,
fp
,
param
);
}
int32_t
qRetrieveQueryResultInfo
(
qinfo_t
qinfo
)
{
...
...
@@ -6114,7 +6118,7 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
return
code
;
}
int32_t
qKillQuery
(
qinfo_t
qinfo
)
{
int32_t
qKillQuery
(
qinfo_t
qinfo
,
void
(
*
fp
)(
void
*
),
void
*
param
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qinfo
;
if
(
pQInfo
==
NULL
||
!
isValidQInfo
(
pQInfo
))
{
...
...
@@ -6122,7 +6126,7 @@ int32_t qKillQuery(qinfo_t qinfo) {
}
setQueryKilled
(
pQInfo
);
qDestroyQueryInfo
(
pQInfo
);
qDestroyQueryInfo
(
pQInfo
,
fp
,
param
);
return
TSDB_CODE_SUCCESS
;
}
...
...
src/vnode/src/vnodeRead.c
浏览文件 @
3206bf96
...
...
@@ -89,7 +89,10 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
vWarn
(
"QInfo:%p connection %p broken, kill query"
,
killQueryMsg
->
qhandle
,
pReadMsg
->
rpcMsg
.
handle
);
assert
(
pReadMsg
->
rpcMsg
.
contLen
>
0
&&
killQueryMsg
->
free
==
1
);
qKillQuery
((
qinfo_t
)
killQueryMsg
->
qhandle
);
// this message arrived here by means of the query message, so release the vnode is necessary
qKillQuery
((
qinfo_t
)
killQueryMsg
->
qhandle
,
vnodeRelease
,
pVnode
);
vnodeRelease
(
pVnode
);
return
TSDB_CODE_TSC_QUERY_CANCELLED
;
// todo change the error code
}
...
...
@@ -112,8 +115,8 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
pRsp
->
code
=
TSDB_CODE_RPC_NETWORK_UNAVAIL
;
//NOTE: there two refcount, needs to kill twice, todo refactor
qKillQuery
(
pQInfo
);
qKillQuery
(
pQInfo
);
qKillQuery
(
pQInfo
,
vnodeRelease
,
pVnode
);
qKillQuery
(
pQInfo
,
vnodeRelease
,
pVnode
);
return
pRsp
->
code
;
}
...
...
@@ -128,7 +131,7 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
if
(
pQInfo
!=
NULL
)
{
vTrace
(
"vgId:%d, QInfo:%p, do qTableQuery"
,
pVnode
->
vgId
,
pQInfo
);
qTableQuery
(
pQInfo
);
// do execute query
qTableQuery
(
pQInfo
,
vnodeRelease
,
pVnode
);
// do execute query
}
return
code
;
...
...
@@ -146,7 +149,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
if
(
pRetrieve
->
free
==
1
)
{
vTrace
(
"vgId:%d, QInfo:%p, retrieve msg received to kill query and free qhandle"
,
pVnode
->
vgId
,
pQInfo
);
int32_t
ret
=
qKillQuery
(
pQInfo
);
int32_t
ret
=
qKillQuery
(
pQInfo
,
vnodeRelease
,
pVnode
);
pRet
->
rsp
=
(
SRetrieveTableRsp
*
)
rpcMallocCont
(
sizeof
(
SRetrieveTableRsp
));
pRet
->
len
=
sizeof
(
SRetrieveTableRsp
);
...
...
@@ -175,8 +178,7 @@ static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
pRet
->
qhandle
=
pQInfo
;
code
=
TSDB_CODE_VND_ACTION_NEED_REPROCESSED
;
}
else
{
// no further execution invoked, release the ref to vnode
qDestroyQueryInfo
(
pQInfo
);
vnodeRelease
(
pVnode
);
qDestroyQueryInfo
(
pQInfo
,
vnodeRelease
,
pVnode
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录