# 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>
148 lines
4.9 KiB
Rust
148 lines
4.9 KiB
Rust
use crate::dataframe::values::{Column, NuDataFrame, NuExpression, NuWhen};
|
|
use nu_engine::command_prelude::*;
|
|
|
|
use polars::prelude::when;
|
|
|
|
#[derive(Clone)]
|
|
pub struct ExprWhen;
|
|
|
|
impl Command for ExprWhen {
|
|
fn name(&self) -> &str {
|
|
"dfr when"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Creates and modifies a when expression."
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.required(
|
|
"when expression",
|
|
SyntaxShape::Any,
|
|
"when expression used for matching",
|
|
)
|
|
.required(
|
|
"then expression",
|
|
SyntaxShape::Any,
|
|
"expression that will be applied when predicate is true",
|
|
)
|
|
.input_output_type(
|
|
Type::Custom("expression".into()),
|
|
Type::Custom("expression".into()),
|
|
)
|
|
.category(Category::Custom("expression".into()))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Create a when conditions",
|
|
example: "dfr when ((dfr col a) > 2) 4",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Create a when conditions",
|
|
example: "dfr when ((dfr col a) > 2) 4 | dfr when ((dfr col a) < 0) 6",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Create a new column for the dataframe",
|
|
example: r#"[[a b]; [6 2] [1 4] [4 1]]
|
|
| dfr into-lazy
|
|
| dfr with-column (
|
|
dfr when ((dfr col a) > 2) 4 | dfr otherwise 5 | dfr as c
|
|
)
|
|
| dfr with-column (
|
|
dfr when ((dfr col a) > 5) 10 | dfr when ((dfr col a) < 2) 6 | dfr otherwise 0 | dfr as d
|
|
)
|
|
| dfr collect"#,
|
|
result: Some(
|
|
NuDataFrame::try_from_columns(
|
|
vec![
|
|
Column::new(
|
|
"a".to_string(),
|
|
vec![Value::test_int(6), Value::test_int(1), Value::test_int(4)],
|
|
),
|
|
Column::new(
|
|
"b".to_string(),
|
|
vec![Value::test_int(2), Value::test_int(4), Value::test_int(1)],
|
|
),
|
|
Column::new(
|
|
"c".to_string(),
|
|
vec![Value::test_int(4), Value::test_int(5), Value::test_int(4)],
|
|
),
|
|
Column::new(
|
|
"d".to_string(),
|
|
vec![Value::test_int(10), Value::test_int(6), Value::test_int(0)],
|
|
),
|
|
],
|
|
None,
|
|
)
|
|
.expect("simple df for test should not fail")
|
|
.into_value(Span::test_data()),
|
|
),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["condition", "match", "if", "else"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let when_predicate: Value = call.req(engine_state, stack, 0)?;
|
|
let when_predicate = NuExpression::try_from_value(when_predicate)?;
|
|
|
|
let then_predicate: Value = call.req(engine_state, stack, 1)?;
|
|
let then_predicate = NuExpression::try_from_value(then_predicate)?;
|
|
|
|
let value = input.into_value(call.head)?;
|
|
let when_then: NuWhen = match value {
|
|
Value::Nothing { .. } => when(when_predicate.into_polars())
|
|
.then(then_predicate.into_polars())
|
|
.into(),
|
|
v => match NuWhen::try_from_value(v)? {
|
|
NuWhen::Then(when_then) => when_then
|
|
.when(when_predicate.into_polars())
|
|
.then(then_predicate.into_polars())
|
|
.into(),
|
|
NuWhen::ChainedThen(when_then_then) => when_then_then
|
|
.when(when_predicate.into_polars())
|
|
.then(then_predicate.into_polars())
|
|
.into(),
|
|
},
|
|
};
|
|
|
|
Ok(PipelineData::Value(when_then.into_value(call.head), None))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::super::super::test_dataframe::test_dataframe;
|
|
use crate::dataframe::eager::{ToNu, WithColumn};
|
|
use crate::dataframe::expressions::otherwise::ExprOtherwise;
|
|
use crate::dataframe::expressions::{ExprAlias, ExprCol};
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
test_dataframe(vec![
|
|
Box::new(WithColumn {}),
|
|
Box::new(ExprCol {}),
|
|
Box::new(ExprAlias {}),
|
|
Box::new(ExprWhen {}),
|
|
Box::new(ExprOtherwise {}),
|
|
Box::new(ToNu {}),
|
|
])
|
|
}
|
|
}
|