mirror of
https://github.com/nushell/nushell
synced 2025-01-04 09:18:57 +00:00
2ad0fcb377
# Description Fix for data ambiguity noted in #8244. Basic change is to use nanosecond resolution for unix timestamps (stored in type Int). Previously, a timestamp might have seconds, milliseconds or nanoseconds, but it turned out there were overlaps in data ranges between different resolutions, so there wasn't always a unique mapping back to date/time. Due to higher precision, the *range* of dates that timestamps can map to is restricted. Unix timestamps with seconds resolution and 64 bit storage can cover all dates from the Big Bang to eternity. Timestamps with seconds resolution and 32 bit storage can only represent dates from 1901-12-13 through 2038-01-19. The nanoseconds resolution and 64 bit storage used with this fix can represent dates from 1677-09-21T00:12:44 to 2262-04-11T23:47:16, something of a compromise. # User-Facing Changes _(List of all changes that impact the user experience here. This helps us keep track of breaking changes.)_ ## `<datetime> | into int` Converts to nanosecond resolution ```rust 〉date now | into int 1678084730502126846 ``` This is the number of non-leap nanoseconds after the unix epoch date: 1970-01-01T00:00:00+00:00. Conversion fails for dates outside the supported range: ```rust 〉1492-10-12 | into int Error: nu:🐚:incorrect_value × Incorrect value. ╭─[entry #51:1:1] 1 │ 1492-10-12 | into int · ────┬─── · ╰── DateTime out of timestamp range 1677-09-21T00:12:43 and 2262-04-11T23:47:16 ╰──── ``` ## `<int> | into datetime` Can no longer fail or produce incorrect results for any 64-bit input: ```rust 〉0 | into datetime Thu, 01 Jan 1970 00:00:00 +0000 (53 years ago) 〉"7fffffffffffffff" | into int -r 16 | into datetime Fri, 11 Apr 2262 23:47:16 +0000 (in 239 years) 〉("7fffffffffffffff" | into int -r 16) * -1 | into datetime Tue, 21 Sep 1677 00:12:43 +0000 (345 years ago) ``` ## `<date> | date to-record` and `<date> | date to-table` Now both have a `nanosecond` field. ```rust 〉"7fffffffffffffff" | into int -r 16 | into datetime | date to-record ╭────────────┬───────────╮ │ year │ 2262 │ │ month │ 4 │ │ day │ 11 │ │ hour │ 23 │ │ minute │ 47 │ │ second │ 16 │ │ nanosecond │ 854775807 │ │ timezone │ +00:00 │ ╰────────────┴───────────╯ 〉"7fffffffffffffff" | into int -r 16 | into datetime | date to-table ╭───┬──────┬───────┬─────┬──────┬────────┬────────┬────────────┬──────────╮ │ # │ year │ month │ day │ hour │ minute │ second │ nanosecond │ timezone │ ├───┼──────┼───────┼─────┼──────┼────────┼────────┼────────────┼──────────┤ │ 0 │ 2262 │ 4 │ 11 │ 23 │ 47 │ 16 │ 854775807 │ +00:00 │ ╰───┴──────┴───────┴─────┴──────┴────────┴────────┴────────────┴──────────╯ ``` This change was not mandated by the OP problem, but it is nice to be able to see the nanosecond bits that were present in Nushell `date` type all along. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
179 lines
5.5 KiB
Rust
179 lines
5.5 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-table"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("date to-table")
|
|
.input_output_types(vec![
|
|
(Type::Date, Type::Table(vec![])),
|
|
(Type::String, Type::Table(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 structured table."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["structured"]
|
|
}
|
|
|
|
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: 789, span },
|
|
Value::String {
|
|
val: "+02:00".to_string(),
|
|
span,
|
|
},
|
|
];
|
|
Some(Value::List {
|
|
vals: vec![Value::Record { cols, vals, span }],
|
|
span,
|
|
})
|
|
};
|
|
|
|
vec![
|
|
Example {
|
|
description: "Convert the current date into a table.",
|
|
example: "date to-table",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert the date into a table.",
|
|
example: "date now | date to-table",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert a given date into a table.",
|
|
//todo: resolve https://github.com/bspeice/dtparse/issues/40, which truncates nanosec bits
|
|
// for now, change the example to use date literal rather than string conversion, as workaround
|
|
example: "2020-04-12T22:10:57.000000789+02:00 | date to-table",
|
|
result: example_result_1(),
|
|
},
|
|
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
|
// Example {
|
|
// description: "Convert a given date into a table.",
|
|
// example: "'2020-04-12 22:10:57 +0200' | into datetime | date to-table",
|
|
// 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::List {
|
|
vals: vec![Value::Record {
|
|
cols,
|
|
vals,
|
|
span: head,
|
|
}],
|
|
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: DatetimeParseError(val.debug_value(), head),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|