Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b1685398
TDengine
项目概览
taosdata
/
TDengine
接近 2 年 前同步成功
通知
1191
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b1685398
编写于
11月 07, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): count the correct number of completed sources.
上级
d016fc9d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
11 deletion
+43
-11
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+43
-11
未找到文件。
source/libs/executor/src/executorimpl.c
浏览文件 @
b1685398
...
...
@@ -1854,17 +1854,22 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
size_t
totalSources
=
taosArrayGetSize
(
pExchangeInfo
->
pSources
);
while
(
1
)
{
// printf("1\n");
tsem_wait
(
&
pExchangeInfo
->
ready
);
// printf("2\n");
int32_t
completed
=
0
;
//
int32_t completed = 0;
for
(
int32_t
i
=
0
;
i
<
totalSources
;
++
i
)
{
SSourceDataInfo
*
pDataInfo
=
taosArrayGet
(
pExchangeInfo
->
pSourceDataInfo
,
i
);
if
(
pDataInfo
->
status
==
EX_SOURCE_DATA_EXHAUSTED
)
{
completed
+=
1
;
// printf("========:%d is completed\n", i);
// completed += 1;
continue
;
}
// printf("index:%d --------3\n", i);
if
(
pDataInfo
->
status
!=
EX_SOURCE_DATA_READY
)
{
// printf("-----------%d, status:%d, continue\n", i, pDataInfo->status);
continue
;
}
...
...
@@ -1879,15 +1884,28 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
// todo
SLoadRemoteDataInfo
*
pLoadInfo
=
&
pExchangeInfo
->
loadInfo
;
if
(
pRsp
->
numOfRows
==
0
)
{
pDataInfo
->
status
=
EX_SOURCE_DATA_EXHAUSTED
;
int32_t
completed
=
0
;
for
(
int32_t
k
=
0
;
k
<
totalSources
;
++
k
)
{
SSourceDataInfo
*
p
=
taosArrayGet
(
pExchangeInfo
->
pSourceDataInfo
,
k
);
if
(
p
->
status
==
EX_SOURCE_DATA_EXHAUSTED
)
{
completed
+=
1
;
}
}
qDebug
(
"%s vgId:%d, taskId:0x%"
PRIx64
" execId:%d index:%d completed, rowsOfSource:%"
PRIu64
", totalRows:%"
PRIu64
", completed:%d try next %d/%"
PRIzu
,
GET_TASKID
(
pTaskInfo
),
pSource
->
addr
.
nodeId
,
pSource
->
taskId
,
pSource
->
execId
,
i
,
pDataInfo
->
totalRows
,
pExchangeInfo
->
loadInfo
.
totalRows
,
completed
+
1
,
i
+
1
,
totalSources
);
pDataInfo
->
status
=
EX_SOURCE_DATA_EXHAUSTED
;
completed
+=
1
;
taosMemoryFreeClear
(
pDataInfo
->
pRsp
);
break
;
// continue;
if
(
completed
==
totalSources
)
{
setAllSourcesCompleted
(
pOperator
,
startTs
);
return
;
}
else
{
break
;
}
}
SRetrieveTableRsp
*
pRetrieveRsp
=
pDataInfo
->
pRsp
;
...
...
@@ -1906,15 +1924,23 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
updateLoadRemoteInfo
(
pLoadInfo
,
pRetrieveRsp
->
numOfRows
,
pRetrieveRsp
->
compLen
,
startTs
,
pOperator
);
int32_t
completed
=
0
;
if
(
pRsp
->
completed
==
1
)
{
pDataInfo
->
status
=
EX_SOURCE_DATA_EXHAUSTED
;
for
(
int32_t
k
=
0
;
k
<
totalSources
;
++
k
)
{
SSourceDataInfo
*
p
=
taosArrayGet
(
pExchangeInfo
->
pSourceDataInfo
,
k
);
if
(
p
->
status
==
EX_SOURCE_DATA_EXHAUSTED
)
{
completed
+=
1
;
}
}
qDebug
(
"%s fetch msg rsp from vgId:%d, taskId:0x%"
PRIx64
" execId:%d index:%d completed, blocks:%d, numOfRows:%d, rowsOfSource:%"
PRIu64
", totalRows:%"
PRIu64
", total:%.2f Kb, completed:%d try next %d/%"
PRIzu
,
GET_TASKID
(
pTaskInfo
),
pSource
->
addr
.
nodeId
,
pSource
->
taskId
,
pSource
->
execId
,
i
,
pRsp
->
numOfBlocks
,
pRsp
->
numOfRows
,
pDataInfo
->
totalRows
,
pLoadInfo
->
totalRows
,
pLoadInfo
->
totalSize
/
1024
.
0
,
completed
+
1
,
i
+
1
,
totalSources
);
completed
+=
1
;
pDataInfo
->
status
=
EX_SOURCE_DATA_EXHAUSTED
;
completed
,
i
+
1
,
totalSources
);
}
else
{
qDebug
(
"%s fetch msg rsp from vgId:%d, taskId:0x%"
PRIx64
" execId:%d blocks:%d, numOfRows:%d, totalRows:%"
PRIu64
", total:%.2f Kb"
,
...
...
@@ -1940,12 +1966,18 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
return
;
}
int32_t
completed
=
0
;
for
(
int32_t
k
=
0
;
k
<
totalSources
;
++
k
)
{
SSourceDataInfo
*
p
=
taosArrayGet
(
pExchangeInfo
->
pSourceDataInfo
,
k
);
if
(
p
->
status
==
EX_SOURCE_DATA_EXHAUSTED
)
{
completed
+=
1
;
}
}
if
(
completed
==
totalSources
)
{
setAllSourcesCompleted
(
pOperator
,
startTs
);
return
;
}
// sched_yield();
}
_error:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录