Apache DataFusion SQL Query Engine
feat: Makes error macros hygienic (#18995)
Thomas Tanon81512da2b0aa
diff --git a/datafusion/catalog-listing/src/helpers.rs b/datafusion/catalog-listing/src/helpers.rsindex 5e69cf1a14..34073338fb 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/common/src/error.rs b/datafusion/common/src/error.rsindex 19a36e4507..c58c33568c 100644--- a/datafusion/common/src/error.rs+++ b/datafusion/common/src/error.rs@@ -768,7 +768,7 @@ impl DataFusionErrorBuilder {macro_rules! unwrap_or_internal_err {($Value: ident) => {$Value.ok_or_else(|| {- DataFusionError::Internal(format!(+ $crate::DataFusionError::Internal(format!("{} should not be None",stringify!($Value)))@@ -789,7 +789,7 @@ macro_rules! unwrap_or_internal_err {macro_rules! assert_or_internal_err {($cond:expr) => {if !$cond {- return Err(DataFusionError::Internal(format!(+ return Err($crate::DataFusionError::Internal(format!("Assertion failed: {}",stringify!($cond))));@@ -797,7 +797,7 @@ macro_rules! assert_or_internal_err {};($cond:expr, $($arg:tt)+) => {if !$cond {- return Err(DataFusionError::Internal(format!(+ return Err($crate::DataFusionError::Internal(format!("Assertion failed: {}: {}",stringify!($cond),format!($($arg)+)@@ -821,7 +821,7 @@ 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::DataFusionError::Internal(format!("Assertion failed: {} == {} (left: {:?}, right: {:?})",stringify!($left),stringify!($right),@@ -834,7 +834,7 @@ 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::DataFusionError::Internal(format!("Assertion failed: {} == {} (left: {:?}, right: {:?}): {}",stringify!($left),stringify!($right),@@ -861,7 +861,7 @@ 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::DataFusionError::Internal(format!("Assertion failed: {} != {} (left: {:?}, right: {:?})",stringify!($left),stringify!($right),@@ -874,7 +874,7 @@ 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::DataFusionError::Internal(format!("Assertion failed: {} != {} (left: {:?}, right: {:?}): {}",stringify!($left),stringify!($right),@@ -968,7 +968,7 @@ make_error!(resources_err, resources_datafusion_err, ResourcesExhausted);#[macro_export]macro_rules! sql_datafusion_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = DataFusionError::SQL(Box::new($ERR), Some(DataFusionError::get_back_trace()));+ let err = $crate::DataFusionError::SQL(Box::new($ERR), Some($crate::DataFusionError::get_back_trace()));$(let err = err.with_diagnostic($DIAG);)?@@ -980,7 +980,7 @@ macro_rules! sql_datafusion_err {#[macro_export]macro_rules! sql_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = datafusion_common::sql_datafusion_err!($ERR);+ let err = $crate::sql_datafusion_err!($ERR);$(let err = err.with_diagnostic($DIAG);)?@@ -992,7 +992,7 @@ macro_rules! sql_err {#[macro_export]macro_rules! arrow_datafusion_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = DataFusionError::ArrowError(Box::new($ERR), Some(DataFusionError::get_back_trace()));+ let err = $crate::DataFusionError::ArrowError(Box::new($ERR), Some($crate::DataFusionError::get_back_trace()));$(let err = err.with_diagnostic($DIAG);)?@@ -1005,7 +1005,7 @@ macro_rules! arrow_datafusion_err {macro_rules! arrow_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = datafusion_common::arrow_datafusion_err!($ERR);+ let err = $crate::arrow_datafusion_err!($ERR);$(let err = err.with_diagnostic($DIAG);)?@@ -1017,9 +1017,9 @@ macro_rules! arrow_err {#[macro_export]macro_rules! schema_datafusion_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = $crate::error::DataFusionError::SchemaError(+ let err = $crate::DataFusionError::SchemaError(Box::new($ERR),- Box::new(Some($crate::error::DataFusionError::get_back_trace())),+ Box::new(Some($crate::DataFusionError::get_back_trace())),);$(let err = err.with_diagnostic($DIAG);@@ -1032,9 +1032,9 @@ macro_rules! schema_datafusion_err {#[macro_export]macro_rules! schema_err {($ERR:expr $(; diagnostic = $DIAG:expr)?) => {{- let err = $crate::error::DataFusionError::SchemaError(+ let err = $crate::DataFusionError::SchemaError(Box::new($ERR),- Box::new(Some($crate::error::DataFusionError::get_back_trace())),+ Box::new(Some($crate::DataFusionError::get_back_trace())),);$(let err = err.with_diagnostic($DIAG);diff --git a/datafusion/common/src/utils/mod.rs b/datafusion/common/src/utils/mod.rsindex 93ab49530f..e061f85263 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::{Array, ArrayRef, FixedSizeListArray, LargeListArray, ListArray, OffsetSizeTrait,cast::AsArray,diff --git a/datafusion/core/src/datasource/listing_table_factory.rs b/datafusion/core/src/datasource/listing_table_factory.rsindex f98297d0e3..1555b523c6 100644--- a/datafusion/core/src/datasource/listing_table_factory.rs+++ b/datafusion/core/src/datasource/listing_table_factory.rs@@ -28,7 +28,7 @@ use crate::datasource::listing::{use crate::execution::context::SessionState;use arrow::datatypes::DataType;-use datafusion_common::{arrow_datafusion_err, plan_err, DataFusionError, ToDFSchema};+use datafusion_common::{arrow_datafusion_err, plan_err, ToDFSchema};use datafusion_common::{config_datafusion_err, Result};use datafusion_expr::CreateExternalTable;diff --git a/datafusion/core/tests/fuzz_cases/record_batch_generator.rs b/datafusion/core/tests/fuzz_cases/record_batch_generator.rsindex 45dba5f786..2e6bd107b3 100644--- a/datafusion/core/tests/fuzz_cases/record_batch_generator.rs+++ b/datafusion/core/tests/fuzz_cases/record_batch_generator.rs@@ -34,7 +34,7 @@ use arrow_schema::{DECIMAL256_MAX_SCALE, DECIMAL32_MAX_PRECISION, DECIMAL32_MAX_SCALE,DECIMAL64_MAX_PRECISION, DECIMAL64_MAX_SCALE,};-use datafusion_common::{arrow_datafusion_err, DataFusionError, Result};+use datafusion_common::{arrow_datafusion_err, Result};use rand::{rng, rngs::StdRng, Rng, SeedableRng};use test_utils::array_gen::{BinaryArrayGenerator, BooleanArrayGenerator, DecimalArrayGenerator,diff --git a/datafusion/datasource-avro/src/avro_to_arrow/arrow_array_reader.rs b/datafusion/datasource-avro/src/avro_to_arrow/arrow_array_reader.rsindex 5b1f534ad7..37ac7ff923 100644--- a/datafusion/datasource-avro/src/avro_to_arrow/arrow_array_reader.rs+++ b/datafusion/datasource-avro/src/avro_to_arrow/arrow_array_reader.rs@@ -46,7 +46,7 @@ use arrow::error::Result as ArrowResult;use arrow::record_batch::RecordBatch;use arrow::util::bit_util;use datafusion_common::arrow_err;-use datafusion_common::error::{DataFusionError, Result};+use datafusion_common::error::Result;use num_traits::NumCast;use std::collections::BTreeMap;use std::io::Read;diff --git a/datafusion/datasource-parquet/src/access_plan.rs b/datafusion/datasource-parquet/src/access_plan.rsindex 295ecea946..7399a2cd08 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.rsindex 731a7f5d86..e499c483db 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.rsindex a4ab78d078..f66fbc408c 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-common/src/interval_arithmetic.rs b/datafusion/expr-common/src/interval_arithmetic.rsindex a43fe8c415..f93ef3b795 100644--- a/datafusion/expr-common/src/interval_arithmetic.rs+++ b/datafusion/expr-common/src/interval_arithmetic.rs@@ -3935,7 +3935,7 @@ mod tests {assert_eq!(interval.cardinality().unwrap(), 9178336040581070850);let interval = Interval::try_new(- ScalarValue::UInt64(Some(u64::MIN + 1)),+ ScalarValue::UInt64(Some(1)),ScalarValue::UInt64(Some(u64::MAX)),)?;assert_eq!(interval.cardinality().unwrap(), u64::MAX);diff --git a/datafusion/expr-common/src/statistics.rs b/datafusion/expr-common/src/statistics.rsindex 72da2caa93..6c8cef35b3 100644--- a/datafusion/expr-common/src/statistics.rs+++ b/datafusion/expr-common/src/statistics.rs@@ -25,8 +25,8 @@ use arrow::array::ArrowNativeTypeOp;use arrow::datatypes::DataType;use datafusion_common::rounding::alter_fp_rounding_mode;use datafusion_common::{- DataFusionError, Result, ScalarValue, assert_eq_or_internal_err,- assert_ne_or_internal_err, assert_or_internal_err, internal_err, not_impl_err,+ Result, ScalarValue, assert_eq_or_internal_err, assert_ne_or_internal_err,+ assert_or_internal_err, internal_err, not_impl_err,};/// This object defines probabilistic distributions that encode uncertaindiff --git a/datafusion/expr/src/expr_schema.rs b/datafusion/expr/src/expr_schema.rsindex 94f5b0480b..3ef61da91b 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.rsindex a416c7f746..1c2c8a2a93 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.rsindex 89d8569a26..9dbda6cd0a 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-common/src/aggregate/count_distinct/dict.rs b/datafusion/functions-aggregate-common/src/aggregate/count_distinct/dict.rsindex 089d8d5acd..854c377380 100644--- a/datafusion/functions-aggregate-common/src/aggregate/count_distinct/dict.rs+++ b/datafusion/functions-aggregate-common/src/aggregate/count_distinct/dict.rs@@ -17,8 +17,8 @@use arrow::array::{ArrayRef, BooleanArray};use arrow::downcast_dictionary_array;+use datafusion_common::internal_err;use datafusion_common::{arrow_datafusion_err, ScalarValue};-use datafusion_common::{internal_err, DataFusionError};use datafusion_expr_common::accumulator::Accumulator;#[derive(Debug)]diff --git a/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator.rs b/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator.rsindex c807591dab..0773109fff 100644--- a/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator.rs+++ b/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator.rs@@ -32,7 +32,7 @@ use arrow::{compute::take_arrays,datatypes::UInt32Type,};-use datafusion_common::{arrow_datafusion_err, DataFusionError, Result, ScalarValue};+use datafusion_common::{arrow_datafusion_err, Result, ScalarValue};use datafusion_expr_common::accumulator::Accumulator;use datafusion_expr_common::groups_accumulator::{EmitTo, GroupsAccumulator};diff --git a/datafusion/functions-aggregate/src/array_agg.rs b/datafusion/functions-aggregate/src/array_agg.rsindex f0ee7327b9..4f5797c308 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.rsindex f74fddd603..7e34ffbaad 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.rsindex adf3e47b7d..05026940fe 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.rsindex f78d463585..8d2a68a0ad 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.rsindex 14f2ed3313..2844eefaf0 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.rsindex e3531d1cf8..4350bfdc5a 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-window/src/rank.rs b/datafusion/functions-window/src/rank.rsindex 0dc8923849..2d6ad6cbc0 100644--- a/datafusion/functions-window/src/rank.rs+++ b/datafusion/functions-window/src/rank.rs@@ -18,7 +18,6 @@//! Implementation of `rank`, `dense_rank`, and `percent_rank` window functions,//! which can be evaluated at runtime during query execution.-use crate::define_udwf_and_expr;use arrow::datatypes::FieldRef;use datafusion_common::arrow::array::ArrayRef;use datafusion_common::arrow::array::{Float64Array, UInt64Array};diff --git a/datafusion/functions/src/core/arrow_cast.rs b/datafusion/functions/src/core/arrow_cast.rsindex c4e58601cd..29d5d31328 100644--- a/datafusion/functions/src/core/arrow_cast.rs+++ b/datafusion/functions/src/core/arrow_cast.rs@@ -22,9 +22,7 @@ use arrow::error::ArrowError;use datafusion_common::{arrow_datafusion_err, exec_err, internal_err, Result, ScalarValue,};-use datafusion_common::{- exec_datafusion_err, utils::take_function_args, DataFusionError,-};+use datafusion_common::{exec_datafusion_err, utils::take_function_args};use std::any::Any;use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyInfo};diff --git a/datafusion/functions/src/core/greatest.rs b/datafusion/functions/src/core/greatest.rsindex 02491501dc..95fd8e64d7 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.rsindex 2a86666856..78c6864d8c 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.rsindex 45e0d1c4cb..602cd4169a 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/datetime/to_date.rs b/datafusion/functions/src/datetime/to_date.rsindex 9ac5f8b371..a216e8e5b7 100644--- a/datafusion/functions/src/datetime/to_date.rs+++ b/datafusion/functions/src/datetime/to_date.rs@@ -20,7 +20,6 @@ use arrow::datatypes::DataType;use arrow::datatypes::DataType::*;use arrow::error::ArrowError::ParseError;use arrow::{array::types::Date32Type, compute::kernels::cast_utils::Parser};-use datafusion_common::error::DataFusionError;use datafusion_common::{arrow_err, exec_err, internal_datafusion_err, Result};use datafusion_expr::{ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,diff --git a/datafusion/functions/src/math/factorial.rs b/datafusion/functions/src/math/factorial.rsindex 79f6da94dd..c9980bb6aa 100644--- a/datafusion/functions/src/math/factorial.rs+++ b/datafusion/functions/src/math/factorial.rs@@ -26,7 +26,7 @@ use arrow::datatypes::DataType;use arrow::datatypes::DataType::Int64;use crate::utils::make_scalar_function;-use datafusion_common::{arrow_datafusion_err, exec_err, DataFusionError, Result};+use datafusion_common::{arrow_datafusion_err, exec_err, Result};use datafusion_expr::{ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,Volatility,diff --git a/datafusion/functions/src/math/lcm.rs b/datafusion/functions/src/math/lcm.rsindex bfb20dfd5c..6d42ce6202 100644--- a/datafusion/functions/src/math/lcm.rs+++ b/datafusion/functions/src/math/lcm.rs@@ -23,7 +23,7 @@ use arrow::datatypes::DataType;use arrow::datatypes::DataType::Int64;use arrow::error::ArrowError;-use datafusion_common::{arrow_datafusion_err, exec_err, DataFusionError, Result};+use datafusion_common::{arrow_datafusion_err, exec_err, Result};use datafusion_expr::{ColumnarValue, Documentation, ScalarFunctionArgs, ScalarUDFImpl, Signature,Volatility,diff --git a/datafusion/functions/src/math/pi.rs b/datafusion/functions/src/math/pi.rsindex dcb2886a3b..92a27932e1 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.rsindex 77067d39dc..4270eff665 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/regex/regexplike.rs b/datafusion/functions/src/regex/regexplike.rsindex 55001f30f6..0791648277 100644--- a/datafusion/functions/src/regex/regexplike.rs+++ b/datafusion/functions/src/regex/regexplike.rs@@ -23,8 +23,7 @@ use arrow::datatypes::DataType;use arrow::datatypes::DataType::{LargeUtf8, Utf8, Utf8View};use datafusion_common::types::logical_string;use datafusion_common::{- arrow_datafusion_err, exec_err, internal_err, plan_err, DataFusionError, Result,- ScalarValue,+ arrow_datafusion_err, exec_err, internal_err, plan_err, Result, ScalarValue,};use datafusion_expr::{binary_expr, cast, Coercion, ColumnarValue, Documentation, Expr, ScalarUDFImpl,diff --git a/datafusion/functions/src/regex/regexpmatch.rs b/datafusion/functions/src/regex/regexpmatch.rsindex 1255b2913f..abbfc9be84 100644--- a/datafusion/functions/src/regex/regexpmatch.rs+++ b/datafusion/functions/src/regex/regexpmatch.rs@@ -21,9 +21,9 @@ use arrow::compute::kernels::regexp;use arrow::datatypes::DataType;use arrow::datatypes::Field;use datafusion_common::exec_err;+use datafusion_common::Result;use datafusion_common::ScalarValue;use datafusion_common::{arrow_datafusion_err, plan_err};-use datafusion_common::{DataFusionError, Result};use datafusion_expr::{ColumnarValue, Documentation, TypeSignature};use datafusion_expr::{ScalarUDFImpl, Signature, Volatility};use datafusion_macros::user_doc;diff --git a/datafusion/functions/src/string/uuid.rs b/datafusion/functions/src/string/uuid.rsindex 6a8585a192..96ce943902 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.rsindex c9cc33708b..0590aba52b 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.rsindex b5256a338b..9228e84abf 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.rsindex 60343ff2ec..ee7b006a2d 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.rsindex a38cd7a75b..ea0980ad4e 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.rsindex dd27ded586..2df1be1b7f 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/datum.rs b/datafusion/physical-expr-common/src/datum.rsindex c84d3afeef..262a6540ff 100644--- a/datafusion/physical-expr-common/src/datum.rs+++ b/datafusion/physical-expr-common/src/datum.rs@@ -23,7 +23,6 @@ use arrow::compute::kernels::cmp::{};use arrow::compute::{ilike, like, nilike, nlike, SortOptions};use arrow::error::ArrowError;-use datafusion_common::DataFusionError;use datafusion_common::{arrow_datafusion_err, assert_or_internal_err, internal_err};use datafusion_common::{Result, ScalarValue};use datafusion_expr_common::columnar_value::ColumnarValue;diff --git a/datafusion/physical-expr-common/src/physical_expr.rs b/datafusion/physical-expr-common/src/physical_expr.rsindex efdd6fcb62..f7f6326876 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.rsindex ae5a4a8559..f16895b44b 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.rsindex 981acbb779..166e639966 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.rsindex 95029c1efe..bb033aac03 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.rsindex 3046e8a028..5502def582 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.rsindex 74edaa1915..3d6740510b 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-expr/src/window/window_expr.rs b/datafusion/physical-expr/src/window/window_expr.rsindex 47f970d276..ace0c31d63 100644--- a/datafusion/physical-expr/src/window/window_expr.rs+++ b/datafusion/physical-expr/src/window/window_expr.rs@@ -32,8 +32,7 @@ use arrow::record_batch::RecordBatch;use datafusion_common::cast::as_boolean_array;use datafusion_common::utils::compare_rows;use datafusion_common::{- arrow_datafusion_err, exec_datafusion_err, internal_err, DataFusionError, Result,- ScalarValue,+ arrow_datafusion_err, exec_datafusion_err, internal_err, Result, ScalarValue,};use datafusion_expr::window_state::{PartitionBatchState, WindowAggState, WindowFrameContext, WindowFrameStateGroups,diff --git a/datafusion/physical-optimizer/src/coalesce_batches.rs b/datafusion/physical-optimizer/src/coalesce_batches.rsindex 956a8994ba..1ad8146edf 100644--- a/datafusion/physical-optimizer/src/coalesce_batches.rs+++ b/datafusion/physical-optimizer/src/coalesce_batches.rs@@ -22,8 +22,8 @@ use crate::{OptimizerContext, PhysicalOptimizerRule};use std::sync::Arc;+use datafusion_common::assert_eq_or_internal_err;use datafusion_common::error::Result;-use datafusion_common::{assert_eq_or_internal_err, DataFusionError};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.rsindex 49c66e0ab2..2c9303d7ea 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.rsindex 8206d43208..671c16c897 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::{OptimizerContext, 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.rsindex 4cf945806b..a87abc2aa5 100644--- a/datafusion/physical-plan/src/aggregates/mod.rs+++ b/datafusion/physical-plan/src/aggregates/mod.rs@@ -47,8 +47,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, ScalarValue,+ assert_eq_or_internal_err, not_impl_err, Constraint, Constraints, Result, ScalarValue,};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.rsindex fcb2ce54be..d442307e94 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.rsindex 860fc81bf6..d0930b2c0e 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.rsindex dfb1800a2e..64e0315a52 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.rsindex 29d5ba1ca8..aa5e7b4a8c 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.rsindex e9606fe1be..e072b55ecf 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.rsindex 91e2593ec4..4b8491cf14 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.rsindex 42a76c6d51..0488cd35a8 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.rsindex 03bf516ead..97ee8ecbdb 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/nested_loop_join.rs b/datafusion/physical-plan/src/joins/nested_loop_join.rsindex f16e2220df..c82961e0e7 100644--- a/datafusion/physical-plan/src/joins/nested_loop_join.rs+++ b/datafusion/physical-plan/src/joins/nested_loop_join.rs@@ -62,8 +62,7 @@ use arrow_schema::DataType;use datafusion_common::cast::as_boolean_array;use datafusion_common::{arrow_err, assert_eq_or_internal_err, internal_datafusion_err, internal_err,- project_schema, unwrap_or_internal_err, DataFusionError, JoinSide, Result,- ScalarValue, Statistics,+ project_schema, unwrap_or_internal_err, JoinSide, Result, ScalarValue, Statistics,};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.rsindex daf47603c2..b5b4325798 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/stream_join_utils.rs b/datafusion/physical-plan/src/joins/stream_join_utils.rsindex f4a3cd92f1..16d87599ba 100644--- a/datafusion/physical-plan/src/joins/stream_join_utils.rs+++ b/datafusion/physical-plan/src/joins/stream_join_utils.rs@@ -37,9 +37,7 @@ use arrow::compute::concat_batches;use arrow::datatypes::{ArrowNativeType, Schema, SchemaRef};use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};use datafusion_common::utils::memory::estimate_memory_size;-use datafusion_common::{- arrow_datafusion_err, DataFusionError, HashSet, JoinSide, Result, ScalarValue,-};+use datafusion_common::{arrow_datafusion_err, HashSet, JoinSide, Result, ScalarValue};use datafusion_expr::interval_arithmetic::Interval;use datafusion_physical_expr::expressions::Column;use datafusion_physical_expr::intervals::cp_solver::ExprIntervalGraph;diff --git a/datafusion/physical-plan/src/joins/symmetric_hash_join.rs b/datafusion/physical-plan/src/joins/symmetric_hash_join.rsindex 8b3677713a..9c778ad131 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.rsindex a78de53fcc..4646e8ebc3 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.rsindex 97a748e33a..92e789ebc5 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.rsindex d657128ee1..be4c3da509 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.rsindex 34b6d5108f..3361a7cdb7 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.rsindex ea0358a55f..047fbd8cbd 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.rsindex 4f7b843262..e3b22611f4 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.rsindex 1f4bc8817e..06c28a8081 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/bounded_window_agg_exec.rs b/datafusion/physical-plan/src/windows/bounded_window_agg_exec.rsindex a76316369e..ccc154bc10 100644--- a/datafusion/physical-plan/src/windows/bounded_window_agg_exec.rs+++ b/datafusion/physical-plan/src/windows/bounded_window_agg_exec.rs@@ -52,7 +52,7 @@ use datafusion_common::utils::{evaluate_partition_ranges, get_at_indices, get_row_at_idx,};use datafusion_common::{- arrow_datafusion_err, exec_datafusion_err, exec_err, DataFusionError, HashMap, Result,+ arrow_datafusion_err, exec_datafusion_err, exec_err, HashMap, Result,};use datafusion_execution::TaskContext;use datafusion_expr::window_state::{PartitionBatchState, WindowAggState};diff --git a/datafusion/physical-plan/src/windows/window_agg_exec.rs b/datafusion/physical-plan/src/windows/window_agg_exec.rsindex 810c97cf47..b588608397 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.rsindex a77e7b2cf1..e2c6efd508 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.rsindex da4cd942cc..508e9af419 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<u8> {assert_eq_or_internal_err!(diff --git a/datafusion/proto/src/logical_plan/mod.rs b/datafusion/proto/src/logical_plan/mod.rsindex 84d6688b78..7a8cbafc22 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.rsindex f804a64fdc..b9bbaea45a 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.rsindex aa66b179e2..60d45baa7f 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.rsindex 40dac9cb31..3271be38f8 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/cte.rs b/datafusion/sql/src/cte.rsindex 8ccab9dd9a..6959ce17ab 100644--- a/datafusion/sql/src/cte.rs+++ b/datafusion/sql/src/cte.rs@@ -92,7 +92,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {} => (left, right, set_quantifier),other => {// If the query is not a UNION, then it is not a recursive CTE- cte_query.body = Box::new(other);+ *cte_query.body = other;return self.non_recursive_cte(cte_query, planner_context);}};diff --git a/datafusion/sql/src/expr/identifier.rs b/datafusion/sql/src/expr/identifier.rsindex 498c58dd89..b5db580217 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.rsindex 10c34d5a4d..575cfd27ee 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.rsindex 571d19db2e..c0dde642a5 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::{