snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix #2680 - replace a meaningless serde message

Browse Source
This commit is contained in:
Tomasz Wiśniewski 2022-09-29 16:36:32 +02:00
parent 2827ff7957
commit 61a518a384
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meilisearch-http/tests/documents/add_documents.rs
View File

@ -372,7 +372,7 @@ async fn error_add_malformed_json_documents() {
assert_eq!( assert_eq!(
response["message"], response["message"],
json!( json!(
r#"The `json` payload provided is malformed. `Couldn't serialize document value: data did not match any variant of untagged enum Either`."# r#"The `json` payload provided is malformed. `Couldn't serialize document value: data are neither an object nor a list of objects`."#
) )
); );
assert_eq!(response["code"], json!("malformed_payload")); assert_eq!(response["code"], json!("malformed_payload"));
@ -395,7 +395,7 @@ async fn error_add_malformed_json_documents() {
assert_eq!(status_code, 400); assert_eq!(status_code, 400);
assert_eq!( assert_eq!(
response["message"], response["message"],
json!("The `json` payload provided is malformed. `Couldn't serialize document value: data did not match any variant of untagged enum Either`.") json!("The `json` payload provided is malformed. `Couldn't serialize document value: data are neither an object nor a list of objects`.")
); );
assert_eq!(response["code"], json!("malformed_payload")); assert_eq!(response["code"], json!("malformed_payload"));
assert_eq!(response["type"], json!("invalid_request")); assert_eq!(response["type"], json!("invalid_request"));

17
meilisearch-lib/src/document_formats.rs
View File

@ -8,6 +8,7 @@ use meilisearch_types::internal_error;
use milli::documents::{DocumentsBatchBuilder, Error}; use milli::documents::{DocumentsBatchBuilder, Error};
use milli::Object; use milli::Object;
use serde::Deserialize; use serde::Deserialize;
use serde_json::error::Category;
type Result<T> = std::result::Result<T, DocumentFormatError>; type Result<T> = std::result::Result<T, DocumentFormatError>;
@ -40,18 +41,24 @@ impl Display for DocumentFormatError {
Self::Internal(e) => write!(f, "An internal error has occurred: `{}`.", 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() {
Category::Data => {
"data are neither an object nor a list of objects".to_string()
}
_ => se.to_string(),
};
// https://github.com/meilisearch/meilisearch/issues/2107 // https://github.com/meilisearch/meilisearch/issues/2107
// The user input maybe insanely long. We need to truncate it. // The user input maybe insanely long. We need to truncate it.
let mut serde_msg = se.to_string();
let ellipsis = "..."; let ellipsis = "...";
let trim_input_prefix_len = 50; let trim_input_prefix_len = 50;
let trim_input_suffix_len = 85; let trim_input_suffix_len = 85;
if serde_msg.len() if message.len()
> trim_input_prefix_len + trim_input_suffix_len + ellipsis.len() > trim_input_prefix_len + trim_input_suffix_len + ellipsis.len()
{ {
serde_msg.replace_range( message.replace_range(
trim_input_prefix_len..serde_msg.len() - trim_input_suffix_len, trim_input_prefix_len..message.len() - trim_input_suffix_len,
ellipsis, ellipsis,
); );
} }
@ -59,7 +66,7 @@ impl Display for DocumentFormatError {
write!( write!(
f, f,
"The `{}` payload provided is malformed. `Couldn't serialize document value: {}`.", "The `{}` payload provided is malformed. `Couldn't serialize document value: {}`.",
b, serde_msg b, message
) )
} }
_ => write!(f, "The `{}` payload provided is malformed: `{}`.", b, me), _ => write!(f, "The `{}` payload provided is malformed: `{}`.", b, me),