diff --git a/src/uu/sort/src/external_sort/mod.rs b/src/uu/sort/src/external_sort/mod.rs index fae00fb72..9f3eb3776 100644 --- a/src/uu/sort/src/external_sort/mod.rs +++ b/src/uu/sort/src/external_sort/mod.rs @@ -212,9 +212,13 @@ where } // initialize buffers for each chunk - iter.max_per_chunk = adjusted_buffer_size - .checked_div(iter.chunks) - .unwrap_or(adjusted_buffer_size); + // iter.max_per_chunk = adjusted_buffer_size + // .checked_div(iter.chunks) + // .unwrap_or(adjusted_buffer_size); + // + // + // + iter.max_per_chunk = adjusted_buffer_size; iter.buffers = vec![VecDeque::new(); iter.chunks as usize]; iter.chunk_offsets = vec![0 as u64; iter.chunks as usize]; for chunk_num in 0..iter.chunks { diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index c24d930dc..ea7d36bae 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -1299,19 +1299,10 @@ fn compare_by(a: &Line, b: &Line, global_settings: &GlobalSettings) -> Ordering (a_str, a_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 => { - if global_settings.buffer_size == DEFAULT_BUF_SIZE { - general_numeric_compare( - a_selection.num_cache.as_f64(), - 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)]), - ) - } + 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::Version => version_compare(a_str, b_str),