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

sort: never use a bigger buffer than requested

Browse source 
A min buffer size of 8KB makes sense in practice, but decreases testability.
This commit is contained in:
Michael Debertol 2021-06-06 11:29:32 +02:00
parent 27456fc8fb
commit 2dd6824e76
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uu/sort/src/ext_sort.rs
View file

@ -30,7 +30,7 @@ use crate::{
compare_by, merge, output_sorted_lines, sort_by, GlobalSettings, compare_by, merge, output_sorted_lines, sort_by, GlobalSettings,
}; };
const MIN_BUFFER_SIZE: usize = 8_000; const START_BUFFER_SIZE: usize = 8_000;
/// Sort files by using auxiliary files for storing intermediate chunks (if needed), and output the result. /// Sort files by using auxiliary files for storing intermediate chunks (if needed), and output the result.
pub fn ext_sort(files: &mut impl Iterator<Item = Box<dyn Read + Send>>, settings: &GlobalSettings) { pub fn ext_sort(files: &mut impl Iterator<Item = Box<dyn Read + Send>>, settings: &GlobalSettings) {
@ -132,7 +132,14 @@ fn reader_writer(
for _ in 0..2 { for _ in 0..2 {
chunks::read( chunks::read(
&mut sender_option, &mut sender_option,
vec![0; MIN_BUFFER_SIZE], vec![
0;
if START_BUFFER_SIZE < buffer_size {
START_BUFFER_SIZE
} else {
buffer_size
}
],
Some(buffer_size), Some(buffer_size),
&mut carry_over, &mut carry_over,
&mut file, &mut file,