forked from extern/nushell
All is a DataFrame (#3812)
* nuframe in its own type in UntaggedValue * Removed eager dataframe from enum * Dataframe created from list of values * Corrected order in dataframe columns * Returned tag from stream collection * Removed series from dataframe commands * Arithmetic operators * forced push * forced push * Replace all command * String commands * appending operations with dfs * Testing suite for dataframes * Unit test for dataframe commands * improved equality for dataframes
This commit is contained in:
@ -5,9 +5,7 @@ use nu_protocol::{Primitive, ShellTypeName, UntaggedValue, Value};
|
||||
use std::ops::Not;
|
||||
|
||||
#[cfg(feature = "dataframe")]
|
||||
use nu_data::dataframe::{compute_between_series, compute_series_single_value};
|
||||
#[cfg(feature = "dataframe")]
|
||||
use nu_protocol::dataframe::PolarsData;
|
||||
use nu_data::dataframe::{compute_between_dataframes, compute_series_single_value};
|
||||
|
||||
pub fn apply_operator(
|
||||
op: Operator,
|
||||
@ -15,13 +13,10 @@ pub fn apply_operator(
|
||||
right: &Value,
|
||||
) -> Result<UntaggedValue, (&'static str, &'static str)> {
|
||||
#[cfg(feature = "dataframe")]
|
||||
if let (
|
||||
UntaggedValue::DataFrame(PolarsData::Series(_)),
|
||||
UntaggedValue::DataFrame(PolarsData::Series(_)),
|
||||
) = (&left.value, &right.value)
|
||||
if let (UntaggedValue::DataFrame(_), UntaggedValue::DataFrame(_)) = (&left.value, &right.value)
|
||||
{
|
||||
return compute_between_series(op, left, right);
|
||||
} else if let (UntaggedValue::DataFrame(PolarsData::Series(_)), UntaggedValue::Primitive(_)) =
|
||||
return compute_between_dataframes(op, left, right);
|
||||
} else if let (UntaggedValue::DataFrame(_), UntaggedValue::Primitive(_)) =
|
||||
(&left.value, &right.value)
|
||||
{
|
||||
return compute_series_single_value(op, left, right);
|
||||
|
Reference in New Issue
Block a user