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

Change one additional_input_at_end to many streams in ParallelInputsProcessor #5274

Merged
merged 22 commits into from
Jul 8, 2022
Merged

Change one additional_input_at_end to many streams in ParallelInputsProcessor #5274

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
33d33c6
speed up agg with right join
gengliqi Jul 1, 2022
f3ef670
fix
gengliqi Jul 1, 2022
858f851
call OnFinish even if finish is true
gengliqi Jul 1, 2022
5659b00
tiny fix
gengliqi Jul 4, 2022
87117cb
address comment
gengliqi Jul 5, 2022
3753603
use mpmcqueue as available_inputs
gengliqi Jul 5, 2022
3fc1230
refine code
gengliqi Jul 6, 2022
82a5095
update UnionBlockInputStream
gengliqi Jul 6, 2022
b44539c
tiny fix
gengliqi Jul 6, 2022
4125552
Merge branch 'master' into speed-parallel-input
gengliqi Jul 6, 2022
bbf43e0
fix tests
gengliqi Jul 7, 2022
5637288
address comments
gengliqi Jul 7, 2022
6ecf88d
add interpreter test
gengliqi Jul 7, 2022
7834eb7
Merge branch 'master' into speed-parallel-input
gengliqi Jul 7, 2022
a3e0099
Merge branch 'master' into speed-parallel-input
gengliqi Jul 7, 2022
f0d1f93
unprepared_inputs use MPMCQueue as well
gengliqi Jul 7, 2022
fa00bd0
add sum
gengliqi Jul 7, 2022
5e1cfa1
address comment
gengliqi Jul 8, 2022
01de389
Merge branch 'master' into speed-parallel-input
gengliqi Jul 8, 2022
e6407ee
Merge branch 'master' into speed-parallel-input
ti-chi-bot Jul 8, 2022
bb913a1
Merge branch 'master' into speed-parallel-input
ti-chi-bot Jul 8, 2022
11367da
fix dag & select interpreter
gengliqi Jul 8, 2022
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/DataStreams/ParallelAggregatingBlockInputStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace DB
{
ParallelAggregatingBlockInputStream::ParallelAggregatingBlockInputStream(
const BlockInputStreams & inputs,
const BlockInputStreamPtr & additional_input_at_end,
const BlockInputStreams & additional_inputs_at_end,
const Aggregator::Params & params_,
const FileProviderPtr & file_provider_,
bool final_,
Expand All @@ -41,11 +41,10 @@ ParallelAggregatingBlockInputStream::ParallelAggregatingBlockInputStream(
, keys_size(params.keys_size)
, aggregates_size(params.aggregates_size)
, handler(*this)
, processor(inputs, additional_input_at_end, max_threads, handler, log)
, processor(inputs, additional_inputs_at_end, max_threads, handler, log)
{
children = inputs;
if (additional_input_at_end)
children.push_back(additional_input_at_end);
children.insert(children.end(), additional_inputs_at_end.begin(), additional_inputs_at_end.end());
}


Expand Down
2 changes: 1 addition & 1 deletion dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ParallelAggregatingBlockInputStream : public IProfilingBlockInputStream
*/
ParallelAggregatingBlockInputStream(
const BlockInputStreams & inputs,
const BlockInputStreamPtr & additional_input_at_end,
const BlockInputStreams & additional_inputs_at_end,
const Aggregator::Params & params_,
const FileProviderPtr & file_provider_,
bool final_,
Expand Down
Loading