Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
8f38c121
T
TDengine
项目概览
慢慢CG
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
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看板
提交
8f38c121
编写于
6月 10, 2020
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[td-225] support query cancel.
上级
bc1ba128
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
74 addition
and
12 deletion
+74
-12
src/query/src/qExecutor.c
src/query/src/qExecutor.c
+44
-10
src/vnode/src/vnodeRead.c
src/vnode/src/vnodeRead.c
+30
-2
未找到文件。
src/query/src/qExecutor.c
浏览文件 @
8f38c121
...
...
@@ -12,8 +12,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qfill.h"
#include "os.h"
#include "qfill.h"
#include "hash.h"
#include "hashfunc.h"
...
...
@@ -5822,20 +5822,39 @@ _over:
//pQInfo already freed in initQInfo, but *pQInfo may not pointer to null;
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
*
pQInfo
=
NULL
;
}
else
{
SQInfo
*
pq
=
(
SQInfo
*
)
(
*
pQInfo
);
T_REF_INC
(
pq
);
T_REF_INC
(
pq
);
}
// if failed to add ref for all meters in this query, abort current query
return
code
;
}
void
qDestroyQueryInfo
(
qinfo_t
pQInfo
)
{
static
void
doDestoryQueryInfo
(
SQInfo
*
pQInfo
)
{
assert
(
pQInfo
!=
NULL
);
qTrace
(
"QInfo:%p query completed"
,
pQInfo
);
// print the query cost summary
queryCostStatis
(
pQInfo
);
queryCostStatis
(
pQInfo
);
// print the query cost summary
freeQInfo
(
pQInfo
);
}
void
qDestroyQueryInfo
(
qinfo_t
qHandle
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qHandle
;
if
(
!
isValidQInfo
(
pQInfo
))
{
return
;
}
// set the query is cancelled
setQueryKilled
(
pQInfo
);
int16_t
ref
=
T_REF_DEC
(
pQInfo
);
if
(
ref
==
0
)
{
doDestoryQueryInfo
(
pQInfo
);
}
}
void
qTableQuery
(
qinfo_t
qinfo
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qinfo
;
...
...
@@ -5846,6 +5865,11 @@ void qTableQuery(qinfo_t qinfo) {
if
(
isQueryKilled
(
pQInfo
))
{
qTrace
(
"QInfo:%p it is already killed, abort"
,
pQInfo
);
int16_t
ref
=
T_REF_DEC
(
pQInfo
);
if
(
ref
==
0
)
{
doDestoryQueryInfo
(
pQInfo
);
}
return
;
}
...
...
@@ -5861,7 +5885,10 @@ void qTableQuery(qinfo_t qinfo) {
}
sem_post
(
&
pQInfo
->
dataReady
);
// vnodeDecRefCount(pQInfo);
int16_t
ref
=
T_REF_DEC
(
pQInfo
);
if
(
ref
==
0
)
{
doDestoryQueryInfo
(
pQInfo
);
}
}
int32_t
qRetrieveQueryResultInfo
(
qinfo_t
qinfo
)
{
...
...
@@ -5887,20 +5914,27 @@ int32_t qRetrieveQueryResultInfo(qinfo_t qinfo) {
bool
qHasMoreResultsToRetrieve
(
qinfo_t
qinfo
)
{
SQInfo
*
pQInfo
=
(
SQInfo
*
)
qinfo
;
if
(
pQInfo
==
NULL
||
pQInfo
->
signature
!=
pQInfo
||
pQInfo
->
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
isValidQInfo
(
pQInfo
)
||
pQInfo
->
code
!=
TSDB_CODE_SUCCESS
)
{
return
false
;
}
SQuery
*
pQuery
=
pQInfo
->
runtimeEnv
.
pQuery
;
bool
ret
=
false
;
if
(
Q_STATUS_EQUAL
(
pQuery
->
status
,
QUERY_OVER
))
{
ret
urn
false
;
ret
=
false
;
}
else
if
(
Q_STATUS_EQUAL
(
pQuery
->
status
,
QUERY_RESBUF_FULL
))
{
ret
urn
true
;
ret
=
true
;
}
else
if
(
Q_STATUS_EQUAL
(
pQuery
->
status
,
QUERY_COMPLETED
))
{
ret
urn
true
;
ret
=
true
;
}
else
{
assert
(
0
);
}
if
(
ret
)
{
T_REF_INC
(
pQInfo
);
}
return
ret
;
}
int32_t
qDumpRetrieveResult
(
qinfo_t
qinfo
,
SRetrieveTableRsp
**
pRsp
,
int32_t
*
contLen
)
{
...
...
src/vnode/src/vnodeRead.c
浏览文件 @
8f38c121
...
...
@@ -59,6 +59,18 @@ int32_t vnodeProcessRead(void *param, SReadMsg *pReadMsg) {
return
(
*
vnodeProcessReadMsgFp
[
msgType
])(
pVnode
,
pReadMsg
);
}
// notify connection(handle) that current qhandle is created, if current connection from
// client is broken, the query needs to be killed immediately.
static
void
vnodeNotifyCurrentQhandle
(
void
*
handle
,
void
*
qhandle
,
int32_t
vgId
)
{
SRetrieveTableMsg
*
killQueryMsg
=
rpcMallocCont
(
sizeof
(
SRetrieveTableMsg
));
killQueryMsg
->
qhandle
=
htobe64
((
uint64_t
)
qhandle
);
killQueryMsg
->
free
=
htons
(
1
);
killQueryMsg
->
header
.
vgId
=
htonl
(
vgId
);
killQueryMsg
->
header
.
contLen
=
htonl
(
sizeof
(
SRetrieveTableMsg
));
rpcReportProgress
(
handle
,
(
char
*
)
killQueryMsg
,
sizeof
(
SRetrieveTableMsg
));
}
static
int32_t
vnodeProcessQueryMsg
(
SVnodeObj
*
pVnode
,
SReadMsg
*
pReadMsg
)
{
void
*
pCont
=
pReadMsg
->
pCont
;
int32_t
contLen
=
pReadMsg
->
contLen
;
...
...
@@ -67,9 +79,23 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
SQueryTableMsg
*
pQueryTableMsg
=
(
SQueryTableMsg
*
)
pCont
;
memset
(
pRet
,
0
,
sizeof
(
SRspRet
));
int32_t
code
=
TSDB_CODE_SUCCESS
;
// qHandle needs to be freed correctly
if
(
pReadMsg
->
rpcMsg
.
code
!=
TSDB_CODE_SUCCESS
)
{
assert
(
pReadMsg
->
rpcMsg
.
contLen
>
0
);
SRetrieveTableMsg
*
killQueryMsg
=
(
SRetrieveTableMsg
*
)
pReadMsg
->
pCont
;
killQueryMsg
->
free
=
htons
(
killQueryMsg
->
free
);
killQueryMsg
->
qhandle
=
htobe64
(
killQueryMsg
->
qhandle
);
assert
(
killQueryMsg
->
free
==
1
);
qDestroyQueryInfo
((
qinfo_t
)
killQueryMsg
->
qhandle
);
return
TSDB_CODE_SUCCESS
;
}
int32_t
code
=
TSDB_CODE_SUCCESS
;
qinfo_t
pQInfo
=
NULL
;
if
(
contLen
!=
0
)
{
code
=
qCreateQueryInfo
(
pVnode
->
tsdb
,
pVnode
->
vgId
,
pQueryTableMsg
,
&
pQInfo
);
...
...
@@ -79,7 +105,9 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
pRet
->
len
=
sizeof
(
SQueryTableRsp
);
pRet
->
rsp
=
pRsp
;
vnodeNotifyCurrentQhandle
(
pReadMsg
->
rpcMsg
.
handle
,
pQInfo
,
pVnode
->
vgId
);
vTrace
(
"vgId:%d, QInfo:%p, dnode query msg disposed"
,
pVnode
->
vgId
,
pQInfo
);
}
else
{
assert
(
pCont
!=
NULL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录