Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
af36cb37
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
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看板
提交
af36cb37
编写于
9月 20, 2022
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor(query): do some internal refactor.
上级
ed0b92bb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
12 deletion
+11
-12
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+11
-12
未找到文件。
source/libs/executor/src/executorimpl.c
浏览文件 @
af36cb37
...
@@ -1135,35 +1135,34 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock, const SArray* pColM
...
@@ -1135,35 +1135,34 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock, const SArray* pColM
}
}
int64_t
st1
=
taosGetTimestampUs
();
int64_t
st1
=
taosGetTimestampUs
();
pError
(
"init completed, el: %d us"
,
st1
-
st
);
// pError("init completed, el: %d us", st1 -
st);
size_t
numOfCols
=
taosArrayGetSize
(
pBlock
->
pDataBlock
);
size_t
numOfCols
=
taosArrayGetSize
(
pBlock
->
pDataBlock
);
SFilterColumnParam
param1
=
{.
numOfCols
=
numOfCols
,
.
pDataBlock
=
pBlock
->
pDataBlock
};
SFilterColumnParam
param1
=
{.
numOfCols
=
numOfCols
,
.
pDataBlock
=
pBlock
->
pDataBlock
};
code
=
filterSetDataFromSlotId
(
filter
,
&
param1
);
code
=
filterSetDataFromSlotId
(
filter
,
&
param1
);
int64_t
st2
=
taosGetTimestampUs
();
int64_t
st2
=
taosGetTimestampUs
();
pError
(
"set data from slotid, el: %d us"
,
st2
-
st1
);
// pError("set data from slotid, el: %d us", st2 -
st1);
int8_t
*
rowRes
=
NULL
;
int8_t
*
rowRes
=
NULL
;
// todo the keep seems never to be True??
// todo the keep seems never to be True??
int32_t
status
=
0
;
int32_t
status
=
0
;
bool
keep
=
filterExecute
(
filter
,
pBlock
,
&
rowRes
,
NULL
,
param1
.
numOfCols
,
&
status
);
bool
keep
=
filterExecute
(
filter
,
pBlock
,
&
rowRes
,
NULL
,
param1
.
numOfCols
,
&
status
);
if
(
pFilterInfo
==
NULL
)
{
if
(
pFilterInfo
==
NULL
)
{
filterFreeInfo
(
filter
);
filterFreeInfo
(
filter
);
}
}
int64_t
st3
=
taosGetTimestampUs
();
int64_t
st3
=
taosGetTimestampUs
();
pError
(
"do filter, el: %d us"
,
st3
-
st2
);
extractQualifiedTupleByFilterResult
(
pBlock
,
rowRes
,
keep
,
status
);
extractQualifiedTupleByFilterResult
(
pBlock
,
rowRes
,
keep
,
status
);
int64_t
st4
=
taosGetTimestampUs
();
int64_t
st4
=
taosGetTimestampUs
();
pError
(
"extract result filter, el: %d us"
,
st4
-
st3
);
pError
(
"extract result filter, el: %d us, rows:%d"
,
st4
-
st3
,
pBlock
->
info
.
rows
);
if
(
pColMatchInfo
!=
NULL
)
{
if
(
pColMatchInfo
!=
NULL
)
{
for
(
int32_t
i
=
0
;
i
<
taosArrayGetSize
(
pColMatchInfo
);
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
taosArrayGetSize
(
pColMatchInfo
);
++
i
)
{
SColMatchInfo
*
pInfo
=
taosArrayGet
(
pColMatchInfo
,
i
);
SColMatchInfo
*
pInfo
=
taosArrayGet
(
pColMatchInfo
,
i
);
if
(
pInfo
->
colId
==
PRIMARYKEY_TIMESTAMP_COL_ID
)
{
if
(
pInfo
->
colId
==
PRIMARYKEY_TIMESTAMP_COL_ID
)
{
...
@@ -1205,7 +1204,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const int8_t* rowR
...
@@ -1205,7 +1204,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const int8_t* rowR
blockDataDestroy
(
px
);
// fix memory leak
blockDataDestroy
(
px
);
// fix memory leak
}
else
if
(
status
==
FILTER_RESULT_NONE_QUALIFIED
)
{
}
else
if
(
status
==
FILTER_RESULT_NONE_QUALIFIED
)
{
pBlock
->
info
.
rows
=
0
;
pBlock
->
info
.
rows
=
0
;
}
else
{
}
else
{
SSDataBlock
*
px
=
createOneDataBlock
(
pBlock
,
true
);
SSDataBlock
*
px
=
createOneDataBlock
(
pBlock
,
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录