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

join: fix default check order behaviour

Browse source 
If neither --nocheck-order or --check-order are specified, only fail on
unsorted inputs if either file contains unpaired lines.
This commit is contained in:
Cecylia Bocovich 2022-01-22 11:35:42 -05:00
parent 8a787fe028
commit 594157d1e0
No known key found for this signature in database
GPG key ID: 009DE379FD9B7B90
2 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/uu/join/src/join.rs
View file

@ -273,6 +273,7 @@ struct State<'a> {
seq: Vec<Line>,
line_num: usize,
has_failed: bool,
has_unpaired: bool,
}
impl<'a> State<'a> {
@ -302,6 +303,7 @@ impl<'a> State<'a> {
seq: Vec::new(),
line_num: 0,
has_failed: false,
has_unpaired: false,
}
}
@ -415,11 +417,18 @@ impl<'a> State<'a> {
}
fn finalize(&mut self, input: &Input, repr: &Repr) -> Result<(), std::io::Error> {
if self.has_line() && self.print_unpaired {
if self.has_line() {
if self.print_unpaired {
self.print_first_line(repr)?;
}
while let Some(line) = self.next_line(input) {
self.print_line(&line, repr)?;
let mut next_line = self.next_line(input);
while let Some(line) = &next_line {
if self.print_unpaired {
self.print_line(line, repr)?;
}
self.reset(next_line);
next_line = self.next_line(input);
}
}
@ -444,6 +453,7 @@ impl<'a> State<'a> {
let diff = input.compare(self.get_current_key(), line.get_field(self.key));
if diff == Ordering::Greater {
if input.check_order == CheckOrder::Enabled || (self.has_unpaired && !self.has_failed) {
eprintln!(
"{}: {}:{}: is not sorted: {}",
uucore::execution_phrase(),
@ -452,12 +462,12 @@ impl<'a> State<'a> {
String::from_utf8_lossy(&line.string)
);
self.has_failed = true;
}
// This is fatal if the check is enabled.
if input.check_order == CheckOrder::Enabled {
std::process::exit(1);
}
self.has_failed = true;
}
Some(line)
@ -760,9 +770,13 @@ fn exec(file1: &str, file2: &str, settings: Settings) -> Result<(), std::io::Err
match diff {
Ordering::Less => {
state1.skip_line(&input, &repr)?;
state1.has_unpaired = true;
state2.has_unpaired = true;
}
Ordering::Greater => {
state2.skip_line(&input, &repr)?;
state1.has_unpaired = true;
state2.has_unpaired = true;
}
Ordering::Equal => {
let next_line1 = state1.extend(&input);
@ -782,6 +796,10 @@ fn exec(file1: &str, file2: &str, settings: Settings) -> Result<(), std::io::Err
state2.finalize(&input, &repr)?;
if state1.has_failed || state2.has_failed {
eprintln!(
"{}: input is not in sorted order",
uucore::execution_phrase()
);
set_exit_code(1);
}
Ok(())

2
tests/by-util/test_join.rs
View file

@ -289,7 +289,7 @@ fn wrong_line_order() {
.arg("fields_4.txt")
.fails()
.stderr_is(&format!(
"{} {}: fields_4.txt:5: is not sorted: 11 g 5 gh",
"{0} {1}: fields_4.txt:5: is not sorted: 11 g 5 gh\n{0} {1}: input is not in sorted order",
ts.bin_path.to_string_lossy(),
ts.util_name
));