From 4a84a5576225eb168e6242dd8d55a166bcd2fe34 Mon Sep 17 00:00:00 2001 From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com> Date: Mon, 24 Nov 2025 16:08:23 +0200 Subject: [PATCH 1/3] chore: use internal_err macro in `assert_eq_or_internal_err` for backtrace --- datafusion/common/src/error.rs | 28 ++++++++++++------------ datafusion/common/src/utils/mod.rs | 2 +- datafusion/expr-common/src/statistics.rs | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/datafusion/common/src/error.rs b/datafusion/common/src/error.rs index 6a5cb31fe3fb..993dc0b322b6 100644 --- a/datafusion/common/src/error.rs +++ b/datafusion/common/src/error.rs @@ -768,10 +768,10 @@ impl DataFusionErrorBuilder { macro_rules! unwrap_or_internal_err { ($Value: ident) => { $Value.ok_or_else(|| { - DataFusionError::Internal(format!( + $crate::error::_internal_datafusion_err!( "{} should not be None", stringify!($Value) - )) + ) })? }; } @@ -789,19 +789,19 @@ macro_rules! unwrap_or_internal_err { macro_rules! assert_or_internal_err { ($cond:expr) => { if !$cond { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {}", stringify!($cond) - ))); + )); } }; ($cond:expr, $($arg:tt)+) => { if !$cond { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {}: {}", stringify!($cond), format!($($arg)+) - ))); + )); } }; } @@ -821,27 +821,27 @@ macro_rules! assert_eq_or_internal_err { let left_val = &$left; let right_val = &$right; if left_val != right_val { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {} == {} (left: {:?}, right: {:?})", stringify!($left), stringify!($right), left_val, right_val - ))); + )); } }}; ($left:expr, $right:expr, $($arg:tt)+) => {{ let left_val = &$left; let right_val = &$right; if left_val != right_val { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {} == {} (left: {:?}, right: {:?}): {}", stringify!($left), stringify!($right), left_val, right_val, format!($($arg)+) - ))); + )); } }}; } @@ -861,27 +861,27 @@ macro_rules! assert_ne_or_internal_err { let left_val = &$left; let right_val = &$right; if left_val == right_val { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {} != {} (left: {:?}, right: {:?})", stringify!($left), stringify!($right), left_val, right_val - ))); + )); } }}; ($left:expr, $right:expr, $($arg:tt)+) => {{ let left_val = &$left; let right_val = &$right; if left_val == right_val { - return Err(DataFusionError::Internal(format!( + return Err($crate::error::_internal_datafusion_err!( "Assertion failed: {} != {} (left: {:?}, right: {:?}): {}", stringify!($left), stringify!($right), left_val, right_val, format!($($arg)+) - ))); + )); } }}; } diff --git a/datafusion/common/src/utils/mod.rs b/datafusion/common/src/utils/mod.rs index 6e7396a7c577..99bdcb6f74fe 100644 --- a/datafusion/common/src/utils/mod.rs +++ b/datafusion/common/src/utils/mod.rs @@ -24,7 +24,7 @@ pub mod string_utils; use crate::assert_or_internal_err; use crate::error::{_exec_datafusion_err, _internal_datafusion_err}; -use crate::{DataFusionError, Result, ScalarValue}; +use crate::{Result, ScalarValue}; use arrow::array::{ cast::AsArray, Array, ArrayRef, FixedSizeListArray, LargeListArray, ListArray, OffsetSizeTrait, diff --git a/datafusion/expr-common/src/statistics.rs b/datafusion/expr-common/src/statistics.rs index 7961bf0872e4..7284673d9a8f 100644 --- a/datafusion/expr-common/src/statistics.rs +++ b/datafusion/expr-common/src/statistics.rs @@ -26,7 +26,7 @@ use arrow::datatypes::DataType; use datafusion_common::rounding::alter_fp_rounding_mode; use datafusion_common::{ assert_eq_or_internal_err, assert_ne_or_internal_err, assert_or_internal_err, - internal_err, not_impl_err, DataFusionError, Result, ScalarValue, + internal_err, not_impl_err, Result, ScalarValue, }; /// This object defines probabilistic distributions that encode uncertain From db486aa9f1ff0cadd89c130581023a76d76d6f5a Mon Sep 17 00:00:00 2001 From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com> Date: Mon, 24 Nov 2025 17:24:31 +0200 Subject: [PATCH 2/3] remove all imports due to clippy: error: unused import: `DataFusionError` --- datafusion/catalog-listing/src/helpers.rs | 4 +--- datafusion/datasource-parquet/src/access_plan.rs | 2 +- datafusion/datasource/src/memory.rs | 3 +-- datafusion/datasource/src/sink.rs | 2 +- datafusion/expr/src/expr_schema.rs | 4 +--- datafusion/expr/src/logical_plan/invariants.rs | 2 +- datafusion/expr/src/udf.rs | 3 +-- datafusion/functions-aggregate/src/array_agg.rs | 4 +--- datafusion/functions-aggregate/src/covariance.rs | 3 +-- datafusion/functions-aggregate/src/nth_value.rs | 2 +- datafusion/functions-aggregate/src/regr.rs | 3 +-- datafusion/functions-nested/src/position.rs | 2 +- datafusion/functions-nested/src/set_ops.rs | 3 +-- datafusion/functions/src/core/greatest.rs | 4 +--- datafusion/functions/src/core/greatest_least_utils.rs | 4 +--- datafusion/functions/src/core/least.rs | 4 +--- datafusion/functions/src/math/pi.rs | 2 +- datafusion/functions/src/math/random.rs | 2 +- datafusion/functions/src/string/uuid.rs | 2 +- datafusion/optimizer/src/decorrelate_predicate_subquery.rs | 4 +--- datafusion/optimizer/src/extract_equijoin_predicate.rs | 2 +- datafusion/optimizer/src/optimize_projections/mod.rs | 3 +-- datafusion/optimizer/src/push_down_filter.rs | 2 +- datafusion/optimizer/src/scalar_subquery_to_join.rs | 4 +--- datafusion/physical-expr-common/src/physical_expr.rs | 3 +-- datafusion/physical-expr/src/aggregate.rs | 3 +-- datafusion/physical-expr/src/analysis.rs | 2 +- datafusion/physical-expr/src/expressions/in_list.rs | 4 ++-- datafusion/physical-expr/src/expressions/like.rs | 2 +- datafusion/physical-expr/src/projection.rs | 2 +- datafusion/physical-optimizer/src/coalesce_batches.rs | 4 +--- .../enforce_sorting/replace_with_order_preserving_variants.rs | 2 +- datafusion/physical-optimizer/src/filter_pushdown.rs | 4 +--- datafusion/physical-plan/src/aggregates/mod.rs | 3 +-- datafusion/physical-plan/src/async_func.rs | 2 +- datafusion/physical-plan/src/coalesce/mod.rs | 2 +- datafusion/physical-plan/src/coalesce_partitions.rs | 4 +--- datafusion/physical-plan/src/coop.rs | 2 +- datafusion/physical-plan/src/empty.rs | 2 +- datafusion/physical-plan/src/explain.rs | 2 +- datafusion/physical-plan/src/joins/cross_join.rs | 3 +-- datafusion/physical-plan/src/joins/hash_join/exec.rs | 4 ++-- datafusion/physical-plan/src/joins/sort_merge_join/exec.rs | 4 ++-- datafusion/physical-plan/src/joins/symmetric_hash_join.rs | 4 ++-- datafusion/physical-plan/src/limit.rs | 4 +--- datafusion/physical-plan/src/memory.rs | 4 +--- datafusion/physical-plan/src/placeholder_row.rs | 2 +- datafusion/physical-plan/src/sorts/sort_preserving_merge.rs | 4 +--- datafusion/physical-plan/src/sorts/streaming_merge.rs | 2 +- datafusion/physical-plan/src/test.rs | 3 +-- datafusion/physical-plan/src/union.rs | 2 +- datafusion/physical-plan/src/windows/window_agg_exec.rs | 2 +- datafusion/physical-plan/src/work_table.rs | 4 +--- datafusion/proto/src/common.rs | 4 +--- datafusion/proto/src/logical_plan/mod.rs | 2 +- datafusion/pruning/src/pruning_predicate.rs | 2 +- datafusion/spark/src/function/math/modulus.rs | 4 +--- datafusion/spark/src/function/math/rint.rs | 1 - datafusion/sql/src/expr/identifier.rs | 3 +-- datafusion/sql/src/unparser/expr.rs | 2 +- datafusion/sql/src/utils.rs | 2 +- 61 files changed, 64 insertions(+), 111 deletions(-) diff --git a/datafusion/catalog-listing/src/helpers.rs b/datafusion/catalog-listing/src/helpers.rs index 5e69cf1a1402..34073338fbd7 100644 --- a/datafusion/catalog-listing/src/helpers.rs +++ b/datafusion/catalog-listing/src/helpers.rs @@ -21,9 +21,7 @@ use std::mem; use std::sync::Arc; use datafusion_catalog::Session; -use datafusion_common::{ - assert_or_internal_err, DataFusionError, HashMap, Result, ScalarValue, -}; +use datafusion_common::{assert_or_internal_err, HashMap, Result, ScalarValue}; use datafusion_datasource::ListingTableUrl; use datafusion_datasource::PartitionedFile; use datafusion_expr::{lit, utils, BinaryExpr, Operator}; diff --git a/datafusion/datasource-parquet/src/access_plan.rs b/datafusion/datasource-parquet/src/access_plan.rs index 295ecea9468e..7399a2cd0856 100644 --- a/datafusion/datasource-parquet/src/access_plan.rs +++ b/datafusion/datasource-parquet/src/access_plan.rs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_eq_or_internal_err, Result}; use parquet::arrow::arrow_reader::{RowSelection, RowSelector}; use parquet::file::metadata::RowGroupMetaData; diff --git a/datafusion/datasource/src/memory.rs b/datafusion/datasource/src/memory.rs index 036574ddd3c3..595b1bf6d426 100644 --- a/datafusion/datasource/src/memory.rs +++ b/datafusion/datasource/src/memory.rs @@ -30,8 +30,7 @@ use crate::source::{DataSource, DataSourceExec}; use arrow::array::{RecordBatch, RecordBatchOptions}; use arrow::datatypes::{Schema, SchemaRef}; use datafusion_common::{ - assert_or_internal_err, plan_err, project_schema, DataFusionError, Result, - ScalarValue, + assert_or_internal_err, plan_err, project_schema, Result, ScalarValue, }; use datafusion_execution::TaskContext; use datafusion_physical_expr::equivalence::project_orderings; diff --git a/datafusion/datasource/src/sink.rs b/datafusion/datasource/src/sink.rs index a4ab78d07840..f66fbc408c68 100644 --- a/datafusion/datasource/src/sink.rs +++ b/datafusion/datasource/src/sink.rs @@ -24,7 +24,7 @@ use std::sync::Arc; use arrow::array::{ArrayRef, RecordBatch, UInt64Array}; use arrow::datatypes::{DataType, Field, Schema, SchemaRef}; -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_eq_or_internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr::{Distribution, EquivalenceProperties}; use datafusion_physical_expr_common::sort_expr::{LexRequirement, OrderingRequirements}; diff --git a/datafusion/expr/src/expr_schema.rs b/datafusion/expr/src/expr_schema.rs index 94f5b0480b65..3ef61da91bd8 100644 --- a/datafusion/expr/src/expr_schema.rs +++ b/datafusion/expr/src/expr_schema.rs @@ -835,9 +835,7 @@ mod tests { use super::*; use crate::{and, col, lit, not, or, out_ref_col_with_metadata, when}; - use datafusion_common::{ - assert_or_internal_err, DFSchema, DataFusionError, ScalarValue, - }; + use datafusion_common::{assert_or_internal_err, DFSchema, ScalarValue}; macro_rules! test_is_expr_nullable { ($EXPR_TYPE:ident) => {{ diff --git a/datafusion/expr/src/logical_plan/invariants.rs b/datafusion/expr/src/logical_plan/invariants.rs index a416c7f7465c..1c2c8a2a936f 100644 --- a/datafusion/expr/src/logical_plan/invariants.rs +++ b/datafusion/expr/src/logical_plan/invariants.rs @@ -18,7 +18,7 @@ use datafusion_common::{ assert_or_internal_err, plan_err, tree_node::{TreeNode, TreeNodeRecursion}, - DFSchemaRef, DataFusionError, Result, + DFSchemaRef, Result, }; use crate::{ diff --git a/datafusion/expr/src/udf.rs b/datafusion/expr/src/udf.rs index 449ddf59094a..92caf5427d63 100644 --- a/datafusion/expr/src/udf.rs +++ b/datafusion/expr/src/udf.rs @@ -26,8 +26,7 @@ use crate::{ColumnarValue, Documentation, Expr, Signature}; use arrow::datatypes::{DataType, Field, FieldRef}; use datafusion_common::config::ConfigOptions; use datafusion_common::{ - assert_or_internal_err, not_impl_err, DataFusionError, ExprSchema, Result, - ScalarValue, + assert_or_internal_err, not_impl_err, ExprSchema, Result, ScalarValue, }; use datafusion_expr_common::dyn_eq::{DynEq, DynHash}; use datafusion_expr_common::interval_arithmetic::Interval; diff --git a/datafusion/functions-aggregate/src/array_agg.rs b/datafusion/functions-aggregate/src/array_agg.rs index f0ee7327b90e..4f5797c308f9 100644 --- a/datafusion/functions-aggregate/src/array_agg.rs +++ b/datafusion/functions-aggregate/src/array_agg.rs @@ -32,9 +32,7 @@ use datafusion_common::cast::as_list_array; use datafusion_common::utils::{ compare_rows, get_row_at_idx, take_function_args, SingleRowListArrayBuilder, }; -use datafusion_common::{ - assert_eq_or_internal_err, exec_err, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_eq_or_internal_err, exec_err, Result, ScalarValue}; use datafusion_expr::function::{AccumulatorArgs, StateFieldsArgs}; use datafusion_expr::utils::format_state_name; use datafusion_expr::{ diff --git a/datafusion/functions-aggregate/src/covariance.rs b/datafusion/functions-aggregate/src/covariance.rs index f74fddd60331..7e34ffbaad01 100644 --- a/datafusion/functions-aggregate/src/covariance.rs +++ b/datafusion/functions-aggregate/src/covariance.rs @@ -24,8 +24,7 @@ use arrow::{ datatypes::{DataType, Field}, }; use datafusion_common::{ - downcast_value, plan_err, unwrap_or_internal_err, DataFusionError, Result, - ScalarValue, + downcast_value, plan_err, unwrap_or_internal_err, Result, ScalarValue, }; use datafusion_expr::{ function::{AccumulatorArgs, StateFieldsArgs}, diff --git a/datafusion/functions-aggregate/src/nth_value.rs b/datafusion/functions-aggregate/src/nth_value.rs index adf3e47b7d5a..05026940fec4 100644 --- a/datafusion/functions-aggregate/src/nth_value.rs +++ b/datafusion/functions-aggregate/src/nth_value.rs @@ -28,7 +28,7 @@ use arrow::datatypes::{DataType, Field, FieldRef, Fields}; use datafusion_common::utils::{get_row_at_idx, SingleRowListArrayBuilder}; use datafusion_common::{ - assert_or_internal_err, exec_err, not_impl_err, DataFusionError, Result, ScalarValue, + assert_or_internal_err, exec_err, not_impl_err, Result, ScalarValue, }; use datafusion_expr::function::{AccumulatorArgs, StateFieldsArgs}; use datafusion_expr::utils::format_state_name; diff --git a/datafusion/functions-aggregate/src/regr.rs b/datafusion/functions-aggregate/src/regr.rs index 44ce0bd48ead..045cb9983843 100644 --- a/datafusion/functions-aggregate/src/regr.rs +++ b/datafusion/functions-aggregate/src/regr.rs @@ -26,8 +26,7 @@ use arrow::{ datatypes::Field, }; use datafusion_common::{ - downcast_value, plan_err, unwrap_or_internal_err, DataFusionError, HashMap, Result, - ScalarValue, + downcast_value, plan_err, unwrap_or_internal_err, HashMap, Result, ScalarValue, }; use datafusion_doc::aggregate_doc_sections::DOC_SECTION_STATISTICAL; use datafusion_expr::function::{AccumulatorArgs, StateFieldsArgs}; diff --git a/datafusion/functions-nested/src/position.rs b/datafusion/functions-nested/src/position.rs index 14f2ed3313d4..2844eefaf058 100644 --- a/datafusion/functions-nested/src/position.rs +++ b/datafusion/functions-nested/src/position.rs @@ -38,7 +38,7 @@ use datafusion_common::cast::{ as_generic_list_array, as_int64_array, as_large_list_array, as_list_array, }; use datafusion_common::{ - assert_or_internal_err, exec_err, utils::take_function_args, DataFusionError, Result, + assert_or_internal_err, exec_err, utils::take_function_args, Result, }; use itertools::Itertools; diff --git a/datafusion/functions-nested/src/set_ops.rs b/datafusion/functions-nested/src/set_ops.rs index e3531d1cf8ee..4350bfdc5a9b 100644 --- a/datafusion/functions-nested/src/set_ops.rs +++ b/datafusion/functions-nested/src/set_ops.rs @@ -30,8 +30,7 @@ use arrow::row::{RowConverter, SortField}; use datafusion_common::cast::{as_large_list_array, as_list_array}; use datafusion_common::utils::ListCoercion; use datafusion_common::{ - assert_eq_or_internal_err, exec_err, internal_err, utils::take_function_args, - DataFusionError, Result, + assert_eq_or_internal_err, exec_err, internal_err, utils::take_function_args, Result, }; use datafusion_expr::{ ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility, diff --git a/datafusion/functions/src/core/greatest.rs b/datafusion/functions/src/core/greatest.rs index 02491501dca6..95fd8e64d727 100644 --- a/datafusion/functions/src/core/greatest.rs +++ b/datafusion/functions/src/core/greatest.rs @@ -21,9 +21,7 @@ use arrow::buffer::BooleanBuffer; use arrow::compute::kernels::cmp; use arrow::compute::SortOptions; use arrow::datatypes::DataType; -use datafusion_common::{ - assert_eq_or_internal_err, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_eq_or_internal_err, Result, ScalarValue}; use datafusion_doc::Documentation; use datafusion_expr::{ColumnarValue, ScalarFunctionArgs}; use datafusion_expr::{ScalarUDFImpl, Signature, Volatility}; diff --git a/datafusion/functions/src/core/greatest_least_utils.rs b/datafusion/functions/src/core/greatest_least_utils.rs index 2a8666685621..78c6864d8c9f 100644 --- a/datafusion/functions/src/core/greatest_least_utils.rs +++ b/datafusion/functions/src/core/greatest_least_utils.rs @@ -18,9 +18,7 @@ use arrow::array::{Array, ArrayRef, BooleanArray}; use arrow::compute::kernels::zip::zip; use arrow::datatypes::DataType; -use datafusion_common::{ - assert_or_internal_err, plan_err, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_or_internal_err, plan_err, Result, ScalarValue}; use datafusion_expr_common::columnar_value::ColumnarValue; use datafusion_expr_common::type_coercion::binary::type_union_resolution; use std::sync::Arc; diff --git a/datafusion/functions/src/core/least.rs b/datafusion/functions/src/core/least.rs index 45e0d1c4cbc9..602cd4169a3f 100644 --- a/datafusion/functions/src/core/least.rs +++ b/datafusion/functions/src/core/least.rs @@ -21,9 +21,7 @@ use arrow::buffer::BooleanBuffer; use arrow::compute::kernels::cmp; use arrow::compute::SortOptions; use arrow::datatypes::DataType; -use datafusion_common::{ - assert_eq_or_internal_err, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_eq_or_internal_err, Result, ScalarValue}; use datafusion_doc::Documentation; use datafusion_expr::{ColumnarValue, ScalarFunctionArgs}; use datafusion_expr::{ScalarUDFImpl, Signature, Volatility}; diff --git a/datafusion/functions/src/math/pi.rs b/datafusion/functions/src/math/pi.rs index dcb2886a3bab..92a27932e164 100644 --- a/datafusion/functions/src/math/pi.rs +++ b/datafusion/functions/src/math/pi.rs @@ -19,7 +19,7 @@ use std::any::Any; use arrow::datatypes::DataType; use arrow::datatypes::DataType::Float64; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result, ScalarValue}; +use datafusion_common::{assert_or_internal_err, Result, ScalarValue}; use datafusion_expr::sort_properties::{ExprProperties, SortProperties}; use datafusion_expr::{ ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature, diff --git a/datafusion/functions/src/math/random.rs b/datafusion/functions/src/math/random.rs index 77067d39dca8..4270eff66572 100644 --- a/datafusion/functions/src/math/random.rs +++ b/datafusion/functions/src/math/random.rs @@ -23,7 +23,7 @@ use arrow::datatypes::DataType; use arrow::datatypes::DataType::Float64; use rand::{rng, Rng}; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_expr::{ColumnarValue, ScalarFunctionArgs}; use datafusion_expr::{Documentation, ScalarUDFImpl, Signature, Volatility}; use datafusion_macros::user_doc; diff --git a/datafusion/functions/src/string/uuid.rs b/datafusion/functions/src/string/uuid.rs index 6a8585a19242..96ce9439028c 100644 --- a/datafusion/functions/src/string/uuid.rs +++ b/datafusion/functions/src/string/uuid.rs @@ -24,7 +24,7 @@ use arrow::datatypes::DataType::Utf8; use rand::Rng; use uuid::Uuid; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_expr::{ColumnarValue, Documentation, Volatility}; use datafusion_expr::{ScalarFunctionArgs, ScalarUDFImpl, Signature}; use datafusion_macros::user_doc; diff --git a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs index c9cc33708bb5..0590aba52bfa 100644 --- a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs +++ b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs @@ -27,9 +27,7 @@ use crate::{OptimizerConfig, OptimizerRule}; use datafusion_common::alias::AliasGenerator; use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode}; -use datafusion_common::{ - assert_or_internal_err, plan_err, Column, DataFusionError, Result, -}; +use datafusion_common::{assert_or_internal_err, plan_err, Column, Result}; use datafusion_expr::expr::{Exists, InSubquery}; use datafusion_expr::expr_rewriter::create_col_from_scalar_expr; use datafusion_expr::logical_plan::{JoinType, Subquery}; diff --git a/datafusion/optimizer/src/extract_equijoin_predicate.rs b/datafusion/optimizer/src/extract_equijoin_predicate.rs index b5256a338bb7..9228e84abf93 100644 --- a/datafusion/optimizer/src/extract_equijoin_predicate.rs +++ b/datafusion/optimizer/src/extract_equijoin_predicate.rs @@ -19,7 +19,7 @@ use crate::optimizer::ApplyOrder; use crate::{OptimizerConfig, OptimizerRule}; use datafusion_common::tree_node::Transformed; -use datafusion_common::{assert_or_internal_err, DFSchema, DataFusionError}; +use datafusion_common::{assert_or_internal_err, DFSchema}; use datafusion_common::{NullEquality, Result}; use datafusion_expr::utils::split_conjunction_owned; use datafusion_expr::utils::{can_hash, find_valid_equijoin_key_pair}; diff --git a/datafusion/optimizer/src/optimize_projections/mod.rs b/datafusion/optimizer/src/optimize_projections/mod.rs index 60343ff2ec2a..ee7b006a2d49 100644 --- a/datafusion/optimizer/src/optimize_projections/mod.rs +++ b/datafusion/optimizer/src/optimize_projections/mod.rs @@ -26,8 +26,7 @@ use std::sync::Arc; use datafusion_common::{ assert_eq_or_internal_err, get_required_group_by_exprs_indices, - internal_datafusion_err, internal_err, Column, DFSchema, DataFusionError, HashMap, - JoinType, Result, + internal_datafusion_err, internal_err, Column, DFSchema, HashMap, JoinType, Result, }; use datafusion_expr::expr::Alias; use datafusion_expr::{ diff --git a/datafusion/optimizer/src/push_down_filter.rs b/datafusion/optimizer/src/push_down_filter.rs index a38cd7a75bc1..ea0980ad4e1c 100644 --- a/datafusion/optimizer/src/push_down_filter.rs +++ b/datafusion/optimizer/src/push_down_filter.rs @@ -29,7 +29,7 @@ use datafusion_common::tree_node::{ }; use datafusion_common::{ assert_eq_or_internal_err, assert_or_internal_err, internal_err, plan_err, - qualified_name, Column, DFSchema, DataFusionError, Result, + qualified_name, Column, DFSchema, Result, }; use datafusion_expr::expr::WindowFunction; use datafusion_expr::expr_rewriter::replace_col; diff --git a/datafusion/optimizer/src/scalar_subquery_to_join.rs b/datafusion/optimizer/src/scalar_subquery_to_join.rs index dd27ded58699..2df1be1b7f0b 100644 --- a/datafusion/optimizer/src/scalar_subquery_to_join.rs +++ b/datafusion/optimizer/src/scalar_subquery_to_join.rs @@ -30,9 +30,7 @@ use datafusion_common::alias::AliasGenerator; use datafusion_common::tree_node::{ Transformed, TransformedResult, TreeNode, TreeNodeRecursion, TreeNodeRewriter, }; -use datafusion_common::{ - assert_or_internal_err, plan_err, Column, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_or_internal_err, plan_err, Column, Result, ScalarValue}; use datafusion_expr::expr_rewriter::create_col_from_scalar_expr; use datafusion_expr::logical_plan::{JoinType, Subquery}; use datafusion_expr::utils::conjunction; diff --git a/datafusion/physical-expr-common/src/physical_expr.rs b/datafusion/physical-expr-common/src/physical_expr.rs index efdd6fcb6265..f7f632687652 100644 --- a/datafusion/physical-expr-common/src/physical_expr.rs +++ b/datafusion/physical-expr-common/src/physical_expr.rs @@ -31,8 +31,7 @@ use datafusion_common::tree_node::{ Transformed, TransformedResult, TreeNode, TreeNodeRecursion, }; use datafusion_common::{ - assert_eq_or_internal_err, exec_err, not_impl_err, DataFusionError, Result, - ScalarValue, + assert_eq_or_internal_err, exec_err, not_impl_err, Result, ScalarValue, }; use datafusion_expr_common::columnar_value::ColumnarValue; use datafusion_expr_common::interval_arithmetic::Interval; diff --git a/datafusion/physical-expr/src/aggregate.rs b/datafusion/physical-expr/src/aggregate.rs index ae5a4a855947..f16895b44bf5 100644 --- a/datafusion/physical-expr/src/aggregate.rs +++ b/datafusion/physical-expr/src/aggregate.rs @@ -42,8 +42,7 @@ use crate::expressions::Column; use arrow::compute::SortOptions; use arrow::datatypes::{DataType, FieldRef, Schema, SchemaRef}; use datafusion_common::{ - assert_or_internal_err, internal_err, not_impl_err, DataFusionError, Result, - ScalarValue, + assert_or_internal_err, internal_err, not_impl_err, Result, ScalarValue, }; use datafusion_expr::{AggregateUDF, ReversedUDAF, SetMonotonicity}; use datafusion_expr_common::accumulator::Accumulator; diff --git a/datafusion/physical-expr/src/analysis.rs b/datafusion/physical-expr/src/analysis.rs index 981acbb779b6..166e639966f1 100644 --- a/datafusion/physical-expr/src/analysis.rs +++ b/datafusion/physical-expr/src/analysis.rs @@ -29,7 +29,7 @@ use arrow::datatypes::Schema; use datafusion_common::stats::Precision; use datafusion_common::{ assert_or_internal_err, internal_datafusion_err, internal_err, ColumnStatistics, - DataFusionError, Result, ScalarValue, + Result, ScalarValue, }; use datafusion_expr::interval_arithmetic::{cardinality_ratio, Interval}; diff --git a/datafusion/physical-expr/src/expressions/in_list.rs b/datafusion/physical-expr/src/expressions/in_list.rs index 95029c1efe74..bb033aac03ed 100644 --- a/datafusion/physical-expr/src/expressions/in_list.rs +++ b/datafusion/physical-expr/src/expressions/in_list.rs @@ -33,8 +33,8 @@ use arrow::datatypes::*; use arrow::util::bit_iterator::BitIndexIterator; use datafusion_common::hash_utils::with_hashes; use datafusion_common::{ - assert_or_internal_err, exec_datafusion_err, exec_err, DFSchema, DataFusionError, - HashSet, Result, ScalarValue, + assert_or_internal_err, exec_datafusion_err, exec_err, DFSchema, HashSet, Result, + ScalarValue, }; use datafusion_expr::{expr_vec_fmt, ColumnarValue}; diff --git a/datafusion/physical-expr/src/expressions/like.rs b/datafusion/physical-expr/src/expressions/like.rs index 3046e8a028a8..5502def5820f 100644 --- a/datafusion/physical-expr/src/expressions/like.rs +++ b/datafusion/physical-expr/src/expressions/like.rs @@ -18,7 +18,7 @@ use crate::PhysicalExpr; use arrow::datatypes::{DataType, Schema}; use arrow::record_batch::RecordBatch; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_expr::{ColumnarValue, Operator}; use datafusion_physical_expr_common::datum::apply_cmp; use std::hash::Hash; diff --git a/datafusion/physical-expr/src/projection.rs b/datafusion/physical-expr/src/projection.rs index 74edaa191508..3d6740510bec 100644 --- a/datafusion/physical-expr/src/projection.rs +++ b/datafusion/physical-expr/src/projection.rs @@ -27,7 +27,7 @@ use arrow::datatypes::{Field, Schema, SchemaRef}; use datafusion_common::stats::{ColumnStatistics, Precision}; use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode}; use datafusion_common::{ - assert_or_internal_err, internal_datafusion_err, plan_err, DataFusionError, Result, + assert_or_internal_err, internal_datafusion_err, plan_err, Result, }; use datafusion_physical_expr_common::sort_expr::{LexOrdering, PhysicalSortExpr}; diff --git a/datafusion/physical-optimizer/src/coalesce_batches.rs b/datafusion/physical-optimizer/src/coalesce_batches.rs index 61e4c0e7f180..d399fd335e46 100644 --- a/datafusion/physical-optimizer/src/coalesce_batches.rs +++ b/datafusion/physical-optimizer/src/coalesce_batches.rs @@ -23,9 +23,7 @@ use crate::PhysicalOptimizerRule; use std::sync::Arc; use datafusion_common::error::Result; -use datafusion_common::{ - assert_eq_or_internal_err, config::ConfigOptions, DataFusionError, -}; +use datafusion_common::{assert_eq_or_internal_err, config::ConfigOptions}; use datafusion_physical_expr::Partitioning; use datafusion_physical_plan::{ async_func::AsyncFuncExec, coalesce_batches::CoalesceBatchesExec, diff --git a/datafusion/physical-optimizer/src/enforce_sorting/replace_with_order_preserving_variants.rs b/datafusion/physical-optimizer/src/enforce_sorting/replace_with_order_preserving_variants.rs index 49c66e0ab244..2c9303d7ea69 100644 --- a/datafusion/physical-optimizer/src/enforce_sorting/replace_with_order_preserving_variants.rs +++ b/datafusion/physical-optimizer/src/enforce_sorting/replace_with_order_preserving_variants.rs @@ -27,7 +27,7 @@ use crate::utils::{ use datafusion_common::config::ConfigOptions; use datafusion_common::tree_node::Transformed; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_physical_plan::coalesce_partitions::CoalescePartitionsExec; use datafusion_physical_plan::execution_plan::EmissionType; use datafusion_physical_plan::repartition::RepartitionExec; diff --git a/datafusion/physical-optimizer/src/filter_pushdown.rs b/datafusion/physical-optimizer/src/filter_pushdown.rs index 8bed6c3aeba0..22cb03fc3e87 100644 --- a/datafusion/physical-optimizer/src/filter_pushdown.rs +++ b/datafusion/physical-optimizer/src/filter_pushdown.rs @@ -36,9 +36,7 @@ use std::sync::Arc; use crate::PhysicalOptimizerRule; use datafusion_common::tree_node::{TreeNode, TreeNodeRecursion}; -use datafusion_common::{ - assert_eq_or_internal_err, config::ConfigOptions, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, config::ConfigOptions, Result}; use datafusion_physical_expr::PhysicalExpr; use datafusion_physical_expr_common::physical_expr::is_volatile; use datafusion_physical_plan::filter_pushdown::{ diff --git a/datafusion/physical-plan/src/aggregates/mod.rs b/datafusion/physical-plan/src/aggregates/mod.rs index 6bf59fd3d303..6c59195f7635 100644 --- a/datafusion/physical-plan/src/aggregates/mod.rs +++ b/datafusion/physical-plan/src/aggregates/mod.rs @@ -45,8 +45,7 @@ use arrow::record_batch::RecordBatch; use arrow_schema::FieldRef; use datafusion_common::stats::Precision; use datafusion_common::{ - assert_eq_or_internal_err, not_impl_err, Constraint, Constraints, DataFusionError, - Result, + assert_eq_or_internal_err, not_impl_err, Constraint, Constraints, Result, }; use datafusion_execution::TaskContext; use datafusion_expr::{Accumulator, Aggregate}; diff --git a/datafusion/physical-plan/src/async_func.rs b/datafusion/physical-plan/src/async_func.rs index fcb2ce54bed9..d442307e9488 100644 --- a/datafusion/physical-plan/src/async_func.rs +++ b/datafusion/physical-plan/src/async_func.rs @@ -23,7 +23,7 @@ use crate::{ use arrow::array::RecordBatch; use arrow_schema::{Fields, Schema, SchemaRef}; use datafusion_common::tree_node::{Transformed, TreeNode, TreeNodeRecursion}; -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_eq_or_internal_err, Result}; use datafusion_execution::{SendableRecordBatchStream, TaskContext}; use datafusion_physical_expr::async_scalar_function::AsyncFuncExpr; use datafusion_physical_expr::equivalence::ProjectionMapping; diff --git a/datafusion/physical-plan/src/coalesce/mod.rs b/datafusion/physical-plan/src/coalesce/mod.rs index 860fc81bf665..d0930b2c0e58 100644 --- a/datafusion/physical-plan/src/coalesce/mod.rs +++ b/datafusion/physical-plan/src/coalesce/mod.rs @@ -18,7 +18,7 @@ use arrow::array::RecordBatch; use arrow::compute::BatchCoalescer; use arrow::datatypes::SchemaRef; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; /// Concatenate multiple [`RecordBatch`]es and apply a limit /// diff --git a/datafusion/physical-plan/src/coalesce_partitions.rs b/datafusion/physical-plan/src/coalesce_partitions.rs index dfb1800a2e6a..64e0315a523d 100644 --- a/datafusion/physical-plan/src/coalesce_partitions.rs +++ b/datafusion/physical-plan/src/coalesce_partitions.rs @@ -33,9 +33,7 @@ use crate::projection::{make_with_child, ProjectionExec}; use crate::{DisplayFormatType, ExecutionPlan, Partitioning}; use datafusion_common::config::ConfigOptions; -use datafusion_common::{ - assert_eq_or_internal_err, internal_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr::PhysicalExpr; diff --git a/datafusion/physical-plan/src/coop.rs b/datafusion/physical-plan/src/coop.rs index 29d5ba1ca84f..aa5e7b4a8cec 100644 --- a/datafusion/physical-plan/src/coop.rs +++ b/datafusion/physical-plan/src/coop.rs @@ -85,7 +85,7 @@ use crate::{ }; use arrow::record_batch::RecordBatch; use arrow_schema::Schema; -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result, Statistics}; +use datafusion_common::{assert_eq_or_internal_err, Result, Statistics}; use datafusion_execution::TaskContext; use crate::execution_plan::SchedulingType; diff --git a/datafusion/physical-plan/src/empty.rs b/datafusion/physical-plan/src/empty.rs index e9606fe1be69..e072b55ecff4 100644 --- a/datafusion/physical-plan/src/empty.rs +++ b/datafusion/physical-plan/src/empty.rs @@ -29,7 +29,7 @@ use crate::{ use arrow::datatypes::SchemaRef; use arrow::record_batch::RecordBatch; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr::EquivalenceProperties; diff --git a/datafusion/physical-plan/src/explain.rs b/datafusion/physical-plan/src/explain.rs index 91e2593ec4cd..4b8491cf14dd 100644 --- a/datafusion/physical-plan/src/explain.rs +++ b/datafusion/physical-plan/src/explain.rs @@ -27,7 +27,7 @@ use crate::{DisplayFormatType, ExecutionPlan, Partitioning}; use arrow::{array::StringBuilder, datatypes::SchemaRef, record_batch::RecordBatch}; use datafusion_common::display::StringifiedPlan; -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_eq_or_internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr::EquivalenceProperties; diff --git a/datafusion/physical-plan/src/joins/cross_join.rs b/datafusion/physical-plan/src/joins/cross_join.rs index 42a76c6d5127..0488cd35a8e3 100644 --- a/datafusion/physical-plan/src/joins/cross_join.rs +++ b/datafusion/physical-plan/src/joins/cross_join.rs @@ -42,8 +42,7 @@ use arrow::compute::concat_batches; use arrow::datatypes::{Fields, Schema, SchemaRef}; use datafusion_common::stats::Precision; use datafusion_common::{ - assert_eq_or_internal_err, internal_err, DataFusionError, JoinType, Result, - ScalarValue, + assert_eq_or_internal_err, internal_err, JoinType, Result, ScalarValue, }; use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation}; use datafusion_execution::TaskContext; diff --git a/datafusion/physical-plan/src/joins/hash_join/exec.rs b/datafusion/physical-plan/src/joins/hash_join/exec.rs index 03bf516eadd1..97ee8ecbdba8 100644 --- a/datafusion/physical-plan/src/joins/hash_join/exec.rs +++ b/datafusion/physical-plan/src/joins/hash_join/exec.rs @@ -66,8 +66,8 @@ use arrow_schema::DataType; use datafusion_common::config::ConfigOptions; use datafusion_common::utils::memory::estimate_memory_size; use datafusion_common::{ - assert_or_internal_err, plan_err, project_schema, DataFusionError, JoinSide, - JoinType, NullEquality, Result, + assert_or_internal_err, plan_err, project_schema, JoinSide, JoinType, NullEquality, + Result, }; use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation}; use datafusion_execution::TaskContext; diff --git a/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs b/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs index daf47603c217..b5b4325798f9 100644 --- a/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs +++ b/datafusion/physical-plan/src/joins/sort_merge_join/exec.rs @@ -45,8 +45,8 @@ use crate::{ use arrow::compute::SortOptions; use arrow::datatypes::SchemaRef; use datafusion_common::{ - assert_eq_or_internal_err, internal_err, plan_err, DataFusionError, JoinSide, - JoinType, NullEquality, Result, + assert_eq_or_internal_err, internal_err, plan_err, JoinSide, JoinType, NullEquality, + Result, }; use datafusion_execution::memory_pool::MemoryConsumer; use datafusion_execution::TaskContext; diff --git a/datafusion/physical-plan/src/joins/symmetric_hash_join.rs b/datafusion/physical-plan/src/joins/symmetric_hash_join.rs index 8b3677713a46..9c778ad13184 100644 --- a/datafusion/physical-plan/src/joins/symmetric_hash_join.rs +++ b/datafusion/physical-plan/src/joins/symmetric_hash_join.rs @@ -67,8 +67,8 @@ use arrow::record_batch::RecordBatch; use datafusion_common::hash_utils::create_hashes; use datafusion_common::utils::bisect; use datafusion_common::{ - assert_eq_or_internal_err, plan_err, DataFusionError, HashSet, JoinSide, JoinType, - NullEquality, Result, + assert_eq_or_internal_err, plan_err, HashSet, JoinSide, JoinType, NullEquality, + Result, }; use datafusion_execution::memory_pool::MemoryConsumer; use datafusion_execution::TaskContext; diff --git a/datafusion/physical-plan/src/limit.rs b/datafusion/physical-plan/src/limit.rs index a78de53fccff..4646e8ebc313 100644 --- a/datafusion/physical-plan/src/limit.rs +++ b/datafusion/physical-plan/src/limit.rs @@ -32,9 +32,7 @@ use crate::{DisplayFormatType, Distribution, ExecutionPlan, Partitioning}; use arrow::datatypes::SchemaRef; use arrow::record_batch::RecordBatch; -use datafusion_common::{ - assert_eq_or_internal_err, internal_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, internal_err, Result}; use datafusion_execution::TaskContext; use futures::stream::{Stream, StreamExt}; diff --git a/datafusion/physical-plan/src/memory.rs b/datafusion/physical-plan/src/memory.rs index 97a748e33a59..92e789ebc596 100644 --- a/datafusion/physical-plan/src/memory.rs +++ b/datafusion/physical-plan/src/memory.rs @@ -32,9 +32,7 @@ use crate::{ use arrow::array::RecordBatch; use arrow::datatypes::SchemaRef; -use datafusion_common::{ - assert_eq_or_internal_err, assert_or_internal_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, assert_or_internal_err, Result}; use datafusion_execution::memory_pool::MemoryReservation; use datafusion_execution::TaskContext; use datafusion_physical_expr::EquivalenceProperties; diff --git a/datafusion/physical-plan/src/placeholder_row.rs b/datafusion/physical-plan/src/placeholder_row.rs index d657128ee12a..be4c3da509e8 100644 --- a/datafusion/physical-plan/src/placeholder_row.rs +++ b/datafusion/physical-plan/src/placeholder_row.rs @@ -30,7 +30,7 @@ use crate::{ use arrow::array::{ArrayRef, NullArray, RecordBatch, RecordBatchOptions}; use arrow::datatypes::{DataType, Field, Fields, Schema, SchemaRef}; -use datafusion_common::{assert_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr::EquivalenceProperties; diff --git a/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs b/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs index 34b6d5108f9e..3361a7cdb718 100644 --- a/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs +++ b/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs @@ -30,9 +30,7 @@ use crate::{ Partitioning, PlanProperties, SendableRecordBatchStream, Statistics, }; -use datafusion_common::{ - assert_eq_or_internal_err, internal_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, internal_err, Result}; use datafusion_execution::memory_pool::MemoryConsumer; use datafusion_execution::TaskContext; use datafusion_physical_expr_common::sort_expr::{LexOrdering, OrderingRequirements}; diff --git a/datafusion/physical-plan/src/sorts/streaming_merge.rs b/datafusion/physical-plan/src/sorts/streaming_merge.rs index ea0358a55fc2..047fbd8cbd81 100644 --- a/datafusion/physical-plan/src/sorts/streaming_merge.rs +++ b/datafusion/physical-plan/src/sorts/streaming_merge.rs @@ -27,7 +27,7 @@ use crate::sorts::{ use crate::{SendableRecordBatchStream, SpillManager}; use arrow::array::*; use arrow::datatypes::{DataType, SchemaRef}; -use datafusion_common::{assert_or_internal_err, internal_err, DataFusionError, Result}; +use datafusion_common::{assert_or_internal_err, internal_err, Result}; use datafusion_execution::disk_manager::RefCountedTempFile; use datafusion_execution::memory_pool::{ human_readable_size, MemoryConsumer, MemoryPool, MemoryReservation, diff --git a/datafusion/physical-plan/src/test.rs b/datafusion/physical-plan/src/test.rs index 4f7b843262de..e3b22611f4de 100644 --- a/datafusion/physical-plan/src/test.rs +++ b/datafusion/physical-plan/src/test.rs @@ -37,8 +37,7 @@ use crate::{DisplayAs, DisplayFormatType, PlanProperties}; use arrow::array::{Array, ArrayRef, Int32Array, RecordBatch}; use arrow_schema::{DataType, Field, Schema, SchemaRef}; use datafusion_common::{ - assert_or_internal_err, config::ConfigOptions, project_schema, DataFusionError, - Result, Statistics, + assert_or_internal_err, config::ConfigOptions, project_schema, Result, Statistics, }; use datafusion_execution::{SendableRecordBatchStream, TaskContext}; use datafusion_physical_expr::equivalence::{ diff --git a/datafusion/physical-plan/src/union.rs b/datafusion/physical-plan/src/union.rs index 1f4bc8817ed5..06c28a8081ef 100644 --- a/datafusion/physical-plan/src/union.rs +++ b/datafusion/physical-plan/src/union.rs @@ -46,7 +46,7 @@ use arrow::record_batch::RecordBatch; use datafusion_common::config::ConfigOptions; use datafusion_common::stats::Precision; use datafusion_common::{ - assert_or_internal_err, exec_err, internal_datafusion_err, DataFusionError, Result, + assert_or_internal_err, exec_err, internal_datafusion_err, Result, }; use datafusion_execution::TaskContext; use datafusion_physical_expr::{calculate_union, EquivalenceProperties, PhysicalExpr}; diff --git a/datafusion/physical-plan/src/windows/window_agg_exec.rs b/datafusion/physical-plan/src/windows/window_agg_exec.rs index 810c97cf4745..b588608397f4 100644 --- a/datafusion/physical-plan/src/windows/window_agg_exec.rs +++ b/datafusion/physical-plan/src/windows/window_agg_exec.rs @@ -42,7 +42,7 @@ use arrow::error::ArrowError; use arrow::record_batch::RecordBatch; use datafusion_common::stats::Precision; use datafusion_common::utils::{evaluate_partition_ranges, transpose}; -use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result}; +use datafusion_common::{assert_eq_or_internal_err, Result}; use datafusion_execution::TaskContext; use datafusion_physical_expr_common::sort_expr::{ OrderingRequirements, PhysicalSortExpr, diff --git a/datafusion/physical-plan/src/work_table.rs b/datafusion/physical-plan/src/work_table.rs index a77e7b2cf10f..e2c6efd508ba 100644 --- a/datafusion/physical-plan/src/work_table.rs +++ b/datafusion/physical-plan/src/work_table.rs @@ -31,9 +31,7 @@ use crate::{ use arrow::datatypes::SchemaRef; use arrow::record_batch::RecordBatch; -use datafusion_common::{ - assert_eq_or_internal_err, internal_datafusion_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, internal_datafusion_err, Result}; use datafusion_execution::memory_pool::MemoryReservation; use datafusion_execution::TaskContext; use datafusion_physical_expr::{EquivalenceProperties, Partitioning}; diff --git a/datafusion/proto/src/common.rs b/datafusion/proto/src/common.rs index da4cd942ccb9..508e9af419c5 100644 --- a/datafusion/proto/src/common.rs +++ b/datafusion/proto/src/common.rs @@ -15,9 +15,7 @@ // specific language governing permissions and limitations // under the License. -use datafusion_common::{ - assert_eq_or_internal_err, internal_datafusion_err, DataFusionError, Result, -}; +use datafusion_common::{assert_eq_or_internal_err, internal_datafusion_err, Result}; pub(crate) fn str_to_byte(s: &String, description: &str) -> Result { assert_eq_or_internal_err!( diff --git a/datafusion/proto/src/logical_plan/mod.rs b/datafusion/proto/src/logical_plan/mod.rs index 84d6688b789b..7a8cbafc22bf 100644 --- a/datafusion/proto/src/logical_plan/mod.rs +++ b/datafusion/proto/src/logical_plan/mod.rs @@ -38,7 +38,7 @@ use datafusion_catalog::cte_worktable::CteWorkTable; use datafusion_common::file_options::file_type::FileType; use datafusion_common::{ assert_or_internal_err, context, internal_datafusion_err, internal_err, not_impl_err, - plan_err, DataFusionError, Result, TableReference, ToDFSchema, + plan_err, Result, TableReference, ToDFSchema, }; use datafusion_datasource::file_format::FileFormat; use datafusion_datasource::file_format::{ diff --git a/datafusion/pruning/src/pruning_predicate.rs b/datafusion/pruning/src/pruning_predicate.rs index 527a0e094613..4084da820c0d 100644 --- a/datafusion/pruning/src/pruning_predicate.rs +++ b/datafusion/pruning/src/pruning_predicate.rs @@ -40,7 +40,7 @@ use datafusion_common::{assert_eq_or_internal_err, Column, DFSchema}; use datafusion_common::{ internal_datafusion_err, plan_datafusion_err, plan_err, tree_node::{Transformed, TreeNode}, - DataFusionError, ScalarValue, + ScalarValue, }; use datafusion_expr_common::operator::Operator; use datafusion_physical_expr::utils::{collect_columns, Guarantee, LiteralGuarantee}; diff --git a/datafusion/spark/src/function/math/modulus.rs b/datafusion/spark/src/function/math/modulus.rs index aa66b179e2d4..60d45baa7f38 100644 --- a/datafusion/spark/src/function/math/modulus.rs +++ b/datafusion/spark/src/function/math/modulus.rs @@ -18,9 +18,7 @@ use arrow::compute::kernels::numeric::add; use arrow::compute::kernels::{cmp::lt, numeric::rem, zip::zip}; use arrow::datatypes::DataType; -use datafusion_common::{ - assert_eq_or_internal_err, DataFusionError, Result, ScalarValue, -}; +use datafusion_common::{assert_eq_or_internal_err, Result, ScalarValue}; use datafusion_expr::{ ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility, }; diff --git a/datafusion/spark/src/function/math/rint.rs b/datafusion/spark/src/function/math/rint.rs index 40dac9cb31d8..3271be38f833 100644 --- a/datafusion/spark/src/function/math/rint.rs +++ b/datafusion/spark/src/function/math/rint.rs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -use datafusion_common::DataFusionError; use std::any::Any; use std::sync::Arc; diff --git a/datafusion/sql/src/expr/identifier.rs b/datafusion/sql/src/expr/identifier.rs index 498c58dd8984..b5db58021774 100644 --- a/datafusion/sql/src/expr/identifier.rs +++ b/datafusion/sql/src/expr/identifier.rs @@ -18,8 +18,7 @@ use arrow::datatypes::Field; use datafusion_common::{ assert_or_internal_err, exec_datafusion_err, internal_err, not_impl_err, - plan_datafusion_err, plan_err, Column, DFSchema, DataFusionError, Result, Span, - TableReference, + plan_datafusion_err, plan_err, Column, DFSchema, Result, Span, TableReference, }; use datafusion_expr::planner::PlannerResult; use datafusion_expr::{Case, Expr}; diff --git a/datafusion/sql/src/unparser/expr.rs b/datafusion/sql/src/unparser/expr.rs index 10c34d5a4df7..575cfd27ee35 100644 --- a/datafusion/sql/src/unparser/expr.rs +++ b/datafusion/sql/src/unparser/expr.rs @@ -41,7 +41,7 @@ use arrow::datatypes::{ use arrow::util::display::array_value_to_string; use datafusion_common::{ assert_eq_or_internal_err, assert_or_internal_err, internal_datafusion_err, - internal_err, not_impl_err, plan_err, Column, DataFusionError, Result, ScalarValue, + internal_err, not_impl_err, plan_err, Column, Result, ScalarValue, }; use datafusion_expr::{ expr::{Alias, Exists, InList, ScalarFunction, Sort, WindowFunction}, diff --git a/datafusion/sql/src/utils.rs b/datafusion/sql/src/utils.rs index 91ab2e003c87..c3f7cb37bdee 100644 --- a/datafusion/sql/src/utils.rs +++ b/datafusion/sql/src/utils.rs @@ -27,7 +27,7 @@ use datafusion_common::tree_node::{ }; use datafusion_common::{ assert_or_internal_err, exec_datafusion_err, exec_err, internal_err, plan_err, - Column, DFSchemaRef, DataFusionError, Diagnostic, HashMap, Result, ScalarValue, + Column, DFSchemaRef, Diagnostic, HashMap, Result, ScalarValue, }; use datafusion_expr::builder::get_struct_unnested_columns; use datafusion_expr::expr::{ From 359653555df48a1364529b05d0066aaaa7ced989 Mon Sep 17 00:00:00 2001 From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com> Date: Mon, 24 Nov 2025 17:38:38 +0200 Subject: [PATCH 3/3] strip backtrace from error --- datafusion/common/src/error.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datafusion/common/src/error.rs b/datafusion/common/src/error.rs index 993dc0b322b6..aaa84a6b94e3 100644 --- a/datafusion/common/src/error.rs +++ b/datafusion/common/src/error.rs @@ -1121,7 +1121,7 @@ mod test { ok_result() } - let err = check().unwrap_err(); + let err = check().unwrap_err().strip_backtrace(); assert_snapshot!( err.to_string(), @r" @@ -1144,7 +1144,7 @@ mod test { ok_result() } - let err = check().unwrap_err(); + let err = check().unwrap_err().strip_backtrace(); assert_snapshot!( err.to_string(), @r" @@ -1168,7 +1168,7 @@ mod test { ok_result() } - let err = check().unwrap_err(); + let err = check().unwrap_err().strip_backtrace(); assert_snapshot!( err.to_string(), @r" @@ -1185,7 +1185,7 @@ mod test { ok_result() } - let err = check().unwrap_err(); + let err = check().unwrap_err().strip_backtrace(); assert_snapshot!( err.to_string(), @r" @@ -1202,7 +1202,7 @@ mod test { ok_result() } - let err = check().unwrap_err(); + let err = check().unwrap_err().strip_backtrace(); assert_snapshot!( err.to_string(), @r"