|
|
|
@ -1,47 +1,23 @@ |
|
|
|
use crate::io::{ParseError, RdfFormat}; |
|
|
|
use crate::io::{ParseError, RdfFormat}; |
|
|
|
|
|
|
|
use crate::storage::numeric_encoder::EncodedTerm; |
|
|
|
use oxiri::IriParseError; |
|
|
|
use oxiri::IriParseError; |
|
|
|
|
|
|
|
use oxrdf::TermRef; |
|
|
|
use std::error::Error; |
|
|
|
use std::error::Error; |
|
|
|
use std::{fmt, io}; |
|
|
|
use std::io; |
|
|
|
|
|
|
|
|
|
|
|
/// An error related to storage operations (reads, writes...).
|
|
|
|
/// An error related to storage operations (reads, writes...).
|
|
|
|
#[derive(Debug)] |
|
|
|
#[derive(Debug, thiserror::Error)] |
|
|
|
#[non_exhaustive] |
|
|
|
#[non_exhaustive] |
|
|
|
pub enum StorageError { |
|
|
|
pub enum StorageError { |
|
|
|
/// Error from the OS I/O layer.
|
|
|
|
/// Error from the OS I/O layer.
|
|
|
|
Io(io::Error), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Io(#[from] io::Error), |
|
|
|
/// Error related to data corruption.
|
|
|
|
/// Error related to data corruption.
|
|
|
|
Corruption(CorruptionError), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Corruption(#[from] CorruptionError), |
|
|
|
#[doc(hidden)] |
|
|
|
#[doc(hidden)] |
|
|
|
Other(Box<dyn Error + Send + Sync + 'static>), |
|
|
|
#[error("{0}")] |
|
|
|
} |
|
|
|
Other(#[source] Box<dyn Error + Send + Sync + 'static>), |
|
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for StorageError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Io(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::Corruption(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::Other(e) => e.fmt(f), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Error for StorageError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Io(e) => Some(e), |
|
|
|
|
|
|
|
Self::Corruption(e) => Some(e), |
|
|
|
|
|
|
|
Self::Other(e) => Some(e.as_ref()), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<io::Error> for StorageError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn from(error: io::Error) -> Self { |
|
|
|
|
|
|
|
Self::Io(error) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl From<StorageError> for io::Error { |
|
|
|
impl From<StorageError> for io::Error { |
|
|
|
@ -56,59 +32,32 @@ impl From<StorageError> for io::Error { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// An error return if some content in the database is corrupted.
|
|
|
|
/// An error return if some content in the database is corrupted.
|
|
|
|
#[derive(Debug)] |
|
|
|
#[derive(Debug, thiserror::Error)] |
|
|
|
pub struct CorruptionError { |
|
|
|
pub enum CorruptionError { |
|
|
|
inner: CorruptionErrorKind, |
|
|
|
#[error("{0}")] |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug)] |
|
|
|
|
|
|
|
enum CorruptionErrorKind { |
|
|
|
|
|
|
|
Msg(String), |
|
|
|
Msg(String), |
|
|
|
Other(Box<dyn Error + Send + Sync + 'static>), |
|
|
|
#[error("{0}")] |
|
|
|
|
|
|
|
Other(#[source] Box<dyn Error + Send + Sync + 'static>), |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl CorruptionError { |
|
|
|
impl CorruptionError { |
|
|
|
/// Builds an error from a printable error message.
|
|
|
|
/// Builds an error from a printable error message.
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
pub(crate) fn new(error: impl Into<Box<dyn Error + Send + Sync + 'static>>) -> Self { |
|
|
|
pub(crate) fn new(error: impl Into<Box<dyn Error + Send + Sync + 'static>>) -> Self { |
|
|
|
Self { |
|
|
|
Self::Other(error.into()) |
|
|
|
inner: CorruptionErrorKind::Other(error.into()), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Builds an error from a printable error message.
|
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
pub(crate) fn msg(msg: impl Into<String>) -> Self { |
|
|
|
|
|
|
|
Self { |
|
|
|
|
|
|
|
inner: CorruptionErrorKind::Msg(msg.into()), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for CorruptionError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
|
|
|
|
|
|
|
match &self.inner { |
|
|
|
|
|
|
|
CorruptionErrorKind::Msg(e) => e.fmt(f), |
|
|
|
|
|
|
|
CorruptionErrorKind::Other(e) => e.fmt(f), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl Error for CorruptionError { |
|
|
|
/// Builds an error from encoding and the term.
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> { |
|
|
|
pub(crate) fn from_encoded_term(encoded: &EncodedTerm, term: &TermRef<'_>) -> Self { |
|
|
|
match &self.inner { |
|
|
|
// TODO: eventually use a dedicated error enum value
|
|
|
|
CorruptionErrorKind::Msg(_) => None, |
|
|
|
Self::new(format!("Invalid term encoding {encoded:?} for {term}")) |
|
|
|
CorruptionErrorKind::Other(e) => Some(e.as_ref()), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl From<CorruptionError> for StorageError { |
|
|
|
/// Builds an error from a printable error message.
|
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
fn from(error: CorruptionError) -> Self { |
|
|
|
pub(crate) fn msg(msg: impl Into<String>) -> Self { |
|
|
|
Self::Corruption(error) |
|
|
|
Self::Msg(msg.into()) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -120,57 +69,25 @@ impl From<CorruptionError> for io::Error { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// An error raised while loading a file into a [`Store`](crate::store::Store).
|
|
|
|
/// An error raised while loading a file into a [`Store`](crate::store::Store).
|
|
|
|
#[derive(Debug)] |
|
|
|
#[derive(Debug, thiserror::Error)] |
|
|
|
pub enum LoaderError { |
|
|
|
pub enum LoaderError { |
|
|
|
/// An error raised while reading the file.
|
|
|
|
/// An error raised while reading the file.
|
|
|
|
Parsing(ParseError), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Parsing(#[from] ParseError), |
|
|
|
/// An error raised during the insertion in the store.
|
|
|
|
/// An error raised during the insertion in the store.
|
|
|
|
Storage(StorageError), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Storage(#[from] StorageError), |
|
|
|
/// The base IRI is invalid.
|
|
|
|
/// The base IRI is invalid.
|
|
|
|
|
|
|
|
#[error("Invalid base IRI '{iri}': {error}")] |
|
|
|
InvalidBaseIri { |
|
|
|
InvalidBaseIri { |
|
|
|
/// The IRI itself.
|
|
|
|
/// The IRI itself.
|
|
|
|
iri: String, |
|
|
|
iri: String, |
|
|
|
/// The parsing error.
|
|
|
|
/// The parsing error.
|
|
|
|
|
|
|
|
#[source] |
|
|
|
error: IriParseError, |
|
|
|
error: IriParseError, |
|
|
|
}, |
|
|
|
}, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for LoaderError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Parsing(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::Storage(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::InvalidBaseIri { iri, error } => write!(f, "Invalid base IRI '{iri}': {error}"), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Error for LoaderError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Parsing(e) => Some(e), |
|
|
|
|
|
|
|
Self::Storage(e) => Some(e), |
|
|
|
|
|
|
|
Self::InvalidBaseIri { error, .. } => Some(error), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<ParseError> for LoaderError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn from(error: ParseError) -> Self { |
|
|
|
|
|
|
|
Self::Parsing(error) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<StorageError> for LoaderError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn from(error: StorageError) -> Self { |
|
|
|
|
|
|
|
Self::Storage(error) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<LoaderError> for io::Error { |
|
|
|
impl From<LoaderError> for io::Error { |
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
fn from(error: LoaderError) -> Self { |
|
|
|
fn from(error: LoaderError) -> Self { |
|
|
|
@ -185,55 +102,19 @@ impl From<LoaderError> for io::Error { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// An error raised while writing a file from a [`Store`](crate::store::Store).
|
|
|
|
/// An error raised while writing a file from a [`Store`](crate::store::Store).
|
|
|
|
#[derive(Debug)] |
|
|
|
#[derive(Debug, thiserror::Error)] |
|
|
|
pub enum SerializerError { |
|
|
|
pub enum SerializerError { |
|
|
|
/// An error raised while writing the content.
|
|
|
|
/// An error raised while writing the content.
|
|
|
|
Io(io::Error), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Io(#[from] io::Error), |
|
|
|
/// An error raised during the lookup in the store.
|
|
|
|
/// An error raised during the lookup in the store.
|
|
|
|
Storage(StorageError), |
|
|
|
#[error(transparent)] |
|
|
|
|
|
|
|
Storage(#[from] StorageError), |
|
|
|
/// A format compatible with [RDF dataset](https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset) is required.
|
|
|
|
/// A format compatible with [RDF dataset](https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-dataset) is required.
|
|
|
|
|
|
|
|
#[error("A RDF format supporting datasets was expected, {0} found")] |
|
|
|
DatasetFormatExpected(RdfFormat), |
|
|
|
DatasetFormatExpected(RdfFormat), |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for SerializerError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Io(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::Storage(e) => e.fmt(f), |
|
|
|
|
|
|
|
Self::DatasetFormatExpected(format) => write!( |
|
|
|
|
|
|
|
f, |
|
|
|
|
|
|
|
"A RDF format supporting datasets was expected, {format} found" |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Error for SerializerError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> { |
|
|
|
|
|
|
|
match self { |
|
|
|
|
|
|
|
Self::Io(e) => Some(e), |
|
|
|
|
|
|
|
Self::Storage(e) => Some(e), |
|
|
|
|
|
|
|
Self::DatasetFormatExpected(_) => None, |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<io::Error> for SerializerError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn from(error: io::Error) -> Self { |
|
|
|
|
|
|
|
Self::Io(error) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<StorageError> for SerializerError { |
|
|
|
|
|
|
|
#[inline] |
|
|
|
|
|
|
|
fn from(error: StorageError) -> Self { |
|
|
|
|
|
|
|
Self::Storage(error) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl From<SerializerError> for io::Error { |
|
|
|
impl From<SerializerError> for io::Error { |
|
|
|
#[inline] |
|
|
|
#[inline] |
|
|
|
fn from(error: SerializerError) -> Self { |
|
|
|
fn from(error: SerializerError) -> Self { |
|
|
|
|
Yuri Astrakhan
1 year ago
committed by