mirror of
https://github.com/aljazceru/turso.git
synced 2026-01-06 09:44:21 +01:00
Add aggregate fn: count
This commit is contained in:
@@ -437,7 +437,23 @@ fn translate_aggregation(
|
||||
});
|
||||
target_register
|
||||
}
|
||||
AggFunc::Count => todo!(),
|
||||
AggFunc::Count => {
|
||||
let expr_reg = if args.is_empty() {
|
||||
program.alloc_register()
|
||||
} else {
|
||||
let expr = &args[0];
|
||||
let expr_reg = program.alloc_register();
|
||||
let _ = translate_expr(program, cursor_id, table, expr, expr_reg);
|
||||
expr_reg
|
||||
};
|
||||
program.emit_insn(Insn::AggStep {
|
||||
acc_reg: target_register,
|
||||
col: expr_reg,
|
||||
func: AggFunc::Count,
|
||||
});
|
||||
target_register
|
||||
}
|
||||
|
||||
AggFunc::GroupConcat => todo!(),
|
||||
AggFunc::Max => todo!(),
|
||||
AggFunc::Min => todo!(),
|
||||
|
||||
@@ -45,6 +45,7 @@ impl Display for OwnedValue {
|
||||
OwnedValue::Agg(a) => match a.as_ref() {
|
||||
AggContext::Avg(acc, _count) => write!(f, "{}", acc),
|
||||
AggContext::Sum(acc) => write!(f, "{}", acc),
|
||||
AggContext::Count(count) => write!(f, "{}", count),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -54,6 +55,7 @@ impl Display for OwnedValue {
|
||||
pub enum AggContext {
|
||||
Avg(OwnedValue, OwnedValue), // acc and count
|
||||
Sum(OwnedValue),
|
||||
Count(OwnedValue),
|
||||
}
|
||||
|
||||
impl std::ops::Add<OwnedValue> for OwnedValue {
|
||||
@@ -158,6 +160,7 @@ pub fn to_value(value: &OwnedValue) -> Value<'_> {
|
||||
OwnedValue::Agg(a) => match a.as_ref() {
|
||||
AggContext::Avg(acc, _count) => to_value(acc), // we assume aggfinal was called
|
||||
AggContext::Sum(acc) => to_value(acc),
|
||||
AggContext::Count(count) => to_value(count),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
14
core/vdbe.rs
14
core/vdbe.rs
@@ -369,6 +369,9 @@ impl Program {
|
||||
AggFunc::Sum => {
|
||||
OwnedValue::Agg(Box::new(AggContext::Sum(OwnedValue::Float(0.0))))
|
||||
}
|
||||
AggFunc::Count => {
|
||||
OwnedValue::Agg(Box::new(AggContext::Count(OwnedValue::Integer(0))))
|
||||
}
|
||||
_ => {
|
||||
todo!();
|
||||
}
|
||||
@@ -398,6 +401,16 @@ impl Program {
|
||||
};
|
||||
*acc += col;
|
||||
}
|
||||
AggFunc::Count => {
|
||||
let OwnedValue::Agg(agg) = state.registers[*acc_reg].borrow_mut()
|
||||
else {
|
||||
unreachable!();
|
||||
};
|
||||
let AggContext::Count(count) = agg.borrow_mut() else {
|
||||
unreachable!();
|
||||
};
|
||||
*count += 1;
|
||||
}
|
||||
_ => {
|
||||
todo!();
|
||||
}
|
||||
@@ -417,6 +430,7 @@ impl Program {
|
||||
*acc /= count.clone();
|
||||
}
|
||||
AggFunc::Sum => {}
|
||||
AggFunc::Count => {}
|
||||
_ => {
|
||||
todo!();
|
||||
}
|
||||
|
||||
@@ -43,6 +43,10 @@ do_execsql_test select-limit {
|
||||
SELECT id FROM users LIMIT 1;
|
||||
} {1}
|
||||
|
||||
do_execsql_test select-count {
|
||||
SELECT count(id) FROM users;
|
||||
} {10000}
|
||||
|
||||
do_execsql_test pragma-cache-size {
|
||||
PRAGMA cache_size
|
||||
} {-2000}
|
||||
|
||||
Reference in New Issue
Block a user