2019-08-19 07:16:39 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-07-24 00:22:11 +02:00
|
|
|
use crate::context::CommandRegistry;
|
2019-05-15 20:14:51 +02: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 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-01-11 07:45:09 +01:00
|
|
|
use nu_protocol::{
|
|
|
|
ColumnPath, PathMember, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape,
|
|
|
|
TaggedDictBuilder, UnspannedPathMember, UntaggedValue, Value,
|
|
|
|
};
|
|
|
|
use nu_source::span_for_spanned_list;
|
|
|
|
use nu_value_ext::{as_string, get_data_by_column_path};
|
2019-05-15 20:14:51 +02:00
|
|
|
|
2019-08-20 05:15:05 +02:00
|
|
|
#[derive(Deserialize)]
|
2020-05-07 13:03:43 +02:00
|
|
|
struct SelectArgs {
|
2020-01-11 07:45:09 +01:00
|
|
|
rest: Vec<ColumnPath>,
|
2019-08-20 05:15:05 +02:00
|
|
|
}
|
|
|
|
|
2020-05-07 13:03:43 +02:00
|
|
|
pub struct Select;
|
2019-08-19 07:16:39 +02:00
|
|
|
|
2020-05-07 13:03:43 +02:00
|
|
|
impl WholeStreamCommand for Select {
|
2019-08-19 07:16:39 +02:00
|
|
|
fn name(&self) -> &str {
|
2020-05-07 13:03:43 +02:00
|
|
|
"select"
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
2019-07-24 00:22:11 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
fn signature(&self) -> Signature {
|
2020-05-07 13:03:43 +02:00
|
|
|
Signature::build("select").rest(
|
2020-01-11 07:45:09 +01:00
|
|
|
SyntaxShape::ColumnPath,
|
|
|
|
"the columns to select from the table",
|
|
|
|
)
|
2019-05-22 09:12:03 +02:00
|
|
|
}
|
2019-08-21 14:08:23 +02:00
|
|
|
|
2019-08-30 00:52:32 +02:00
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Down-select table to only these columns."
|
|
|
|
}
|
|
|
|
|
2019-08-21 14:08:23 +02:00
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-05-07 13:03:43 +02:00
|
|
|
args.process(registry, select)?.run()
|
2019-08-21 14:08:23 +02:00
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
|
2020-05-07 13:03:43 +02:00
|
|
|
fn select(
|
|
|
|
SelectArgs { rest: mut fields }: SelectArgs,
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 05:30:44 +02:00
|
|
|
RunnableContext {
|
|
|
|
mut input, name, ..
|
|
|
|
}: RunnableContext,
|
2019-08-20 05:15:05 +02:00
|
|
|
) -> Result<OutputStream, ShellError> {
|
2019-12-06 16:28:26 +01:00
|
|
|
if fields.is_empty() {
|
2019-08-20 08:11:11 +02:00
|
|
|
return Err(ShellError::labeled_error(
|
2020-05-07 13:03:43 +02:00
|
|
|
"Select requires columns to select",
|
2019-08-20 08:11:11 +02:00
|
|
|
"needs parameter",
|
|
|
|
name,
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
2020-01-11 07:45:09 +01:00
|
|
|
let member = fields.remove(0);
|
|
|
|
let member = vec![member];
|
|
|
|
|
|
|
|
let column_paths = vec![&member, &fields]
|
|
|
|
.into_iter()
|
|
|
|
.flatten()
|
|
|
|
.cloned()
|
|
|
|
.collect::<Vec<ColumnPath>>();
|
2019-05-15 20:14:51 +02:00
|
|
|
|
2020-01-07 05:06:48 +01:00
|
|
|
let stream = async_stream! {
|
|
|
|
let mut empty = true;
|
2020-01-11 07:45:09 +01:00
|
|
|
let mut bring_back: indexmap::IndexMap<String, Vec<Value>> = indexmap::IndexMap::new();
|
2020-01-07 05:06:48 +01:00
|
|
|
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 05:30:44 +02:00
|
|
|
while let Some(value) = input.next().await {
|
2020-01-11 07:45:09 +01:00
|
|
|
for path in &column_paths {
|
|
|
|
let path_members_span = span_for_spanned_list(path.members().iter().map(|p| p.span));
|
|
|
|
|
|
|
|
let fetcher = get_data_by_column_path(&value, &path, Box::new(move |(obj_source, path_member_tried, error)| {
|
|
|
|
if let PathMember { unspanned: UnspannedPathMember::String(column), .. } = path_member_tried {
|
|
|
|
return ShellError::labeled_error_with_secondary(
|
|
|
|
"No data to fetch.",
|
2020-05-07 13:03:43 +02:00
|
|
|
format!("Couldn't select column \"{}\"", column),
|
2020-01-11 07:45:09 +01:00
|
|
|
path_member_tried.span,
|
2020-03-13 18:23:41 +01:00
|
|
|
format!("How about exploring it with \"get\"? Check the input is appropriate originating from here"),
|
2020-01-11 07:45:09 +01:00
|
|
|
obj_source.tag.span)
|
|
|
|
}
|
|
|
|
|
|
|
|
error
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
|
|
let field = path.clone();
|
|
|
|
let key = as_string(&UntaggedValue::Primitive(Primitive::ColumnPath(field.clone())).into_untagged_value())?;
|
|
|
|
|
|
|
|
match fetcher {
|
|
|
|
Ok(results) => {
|
|
|
|
match results.value {
|
|
|
|
UntaggedValue::Table(records) => {
|
|
|
|
for x in records {
|
|
|
|
let mut out = TaggedDictBuilder::new(name.clone());
|
|
|
|
out.insert_untagged(&key, x.value.clone());
|
|
|
|
let group = bring_back.entry(key.clone()).or_insert(vec![]);
|
|
|
|
group.push(out.into_value());
|
|
|
|
}
|
|
|
|
},
|
|
|
|
x => {
|
|
|
|
let mut out = TaggedDictBuilder::new(name.clone());
|
|
|
|
out.insert_untagged(&key, x.clone());
|
|
|
|
let group = bring_back.entry(key.clone()).or_insert(vec![]);
|
|
|
|
group.push(out.into_value());
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(reason) => {
|
|
|
|
// At the moment, we can't add switches, named flags
|
|
|
|
// and the like while already using .rest since it
|
|
|
|
// breaks the parser.
|
|
|
|
//
|
|
|
|
// We allow flexibility for now and skip the error
|
|
|
|
// if a given column isn't present.
|
|
|
|
let strict: Option<bool> = None;
|
|
|
|
|
|
|
|
if strict.is_some() {
|
|
|
|
yield Err(reason);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
bring_back.entry(key.clone()).or_insert(vec![]);
|
|
|
|
}
|
2020-01-07 05:06:48 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-11 07:45:09 +01:00
|
|
|
let mut max = 0;
|
|
|
|
|
|
|
|
if let Some(max_column) = bring_back.values().max() {
|
|
|
|
max = max_column.len();
|
|
|
|
}
|
|
|
|
|
|
|
|
let keys = bring_back.keys().map(|x| x.clone()).collect::<Vec<String>>();
|
|
|
|
|
|
|
|
for mut current in 0..max {
|
|
|
|
let mut out = TaggedDictBuilder::new(name.clone());
|
|
|
|
|
|
|
|
for k in &keys {
|
|
|
|
let nothing = UntaggedValue::Primitive(Primitive::Nothing).into_untagged_value();
|
|
|
|
let subsets = bring_back.get(k);
|
|
|
|
|
|
|
|
match subsets {
|
|
|
|
Some(set) => {
|
|
|
|
match set.get(current) {
|
|
|
|
Some(row) => out.insert_untagged(k, row.get_data(k).borrow().clone()),
|
|
|
|
None => out.insert_untagged(k, nothing.clone()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => out.insert_untagged(k, nothing.clone()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
yield ReturnSuccess::value(out.into_value());
|
2020-01-07 05:06:48 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let stream: BoxStream<'static, ReturnValue> = stream.boxed();
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
2019-05-15 20:14:51 +02:00
|
|
|
}
|