extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-23 06:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Elide clone in V::follow_cell_path for record (#12325)

Browse Source 
# Description
This clone is not necessary and tanks the performance of deep nested
access.
As soon as we found the value, we know we discard the old value, so can
`std::mem::take` the inner (`impl Default for Value` to the rescue)

We may be able to further optimize this but not having to clone the
value is vital.
This commit is contained in:
Stefan Holderbach 2024-03-30 14:03:31 +01:00 committed by GitHub
parent e889679d42
commit ce581a80a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu-protocol/src/value/mod.rs
View File

@ -1160,16 +1160,16 @@ impl Value {
let span = current.span(); let span = current.span();
match current { match current {
Value::Record { val, .. } => { Value::Record { mut val, .. } => {
// Make reverse iterate to avoid duplicate column leads to first value, actually last value is expected. // Make reverse iterate to avoid duplicate column leads to first value, actually last value is expected.
if let Some(found) = val.iter().rev().find(|x| { if let Some(found) = val.iter_mut().rev().find(|x| {
if insensitive { if insensitive {
x.0.eq_ignore_case(column_name) x.0.eq_ignore_case(column_name)
} else { } else {
x.0 == column_name x.0 == column_name
} }
}) { }) {
current = found.1.clone(); // TODO: avoid clone here current = std::mem::take(found.1);
} else if *optional { } else if *optional {
return Ok(Value::nothing(*origin_span)); // short-circuit return Ok(Value::nothing(*origin_span)); // short-circuit
} else if let Some(suggestion) = } else if let Some(suggestion) =
@ -1222,15 +1222,15 @@ impl Value {
.map(|val| { .map(|val| {
let val_span = val.span(); let val_span = val.span();
match val { match val {
Value::Record { val, .. } => { Value::Record { mut val, .. } => {
if let Some(found) = val.iter().rev().find(|x| { if let Some(found) = val.iter_mut().rev().find(|x| {
if insensitive { if insensitive {
x.0.eq_ignore_case(column_name) x.0.eq_ignore_case(column_name)
} else { } else {
x.0 == column_name x.0 == column_name
} }
}) { }) {
Ok(found.1.clone()) // TODO: avoid clone here Ok(std::mem::take(found.1))
} else if *optional { } else if *optional {
Ok(Value::nothing(*origin_span)) Ok(Value::nothing(*origin_span))
} else if let Some(suggestion) = } else if let Some(suggestion) =