snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-12-02 01:55:03 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

convert all the document format error due to io to io::Error

Browse Source
This commit is contained in:
Tamo 2022-12-20 17:49:38 +01:00
parent 3040172562
commit c637bfba37
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dump/src/error.rs
View File

@ -21,7 +21,8 @@ impl ErrorCode for Error {
match self { match self {
Error::Io(e) => e.error_code(), Error::Io(e) => e.error_code(),
// These error come from an internal mis // These errors either happens when creating a dump and don't need any error code.
// These error come from a internal bad deserialization.
Error::Serde(_) => Code::Internal, Error::Serde(_) => Code::Internal,
Error::Uuid(_) => Code::Internal, Error::Uuid(_) => Code::Internal,

16
meilisearch-types/src/document_formats.rs
View File

@ -36,7 +36,6 @@ impl fmt::Display for PayloadType {
#[derive(Debug)] #[derive(Debug)]
pub enum DocumentFormatError { pub enum DocumentFormatError {
Io(io::Error), Io(io::Error),
Internal(Box<dyn std::error::Error + Send + Sync + 'static>),
MalformedPayload(Error, PayloadType), MalformedPayload(Error, PayloadType),
} }
@ -44,7 +43,6 @@ impl Display for DocumentFormatError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Io(e) => write!(f, "{e}"), Self::Io(e) => write!(f, "{e}"),
Self::Internal(e) => write!(f, "An internal error has occurred: `{}`.", e),
Self::MalformedPayload(me, b) => match me.borrow() { Self::MalformedPayload(me, b) => match me.borrow() {
Error::Json(se) => { Error::Json(se) => {
let mut message = match se.classify() { let mut message = match se.classify() {
@ -86,7 +84,7 @@ impl std::error::Error for DocumentFormatError {}
impl From<(PayloadType, Error)> for DocumentFormatError { impl From<(PayloadType, Error)> for DocumentFormatError {
fn from((ty, error): (PayloadType, Error)) -> Self { fn from((ty, error): (PayloadType, Error)) -> Self {
match error { match error {
Error::Io(e) => Self::Internal(Box::new(e)), Error::Io(e) => Self::Io(e),
e => Self::MalformedPayload(e, ty), e => Self::MalformedPayload(e, ty),
} }
} }
@ -102,7 +100,6 @@ impl ErrorCode for DocumentFormatError {
fn error_code(&self) -> Code { fn error_code(&self) -> Code {
match self { match self {
DocumentFormatError::Io(e) => e.error_code(), DocumentFormatError::Io(e) => e.error_code(),
DocumentFormatError::Internal(_) => Code::Internal,
DocumentFormatError::MalformedPayload(_, _) => Code::MalformedPayload, DocumentFormatError::MalformedPayload(_, _) => Code::MalformedPayload,
} }
} }
@ -116,7 +113,7 @@ pub fn read_csv(file: &File, writer: impl Write + Seek) -> Result<u64> {
builder.append_csv(csv).map_err(|e| (PayloadType::Csv, e))?; builder.append_csv(csv).map_err(|e| (PayloadType::Csv, e))?;
let count = builder.documents_count(); let count = builder.documents_count();
let _ = builder.into_inner().map_err(Into::into).map_err(DocumentFormatError::Internal)?; let _ = builder.into_inner().map_err(DocumentFormatError::Io)?;
Ok(count as u64) Ok(count as u64)
} }
@ -145,7 +142,7 @@ fn read_json_inner(
// The json data has been deserialized and does not need to be processed again. // The json data has been deserialized and does not need to be processed again.
// The data has been transferred to the writer during the deserialization process. // The data has been transferred to the writer during the deserialization process.
Ok(Ok(_)) => (), Ok(Ok(_)) => (),
Ok(Err(e)) => return Err(DocumentFormatError::Internal(Box::new(e))), Ok(Err(e)) => return Err(DocumentFormatError::Io(e)),
Err(_e) => { Err(_e) => {
// If we cannot deserialize the content as an array of object then we try // If we cannot deserialize the content as an array of object then we try
// to deserialize it with the original method to keep correct error messages. // to deserialize it with the original method to keep correct error messages.
@ -161,16 +158,13 @@ fn read_json_inner(
.map_err(|e| (payload_type, e))?; .map_err(|e| (payload_type, e))?;
for object in content.inner.map_right(|o| vec![o]).into_inner() { for object in content.inner.map_right(|o| vec![o]).into_inner() {
builder builder.append_json_object(&object).map_err(DocumentFormatError::Io)?;
.append_json_object(&object)
.map_err(Into::into)
.map_err(DocumentFormatError::Internal)?;
} }
} }
} }
let count = builder.documents_count(); let count = builder.documents_count();
let _ = builder.into_inner().map_err(Into::into).map_err(DocumentFormatError::Internal)?; let _ = builder.into_inner().map_err(DocumentFormatError::Io)?;
Ok(count as u64) Ok(count as u64)
} }