mirror of
https://github.com/nushell/nushell.git
synced 2025-05-22 23:51:18 +00:00
# Description This PR introduces a `ByteStream` type which is a `Read`-able stream of bytes. Internally, it has an enum over three different byte stream sources: ```rust pub enum ByteStreamSource { Read(Box<dyn Read + Send + 'static>), File(File), Child(ChildProcess), } ``` This is in comparison to the current `RawStream` type, which is an `Iterator<Item = Vec<u8>>` and has to allocate for each read chunk. Currently, `PipelineData::ExternalStream` serves a weird dual role where it is either external command output or a wrapper around `RawStream`. `ByteStream` makes this distinction more clear (via `ByteStreamSource`) and replaces `PipelineData::ExternalStream` in this PR: ```rust pub enum PipelineData { Empty, Value(Value, Option<PipelineMetadata>), ListStream(ListStream, Option<PipelineMetadata>), ByteStream(ByteStream, Option<PipelineMetadata>), } ``` The PR is relatively large, but a decent amount of it is just repetitive changes. This PR fixes #7017, fixes #10763, and fixes #12369. This PR also improves performance when piping external commands. Nushell should, in most cases, have competitive pipeline throughput compared to, e.g., bash. | Command | Before (MB/s) | After (MB/s) | Bash (MB/s) | | -------------------------------------------------- | -------------:| ------------:| -----------:| | `throughput \| rg 'x'` | 3059 | 3744 | 3739 | | `throughput \| nu --testbin relay o> /dev/null` | 3508 | 8087 | 8136 | # User-Facing Changes - This is a breaking change for the plugin communication protocol, because the `ExternalStreamInfo` was replaced with `ByteStreamInfo`. Plugins now only have to deal with a single input stream, as opposed to the previous three streams: stdout, stderr, and exit code. - The output of `describe` has been changed for external/byte streams. - Temporary breaking change: `bytes starts-with` no longer works with byte streams. This is to keep the PR smaller, and `bytes ends-with` already does not work on byte streams. - If a process core dumped, then instead of having a `Value::Error` in the `exit_code` column of the output returned from `complete`, it now is a `Value::Int` with the negation of the signal number. # After Submitting - Update docs and book as necessary - Release notes (e.g., plugin protocol changes) - Adapt/convert commands to work with byte streams (high priority is `str length`, `bytes starts-with`, and maybe `bytes ends-with`). - Refactor the `tee` code, Devyn has already done some work on this. --------- Co-authored-by: Devyn Cairns <devyn.cairns@gmail.com>
183 lines
5.9 KiB
Rust
183 lines
5.9 KiB
Rust
use crate::{
|
|
dataframe::{utils::extract_strings, values::NuLazyFrame},
|
|
values::CustomValueSupport,
|
|
PolarsPlugin,
|
|
};
|
|
|
|
use super::super::values::{Column, NuDataFrame};
|
|
|
|
use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
|
|
use nu_protocol::{
|
|
Category, Example, LabeledError, PipelineData, ShellError, Signature, Span, SyntaxShape, Type,
|
|
Value,
|
|
};
|
|
use polars::prelude::UniqueKeepStrategy;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Unique;
|
|
|
|
impl PluginCommand for Unique {
|
|
type Plugin = PolarsPlugin;
|
|
|
|
fn name(&self) -> &str {
|
|
"polars unique"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Returns unique values from a dataframe."
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.named(
|
|
"subset",
|
|
SyntaxShape::Any,
|
|
"Subset of column(s) to use to maintain rows (lazy df)",
|
|
Some('s'),
|
|
)
|
|
.switch(
|
|
"last",
|
|
"Keeps last unique value. Default keeps first value (lazy df)",
|
|
Some('l'),
|
|
)
|
|
.switch(
|
|
"maintain-order",
|
|
"Keep the same order as the original DataFrame (lazy df)",
|
|
Some('k'),
|
|
)
|
|
.input_output_type(
|
|
Type::Custom("dataframe".into()),
|
|
Type::Custom("dataframe".into()),
|
|
)
|
|
.category(Category::Custom("dataframe or lazyframe".into()))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Returns unique values from a series",
|
|
example: "[2 2 2 2 2] | polars into-df | polars unique",
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(
|
|
vec![Column::new("0".to_string(), vec![Value::test_int(2)])],
|
|
None,
|
|
)
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
Example {
|
|
description: "Returns unique values in a subset of lazyframe columns",
|
|
example: "[[a b c]; [1 2 1] [2 2 2] [3 2 1]] | polars into-df | polars unique --subset [b c] | polars collect",
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(
|
|
vec![
|
|
Column::new(
|
|
"a".to_string(),
|
|
vec![Value::test_int(1), Value::test_int(2)]
|
|
),
|
|
Column::new(
|
|
"b".to_string(),
|
|
vec![Value::test_int(2), Value::test_int(2)]
|
|
),
|
|
Column::new(
|
|
"c".to_string(),
|
|
vec![Value::test_int(1), Value::test_int(2)]
|
|
)
|
|
],
|
|
None,
|
|
)
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
Example {
|
|
description: "Returns unique values in a subset of lazyframe columns",
|
|
example: r#"[[a b c]; [1 2 1] [2 2 2] [3 2 1]]
|
|
| polars into-df
|
|
| polars unique --subset [b c] --last
|
|
| polars collect"#,
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(
|
|
vec![
|
|
Column::new(
|
|
"a".to_string(),
|
|
vec![Value::test_int(2), Value::test_int(3)]
|
|
),
|
|
Column::new(
|
|
"b".to_string(),
|
|
vec![Value::test_int(2), Value::test_int(2)]
|
|
),
|
|
Column::new(
|
|
"c".to_string(),
|
|
vec![Value::test_int(2), Value::test_int(1)]
|
|
)
|
|
],
|
|
None,
|
|
)
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
Example {
|
|
description: "Creates a is unique expression from a column",
|
|
example: "col a | unique",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
plugin: &Self::Plugin,
|
|
engine: &EngineInterface,
|
|
call: &EvaluatedCall,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, LabeledError> {
|
|
let value = input.into_value(call.head)?;
|
|
let df = NuLazyFrame::try_from_value_coerce(plugin, &value)?;
|
|
command_lazy(plugin, engine, call, df).map_err(LabeledError::from)
|
|
}
|
|
}
|
|
|
|
fn command_lazy(
|
|
plugin: &PolarsPlugin,
|
|
engine: &EngineInterface,
|
|
call: &EvaluatedCall,
|
|
lazy: NuLazyFrame,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let last = call.has_flag("last")?;
|
|
let maintain = call.has_flag("maintain-order")?;
|
|
|
|
let subset: Option<Value> = call.get_flag("subset")?;
|
|
let subset = match subset {
|
|
Some(value) => Some(extract_strings(value)?),
|
|
None => None,
|
|
};
|
|
|
|
let strategy = if last {
|
|
UniqueKeepStrategy::Last
|
|
} else {
|
|
UniqueKeepStrategy::First
|
|
};
|
|
|
|
let lazy = lazy.to_polars();
|
|
let lazy: NuLazyFrame = if maintain {
|
|
lazy.unique(subset, strategy).into()
|
|
} else {
|
|
lazy.unique_stable(subset, strategy).into()
|
|
};
|
|
lazy.to_pipeline_data(plugin, engine, call.head)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
use crate::test::test_polars_plugin_command;
|
|
|
|
#[test]
|
|
fn test_examples() -> Result<(), ShellError> {
|
|
test_polars_plugin_command(&Unique)
|
|
}
|
|
}
|