Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storages: refine SegmentReadTaskScheduler #8557

Merged
merged 7 commits into from
Jan 3, 2024
Merged

Storages: refine SegmentReadTaskScheduler #8557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87827c4
Storages: refine `SegmentReadTaskScheduler`
JinheLin Jan 2, 2024
1c76d62
comment
JinheLin Dec 28, 2023
21ec867
comment
JinheLin Dec 28, 2023
2586b05
Add assert
JinheLin Jan 2, 2024
ffcc9d8
Merge branch 'master' into refine_scheduler
ti-chi-bot[bot] Jan 2, 2024
9d383d9
Merge branch 'master' into refine_scheduler
ti-chi-bot[bot] Jan 2, 2024
86f138f
Merge branch 'master' into refine_scheduler
JaySon-Huang Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions dbms/src/Flash/Pipeline/Schedule/Tasks/RFWaitTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,14 @@ class RFWaitTask : public Task

static void submitReadyRfsAndSegmentTaskPool(
const RuntimeFilteList & ready_rf_list,
const DM::SegmentReadTaskPoolPtr & task_pool,
const LoggerPtr & log)
const DM::SegmentReadTaskPoolPtr & task_pool)
{
for (const RuntimeFilterPtr & rf : ready_rf_list)
{
auto rs_operator = rf->parseToRSOperator(task_pool->getColumnToRead());
task_pool->appendRSOperator(rs_operator);
}
DM::SegmentReadTaskScheduler::instance().add(task_pool, log);
DM::SegmentReadTaskScheduler::instance().add(task_pool);
}

private:
Expand All @@ -83,7 +82,7 @@ class RFWaitTask : public Task
filterAndMoveReadyRfs(waiting_rf_list, ready_rf_list);
if (waiting_rf_list.empty() || stopwatch.elapsed() >= max_wait_time_ns)
{
submitReadyRfsAndSegmentTaskPool(ready_rf_list, task_pool, log);
submitReadyRfsAndSegmentTaskPool(ready_rf_list, task_pool);
return ExecTaskStatus::FINISHED;
}
return ExecTaskStatus::WAITING;
Expand Down
4 changes: 2 additions & 2 deletions dbms/src/Operators/UnorderedSourceOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void UnorderedSourceOp::operatePrefixImpl()
std::call_once(task_pool->addToSchedulerFlag(), [&]() {
if (waiting_rf_list.empty())
{
DM::SegmentReadTaskScheduler::instance().add(task_pool, log);
DM::SegmentReadTaskScheduler::instance().add(task_pool);
}
else
{
Expand All @@ -74,7 +74,7 @@ void UnorderedSourceOp::operatePrefixImpl()

if (max_wait_time_ms <= 0 || waiting_rf_list.empty())
{
RFWaitTask::submitReadyRfsAndSegmentTaskPool(ready_rf_list, task_pool, log);
RFWaitTask::submitReadyRfsAndSegmentTaskPool(ready_rf_list, task_pool);
}
else
{
Expand Down
110 changes: 0 additions & 110 deletions dbms/src/Storages/DeltaMerge/ReadThread/CircularScanList.h
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions dbms/src/Storages/DeltaMerge/ReadThread/MergedTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ class MergedTask
}
}

#ifndef DBMS_PUBLIC_GTEST
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I found these 3 methods not accessed in gtest_segment_read_tasks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the member variables in gtest_segment_read_tasks. For example,

ASSERT_EQ(merged_task->units.size(), 1);

private:
#else
public:
#endif
void initOnce();
int readOneBlock();
void setUnitFinish(int i) { finished_count += units[i].setFinish(); }
Expand Down
Loading