Skip to content

Commit

Permalink
fix: inline datafusion_common (#2963)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
LuQQiu authored Oct 1, 2024
1 parent a151f32 commit 1e0c4f8
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions rust/lance-core/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<dyn std::error::Error + Send + Sync + 'static>;
Expand Down Expand Up @@ -306,38 +305,38 @@ impl From<datafusion_sql::sqlparser::tokenizer::TokenizerError> for Error {
}

#[cfg(feature = "datafusion")]
impl From<Error> for DataFusionError {
impl From<Error> for datafusion_common::DataFusionError {
#[track_caller]
fn from(e: Error) -> Self {
Self::Execution(e.to_string())
}
}

#[cfg(feature = "datafusion")]
impl From<DataFusionError> for Error {
impl From<datafusion_common::DataFusionError> 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,
},
Expand Down

0 comments on commit 1e0c4f8

Please sign in to comment.