Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-15 14:44:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Value::Record compare logic, and pass uniq tests. (#5541)

Browse source 
* fix record compare logic

* add more comment
This commit is contained in:
WindSoilder 2022-05-14 19:04:09 +08:00 committed by GitHub
parent 3cef94ba39
commit 16bd7b6d0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/nu-command/tests/commands/uniq.rs
View file

@ -61,8 +61,6 @@ fn uniq_values() {
})
}
// FIXME: jt: needs more work
#[ignore]
#[test]
fn nested_json_structures() {
Playground::setup("uniq_test_3", |dirs, sandbox| {
@ -127,8 +125,6 @@ fn nested_json_structures() {
})
}
// FIXME: jt: needs more work
#[ignore]
#[test]
fn uniq_when_keys_out_of_order() {
let actual = nu!(

28
crates/nu-protocol/src/value/mod.rs
View file

@ -27,6 +27,7 @@ use crate::{did_you_mean, BlockId, Config, Span, Spanned, Type, VarId};
use crate::ast::Operator;
pub use custom_value::CustomValue;
use std::iter;
use crate::ShellError;
@ -1287,9 +1288,17 @@ impl PartialOrd for Value {
vals: rhs_vals,
..
} => {
let result = lhs_cols.partial_cmp(rhs_cols);
// reorder cols and vals to make more logically compare.
// more genral, if two record have same col and values,
// the order of cols shouldn't affect the equal property.
let (lhs_cols_ordered, lhs_vals_ordered) =
reorder_record_inner(lhs_cols, lhs_vals);
let (rhs_cols_ordered, rhs_vals_ordered) =
reorder_record_inner(rhs_cols, rhs_vals);
let result = lhs_cols_ordered.partial_cmp(&rhs_cols_ordered);
if result == Some(Ordering::Equal) {
lhs_vals.partial_cmp(rhs_vals)
lhs_vals_ordered.partial_cmp(&rhs_vals_ordered)
} else {
result
}
@ -2232,6 +2241,21 @@ impl Value {
}
}
fn reorder_record_inner(cols: &[String], vals: &[Value]) -> (Vec<String>, Vec<Value>) {
let mut kv_pairs =
iter::zip(cols.to_owned(), vals.to_owned()).collect::<Vec<(String, Value)>>();
kv_pairs.sort_by(|a, b| {
a.0.partial_cmp(&b.0)
.expect("Columns should support compare")
});
let (mut cols, mut vals) = (vec![], vec![]);
for (col, val) in kv_pairs {
cols.push(col);
vals.push(val);
}
(cols, vals)
}
/// Create a Value::Record from a spanned hashmap
impl From<Spanned<HashMap<String, Value>>> for Value {
fn from(input: Spanned<HashMap<String, Value>>) -> Self {