-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(errors): some better error handling
- create custom error enum - update session traits to leverage new error method - update .sql command to be a Result
- Loading branch information
Showing
6 changed files
with
144 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| //! Defines `SparkError` for representing failures in various Spark operations. | ||
| //! Most of these are wrappers for tonic or arrow error messages | ||
| use std::fmt::{Debug, Display, Formatter}; | ||
| use std::io::Write; | ||
|
|
||
| use std::error::Error; | ||
|
|
||
| use arrow::error::ArrowError; | ||
|
|
||
| /// Many different operations in the `Spark` crate return this error type. | ||
| #[derive(Debug)] | ||
| pub enum SparkError { | ||
| /// Returned when functionality is not yet available. | ||
| NotYetImplemented(String), | ||
| ExternalError(Box<dyn Error + Send + Sync>), | ||
| AnalysisException(String), | ||
| IoError(String, std::io::Error), | ||
| ArrowError(ArrowError), | ||
| } | ||
|
|
||
| impl SparkError { | ||
| /// Wraps an external error in an `SparkError`. | ||
| pub fn from_external_error(error: Box<dyn Error + Send + Sync>) -> Self { | ||
| Self::ExternalError(error) | ||
| } | ||
| } | ||
|
|
||
| impl From<std::io::Error> for SparkError { | ||
| fn from(error: std::io::Error) -> Self { | ||
| SparkError::IoError(error.to_string(), error) | ||
| } | ||
| } | ||
|
|
||
| impl From<std::str::Utf8Error> for SparkError { | ||
| fn from(error: std::str::Utf8Error) -> Self { | ||
| SparkError::AnalysisException(error.to_string()) | ||
| } | ||
| } | ||
|
|
||
| impl From<std::string::FromUtf8Error> for SparkError { | ||
| fn from(error: std::string::FromUtf8Error) -> Self { | ||
| SparkError::AnalysisException(error.to_string()) | ||
| } | ||
| } | ||
|
|
||
| impl From<ArrowError> for SparkError { | ||
| fn from(error: ArrowError) -> Self { | ||
| SparkError::ArrowError(error) | ||
| } | ||
| } | ||
|
|
||
| impl From<tonic::Status> for SparkError { | ||
| fn from(status: tonic::Status) -> Self { | ||
| SparkError::AnalysisException(status.message().to_string()) | ||
| } | ||
| } | ||
|
|
||
| impl<W: Write> From<std::io::IntoInnerError<W>> for SparkError { | ||
| fn from(error: std::io::IntoInnerError<W>) -> Self { | ||
| SparkError::IoError(error.to_string(), error.into()) | ||
| } | ||
| } | ||
|
|
||
| impl Display for SparkError { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| match self { | ||
| SparkError::ExternalError(source) => write!(f, "External error: {}", &source), | ||
| SparkError::AnalysisException(desc) => write!(f, "Analysis error: {desc}"), | ||
| SparkError::IoError(desc, _) => write!(f, "Io error: {desc}"), | ||
| SparkError::ArrowError(desc) => write!(f, "Apache Arrow error: {desc}"), | ||
| SparkError::NotYetImplemented(source) => write!(f, "Not yet implemented: {source}"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Error for SparkError { | ||
| fn source(&self) -> Option<&(dyn Error + 'static)> { | ||
| if let Self::ExternalError(e) = self { | ||
| Some(e.as_ref()) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // #[cfg(test)] | ||
| // mod test { | ||
| // use super::*; | ||
| // | ||
| // #[test] | ||
| // fn error_source() { | ||
| // let e1 = SparkError::DivideByZero; | ||
| // assert!(e1.source().is_none()); | ||
| // | ||
| // // one level of wrapping | ||
| // let e2 = SparkError::ExternalError(Box::new(e1)); | ||
| // let source = e2.source().unwrap().downcast_ref::<SparkError>().unwrap(); | ||
| // assert!(matches!(source, SparkError::DivideByZero)); | ||
| // | ||
| // // two levels of wrapping | ||
| // let e3 = SparkError::ExternalError(Box::new(e2)); | ||
| // let source = e3 | ||
| // .source() | ||
| // .unwrap() | ||
| // .downcast_ref::<SparkError>() | ||
| // .unwrap() | ||
| // .source() | ||
| // .unwrap() | ||
| // .downcast_ref::<SparkError>() | ||
| // .unwrap(); | ||
| // | ||
| // assert!(matches!(source, SparkError::DivideByZero)); | ||
| // } | ||
| // } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters