Skip to content

minor: reduce error size #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timsaucer merged 1 commit into from
May 17, 2025
Merged

minor: reduce error size #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub type PyDataFusionResult<T> = std::result::Result<T, PyDataFusionError>;

#[derive(Debug)]
pub enum PyDataFusionError {
ExecutionError(InnerDataFusionError),
ExecutionError(Box<InnerDataFusionError>),
ArrowError(ArrowError),
Common(String),
PythonError(PyErr),
Expand All @@ -55,7 +55,7 @@ impl From<ArrowError> for PyDataFusionError {

impl From<InnerDataFusionError> for PyDataFusionError {
fn from(err: InnerDataFusionError) -> PyDataFusionError {
PyDataFusionError::ExecutionError(err)
PyDataFusionError::ExecutionError(Box::new(err))
}
}

Expand Down
14 changes: 6 additions & 8 deletions src/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ use datafusion::logical_expr::{
};

use crate::common::data_type::{DataTypeMap, NullTreatment, PyScalarValue, RexType};
use crate::errors::{
py_runtime_err, py_type_err, py_unsupported_variant_err, PyDataFusionError, PyDataFusionResult,
};
use crate::errors::{py_runtime_err, py_type_err, py_unsupported_variant_err, PyDataFusionResult};
use crate::expr::aggregate_expr::PyAggregateFunction;
use crate::expr::binary_expr::PyBinaryExpr;
use crate::expr::column::PyColumn;
Expand Down Expand Up @@ -622,11 +620,11 @@ impl PyExpr {
order_by,
null_treatment,
),
_ => Err(
PyDataFusionError::ExecutionError(datafusion::error::DataFusionError::Plan(
format!("Using {} with `over` is not allowed. Must use an aggregate or window function.", self.expr.variant_name()),
))
),
_ => Err(datafusion::error::DataFusionError::Plan(format!(
"Using {} with `over` is not allowed. Must use an aggregate or window function.",
self.expr.variant_name()
))
.into()),
}
}
}
Expand Down