Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
965ee9a6
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
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看板
提交
965ee9a6
编写于
11月 26, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): keep block order in exchange operator.
上级
257137e5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
7 deletion
+18
-7
source/libs/executor/src/exchangeoperator.c
source/libs/executor/src/exchangeoperator.c
+11
-5
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+1
-1
source/libs/function/src/detail/tminmax.c
source/libs/function/src/detail/tminmax.c
+1
-1
source/util/src/tarray.c
source/util/src/tarray.c
+2
-0
tests/script/tsim/parser/select_with_tags.sim
tests/script/tsim/parser/select_with_tags.sim
+3
-0
未找到文件。
source/libs/executor/src/exchangeoperator.c
浏览文件 @
965ee9a6
...
...
@@ -182,10 +182,15 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
}
// we have buffered retrieved datablock, return it directly
SSDataBlock
**
p
=
taosArrayPop
(
pExchangeInfo
->
pResultBlockList
);
SSDataBlock
*
p
=
NULL
;
if
(
taosArrayGetSize
(
pExchangeInfo
->
pResultBlockList
)
>
0
)
{
p
=
taosArrayGetP
(
pExchangeInfo
->
pResultBlockList
,
0
);
taosArrayRemove
(
pExchangeInfo
->
pResultBlockList
,
0
);
}
if
(
p
!=
NULL
)
{
taosArrayPush
(
pExchangeInfo
->
pRecycledBlocks
,
p
);
return
*
p
;
taosArrayPush
(
pExchangeInfo
->
pRecycledBlocks
,
&
p
);
return
p
;
}
else
{
if
(
pExchangeInfo
->
seqLoadData
)
{
seqLoadRemoteData
(
pOperator
);
...
...
@@ -196,9 +201,10 @@ static SSDataBlock* doLoadRemoteDataImpl(SOperatorInfo* pOperator) {
if
(
taosArrayGetSize
(
pExchangeInfo
->
pResultBlockList
)
==
0
)
{
return
NULL
;
}
else
{
p
=
taosArrayPop
(
pExchangeInfo
->
pResultBlockList
);
p
=
taosArrayGetP
(
pExchangeInfo
->
pResultBlockList
,
0
);
taosArrayRemove
(
pExchangeInfo
->
pResultBlockList
,
0
);
taosArrayPush
(
pExchangeInfo
->
pRecycledBlocks
,
p
);
return
*
p
;
return
p
;
}
}
}
...
...
source/libs/executor/src/tsort.c
浏览文件 @
965ee9a6
...
...
@@ -801,7 +801,7 @@ STupleHandle* tsortNextTuple(SSortHandle* pHandle) {
index
=
tMergeTreeGetChosenIndex
(
pHandle
->
pMergeTree
);
pSource
=
pHandle
->
cmpParam
.
pSources
[
index
];
assert
(
pSource
->
src
.
pBlock
!=
NULL
);
ASSERT
(
pSource
->
src
.
pBlock
!=
NULL
);
pHandle
->
tupleHandle
.
rowIndex
=
pSource
->
src
.
rowIndex
;
pHandle
->
tupleHandle
.
pBlock
=
pSource
->
src
.
pBlock
;
...
...
source/libs/function/src/detail/tminmax.c
浏览文件 @
965ee9a6
...
...
@@ -649,7 +649,7 @@ static void doExtractVal(SColumnInfoData* pCol, int32_t i, int32_t end, SqlFunct
}
case
TSDB_DATA_TYPE_INT
:
{
const
int
16_t
*
pData
=
(
const
int16
_t
*
)
pCol
->
pData
;
const
int
32_t
*
pData
=
(
const
int32
_t
*
)
pCol
->
pData
;
__COMPARE_ACQUIRED_MAX
(
i
,
end
,
pCol
->
nullbitmap
,
pData
,
pCtx
,
*
(
int32_t
*
)
&
(
pBuf
->
v
),
&
pBuf
->
tuplePos
)
break
;
}
...
...
source/util/src/tarray.c
浏览文件 @
965ee9a6
...
...
@@ -17,6 +17,8 @@
#include "tarray.h"
#include "tcoding.h"
// todo refactor API
SArray
*
taosArrayInit
(
size_t
size
,
size_t
elemSize
)
{
assert
(
elemSize
>
0
);
...
...
tests/script/tsim/parser/select_with_tags.sim
浏览文件 @
965ee9a6
...
...
@@ -396,7 +396,10 @@ if $row != 12800 then
return -1
endi
print $data00 , $data01
if $data00 != @select_tags_tb0@ then
print expect select_tags_tb0 , actual: $data00
return -1
endi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录