Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
1da67a56
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
1da67a56
编写于
11月 08, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): set correct status.
上级
b1685398
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
34 addition
and
29 deletion
+34
-29
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+33
-29
tests/script/tsim/parser/auto_create_tb.sim
tests/script/tsim/parser/auto_create_tb.sim
+1
-0
未找到文件。
source/libs/executor/src/executorimpl.c
浏览文件 @
1da67a56
...
...
@@ -1853,21 +1853,32 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
int64_t
startTs
=
taosGetTimestampUs
();
size_t
totalSources
=
taosArrayGetSize
(
pExchangeInfo
->
pSources
);
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
;
}
while
(
1
)
{
// printf("1\n");
tsem_wait
(
&
pExchangeInfo
->
ready
);
// printf("2\n");
// 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
)
{
// printf("========:%d is completed\n", i);
// completed += 1;
continue
;
}
// printf("index:%d -
-------3\n", i
);
// printf("index:%d -
status:%d\n", i, pDataInfo->status
);
if
(
pDataInfo
->
status
!=
EX_SOURCE_DATA_READY
)
{
// printf("-----------%d, status:%d, continue\n", i, pDataInfo->status);
continue
;
...
...
@@ -1885,33 +1896,27 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
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
;
}
}
// printf("%d completed, try next\n", i);
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
);
pExchangeInfo
->
loadInfo
.
totalRows
,
completed
,
i
+
1
,
totalSources
);
taosMemoryFreeClear
(
pDataInfo
->
pRsp
);
if
(
completed
==
totalSources
)
{
setAllSourcesCompleted
(
pOperator
,
startTs
);
return
;
}
else
{
// if (completed == totalSources) {
// return;
// } else {
// break;
// }
break
;
}
}
SRetrieveTableRsp
*
pRetrieveRsp
=
pDataInfo
->
pRsp
;
int32_t
index
=
0
;
char
*
pStart
=
pRetrieveRsp
->
data
;
while
(
index
++
<
pRetrieveRsp
->
numOfBlocks
)
{
printf
(
"results, numOfBLock: %d
\n
"
,
pRetrieveRsp
->
numOfBlocks
);
SSDataBlock
*
pb
=
createOneDataBlock
(
pExchangeInfo
->
pDummyBlock
,
false
);
code
=
extractDataBlockFromFetchRsp
(
pb
,
pStart
,
NULL
,
&
pStart
);
if
(
code
!=
0
)
{
...
...
@@ -1924,16 +1929,16 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
updateLoadRemoteInfo
(
pLoadInfo
,
pRetrieveRsp
->
numOfRows
,
pRetrieveRsp
->
compLen
,
startTs
,
pOperator
);
int32_t
completed
=
0
;
//
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
;
}
}
//
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
...
...
@@ -1959,9 +1964,9 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
}
}
if
(
completed
==
totalSources
)
{
setAllSourcesCompleted
(
pOperator
,
startTs
);
}
//
if (completed == totalSources) {
//
setAllSourcesCompleted(pOperator, startTs);
//
}
return
;
}
...
...
@@ -1975,7 +1980,6 @@ static void concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SExchangeIn
}
if
(
completed
==
totalSources
)
{
setAllSourcesCompleted
(
pOperator
,
startTs
);
return
;
}
}
...
...
tests/script/tsim/parser/auto_create_tb.sim
浏览文件 @
1da67a56
...
...
@@ -186,6 +186,7 @@ endi
sql select t1, count(*), first(c9) from $stb partition by t1 order by t1 asc slimit 3
if $rows != 3 then
print expect 3, actual: $rows
return -1
endi
if $data(1)[1] != 1 then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录