Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
8ef7fa9b
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,发现更多精彩内容 >>
提交
8ef7fa9b
编写于
4月 17, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: add group cache hash
上级
bd71cb88
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
15 addition
and
7 deletion
+15
-7
source/libs/executor/src/executil.c
source/libs/executor/src/executil.c
+15
-7
未找到文件。
source/libs/executor/src/executil.c
浏览文件 @
8ef7fa9b
...
@@ -448,7 +448,7 @@ static void genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
...
@@ -448,7 +448,7 @@ static void genTagFilterDigest(const SNode* pTagCond, T_MD5_CTX* pContext) {
}
}
int32_t
getColInfoResultForGroupby
(
void
*
metaHandle
,
SNodeList
*
group
,
STableListInfo
*
pTableListInfo
)
{
int32_t
getColInfoResultForGroupby
(
void
*
metaHandle
,
uint64_t
suid
,
SNodeList
*
group
,
STableListInfo
*
pTableListInfo
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
SArray
*
pBlockList
=
NULL
;
SArray
*
pBlockList
=
NULL
;
SSDataBlock
*
pResBlock
=
NULL
;
SSDataBlock
*
pResBlock
=
NULL
;
...
@@ -457,6 +457,7 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
...
@@ -457,6 +457,7 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
SArray
*
pUidTagList
=
NULL
;
SArray
*
pUidTagList
=
NULL
;
static
T_MD5_CTX
lastMd5
=
{
-
1
};
static
T_MD5_CTX
lastMd5
=
{
-
1
};
static
SArray
*
lastTableList
=
NULL
;
static
SArray
*
lastTableList
=
NULL
;
static
SHashObj
*
pTableListHash
=
NULL
;
int32_t
rows
=
taosArrayGetSize
(
pTableListInfo
->
pTableList
);
int32_t
rows
=
taosArrayGetSize
(
pTableListInfo
->
pTableList
);
if
(
rows
==
0
)
{
if
(
rows
==
0
)
{
...
@@ -489,7 +490,8 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
...
@@ -489,7 +490,8 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
genTagFilterDigest
((
SNode
*
)
listNode
,
&
context
);
genTagFilterDigest
((
SNode
*
)
listNode
,
&
context
);
nodesFree
(
listNode
);
nodesFree
(
listNode
);
if
(
lastTableList
&&
(
0
==
memcmp
(
context
.
digest
,
lastMd5
.
digest
,
sizeof
(
lastMd5
.
digest
))
&&
(
taosArrayGetSize
(
pTableListInfo
->
pTableList
)
==
taosArrayGetSize
(
lastTableList
))))
{
SArray
**
pLastTableList
=
(
SArray
**
)
taosHashGet
(
pTableListHash
,
context
.
digest
,
sizeof
(
context
.
digest
));
if
(
pLastTableList
&&
*
pLastTableList
)
{
pTableListInfo
->
pTableList
=
taosArrayDup
(
lastTableList
,
NULL
);
pTableListInfo
->
pTableList
=
taosArrayDup
(
lastTableList
,
NULL
);
goto
end
;
goto
end
;
}
else
{
}
else
{
...
@@ -622,9 +624,15 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
...
@@ -622,9 +624,15 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
info
->
groupId
=
calcGroupId
(
keyBuf
,
len
);
info
->
groupId
=
calcGroupId
(
keyBuf
,
len
);
}
}
memcpy
(
&
lastMd5
.
digest
,
&
context
.
digest
,
sizeof
(
context
.
digest
));
if
(
NULL
==
pTableListHash
)
{
taosArrayDestroy
(
lastTableList
);
SHashObj
*
pHash
=
taosHashInit
(
10
,
taosGetDefaultHashFunction
(
TSDB_DATA_TYPE_BINARY
),
true
,
HASH_ENTRY_LOCK
);
if
(
atomic_val_compare_exchange_ptr
(
&
pTableListHash
,
NULL
,
pHash
))
{
taosHashCleanup
(
pHash
);
}
}
lastTableList
=
taosArrayDup
(
pTableListInfo
->
pTableList
,
NULL
);
lastTableList
=
taosArrayDup
(
pTableListInfo
->
pTableList
,
NULL
);
taosHashPut
(
pTableListHash
,
context
.
digest
,
sizeof
(
context
.
digest
),
&
lastTableList
,
POINTER_BYTES
);
// int64_t st2 = taosGetTimestampUs();
// int64_t st2 = taosGetTimestampUs();
// qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
// qDebug("calculate tag block rows:%d, cost:%ld us", rows, st2-st1);
...
@@ -2001,7 +2009,7 @@ static int32_t sortTableGroup(STableListInfo* pTableListInfo) {
...
@@ -2001,7 +2009,7 @@ static int32_t sortTableGroup(STableListInfo* pTableListInfo) {
return
TDB_CODE_SUCCESS
;
return
TDB_CODE_SUCCESS
;
}
}
int32_t
buildGroupIdMapForAllTables
(
STableListInfo
*
pTableListInfo
,
SReadHandle
*
pHandle
,
SNodeList
*
group
,
int32_t
buildGroupIdMapForAllTables
(
STableListInfo
*
pTableListInfo
,
SReadHandle
*
pHandle
,
S
ScanPhysiNode
*
pScanNode
,
S
NodeList
*
group
,
bool
groupSort
)
{
bool
groupSort
)
{
int32_t
code
=
TSDB_CODE_SUCCESS
;
int32_t
code
=
TSDB_CODE_SUCCESS
;
...
@@ -2022,7 +2030,7 @@ int32_t buildGroupIdMapForAllTables(STableListInfo* pTableListInfo, SReadHandle*
...
@@ -2022,7 +2030,7 @@ int32_t buildGroupIdMapForAllTables(STableListInfo* pTableListInfo, SReadHandle*
pTableListInfo
->
numOfOuputGroups
=
1
;
pTableListInfo
->
numOfOuputGroups
=
1
;
}
}
}
else
{
}
else
{
code
=
getColInfoResultForGroupby
(
pHandle
->
meta
,
group
,
pTableListInfo
);
code
=
getColInfoResultForGroupby
(
pHandle
->
meta
,
pScanNode
->
suid
,
group
,
pTableListInfo
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
return
code
;
}
}
...
@@ -2071,7 +2079,7 @@ int32_t createScanTableListInfo(SScanPhysiNode* pScanNode, SNodeList* pGroupTags
...
@@ -2071,7 +2079,7 @@ int32_t createScanTableListInfo(SScanPhysiNode* pScanNode, SNodeList* pGroupTags
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
code
=
buildGroupIdMapForAllTables
(
pTableListInfo
,
pHandle
,
pGroupTags
,
groupSort
);
code
=
buildGroupIdMapForAllTables
(
pTableListInfo
,
pHandle
,
p
ScanNode
,
p
GroupTags
,
groupSort
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
return
code
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录