Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ddab83a2
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看板
提交
ddab83a2
编写于
3月 21, 2023
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: optimize table merge scan performance
上级
189ff567
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
21 deletion
+33
-21
source/libs/executor/inc/tsort.h
source/libs/executor/inc/tsort.h
+2
-1
source/libs/executor/src/scanoperator.c
source/libs/executor/src/scanoperator.c
+14
-15
source/libs/executor/src/tsort.c
source/libs/executor/src/tsort.c
+17
-5
未找到文件。
source/libs/executor/inc/tsort.h
浏览文件 @
ddab83a2
...
@@ -44,7 +44,8 @@ typedef struct SSortSource {
...
@@ -44,7 +44,8 @@ typedef struct SSortSource {
void
*
param
;
void
*
param
;
bool
onlyRef
;
bool
onlyRef
;
};
};
int64_t
fetchUs
;
int64_t
fetchNum
;
}
SSortSource
;
}
SSortSource
;
typedef
struct
SMsortComparParam
{
typedef
struct
SMsortComparParam
{
...
...
source/libs/executor/src/scanoperator.c
浏览文件 @
ddab83a2
...
@@ -43,7 +43,8 @@ typedef struct STableMergeScanSortSourceParam {
...
@@ -43,7 +43,8 @@ typedef struct STableMergeScanSortSourceParam {
SOperatorInfo
*
pOperator
;
SOperatorInfo
*
pOperator
;
int32_t
readerIdx
;
int32_t
readerIdx
;
uint64_t
uid
;
uint64_t
uid
;
SSDataBlock
*
inputBlock
;
SSDataBlock
*
inputBlock
;
STsdbReader
*
dataReader
;
}
STableMergeScanSortSourceParam
;
}
STableMergeScanSortSourceParam
;
static
bool
processBlockWithProbability
(
const
SSampleExecInfo
*
pInfo
);
static
bool
processBlockWithProbability
(
const
SSampleExecInfo
*
pInfo
);
...
@@ -2586,6 +2587,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
...
@@ -2586,6 +2587,7 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
SExecTaskInfo
*
pTaskInfo
=
pOperator
->
pTaskInfo
;
SExecTaskInfo
*
pTaskInfo
=
pOperator
->
pTaskInfo
;
int32_t
readIdx
=
source
->
readerIdx
;
int32_t
readIdx
=
source
->
readerIdx
;
SSDataBlock
*
pBlock
=
source
->
inputBlock
;
SSDataBlock
*
pBlock
=
source
->
inputBlock
;
int32_t
code
=
0
;
SQueryTableDataCond
*
pQueryCond
=
taosArrayGet
(
pInfo
->
queryConds
,
readIdx
);
SQueryTableDataCond
*
pQueryCond
=
taosArrayGet
(
pInfo
->
queryConds
,
readIdx
);
...
@@ -2593,12 +2595,14 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
...
@@ -2593,12 +2595,14 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
void
*
p
=
tableListGetInfo
(
pTaskInfo
->
pTableInfoList
,
readIdx
+
pInfo
->
tableStartIndex
);
void
*
p
=
tableListGetInfo
(
pTaskInfo
->
pTableInfoList
,
readIdx
+
pInfo
->
tableStartIndex
);
SReadHandle
*
pHandle
=
&
pInfo
->
base
.
readHandle
;
SReadHandle
*
pHandle
=
&
pInfo
->
base
.
readHandle
;
int32_t
code
=
if
(
NULL
==
source
->
dataReader
)
{
tsdbReaderOpen
(
pHandle
->
vnode
,
pQueryCond
,
p
,
1
,
pBlock
,
&
pInfo
->
base
.
dataReader
,
GET_TASKID
(
pTaskInfo
));
code
=
tsdbReaderOpen
(
pHandle
->
vnode
,
pQueryCond
,
p
,
1
,
pBlock
,
&
source
->
dataReader
,
GET_TASKID
(
pTaskInfo
));
if
(
code
!=
0
)
{
if
(
code
!=
0
)
{
T_LONG_JMP
(
pTaskInfo
->
env
,
code
);
T_LONG_JMP
(
pTaskInfo
->
env
,
code
);
}
}
}
pInfo
->
base
.
dataReader
=
source
->
dataReader
;
STsdbReader
*
reader
=
pInfo
->
base
.
dataReader
;
STsdbReader
*
reader
=
pInfo
->
base
.
dataReader
;
qTrace
(
"tsdb/read-table-data: %p, enter next reader"
,
reader
);
qTrace
(
"tsdb/read-table-data: %p, enter next reader"
,
reader
);
while
(
tsdbNextDataBlock
(
reader
))
{
while
(
tsdbNextDataBlock
(
reader
))
{
...
@@ -2637,14 +2641,10 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
...
@@ -2637,14 +2641,10 @@ static SSDataBlock* getTableDataBlockImpl(void* param) {
pInfo
->
base
.
readRecorder
.
elapsedTime
+=
(
taosGetTimestampUs
()
-
st
)
/
1000
.
0
;
pInfo
->
base
.
readRecorder
.
elapsedTime
+=
(
taosGetTimestampUs
()
-
st
)
/
1000
.
0
;
qTrace
(
"tsdb/read-table-data: %p, close reader"
,
reader
);
qTrace
(
"tsdb/read-table-data: %p, close reader"
,
reader
);
tsdbReaderClose
(
pInfo
->
base
.
dataReader
);
pInfo
->
base
.
dataReader
=
NULL
;
pInfo
->
base
.
dataReader
=
NULL
;
return
pBlock
;
return
pBlock
;
}
}
qDebug
(
"8"
);
tsdbReaderClose
(
pInfo
->
base
.
dataReader
);
pInfo
->
base
.
dataReader
=
NULL
;
pInfo
->
base
.
dataReader
=
NULL
;
return
NULL
;
return
NULL
;
}
}
...
@@ -2759,6 +2759,8 @@ int32_t stopGroupTableMergeScan(SOperatorInfo* pOperator) {
...
@@ -2759,6 +2759,8 @@ int32_t stopGroupTableMergeScan(SOperatorInfo* pOperator) {
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
++
i
)
{
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
++
i
)
{
STableMergeScanSortSourceParam
*
param
=
taosArrayGet
(
pInfo
->
sortSourceParams
,
i
);
STableMergeScanSortSourceParam
*
param
=
taosArrayGet
(
pInfo
->
sortSourceParams
,
i
);
blockDataDestroy
(
param
->
inputBlock
);
blockDataDestroy
(
param
->
inputBlock
);
tsdbReaderClose
(
param
->
dataReader
);
param
->
dataReader
=
NULL
;
}
}
taosArrayClear
(
pInfo
->
sortSourceParams
);
taosArrayClear
(
pInfo
->
sortSourceParams
);
...
@@ -2871,15 +2873,14 @@ void destroyTableMergeScanOperatorInfo(void* param) {
...
@@ -2871,15 +2873,14 @@ void destroyTableMergeScanOperatorInfo(void* param) {
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
i
++
)
{
for
(
int32_t
i
=
0
;
i
<
numOfTable
;
i
++
)
{
STableMergeScanSortSourceParam
*
p
=
taosArrayGet
(
pTableScanInfo
->
sortSourceParams
,
i
);
STableMergeScanSortSourceParam
*
p
=
taosArrayGet
(
pTableScanInfo
->
sortSourceParams
,
i
);
blockDataDestroy
(
p
->
inputBlock
);
blockDataDestroy
(
p
->
inputBlock
);
tsdbReaderClose
(
p
->
dataReader
);
p
->
dataReader
=
NULL
;
}
}
taosArrayDestroy
(
pTableScanInfo
->
sortSourceParams
);
taosArrayDestroy
(
pTableScanInfo
->
sortSourceParams
);
tsortDestroySortHandle
(
pTableScanInfo
->
pSortHandle
);
tsortDestroySortHandle
(
pTableScanInfo
->
pSortHandle
);
pTableScanInfo
->
pSortHandle
=
NULL
;
pTableScanInfo
->
pSortHandle
=
NULL
;
tsdbReaderClose
(
pTableScanInfo
->
base
.
dataReader
);
pTableScanInfo
->
base
.
dataReader
=
NULL
;
for
(
int
i
=
0
;
i
<
taosArrayGetSize
(
pTableScanInfo
->
queryConds
);
i
++
)
{
for
(
int
i
=
0
;
i
<
taosArrayGetSize
(
pTableScanInfo
->
queryConds
);
i
++
)
{
SQueryTableDataCond
*
pCond
=
taosArrayGet
(
pTableScanInfo
->
queryConds
,
i
);
SQueryTableDataCond
*
pCond
=
taosArrayGet
(
pTableScanInfo
->
queryConds
,
i
);
taosMemoryFree
(
pCond
->
colList
);
taosMemoryFree
(
pCond
->
colList
);
...
@@ -2896,8 +2897,6 @@ void destroyTableMergeScanOperatorInfo(void* param) {
...
@@ -2896,8 +2897,6 @@ void destroyTableMergeScanOperatorInfo(void* param) {
taosArrayDestroy
(
pTableScanInfo
->
pSortInfo
);
taosArrayDestroy
(
pTableScanInfo
->
pSortInfo
);
cleanupExprSupp
(
&
pTableScanInfo
->
base
.
pseudoSup
);
cleanupExprSupp
(
&
pTableScanInfo
->
base
.
pseudoSup
);
tsdbReaderClose
(
pTableScanInfo
->
base
.
dataReader
);
pTableScanInfo
->
base
.
dataReader
=
NULL
;
taosLRUCacheCleanup
(
pTableScanInfo
->
base
.
metaCache
.
pTableMetaEntryCache
);
taosLRUCacheCleanup
(
pTableScanInfo
->
base
.
metaCache
.
pTableMetaEntryCache
);
taosMemoryFreeClear
(
param
);
taosMemoryFreeClear
(
param
);
...
...
source/libs/executor/src/tsort.c
浏览文件 @
ddab83a2
...
@@ -108,12 +108,18 @@ static int32_t sortComparCleanup(SMsortComparParam* cmpParam) {
...
@@ -108,12 +108,18 @@ static int32_t sortComparCleanup(SMsortComparParam* cmpParam) {
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
void
tsortClearOrderdSource
(
SArray
*
pOrderedSource
)
{
void
tsortClearOrderdSource
(
SArray
*
pOrderedSource
,
int64_t
*
fetchUs
,
int64_t
*
fetchNum
)
{
for
(
size_t
i
=
0
;
i
<
taosArrayGetSize
(
pOrderedSource
);
i
++
)
{
for
(
size_t
i
=
0
;
i
<
taosArrayGetSize
(
pOrderedSource
);
i
++
)
{
SSortSource
**
pSource
=
taosArrayGet
(
pOrderedSource
,
i
);
SSortSource
**
pSource
=
taosArrayGet
(
pOrderedSource
,
i
);
if
(
NULL
==
*
pSource
)
{
if
(
NULL
==
*
pSource
)
{
continue
;
continue
;
}
}
if
(
fetchUs
)
{
*
fetchUs
+=
(
*
pSource
)
->
fetchUs
;
*
fetchNum
+=
(
*
pSource
)
->
fetchNum
;
}
// release pageIdList
// release pageIdList
if
((
*
pSource
)
->
pageIdList
)
{
if
((
*
pSource
)
->
pageIdList
)
{
taosArrayDestroy
((
*
pSource
)
->
pageIdList
);
taosArrayDestroy
((
*
pSource
)
->
pageIdList
);
...
@@ -147,7 +153,10 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
...
@@ -147,7 +153,10 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
taosMemoryFreeClear
(
pSortHandle
->
idStr
);
taosMemoryFreeClear
(
pSortHandle
->
idStr
);
blockDataDestroy
(
pSortHandle
->
pDataBlock
);
blockDataDestroy
(
pSortHandle
->
pDataBlock
);
tsortClearOrderdSource
(
pSortHandle
->
pOrderedSource
);
int64_t
fetchUs
=
0
,
fetchNum
=
0
;
tsortClearOrderdSource
(
pSortHandle
->
pOrderedSource
,
&
fetchUs
,
&
fetchNum
);
qError
(
"all source fetch time: %"
PRId64
"us num:%"
PRId64
" %s"
,
fetchUs
,
fetchNum
,
pSortHandle
->
idStr
);
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosArrayDestroy
(
pSortHandle
->
pOrderedSource
);
taosMemoryFreeClear
(
pSortHandle
);
taosMemoryFreeClear
(
pSortHandle
);
}
}
...
@@ -307,7 +316,7 @@ static int32_t sortComparInit(SMsortComparParam* pParam, SArray* pSources, int32
...
@@ -307,7 +316,7 @@ static int32_t sortComparInit(SMsortComparParam* pParam, SArray* pSources, int32
}
}
int64_t
et
=
taosGetTimestampUs
();
int64_t
et
=
taosGetTimestampUs
();
q
Debug
(
"init for merge sort completed, elapsed time:%.2f ms, %s"
,
(
et
-
st
)
/
1000
.
0
,
pHandle
->
idStr
);
q
Error
(
"init for merge sort completed, elapsed time:%.2f ms, %s"
,
(
et
-
st
)
/
1000
.
0
,
pHandle
->
idStr
);
}
}
return
code
;
return
code
;
...
@@ -365,7 +374,10 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
...
@@ -365,7 +374,10 @@ static int32_t adjustMergeTreeForNextTuple(SSortSource* pSource, SMultiwayMergeT
releaseBufPage
(
pHandle
->
pBuf
,
pPage
);
releaseBufPage
(
pHandle
->
pBuf
,
pPage
);
}
}
}
else
{
}
else
{
int64_t
st
=
taosGetTimestampUs
();
pSource
->
src
.
pBlock
=
pHandle
->
fetchfp
(((
SSortSource
*
)
pSource
)
->
param
);
pSource
->
src
.
pBlock
=
pHandle
->
fetchfp
(((
SSortSource
*
)
pSource
)
->
param
);
pSource
->
fetchUs
+=
taosGetTimestampUs
()
-
st
;
pSource
->
fetchNum
++
;
if
(
pSource
->
src
.
pBlock
==
NULL
)
{
if
(
pSource
->
src
.
pBlock
==
NULL
)
{
(
*
numOfCompleted
)
+=
1
;
(
*
numOfCompleted
)
+=
1
;
pSource
->
src
.
rowIndex
=
-
1
;
pSource
->
src
.
rowIndex
=
-
1
;
...
@@ -602,7 +614,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
...
@@ -602,7 +614,7 @@ static int32_t doInternalMergeSort(SSortHandle* pHandle) {
}
}
}
}
tsortClearOrderdSource
(
pHandle
->
pOrderedSource
);
tsortClearOrderdSource
(
pHandle
->
pOrderedSource
,
NULL
,
NULL
);
taosArrayAddAll
(
pHandle
->
pOrderedSource
,
pResList
);
taosArrayAddAll
(
pHandle
->
pOrderedSource
,
pResList
);
taosArrayDestroy
(
pResList
);
taosArrayDestroy
(
pResList
);
...
@@ -644,7 +656,7 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
...
@@ -644,7 +656,7 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
SSortSource
*
source
=
*
pSource
;
SSortSource
*
source
=
*
pSource
;
*
pSource
=
NULL
;
*
pSource
=
NULL
;
tsortClearOrderdSource
(
pHandle
->
pOrderedSource
);
tsortClearOrderdSource
(
pHandle
->
pOrderedSource
,
NULL
,
NULL
);
while
(
1
)
{
while
(
1
)
{
SSDataBlock
*
pBlock
=
pHandle
->
fetchfp
(
source
->
param
);
SSDataBlock
*
pBlock
=
pHandle
->
fetchfp
(
source
->
param
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录