Skip to content

fix: Fix error with column order in FinalMergeSort #27

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

Merged
waralex merged 2 commits into from
May 9, 2022
Merged

fix: Fix error with column order in FinalMergeSort #27

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482fdf9
Fix of an error in a situation when the order of columns in the group…
May 8, 2022
3c99824
comment fix
May 9, 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
9 changes: 7 additions & 2 deletions datafusion/src/physical_plan/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,8 @@ impl DefaultPhysicalPlanner {
})
.collect::<Result<Vec<_>>>()?;

//It's not obvious here, but "order" here is vector of positions of underlying
//index columns in "order by" columns order
let (strategy, order) =
compute_aggregation_strategy(input_exec.as_ref(), &groups);
// TODO: fix cubestore planning and re-enable.
Expand Down Expand Up @@ -536,11 +538,14 @@ impl DefaultPhysicalPlanner {
if strategy == AggregateStrategy::InplaceSorted
&& initial_aggr.output_partitioning().partition_count() != 1
&& !groups.is_empty()
&& order.is_some()
{
let order = order.as_ref().unwrap();
initial_aggr = Arc::new(MergeSortExec::try_new(
initial_aggr,
(0..groups.len())
.map(|i| Column::new(&groups[i].1, i))
order
.iter()
.map(|i| Column::new(&groups[*i].1, *i))
.collect(),
)?);
}
Expand Down
⚡