aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 08:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delay deduplication of aggregate expressions

Browse Source 
It is not necessary to iterate over existing aggregates for every
traversed expression. Instead, do so only when an aggregate function
is found.
This commit is contained in:
Piotr Rzysko
2025-09-01 21:26:47 +02:00
parent 569e41cb1e
commit 517f23013a
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/translate/planner.rs
View File

@@ -36,13 +36,6 @@ pub fn resolve_aggregates(
) -> Result<bool> {
let mut contains_aggregates = false;
walk_expr(top_level_expr, &mut |expr: &Expr| -> Result<WalkControl> {
if aggs
.iter()
.any(|a| exprs_are_equivalent(&a.original_expr, expr))
{
contains_aggregates = true;
return Ok(WalkControl::SkipChildren);
}
match expr {
Expr::FunctionCall {
name,
@@ -76,20 +69,20 @@ pub fn resolve_aggregates(
}
match Func::resolve_function(name.as_str(), args_count) {
Ok(Func::Agg(f)) => {
aggs.push(Aggregate::new(f, args, expr, distinctness));
add_aggregate_if_not_exists(aggs, expr, args, distinctness, f);
contains_aggregates = true;
return Ok(WalkControl::SkipChildren);
}
Err(e) => {
if let Some(f) = syms.resolve_function(name.as_str(), args_count) {
if let ExtFunc::Aggregate { .. } = f.as_ref().func {
let agg = Aggregate::new(
AggFunc::External(f.func.clone().into()),
args,
add_aggregate_if_not_exists(
aggs,
expr,
args,
distinctness,
AggFunc::External(f.func.clone().into()),
);
aggs.push(agg);
contains_aggregates = true;
return Ok(WalkControl::SkipChildren);
}
@@ -108,7 +101,7 @@ pub fn resolve_aggregates(
}
match Func::resolve_function(name.as_str(), 0) {
Ok(Func::Agg(f)) => {
aggs.push(Aggregate::new(f, &[], expr, Distinctness::NonDistinct));
add_aggregate_if_not_exists(aggs, expr, &[], Distinctness::NonDistinct, f);
contains_aggregates = true;
return Ok(WalkControl::SkipChildren);
}
@@ -137,6 +130,21 @@ pub fn resolve_aggregates(
Ok(contains_aggregates)
}
fn add_aggregate_if_not_exists(
aggs: &mut Vec<Aggregate>,
expr: &Expr,
args: &[Box<Expr>],
distinctness: Distinctness,
func: AggFunc,
) {
if aggs
.iter()
.all(|a| !exprs_are_equivalent(&a.original_expr, expr))
{
aggs.push(Aggregate::new(func, args, expr, distinctness));
}
}
pub fn bind_column_references(
top_level_expr: &mut Expr,
referenced_tables: &mut TableReferences,