forked from extern/nushell
# 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
146 lines
3.8 KiB
Rust
146 lines
3.8 KiB
Rust
use crate::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::{Call, CellPath};
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Span;
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
|
};
|
|
use std::marker::PhantomData;
|
|
|
|
pub trait HashDigest: digest::Digest + Clone {
|
|
fn name() -> &'static str;
|
|
fn examples() -> Vec<Example<'static>>;
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct GenericDigest<D: HashDigest> {
|
|
name: String,
|
|
usage: String,
|
|
phantom: PhantomData<D>,
|
|
}
|
|
|
|
impl<D: HashDigest> Default for GenericDigest<D> {
|
|
fn default() -> Self {
|
|
Self {
|
|
name: format!("hash {}", D::name()),
|
|
usage: format!("Hash a value using the {} hash algorithm", D::name()),
|
|
phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(super) struct Arguments {
|
|
pub(super) cell_paths: Option<Vec<CellPath>>,
|
|
pub(super) binary: bool,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
impl<D> Command for GenericDigest<D>
|
|
where
|
|
D: HashDigest + Send + Sync + 'static,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.category(Category::Hash)
|
|
.input_output_types(vec![
|
|
(Type::String, Type::String),
|
|
(Type::String, Type::Binary),
|
|
])
|
|
.switch(
|
|
"binary",
|
|
"Output binary instead of hexadecimal representation",
|
|
Some('b'),
|
|
)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
format!("optionally {} hash data by cell path", D::name()),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
&self.usage
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example<'static>> {
|
|
D::examples()
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let binary = call.has_flag("binary");
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let args = Arguments { binary, cell_paths };
|
|
operate(
|
|
action::<D>,
|
|
args,
|
|
input,
|
|
call.head,
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
}
|
|
|
|
pub(super) fn action<D>(input: &Value, args: &Arguments, _span: Span) -> Value
|
|
where
|
|
D: HashDigest,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
let (bytes, span) = match input {
|
|
Value::String { val, span } => (val.as_bytes(), *span),
|
|
Value::Binary { val, span } => (val.as_slice(), *span),
|
|
// Propagate existing errors
|
|
Value::Error { .. } => return input.clone(),
|
|
other => {
|
|
let span = match input.span() {
|
|
Ok(span) => span,
|
|
Err(error) => {
|
|
return Value::Error {
|
|
error: Box::new(error),
|
|
}
|
|
}
|
|
};
|
|
|
|
return Value::Error {
|
|
error: Box::new(ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string or binary".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: span,
|
|
src_span: other.expect_span(),
|
|
}),
|
|
};
|
|
}
|
|
};
|
|
|
|
let digest = D::digest(bytes);
|
|
|
|
if args.binary {
|
|
Value::Binary {
|
|
val: digest.to_vec(),
|
|
span,
|
|
}
|
|
} else {
|
|
Value::String {
|
|
val: format!("{digest:x}"),
|
|
span,
|
|
}
|
|
}
|
|
}
|