RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 05:57:46 +00:00
Code Issues Activity

Bring back non-external sort as default

Browse source
This commit is contained in:
electricboogie 2021-04-18 15:39:20 -05:00
parent e841bb6a24
commit fb19522ca0
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ extern crate uucore;
mod ext_sorter; mod ext_sorter;
mod numeric_str_cmp; mod numeric_str_cmp;
use rayon::prelude::*;
use clap::{App, Arg}; use clap::{App, Arg};
use fnv::FnvHasher; use fnv::FnvHasher;
use itertools::Itertools; use itertools::Itertools;
@ -1031,8 +1032,15 @@ fn exec(files: Vec<String>, settings: &GlobalSettings) -> i32 {
return exec_check_file(&lines, &settings); return exec_check_file(&lines, &settings);
} }
lines = sort_by(lines, &settings); // Only use ext_sorter when we need to.
// Probably faster that we don't create
// an owned value each run
if settings.buffer_size != DEFAULT_BUF_SIZE {
lines = ext_sort_by(lines, &settings);
} else {
sort_by(&mut lines, &settings);
}
if settings.merge { if settings.merge {
if settings.unique { if settings.unique {
print_sorted(file_merger.dedup(), &settings) print_sorted(file_merger.dedup(), &settings)
@ -1086,7 +1094,7 @@ fn exec_check_file(unwrapped_lines: &[Line], settings: &GlobalSettings) -> i32 {
} }
} }
fn sort_by(lines: Vec<Line>, settings: &GlobalSettings) -> Vec<Line> { fn ext_sort_by(lines: Vec<Line>, settings: &GlobalSettings) -> Vec<Line> {
let sorter = ExternalSorter::new() let sorter = ExternalSorter::new()
.with_segment_size(settings.buffer_size) .with_segment_size(settings.buffer_size)
.with_sort_dir(settings.tmp_dir.clone()) .with_sort_dir(settings.tmp_dir.clone())
@ -1098,6 +1106,10 @@ fn sort_by(lines: Vec<Line>, settings: &GlobalSettings) -> Vec<Line> {
result result
} }
fn sort_by(lines: &mut Vec<Line>, settings: &GlobalSettings) {
lines.par_sort_by(|a, b| compare_by(a, b, &settings))
}
fn compare_by(a: &Line, b: &Line, global_settings: &GlobalSettings) -> Ordering { fn compare_by(a: &Line, b: &Line, global_settings: &GlobalSettings) -> Ordering {
for (idx, selector) in global_settings.selectors.iter().enumerate() { for (idx, selector) in global_settings.selectors.iter().enumerate() {
let a_selection = &a.selections[idx]; let a_selection = &a.selections[idx];