extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-18 03:21:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow custom value operations to work on eager and lazy dataframes interchangeably. (#12819)

Browse Source 
Fixes Bug #12809 

The example that @maxim-uvarov posted now works as expected:

<img width="1223" alt="Screenshot 2024-05-09 at 16 21 01"
src="https://github.com/nushell/nushell/assets/56345/a4df62e3-e432-4c09-8e25-9a6c198741a3">
This commit is contained in:
Jack Wright 2024-05-13 16:17:31 -07:00 committed by GitHub
parent aaf973bbba
commit 98369985b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
View File

@ -27,7 +27,7 @@ impl NuDataFrame {
let rhs_span = right.span(); let rhs_span = right.span();
match right { match right {
Value::Custom { .. } => { Value::Custom { .. } => {
let rhs = NuDataFrame::try_from_value(plugin, right)?; let rhs = NuDataFrame::try_from_value_coerce(plugin, right, rhs_span)?;
match (self.is_series(), rhs.is_series()) { match (self.is_series(), rhs.is_series()) {
(true, true) => { (true, true) => {

48
crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
View File

@ -7,7 +7,7 @@ use uuid::Uuid;
use crate::{ use crate::{
values::{CustomValueSupport, NuDataFrame, PolarsPluginCustomValue}, values::{CustomValueSupport, NuDataFrame, PolarsPluginCustomValue},
PolarsPlugin, Cacheable, PolarsPlugin,
}; };
use super::NuLazyFrame; use super::NuLazyFrame;
@ -76,11 +76,49 @@ impl PolarsPluginCustomValue for NuLazyFrameCustomValue {
_engine: &EngineInterface, _engine: &EngineInterface,
other_value: Value, other_value: Value,
) -> Result<Option<Ordering>, ShellError> { ) -> Result<Option<Ordering>, ShellError> {
// to compare, we need to convert to NuDataframe let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
let df = NuLazyFrame::try_from_custom_value(plugin, self)?;
let df = df.collect(other_value.span())?;
let other = NuDataFrame::try_from_value_coerce(plugin, &other_value, other_value.span())?; let other = NuDataFrame::try_from_value_coerce(plugin, &other_value, other_value.span())?;
let res = df.is_equal(&other); let res = eager.is_equal(&other);
Ok(res) Ok(res)
} }
fn custom_value_operation(
&self,
plugin: &PolarsPlugin,
engine: &EngineInterface,
lhs_span: Span,
operator: nu_protocol::Spanned<nu_protocol::ast::Operator>,
right: Value,
) -> Result<Value, ShellError> {
let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
Ok(eager
.compute_with_value(plugin, lhs_span, operator.item, operator.span, &right)?
.cache(plugin, engine, lhs_span)?
.into_value(lhs_span))
}
fn custom_value_follow_path_int(
&self,
plugin: &PolarsPlugin,
_engine: &EngineInterface,
_self_span: Span,
index: nu_protocol::Spanned<usize>,
) -> Result<Value, ShellError> {
let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
eager.get_value(index.item, index.span)
}
fn custom_value_follow_path_string(
&self,
plugin: &PolarsPlugin,
engine: &EngineInterface,
self_span: Span,
column_name: nu_protocol::Spanned<String>,
) -> Result<Value, ShellError> {
let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
let column = eager.column(&column_name.item, self_span)?;
Ok(column
.cache(plugin, engine, self_span)?
.into_value(self_span))
}
} }