# 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
142 lines
4.1 KiB
Rust
142 lines
4.1 KiB
Rust
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"math log"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math log")
|
|
.required(
|
|
"base",
|
|
SyntaxShape::Number,
|
|
"Base for which the logarithm should be computed",
|
|
)
|
|
.input_output_types(vec![(Type::Number, Type::Float)])
|
|
.vectorizes_over_list(true)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Returns the logarithm for an arbitrary base."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["base", "exponent", "inverse", "euler"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let base: Spanned<f64> = call.req(engine_state, stack, 0)?;
|
|
|
|
if base.item <= 0.0f64 {
|
|
return Err(ShellError::UnsupportedInput(
|
|
"Base has to be greater 0".into(),
|
|
"value originates from here".into(),
|
|
head,
|
|
base.span,
|
|
));
|
|
}
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
let base = base.item;
|
|
input.map(
|
|
move |value| operate(value, head, base),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Get the logarithm of 100 to the base 10",
|
|
example: "100 | math log 10",
|
|
result: Some(Value::test_float(2.0f64)),
|
|
},
|
|
Example {
|
|
example: "[16 8 4] | math log 2",
|
|
description: "Get the log2 of a list of values",
|
|
result: Some(Value::List {
|
|
vals: vec![
|
|
Value::test_float(4.0),
|
|
Value::test_float(3.0),
|
|
Value::test_float(2.0),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn operate(value: Value, head: Span, base: f64) -> Value {
|
|
match value {
|
|
numeric @ (Value::Int { .. } | Value::Float { .. }) => {
|
|
let (val, span) = match numeric {
|
|
Value::Int { val, span } => (val as f64, span),
|
|
Value::Float { val, span } => (val, span),
|
|
_ => unreachable!(),
|
|
};
|
|
|
|
if val <= 0.0 {
|
|
return Value::Error {
|
|
error: Box::new(ShellError::UnsupportedInput(
|
|
"'math log' undefined for values outside the open interval (0, Inf)."
|
|
.into(),
|
|
"value originates from here".into(),
|
|
head,
|
|
span,
|
|
)),
|
|
};
|
|
}
|
|
// Specialize for better precision/performance
|
|
let val = if base == 10.0 {
|
|
val.log10()
|
|
} else if base == 2.0 {
|
|
val.log2()
|
|
} else {
|
|
val.log(base)
|
|
};
|
|
|
|
Value::Float { val, span }
|
|
}
|
|
Value::Error { .. } => value,
|
|
other => Value::Error {
|
|
error: Box::new(ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "numeric".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: head,
|
|
src_span: other.expect_span(),
|
|
}),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|