Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
7c39bc98
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c39bc98
编写于
8月 11, 2023
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: some minor modifications
上级
20f5e2af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
32 deletion
+42
-32
source/libs/executor/inc/executorInt.h
source/libs/executor/inc/executorInt.h
+1
-0
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+41
-32
未找到文件。
source/libs/executor/inc/executorInt.h
浏览文件 @
7c39bc98
...
...
@@ -263,6 +263,7 @@ typedef struct STagScanInfo {
void
*
pCtbCursor
;
SNode
*
pTagCond
;
SNode
*
pTagIndexCond
;
SStorageAPI
*
pStorageAPI
;
}
STagScanInfo
;
typedef
enum
EStreamScanMode
{
...
...
source/libs/executor/src/scanoperator.c
浏览文件 @
7c39bc98
...
...
@@ -2767,9 +2767,10 @@ static EDealRes tagScanRewriteTagColumn(SNode** pNode, void* pContext) {
}
static
void
tagScanFilterByTagCond
(
SArray
*
aUidTags
,
SNode
*
pTagCond
,
SArray
*
a
UidTag
Idxs
,
void
*
pVnode
,
SStorageAPI
*
pAPI
)
{
static
void
tagScanFilterByTagCond
(
SArray
*
aUidTags
,
SNode
*
pTagCond
,
SArray
*
a
Filter
Idxs
,
void
*
pVnode
,
SStorageAPI
*
pAPI
)
{
int32_t
code
=
0
;
int32_t
numOfTables
=
taosArrayGetSize
(
aUidTags
);
STagScanFilterContext
ctx
=
{
0
};
ctx
.
colHash
=
taosHashInit
(
4
,
taosGetDefaultHashFunction
(
TSDB_DATA_TYPE_SMALLINT
),
false
,
HASH_NO_LOCK
);
ctx
.
cInfoList
=
taosArrayInit
(
4
,
sizeof
(
SColumnInfo
));
...
...
@@ -2777,48 +2778,42 @@ static void tagScanFilterByTagCond(SArray* aUidTags, SNode* pTagCond, SArray* aU
nodesRewriteExprPostOrder
(
&
pTagCond
,
tagScanRewriteTagColumn
,
(
void
*
)
&
ctx
);
SSDataBlock
*
pResBlock
=
createTagValBlockForFilter
(
ctx
.
cInfoList
,
numOfTables
,
aUidTags
,
pVnode
,
pAPI
);
if
(
pResBlock
==
NULL
)
{
}
SArray
*
pBlockList
=
taosArrayInit
(
1
,
POINTER_BYTES
);
taosArrayPush
(
pBlockList
,
&
pResBlock
);
SDataType
type
=
{.
type
=
TSDB_DATA_TYPE_BOOL
,
.
bytes
=
sizeof
(
bool
)};
SScalarParam
output
=
{
0
};
code
=
tagScanCreateResultData
(
&
type
,
numOfTables
,
&
output
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
tagScanCreateResultData
(
&
type
,
numOfTables
,
&
output
);
}
code
=
scalarCalculate
(
pTagCond
,
pBlockList
,
&
output
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
}
scalarCalculate
(
pTagCond
,
pBlockList
,
&
output
);
bool
*
result
=
(
bool
*
)
output
.
columnData
->
pData
;
for
(
int32_t
i
=
0
;
i
<
numOfTables
;
++
i
)
{
if
(
result
[
i
])
{
taosArrayPush
(
a
UidTag
Idxs
,
&
i
);
taosArrayPush
(
a
Filter
Idxs
,
&
i
);
}
}
taosHashCleanup
(
ctx
.
colHash
);
taosArrayDestroy
(
ctx
.
cInfoList
);
blockDataDestroy
(
pResBlock
);
taosArrayDestroy
(
pBlockList
);
colDataDestroy
(
output
.
columnData
);
taosMemoryFreeClear
(
output
.
columnData
);
blockDataDestroy
(
pResBlock
);
taosArrayDestroy
(
pBlockList
);
taosHashCleanup
(
ctx
.
colHash
);
taosArrayDestroy
(
ctx
.
cInfoList
);
}
static
void
tagScanFillOneCellWithTag
(
const
STUidTagInfo
*
pUidTagInfo
,
SExprInfo
*
pExprInfo
,
SColumnInfoData
*
pColInfo
,
int
rowIndex
,
const
SStorageAPI
*
pAPI
,
void
*
pVnode
)
{
if
(
fmIsScanPseudoColumnFunc
(
pExprInfo
->
pExpr
->
_function
.
functionId
))
{
// tbname
char
str
[
TSDB_TABLE_FNAME_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
// if (pUidTagInfo->name != NULL) {
// STR_TO_VARSTR(str, pUidTagInfo->name);
// } else { // name is not retrieved during filter
// pAPI->metaFn.getTableNameByUid(pVnode, pUidTagInfo->uid, str);
// }
STR_TO_VARSTR
(
str
,
"zsl"
);
// if (pUidTagInfo->name != NULL) {
// STR_TO_VARSTR(str, pUidTagInfo->name);
// } else { // name is not retrieved during filter
// pAPI->metaFn.getTableNameByUid(pVnode, pUidTagInfo->uid, str);
// }
colDataSetVal
(
pColInfo
,
rowIndex
,
str
,
false
);
}
else
{
...
...
@@ -2846,13 +2841,15 @@ static void tagScanFillOneCellWithTag(const STUidTagInfo* pUidTagInfo, SExprInfo
}
}
static
int32_t
tagScanFillResultBlock
(
SOperatorInfo
*
pOperator
,
SSDataBlock
*
pRes
,
SArray
*
aUidTags
,
SArray
*
a
UidTag
Idxs
,
static
int32_t
tagScanFillResultBlock
(
SOperatorInfo
*
pOperator
,
SSDataBlock
*
pRes
,
SArray
*
aUidTags
,
SArray
*
a
Filter
Idxs
,
SStorageAPI
*
pAPI
)
{
STagScanInfo
*
pInfo
=
pOperator
->
info
;
SExprInfo
*
pExprInfo
=
&
pOperator
->
exprSupp
.
pExprInfo
[
0
];
for
(
int
i
=
0
;
i
<
taosArrayGetSize
(
aUidTagIdxs
);
++
i
)
{
STUidTagInfo
*
pUidTagInfo
=
taosArrayGet
(
aUidTags
,
*
(
int32_t
*
)
taosArrayGet
(
aUidTagIdxs
,
i
));
size_t
szTables
=
taosArrayGetSize
(
aFilterIdxs
);
for
(
int
i
=
0
;
i
<
szTables
;
++
i
)
{
int32_t
idx
=
*
(
int32_t
*
)
taosArrayGet
(
aFilterIdxs
,
i
);
STUidTagInfo
*
pUidTagInfo
=
taosArrayGet
(
aUidTags
,
idx
);
for
(
int32_t
j
=
0
;
j
<
pOperator
->
exprSupp
.
numOfExprs
;
++
j
)
{
SColumnInfoData
*
pDst
=
taosArrayGet
(
pRes
->
pDataBlock
,
pExprInfo
[
j
].
base
.
resSchema
.
slotId
);
tagScanFillOneCellWithTag
(
pUidTagInfo
,
&
pExprInfo
[
j
],
pDst
,
i
,
pAPI
,
pInfo
->
readHandle
.
vnode
);
...
...
@@ -2920,8 +2917,10 @@ static SSDataBlock* doTagScanFromCtbIdx(SOperatorInfo* pOperator) {
if
(
pInfo
->
pCtbCursor
==
NULL
)
{
pInfo
->
pCtbCursor
=
pAPI
->
metaFn
.
openCtbCursor
(
pInfo
->
readHandle
.
vnode
,
pInfo
->
suid
,
1
);
}
SArray
*
aUidTags
=
taosArrayInit
(
pOperator
->
resultInfo
.
capacity
,
sizeof
(
STUidTagInfo
));
SArray
*
aUidTagIdxs
=
taosArrayInit
(
pOperator
->
resultInfo
.
capacity
,
sizeof
(
int32_t
));
SArray
*
aFilterIdxs
=
taosArrayInit
(
pOperator
->
resultInfo
.
capacity
,
sizeof
(
int32_t
));
while
(
1
)
{
while
(
count
<
pOperator
->
resultInfo
.
capacity
)
{
SMCtbCursor
*
pCur
=
pInfo
->
pCtbCursor
;
...
...
@@ -2936,20 +2935,26 @@ static SSDataBlock* doTagScanFromCtbIdx(SOperatorInfo* pOperator) {
}
int32_t
numTables
=
taosArrayGetSize
(
aUidTags
);
if
(
numTables
!=
0
&&
pInfo
->
pTagCond
!=
NULL
)
{
tagScanFilterByTagCond
(
aUidTags
,
pInfo
->
pTagCond
,
pInfo
->
readHandle
.
vnode
,
aUidTagIdxs
,
pAPI
)
;
if
(
numTables
==
0
)
{
break
;
}
tagScanFillResultBlock
(
pOperator
,
pRes
,
aUidTags
,
aUidTagIdxs
,
pAPI
);
count
=
taosArrayGetSize
(
aUidTagIdxs
);
if
(
taosArrayGetSize
(
aUidTagIdxs
)
!=
0
)
{
tagScanFilterByTagCond
(
aUidTags
,
pInfo
->
pTagCond
,
pInfo
->
readHandle
.
vnode
,
aFilterIdxs
,
pAPI
);
tagScanFillResultBlock
(
pOperator
,
pRes
,
aUidTags
,
aFilterIdxs
,
pAPI
);
count
=
taosArrayGetSize
(
aFilterIdxs
);
if
(
count
!=
0
)
{
break
;
}
taosArrayClearEx
(
aUidTags
,
tagScanFreeUidTag
);
taosArrayClear
(
a
UidTag
Idxs
);
taosArrayClear
(
a
Filter
Idxs
);
}
taosArrayDestroy
(
aUidTagIdxs
);
taosArrayDestroy
(
aFilterIdxs
);
taosArrayDestroyEx
(
aUidTags
,
tagScanFreeUidTag
);
pOperator
->
resultInfo
.
totalRows
+=
count
;
return
(
pRes
->
info
.
rows
==
0
)
?
NULL
:
pInfo
->
pRes
;
}
...
...
@@ -3012,6 +3017,9 @@ static SSDataBlock* doTagScan(SOperatorInfo* pOperator) {
static
void
destroyTagScanOperatorInfo
(
void
*
param
)
{
STagScanInfo
*
pInfo
=
(
STagScanInfo
*
)
param
;
if
(
pInfo
->
pCtbCursor
!=
NULL
)
{
pInfo
->
pStorageAPI
->
metaFn
.
closeCtbCursor
(
pInfo
->
pCtbCursor
,
1
);
}
pInfo
->
pRes
=
blockDataDestroy
(
pInfo
->
pRes
);
taosArrayDestroy
(
pInfo
->
matchInfo
.
pList
);
pInfo
->
pTableListInfo
=
tableListDestroy
(
pInfo
->
pTableListInfo
);
...
...
@@ -3043,6 +3051,7 @@ SOperatorInfo* createTagScanOperatorInfo(SReadHandle* pReadHandle, STagScanPhysi
pInfo
->
pTagCond
=
pTagCond
;
pInfo
->
pTagIndexCond
=
pTagIndexCond
;
pInfo
->
pTableListInfo
=
pTableListInfo
;
pInfo
->
pStorageAPI
=
&
pTaskInfo
->
storageAPI
;
pInfo
->
pRes
=
createDataBlockFromDescNode
(
pDescNode
);
pInfo
->
readHandle
=
*
pReadHandle
;
pInfo
->
curPos
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录