mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-12-23 08:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

quick fix for #399

Browse source
This commit is contained in:
jussisaurio 2024-11-17 17:06:09 +02:00
parent de801f1e25
commit ccdcf302ca
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/translate/emitter.rs
View file

@ -811,7 +811,20 @@ impl Emitter for Operator {
)?;
}
for (i, agg) in aggregates.iter().enumerate() {
let expr = &agg.args[0]; // TODO hakhackhachkachkachk hack hack
// TODO it's a hack to assume aggregate functions have exactly one argument.
// Counterpoint e.g. GROUP_CONCAT(expr, separator).
//
// Here we are collecting scalars for the group by sorter, which will include
// both the group by expressions and the aggregate arguments.
// e.g. in `select u.first_name, sum(u.age) from users group by u.first_name`
// the sorter will have two scalars: u.first_name and u.age.
// these are then sorted by u.first_name, and for each u.first_name, we sum the u.age.
// the actual aggregation is done later in GROUP_BY_SORT_AND_COMPARE below.
//
// This is why we take the first argument of each aggregate function currently.
// It's mostly an artifact of the current architecture being a bit poor; we should recognize
// which scalars are dependencies of aggregate functions and explicitly collect those.
let expr = &agg.args[0];
let agg_reg = start_reg + sort_keys_count + i;
translate_expr(
program,

4
core/translate/planner.rs
View file

@ -158,7 +158,9 @@ pub fn prepare_select_plan<'a>(schema: &Schema, select: ast::Select) -> Result<P
) {
aggregate_expressions.push(Aggregate {
func: f,
args: vec![],
args: vec![ast::Expr::Literal(ast::Literal::Numeric(
"1".to_string(),
))],
original_expr: expr.clone(),
});
}

4
testing/groupby.test
View file

@ -127,3 +127,7 @@ do_execsql_test group_by_function_expression_ridiculous {
(97|36
(20|35
(31|35}
do_execsql_test group_by_count_star {
select u.first_name, count(*) from users u group by u.first_name limit 1;
} {Aaron|41}