RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-03 06:27:45 +00:00
Code Issues Activity

Remove unneeded condition for use of NumCache

Browse source
This commit is contained in:
electricboogie 2021-04-25 17:52:20 -05:00
parent 0f707cdb25
commit 32222c1ee7
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,9 +212,13 @@ where
} }
// initialize buffers for each chunk // initialize buffers for each chunk
iter.max_per_chunk = adjusted_buffer_size // iter.max_per_chunk = adjusted_buffer_size
.checked_div(iter.chunks) // .checked_div(iter.chunks)
.unwrap_or(adjusted_buffer_size); // .unwrap_or(adjusted_buffer_size);
//
//
//
iter.max_per_chunk = adjusted_buffer_size;
iter.buffers = vec![VecDeque::new(); iter.chunks as usize]; iter.buffers = vec![VecDeque::new(); iter.chunks as usize];
iter.chunk_offsets = vec![0 as u64; iter.chunks as usize]; iter.chunk_offsets = vec![0 as u64; iter.chunks as usize];
for chunk_num in 0..iter.chunks { for chunk_num in 0..iter.chunks {

15
src/uu/sort/src/sort.rs
View file

@ -1299,19 +1299,10 @@ fn compare_by(a: &Line, b: &Line, global_settings: &GlobalSettings) -> Ordering
(a_str, a_selection.num_cache.as_num_info()), (a_str, a_selection.num_cache.as_num_info()),
(b_str, b_selection.num_cache.as_num_info()), (b_str, b_selection.num_cache.as_num_info()),
), ),
// serde JSON has issues with f64 null values, so caching them won't work for us with ext sort
SortMode::GeneralNumeric => { SortMode::GeneralNumeric => {
if global_settings.buffer_size == DEFAULT_BUF_SIZE { general_numeric_compare(
general_numeric_compare( general_f64_parse(&a_str[get_leading_gen(a_str)]),
a_selection.num_cache.as_f64(), general_f64_parse(&b_str[get_leading_gen(b_str)]),)
b_selection.num_cache.as_f64(),
)
} else {
general_numeric_compare(
general_f64_parse(&a_str[get_leading_gen(a_str)]),
general_f64_parse(&b_str[get_leading_gen(b_str)]),
)
}
} }
SortMode::Month => month_compare(a_str, b_str), SortMode::Month => month_compare(a_str, b_str),
SortMode::Version => version_compare(a_str, b_str), SortMode::Version => version_compare(a_str, b_str),