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
175 lines
5.2 KiB
Rust
175 lines
5.2 KiB
Rust
use crate::date::utils::parse_date_from_string;
|
|
use chrono::{DateTime, Datelike, FixedOffset, Local, Timelike};
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError::DatetimeParseError, ShellError::PipelineEmpty,
|
|
Signature, Span, Value,
|
|
};
|
|
use nu_protocol::{ShellError, Type};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"date to-record"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("date to-record")
|
|
.input_output_types(vec![
|
|
(Type::Date, Type::Record(vec![])),
|
|
(Type::String, Type::Record(vec![])),
|
|
])
|
|
.allow_variants_without_examples(true) // https://github.com/nushell/nushell/issues/7032
|
|
.category(Category::Date)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert the date into a record."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["structured", "table"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(PipelineEmpty { dst_span: head });
|
|
}
|
|
input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
let example_result_1 = || {
|
|
let span = Span::test_data();
|
|
let cols = vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"day".into(),
|
|
"hour".into(),
|
|
"minute".into(),
|
|
"second".into(),
|
|
"nanosecond".into(),
|
|
"timezone".into(),
|
|
];
|
|
let vals = vec![
|
|
Value::Int { val: 2020, span },
|
|
Value::Int { val: 4, span },
|
|
Value::Int { val: 12, span },
|
|
Value::Int { val: 22, span },
|
|
Value::Int { val: 10, span },
|
|
Value::Int { val: 57, span },
|
|
Value::Int {
|
|
val: 123_000_000,
|
|
span,
|
|
},
|
|
Value::String {
|
|
val: "+02:00".to_string(),
|
|
span,
|
|
},
|
|
];
|
|
Some(Value::Record { cols, vals, span })
|
|
};
|
|
|
|
vec![
|
|
Example {
|
|
description: "Convert the current date into a record.",
|
|
example: "date to-record",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert the current date into a record.",
|
|
example: "date now | date to-record",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert a date string into a record.",
|
|
example: "'2020-04-12T22:10:57.123+02:00' | date to-record",
|
|
result: example_result_1(),
|
|
},
|
|
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
|
// Example {
|
|
// description: "Convert a date into a record.",
|
|
// example: "'2020-04-12 22:10:57 +0200' | into datetime | date to-record",
|
|
// result: example_result_1(),
|
|
// },
|
|
]
|
|
}
|
|
}
|
|
|
|
fn parse_date_into_table(date: Result<DateTime<FixedOffset>, Value>, head: Span) -> Value {
|
|
let cols = vec![
|
|
"year".into(),
|
|
"month".into(),
|
|
"day".into(),
|
|
"hour".into(),
|
|
"minute".into(),
|
|
"second".into(),
|
|
"nanosecond".into(),
|
|
"timezone".into(),
|
|
];
|
|
match date {
|
|
Ok(x) => {
|
|
let vals = vec![
|
|
Value::int(x.year() as i64, head),
|
|
Value::int(x.month() as i64, head),
|
|
Value::int(x.day() as i64, head),
|
|
Value::int(x.hour() as i64, head),
|
|
Value::int(x.minute() as i64, head),
|
|
Value::int(x.second() as i64, head),
|
|
Value::int(x.nanosecond() as i64, head),
|
|
Value::string(x.offset().to_string(), head),
|
|
];
|
|
Value::Record {
|
|
cols,
|
|
vals,
|
|
span: head,
|
|
}
|
|
}
|
|
Err(e) => e,
|
|
}
|
|
}
|
|
|
|
fn helper(val: Value, head: Span) -> Value {
|
|
match val {
|
|
Value::String {
|
|
val,
|
|
span: val_span,
|
|
} => {
|
|
let date = parse_date_from_string(&val, val_span);
|
|
parse_date_into_table(date, head)
|
|
}
|
|
Value::Nothing { span: _ } => {
|
|
let now = Local::now();
|
|
let n = now.with_timezone(now.offset());
|
|
parse_date_into_table(Ok(n), head)
|
|
}
|
|
Value::Date { val, span: _ } => parse_date_into_table(Ok(val), head),
|
|
_ => Value::Error {
|
|
error: Box::new(DatetimeParseError(val.debug_value(), head)),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|