2019-10-20 23:42:07 +00:00
|
|
|
use crate::commands::WholeStreamCommand;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
use crate::data::base::property_get::get_data_by_key;
|
|
|
|
use crate::data::{value, TaggedDictBuilder};
|
2019-10-20 23:42:07 +00:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, Value};
|
2019-11-21 14:33:14 +00:00
|
|
|
use nu_source::Tagged;
|
2019-10-20 23:42:07 +00:00
|
|
|
|
|
|
|
pub struct GroupBy;
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
pub struct GroupByArgs {
|
|
|
|
column_name: Tagged<String>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl WholeStreamCommand for GroupBy {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"group-by"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2019-10-28 05:15:35 +00:00
|
|
|
Signature::build("group-by").required(
|
|
|
|
"column_name",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"the name of the column to group by",
|
|
|
|
)
|
2019-10-20 23:42:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Creates a new table with the data from the table rows grouped by the column given."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
args.process(registry, group_by)?.run()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-29 21:04:31 +00:00
|
|
|
pub fn group_by(
|
2019-10-20 23:42:07 +00:00
|
|
|
GroupByArgs { column_name }: GroupByArgs,
|
|
|
|
RunnableContext { input, name, .. }: RunnableContext,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
let stream = async_stream! {
|
2019-11-21 14:33:14 +00:00
|
|
|
let values: Vec<Value> = input.values.collect().await;
|
2019-10-29 21:04:31 +00:00
|
|
|
|
|
|
|
if values.is_empty() {
|
|
|
|
yield Err(ShellError::labeled_error(
|
|
|
|
"Expected table from pipeline",
|
|
|
|
"requires a table input",
|
|
|
|
column_name.span()
|
|
|
|
))
|
|
|
|
} else {
|
|
|
|
match group(&column_name, values, name) {
|
|
|
|
Ok(grouped) => yield ReturnSuccess::value(grouped),
|
|
|
|
Err(err) => yield Err(err)
|
2019-10-22 05:00:06 +00:00
|
|
|
}
|
2019-10-20 23:42:07 +00:00
|
|
|
}
|
2019-10-29 21:04:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn group(
|
|
|
|
column_name: &Tagged<String>,
|
2019-11-21 14:33:14 +00:00
|
|
|
values: Vec<Value>,
|
2019-10-29 21:04:31 +00:00
|
|
|
tag: impl Into<Tag>,
|
2019-11-21 14:33:14 +00:00
|
|
|
) -> Result<Value, ShellError> {
|
2019-10-29 21:04:31 +00:00
|
|
|
let tag = tag.into();
|
|
|
|
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
let mut groups: indexmap::IndexMap<String, Vec<Value>> = indexmap::IndexMap::new();
|
2019-10-20 23:42:07 +00:00
|
|
|
|
2019-10-29 21:04:31 +00:00
|
|
|
for value in values {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
let group_key = get_data_by_key(&value, column_name.borrow_spanned());
|
2019-10-20 23:42:07 +00:00
|
|
|
|
2019-10-29 21:04:31 +00:00
|
|
|
if group_key.is_none() {
|
|
|
|
let possibilities = value.data_descriptors();
|
|
|
|
|
|
|
|
let mut possible_matches: Vec<_> = possibilities
|
|
|
|
.iter()
|
|
|
|
.map(|x| (natural::distance::levenshtein_distance(x, column_name), x))
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
possible_matches.sort();
|
|
|
|
|
|
|
|
if possible_matches.len() > 0 {
|
|
|
|
return Err(ShellError::labeled_error(
|
|
|
|
"Unknown column",
|
|
|
|
format!("did you mean '{}'?", possible_matches[0].1),
|
|
|
|
column_name.tag(),
|
|
|
|
));
|
|
|
|
} else {
|
|
|
|
return Err(ShellError::labeled_error(
|
|
|
|
"Unknown column",
|
|
|
|
"row does not contain this column",
|
|
|
|
column_name.tag(),
|
|
|
|
));
|
|
|
|
}
|
2019-10-20 23:42:07 +00:00
|
|
|
}
|
|
|
|
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
let group_key = group_key.unwrap().as_string()?.to_string();
|
2019-10-29 21:04:31 +00:00
|
|
|
let group = groups.entry(group_key).or_insert(vec![]);
|
|
|
|
group.push(value);
|
|
|
|
}
|
2019-10-20 23:42:07 +00:00
|
|
|
|
2019-10-29 21:04:31 +00:00
|
|
|
let mut out = TaggedDictBuilder::new(&tag);
|
|
|
|
|
|
|
|
for (k, v) in groups.iter() {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
out.insert_untagged(k, value::table(v));
|
2019-10-29 21:04:31 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
Ok(out.into_value())
|
2019-10-29 21:04:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use crate::commands::group_by::group;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
use crate::data::value;
|
2019-10-29 21:04:31 +00:00
|
|
|
use indexmap::IndexMap;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
use nu_protocol::Value;
|
2019-11-21 14:33:14 +00:00
|
|
|
use nu_source::*;
|
2019-10-29 21:04:31 +00:00
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
fn string(input: impl Into<String>) -> Value {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
value::string(input.into()).into_untagged_value()
|
2019-10-29 21:04:31 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
fn row(entries: IndexMap<String, Value>) -> Value {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
value::row(entries).into_untagged_value()
|
2019-10-29 21:04:31 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
fn table(list: &Vec<Value>) -> Value {
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
value::table(list).into_untagged_value()
|
2019-10-29 21:04:31 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
fn nu_releases_commiters() -> Vec<Value> {
|
2019-11-12 07:07:43 +00:00
|
|
|
vec![
|
2019-10-29 21:04:31 +00:00
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("August 23-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("August 23-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("October 10-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("Sept 24-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("October 10-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("Sept 24-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("October 10-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("Sept 24-2019")},
|
|
|
|
),
|
|
|
|
row(
|
|
|
|
indexmap! {"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("August 23-2019")},
|
|
|
|
),
|
2019-11-12 07:07:43 +00:00
|
|
|
]
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn groups_table_by_date_column() {
|
|
|
|
let for_key = String::from("date").tagged_unknown();
|
2019-10-29 21:04:31 +00:00
|
|
|
|
|
|
|
assert_eq!(
|
2019-11-12 07:07:43 +00:00
|
|
|
group(&for_key, nu_releases_commiters(), Tag::unknown()).unwrap(),
|
2019-10-29 21:04:31 +00:00
|
|
|
row(indexmap! {
|
|
|
|
"August 23-2019".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("August 23-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("August 23-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("August 23-2019")})
|
|
|
|
]),
|
|
|
|
"October 10-2019".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("October 10-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("October 10-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("October 10-2019")})
|
|
|
|
]),
|
|
|
|
"Sept 24-2019".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("Sept 24-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("Sept 24-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("Sept 24-2019")})
|
|
|
|
]),
|
|
|
|
})
|
|
|
|
);
|
|
|
|
}
|
2019-11-12 07:07:43 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn groups_table_by_country_column() {
|
|
|
|
let for_key = String::from("country").tagged_unknown();
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
group(&for_key, nu_releases_commiters(), Tag::unknown()).unwrap(),
|
|
|
|
row(indexmap! {
|
|
|
|
"EC".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("August 23-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("Sept 24-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("October 10-2019")})
|
|
|
|
]),
|
|
|
|
"NZ".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("August 23-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("October 10-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => string("Sept 24-2019")})
|
|
|
|
]),
|
|
|
|
"US".into() => table(&vec![
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("October 10-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("Sept 24-2019")}),
|
|
|
|
row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("August 23-2019")}),
|
|
|
|
]),
|
|
|
|
})
|
|
|
|
);
|
|
|
|
}
|
2019-10-20 23:42:07 +00:00
|
|
|
}
|