From 1e0c4f85efce432ecb758a0a043d66ed25289903 Mon Sep 17 00:00:00 2001 From: LuQQiu Date: Mon, 30 Sep 2024 18:20:45 -0700 Subject: [PATCH] fix: inline datafusion_common (#2963) Solve the error[E0432]: unresolved import `datafusion_common` --> rust/lance-core/src/error.rs:5:5 | 5 | use datafusion_common::DataFusionError; | ^^^^^^^^^^^^^^^^^ use of undeclared crate or module `datafusion_common` in cd /rust/lance-linalg && cargo bench --- rust/lance-core/src/error.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/rust/lance-core/src/error.rs b/rust/lance-core/src/error.rs index af2a8352dc..31c386fa1e 100644 --- a/rust/lance-core/src/error.rs +++ b/rust/lance-core/src/error.rs @@ -2,7 +2,6 @@ // SPDX-FileCopyrightText: Copyright The Lance Authors use arrow_schema::ArrowError; -use datafusion_common::DataFusionError; use snafu::{Location, Snafu}; type BoxedError = Box; @@ -306,7 +305,7 @@ impl From for Error { } #[cfg(feature = "datafusion")] -impl From for DataFusionError { +impl From for datafusion_common::DataFusionError { #[track_caller] fn from(e: Error) -> Self { Self::Execution(e.to_string()) @@ -314,30 +313,30 @@ impl From for DataFusionError { } #[cfg(feature = "datafusion")] -impl From for Error { +impl From for Error { #[track_caller] - fn from(e: DataFusionError) -> Self { + fn from(e: datafusion_common::DataFusionError) -> Self { let location = std::panic::Location::caller().to_snafu_location(); match e { - DataFusionError::SQL(..) - | DataFusionError::Plan(..) - | DataFusionError::Configuration(..) => Self::InvalidInput { + datafusion_common::DataFusionError::SQL(..) + | datafusion_common::DataFusionError::Plan(..) + | datafusion_common::DataFusionError::Configuration(..) => Self::InvalidInput { source: box_error(e), location, }, - DataFusionError::SchemaError(..) => Self::Schema { + datafusion_common::DataFusionError::SchemaError(..) => Self::Schema { message: e.to_string(), location, }, - DataFusionError::ArrowError(..) => Self::Arrow { + datafusion_common::DataFusionError::ArrowError(..) => Self::Arrow { message: e.to_string(), location, }, - DataFusionError::NotImplemented(..) => Self::NotSupported { + datafusion_common::DataFusionError::NotImplemented(..) => Self::NotSupported { source: box_error(e), location, }, - DataFusionError::Execution(..) => Self::Execution { + datafusion_common::DataFusionError::Execution(..) => Self::Execution { message: e.to_string(), location, },