mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 18:57:44 +02:00
Box ShellError
in Value::Error
(#8375)
# Description Our `ShellError` at the moment has a `std::mem::size_of<ShellError>` of 136 bytes (on AMD64). As a result `Value` directly storing the struct also required 136 bytes (thanks to alignment requirements). This change stores the `Value::Error` `ShellError` on the heap. Pro: - Value now needs just 80 bytes - Should be 1 cacheline less (still at least 2 cachelines) Con: - More small heap allocations when dealing with `Value::Error` - More heap fragmentation - Potential for additional required memcopies # Further code changes Includes a small refactor of `try` due to a type mismatch in its large match. # User-Facing Changes None for regular users. Plugin authors may have to update their matches on `Value` if they use `nu-protocol` Needs benchmarking to see if there is a benefit in real world workloads. **Update** small improvements in runtime for workloads with high volume of values. Significant reduction in maximum resident set size, when many values are held in memory. # Tests + Formatting
This commit is contained in:
committed by
GitHub
parent
c26d91fb61
commit
a52386e837
@ -98,7 +98,7 @@ fn to_url(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
|
||||
}
|
||||
}
|
||||
// Propagate existing errors
|
||||
Value::Error { error } => Err(error),
|
||||
Value::Error { error } => Err(*error),
|
||||
other => Err(ShellError::UnsupportedInput(
|
||||
"Expected a table from pipeline".to_string(),
|
||||
"value originates from here".into(),
|
||||
|
@ -100,12 +100,12 @@ fn action_all(input: &Value, _arg: &CellPathOnlyArgs, head: Span) -> Value {
|
||||
}
|
||||
Value::Error { .. } => input.clone(),
|
||||
_ => Value::Error {
|
||||
error: ShellError::OnlySupportsThisInputType {
|
||||
error: Box::new(ShellError::OnlySupportsThisInputType {
|
||||
exp_input_type: "string".into(),
|
||||
wrong_type: input.get_type().to_string(),
|
||||
dst_span: head,
|
||||
src_span: input.expect_span(),
|
||||
},
|
||||
}),
|
||||
},
|
||||
}
|
||||
}
|
||||
@ -121,12 +121,12 @@ fn action(input: &Value, _arg: &CellPathOnlyArgs, head: Span) -> Value {
|
||||
}
|
||||
Value::Error { .. } => input.clone(),
|
||||
_ => Value::Error {
|
||||
error: ShellError::OnlySupportsThisInputType {
|
||||
error: Box::new(ShellError::OnlySupportsThisInputType {
|
||||
exp_input_type: "string".into(),
|
||||
wrong_type: input.get_type().to_string(),
|
||||
dst_span: head,
|
||||
src_span: input.expect_span(),
|
||||
},
|
||||
}),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ impl Command for SubCommand {
|
||||
|
||||
url_components?.to_url(span)
|
||||
}
|
||||
Value::Error { error } => Err(error),
|
||||
Value::Error { error } => Err(*error),
|
||||
other => Err(ShellError::UnsupportedInput(
|
||||
"Expected a record from pipeline".to_string(),
|
||||
"value originates from here".into(),
|
||||
@ -164,7 +164,7 @@ impl UrlComponents {
|
||||
port: Some(val),
|
||||
..self
|
||||
}),
|
||||
Value::Error { error } => Err(error),
|
||||
Value::Error { error } => Err(*error),
|
||||
other => Err(ShellError::IncompatibleParametersSingle {
|
||||
msg: String::from(
|
||||
"Port parameter should be an unsigned integer or a string representing it",
|
||||
@ -211,7 +211,7 @@ impl UrlComponents {
|
||||
..self
|
||||
})
|
||||
}
|
||||
Value::Error { error } => Err(error),
|
||||
Value::Error { error } => Err(*error),
|
||||
other => Err(ShellError::IncompatibleParametersSingle {
|
||||
msg: String::from("Key params has to be a record"),
|
||||
span: other.expect_span(),
|
||||
|
Reference in New Issue
Block a user