Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_50753323
TDengine
提交
04e06009
T
TDengine
项目概览
qq_50753323
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
04e06009
编写于
7月 18, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the issue #108, limit does not have effects on the results
上级
69176181
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
12 deletion
+11
-12
src/client/src/tscAsync.c
src/client/src/tscAsync.c
+11
-12
未找到文件。
src/client/src/tscAsync.c
浏览文件 @
04e06009
...
...
@@ -112,19 +112,19 @@ static void tscProcessAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOf
// sequentially retrieve data from remain vnodes first, query vnode specified by vnodeIdx
if
(
numOfRows
==
0
&&
tscProjectionQueryOnMetric
(
pSql
))
{
// vnode is denoted by vnodeIdx, continue to query vnode specified by vnodeIdx
assert
(
p
Sql
->
cmd
.
vnodeIdx
>=
1
);
assert
(
p
Cmd
->
vnodeIdx
>=
1
);
/* reach the maximum number of output rows, abort */
if
(
p
Sql
->
cmd
.
defaultVal
[
0
]
>
0
&&
pRes
->
numOfTotal
>=
pCmd
->
defaultVal
[
0
]
)
{
if
(
p
Cmd
->
globalLimit
>
0
&&
pRes
->
numOfTotal
>=
pCmd
->
globalLimit
)
{
(
*
pSql
->
fetchFp
)(
param
,
tres
,
0
);
return
;
}
/* update the limit value according to current retrieval results */
pCmd
->
limit
.
limit
=
p
Sql
->
cmd
.
defaultVal
[
0
]
-
pRes
->
numOfTotal
;
pCmd
->
limit
.
limit
=
p
Cmd
->
globalLimit
-
pRes
->
numOfTotal
;
if
((
++
(
pSql
->
cmd
.
vnodeIdx
))
<=
p
Sql
->
cmd
.
pMetricMeta
->
numOfVnodes
)
{
p
Sql
->
cmd
.
command
=
TSDB_SQL_SELECT
;
// reset flag to launch query first.
if
((
++
(
pSql
->
cmd
.
vnodeIdx
))
<=
p
Cmd
->
pMetricMeta
->
numOfVnodes
)
{
p
Cmd
->
command
=
TSDB_SQL_SELECT
;
// reset flag to launch query first.
pRes
->
row
=
0
;
pRes
->
numOfRows
=
0
;
...
...
@@ -134,8 +134,7 @@ static void tscProcessAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOf
tscProcessSql
(
pSql
);
return
;
}
}
else
{
/* localreducer has handle this situation */
}
else
{
// localreducer has handle this situation
if
(
pCmd
->
command
!=
TSDB_SQL_RETRIEVE_METRIC
)
{
pRes
->
numOfTotal
+=
pRes
->
numOfRows
;
}
...
...
@@ -268,19 +267,19 @@ void tscProcessAsyncRetrieve(void *param, TAOS_RES *tres, int numOfRows) {
/*
* vnode is denoted by vnodeIdx, continue to query vnode specified by vnodeIdx till all vnode have been retrieved
*/
assert
(
p
Sql
->
cmd
.
vnodeIdx
>=
1
);
assert
(
p
Cmd
->
vnodeIdx
>=
1
);
/* reach the maximum number of output rows, abort */
if
(
p
Sql
->
cmd
.
defaultVal
[
0
]
>
0
&&
pRes
->
numOfTotal
>=
pCmd
->
defaultVal
[
0
]
)
{
if
(
p
Cmd
->
globalLimit
>
0
&&
pRes
->
numOfTotal
>=
pCmd
->
globalLimit
)
{
(
*
pSql
->
fetchFp
)(
pSql
->
param
,
pSql
,
NULL
);
return
;
}
/* update the limit value according to current retrieval results */
pCmd
->
limit
.
limit
=
p
Sql
->
cmd
.
defaultVal
[
0
]
-
pRes
->
numOfTotal
;
pCmd
->
limit
.
limit
=
p
Cmd
->
globalLimit
-
pRes
->
numOfTotal
;
if
((
++
p
Sql
->
cmd
.
vnodeIdx
)
<=
pSql
->
cmd
.
pMetricMeta
->
numOfVnodes
)
{
p
Sql
->
cmd
.
command
=
TSDB_SQL_SELECT
;
// reset flag to launch query first.
if
((
++
p
Cmd
->
vnodeIdx
)
<=
pCmd
->
pMetricMeta
->
numOfVnodes
)
{
p
Cmd
->
command
=
TSDB_SQL_SELECT
;
// reset flag to launch query first.
pRes
->
row
=
0
;
pRes
->
numOfRows
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录