Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e506662
move out the ordering ruel
jayzhan211 Apr 10, 2024
2812886
introduce rule
jayzhan211 Apr 10, 2024
d20dde3
revert test result
jayzhan211 Apr 10, 2024
c671033
pass mulit order test
jayzhan211 Apr 10, 2024
3f43dc1
cleanup
jayzhan211 Apr 10, 2024
c8b46a4
with new childes
jayzhan211 Apr 10, 2024
fcb297b
revert slt
jayzhan211 Apr 10, 2024
ab10168
revert back
jayzhan211 Apr 10, 2024
fffb54a
rm rewrite in new child
jayzhan211 Apr 10, 2024
fec3eaf
backup
jayzhan211 Apr 10, 2024
5b68b48
only move conversion to optimizer
jayzhan211 Apr 10, 2024
2ab74c9
find test that do reverse
jayzhan211 Apr 11, 2024
03abf19
add test for first and last
jayzhan211 Apr 11, 2024
83c721a
pass all test
jayzhan211 Apr 11, 2024
34b8f01
upd test
jayzhan211 Apr 11, 2024
b17e8f7
upd test
jayzhan211 Apr 12, 2024
a313af0
cleanup
jayzhan211 Apr 12, 2024
a37fb3e
cleanup
jayzhan211 Apr 12, 2024
8de501c
cleanup
jayzhan211 Apr 12, 2024
107f4c8
add aggregate test
jayzhan211 Apr 12, 2024
345d4c6
cleanup
jayzhan211 Apr 12, 2024
030d7b9
final draft
jayzhan211 Apr 12, 2024
cf3f33e
cleanup again
jayzhan211 Apr 12, 2024
6d9ee9f
pull out finer ordering code and reuse
jayzhan211 Apr 13, 2024
abd40c6
clippy
jayzhan211 Apr 13, 2024
3e2c186
remove finer in optimize rule
jayzhan211 Apr 13, 2024
d7c2590
add comments and clenaup
jayzhan211 Apr 13, 2024
fed356a
rename fun
jayzhan211 Apr 13, 2024
0d3d461
rename fun
jayzhan211 Apr 13, 2024
d3daa4e
fmt
jayzhan211 Apr 13, 2024
dcb3e90
avoid unnecessary recursion and rename
jayzhan211 Apr 13, 2024
2951fbc
remove unnecessary rule
jayzhan211 Apr 15, 2024
af45a22
Merge remote-tracking branch 'upstream/main' into aggr-rule
jayzhan211 Apr 15, 2024
35b84ae
Merge remote-tracking branch 'upstream/main' into aggr-rule
jayzhan211 Apr 15, 2024
fffcd3b
fix merge
jayzhan211 Apr 15, 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
260 changes: 260 additions & 0 deletions datafusion/core/src/physical_optimizer/convert_first_last.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

use datafusion_common::Result;
use datafusion_common::{
config::ConfigOptions,
tree_node::{Transformed, TransformedResult, TreeNode},
};
use datafusion_physical_expr::expressions::{FirstValue, LastValue};
use datafusion_physical_expr::{
equivalence::ProjectionMapping, reverse_order_bys, AggregateExpr,
EquivalenceProperties, PhysicalSortRequirement,
};
use datafusion_physical_plan::aggregates::concat_slices;
use datafusion_physical_plan::{
aggregates::{AggregateExec, AggregateMode},
ExecutionPlan, ExecutionPlanProperties, InputOrderMode,
};
use std::sync::Arc;

use datafusion_physical_plan::windows::get_ordered_partition_by_indices;

use super::PhysicalOptimizerRule;

/// The optimizer rule check the ordering requirements of the aggregate expressions.
/// And convert between FIRST_VALUE and LAST_VALUE if possible.
/// For example, If we have an ascending values and we want LastValue from the descending requirement,
/// it is equivalent to FirstValue with the current ascending ordering.
///
/// The concrete example is that, says we have values c1 with [1, 2, 3], which is an ascending order.
/// If we want LastValue(c1 order by desc), which is the first value of reversed c1 [3, 2, 1],
/// so we can convert the aggregate expression to FirstValue(c1 order by asc),
/// since the current ordering is already satisfied, it saves our time!
#[derive(Default)]
pub struct OptimizeAggregateOrder {}

impl OptimizeAggregateOrder {
pub fn new() -> Self {
Self::default()
}
}

impl PhysicalOptimizerRule for OptimizeAggregateOrder {
fn optimize(
&self,
plan: Arc<dyn ExecutionPlan>,
_config: &ConfigOptions,
) -> Result<Arc<dyn ExecutionPlan>> {
plan.transform_up(&get_common_requirement_of_aggregate_input)
.data()
}

fn name(&self) -> &str {
"OptimizeAggregateOrder"
}

fn schema_check(&self) -> bool {
true
}
}

fn get_common_requirement_of_aggregate_input(
Comment thread
jayzhan211 marked this conversation as resolved.
plan: Arc<dyn ExecutionPlan>,
) -> Result<Transformed<Arc<dyn ExecutionPlan>>> {
if let Some(aggr_exec) = plan.as_any().downcast_ref::<AggregateExec>() {
let input = aggr_exec.input();
let mut aggr_expr = try_get_updated_aggr_expr_from_child(aggr_exec);
let group_by = aggr_exec.group_by();
let mode = aggr_exec.mode();

let input_eq_properties = input.equivalence_properties();
let groupby_exprs = group_by.input_exprs();
// If existing ordering satisfies a prefix of the GROUP BY expressions,
// prefix requirements with this section. In this case, aggregation will
// work more efficiently.
let indices = get_ordered_partition_by_indices(&groupby_exprs, input);
let requirement = indices
.iter()
.map(|&idx| PhysicalSortRequirement {
expr: groupby_exprs[idx].clone(),
options: None,
})
.collect::<Vec<_>>();

try_convert_first_last_if_better(
&requirement,
&mut aggr_expr,
input_eq_properties,
)?;

let required_input_ordering = (!requirement.is_empty()).then_some(requirement);

let input_order_mode =
if indices.len() == groupby_exprs.len() && !indices.is_empty() {
InputOrderMode::Sorted
} else if !indices.is_empty() {
InputOrderMode::PartiallySorted(indices)
} else {
InputOrderMode::Linear
};
let projection_mapping =
ProjectionMapping::try_new(group_by.expr(), &input.schema())?;

let cache = AggregateExec::compute_properties(
input,
plan.schema().clone(),
&projection_mapping,
mode,
&input_order_mode,
);

let aggr_exec = aggr_exec.new_with_aggr_expr_and_ordering_info(
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

keep the logic similar to AggregateExec::try_new_with_schema

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

        Ok(AggregateExec {
            mode,
            group_by,
            aggr_expr,
            filter_expr,
            input,
            schema,
            input_schema,
            metrics: ExecutionPlanMetricsSet::new(),
            required_input_ordering,
            limit: None,
            input_order_mode,
            cache,
        })

required_input_ordering,
aggr_expr,
cache,
input_order_mode,
);

Ok(Transformed::yes(
Arc::new(aggr_exec) as Arc<dyn ExecutionPlan>
))
} else {
Ok(Transformed::no(plan))
}
}

/// In `create_initial_plan` for LogicalPlan::Aggregate, we have a nested AggregateExec where the first layer
/// is in Partial mode and the second layer is in Final or Finalpartitioned mode.
/// If the first layer of aggregate plan is transformed, we need to update the child of the layer with final mode.
/// Therefore, we check it and get the updated aggregate expressions.
///
/// If AggregateExec is created from elsewhere, we skip the check and return the original aggregate expressions.
fn try_get_updated_aggr_expr_from_child(
aggr_exec: &AggregateExec,
) -> Vec<Arc<dyn AggregateExpr>> {
let input = aggr_exec.input();
if aggr_exec.mode() == &AggregateMode::Final
|| aggr_exec.mode() == &AggregateMode::FinalPartitioned
{
// Some aggregators may be modified during initialization for
// optimization purposes. For example, a FIRST_VALUE may turn
// into a LAST_VALUE with the reverse ordering requirement.
// To reflect such changes to subsequent stages, use the updated
// `AggregateExpr`/`PhysicalSortExpr` objects.
//
// The bottom up transformation is the mirror of LogicalPlan::Aggregate creation in [create_initial_plan]
if let Some(c_aggr_exec) = input.as_any().downcast_ref::<AggregateExec>() {
if c_aggr_exec.mode() == &AggregateMode::Partial {
// If the input is an AggregateExec in Partial mode, then the
// input is a CoalescePartitionsExec. In this case, the
// AggregateExec is the second stage of aggregation. The
// requirements of the second stage are the requirements of
// the first stage.
return c_aggr_exec.aggr_expr().to_vec();
}
}
}

aggr_exec.aggr_expr().to_vec()
}

/// Get the common requirement that satisfies all the aggregate expressions.
///
/// # Parameters
///
/// - `aggr_exprs`: A slice of `Arc<dyn AggregateExpr>` containing all the
/// aggregate expressions.
/// - `group_by`: A reference to a `PhysicalGroupBy` instance representing the
/// physical GROUP BY expression.
/// - `eq_properties`: A reference to an `EquivalenceProperties` instance
/// representing equivalence properties for ordering.
/// - `agg_mode`: A reference to an `AggregateMode` instance representing the
/// mode of aggregation.
///
/// # Returns
///
/// A `LexRequirement` instance, which is the requirement that satisfies all the
/// aggregate requirements. Returns an error in case of conflicting requirements.
///
/// Similar to the one in datafusion/physical-plan/src/aggregates/mod.rs, but this
/// function care only the possible conversion between FIRST_VALUE and LAST_VALUE
fn try_convert_first_last_if_better(
prefix_requirement: &[PhysicalSortRequirement],
aggr_exprs: &mut [Arc<dyn AggregateExpr>],
eq_properties: &EquivalenceProperties,
) -> Result<()> {
for aggr_expr in aggr_exprs.iter_mut() {
let aggr_req = aggr_expr.order_bys().unwrap_or(&[]);
let reverse_aggr_req = reverse_order_bys(aggr_req);
let aggr_req = PhysicalSortRequirement::from_sort_exprs(aggr_req);
let reverse_aggr_req =
PhysicalSortRequirement::from_sort_exprs(&reverse_aggr_req);

if let Some(first_value) = aggr_expr.as_any().downcast_ref::<FirstValue>() {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Eventually (some other PR) it would be amazing if we can move this code into FirstValue somehow. As it is now, there is a coupling between the optimizer rule and the actual PhysicalExpr -- which means among other things this same optimization can't be used by user defined aggregates

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, this should be similar to FunctionRewrite, registerable optimize rule.

let mut first_value = first_value.clone();

if eq_properties.ordering_satisfy_requirement(&concat_slices(
prefix_requirement,
&aggr_req,
)) {
first_value = first_value.with_requirement_satisfied(true);
*aggr_expr = Arc::new(first_value) as _;
} else if eq_properties.ordering_satisfy_requirement(&concat_slices(
prefix_requirement,
&reverse_aggr_req,
)) {
// Converting to LAST_VALUE enables more efficient execution
// given the existing ordering:
let mut last_value = first_value.convert_to_last();
last_value = last_value.with_requirement_satisfied(true);
*aggr_expr = Arc::new(last_value) as _;
} else {
// Requirement is not satisfied with existing ordering.
first_value = first_value.with_requirement_satisfied(false);
*aggr_expr = Arc::new(first_value) as _;
}
continue;
}
if let Some(last_value) = aggr_expr.as_any().downcast_ref::<LastValue>() {
let mut last_value = last_value.clone();
if eq_properties.ordering_satisfy_requirement(&concat_slices(
prefix_requirement,
&aggr_req,
)) {
last_value = last_value.with_requirement_satisfied(true);
*aggr_expr = Arc::new(last_value) as _;
} else if eq_properties.ordering_satisfy_requirement(&concat_slices(
prefix_requirement,
&reverse_aggr_req,
)) {
// Converting to FIRST_VALUE enables more efficient execution
// given the existing ordering:
let mut first_value = last_value.convert_to_first();
first_value = first_value.with_requirement_satisfied(true);
*aggr_expr = Arc::new(first_value) as _;
} else {
// Requirement is not satisfied with existing ordering.
last_value = last_value.with_requirement_satisfied(false);
*aggr_expr = Arc::new(last_value) as _;
}
continue;
}
}

Ok(())
}
1 change: 1 addition & 0 deletions datafusion/core/src/physical_optimizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
pub mod aggregate_statistics;
pub mod coalesce_batches;
pub mod combine_partial_final_agg;
mod convert_first_last;
pub mod enforce_distribution;
pub mod enforce_sorting;
pub mod join_selection;
Expand Down
3 changes: 3 additions & 0 deletions datafusion/core/src/physical_optimizer/optimizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

use std::sync::Arc;

use super::convert_first_last::OptimizeAggregateOrder;
use super::projection_pushdown::ProjectionPushdown;
use crate::config::ConfigOptions;
use crate::physical_optimizer::aggregate_statistics::AggregateStatistics;
Expand Down Expand Up @@ -101,6 +102,8 @@ impl PhysicalOptimizer {
// Note that one should always run this rule after running the EnforceDistribution rule
// as the latter may break local sorting requirements.
Arc::new(EnforceSorting::new()),
// Run once after the local sorting requirement is changed
Arc::new(OptimizeAggregateOrder::new()),
// TODO: `try_embed_to_hash_join` in the ProjectionPushdown rule would be block by the CoalesceBatches, so add it before CoalesceBatches. Maybe optimize it in the future.
Arc::new(ProjectionPushdown::new()),
// The CoalesceBatches rule will not influence the distribution and ordering of the
Expand Down
11 changes: 11 additions & 0 deletions datafusion/core/tests/data/convert_first_last.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
c1,c2,c3
1,9,0
2,8,1
3,7,2
4,6,3
5,5,4
6,4,5
7,3,6
8,2,7
9,1,8
10,0,9
Loading