RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

sort: improve memory usage for extsort

Browse source
This commit is contained in:
Michael Debertol 2021-05-07 21:50:33 +02:00
parent c38373946a
commit 8c9faa16b9
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/uu/sort/src/external_sort/mod.rs
View file

@ -113,7 +113,7 @@ pub fn ext_sort(
chunk.push(seq); chunk.push(seq);
if total_read >= settings.buffer_size { if total_read + chunk.len() * std::mem::size_of::<Line>() >= settings.buffer_size {
super::sort_by(&mut chunk, &settings); super::sort_by(&mut chunk, &settings);
write_chunk( write_chunk(
settings, settings,
@ -136,6 +136,9 @@ pub fn ext_sort(
iter.chunks += 1; iter.chunks += 1;
} }
// We manually drop here to not go over our memory limit when we allocate below.
drop(chunk);
// initialize buffers for each chunk // initialize buffers for each chunk
// //
// Having a right sized buffer for each chunk for smallish values seems silly to me? // Having a right sized buffer for each chunk for smallish values seems silly to me?