ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-01-20 03:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure there is no allocation in final aggregation step.

Browse Source
This commit is contained in:
gwenn 2016-01-28 18:12:23 +01:00
parent 0d317d2e23
commit ea14115d6c
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/functions.rs
View File

@ -489,8 +489,8 @@ impl InnerConnection {
where D: Aggregate<A, T>, where D: Aggregate<A, T>,
T: ToResult T: ToResult
{ {
unsafe fn aggregate_context<A>(ctx: *mut sqlite3_context) -> Option<*mut *mut A> { unsafe fn aggregate_context<A>(ctx: *mut sqlite3_context, bytes: usize) -> Option<*mut *mut A> {
let pac = ffi::sqlite3_aggregate_context(ctx, ::std::mem::size_of::<*mut A>() as c_int) let pac = ffi::sqlite3_aggregate_context(ctx, bytes as c_int)
as *mut *mut A; as *mut *mut A;
if pac.is_null() { if pac.is_null() {
return None; return None;
@ -525,7 +525,7 @@ impl InnerConnection {
assert!(!boxed_aggr.is_null(), assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer"); "Internal error - null aggregate pointer");
let pac = match aggregate_context(ctx) { let pac = match aggregate_context(ctx, ::std::mem::size_of::<*mut A>()) {
Some(pac) => pac, Some(pac) => pac,
None => { None => {
ffi::sqlite3_result_error_nomem(ctx); ffi::sqlite3_result_error_nomem(ctx);
@ -556,19 +556,16 @@ impl InnerConnection {
assert!(!boxed_aggr.is_null(), assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer"); "Internal error - null aggregate pointer");
let pac = match aggregate_context(ctx) { // Within the xFinal callback, it is customary to set N=0 in calls to
Some(pac) => pac, // sqlite3_aggregate_context(C,N) so that no pointless memory allocations occur.
None => { let a: Option<A> = match aggregate_context(ctx, 0) {
ffi::sqlite3_result_error_nomem(ctx); Some(pac) => if (*pac).is_null() {
return;
}
};
let a: Option<A> = if (*pac).is_null() {
None None
} else { } else {
let a = Box::from_raw(*pac); let a = Box::from_raw(*pac);
Some(*a) Some(*a)
},
None => None,
}; };
match (*boxed_aggr).finalize(a) { match (*boxed_aggr).finalize(a) {