searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-30 00:34:26 +01:00
Code Issues Releases Wiki Activity

test fail fix

Browse Source
This commit is contained in:
jiangbo212 2022-12-03 22:48:38 +08:00
parent 7b08d700f7
commit 5a770ffe47
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index-scheduler/src/lib.rs
View File

@ -1193,7 +1193,7 @@ mod tests {
) -> std::result::Result<usize, DocumentFormatError> { ) -> std::result::Result<usize, DocumentFormatError> {
let temp_file = NamedTempFile::new().unwrap(); let temp_file = NamedTempFile::new().unwrap();
let mut buffer = BufWriter::new(temp_file.reopen().unwrap()); let mut buffer = BufWriter::new(temp_file.reopen().unwrap());
buffer.write(bytes).unwrap(); buffer.write_all(bytes).unwrap();
buffer.flush().unwrap(); buffer.flush().unwrap();
meilisearch_types::document_formats::read_json(temp_file.as_file(), write) meilisearch_types::document_formats::read_json(temp_file.as_file(), write)
} }

16
meilisearch-http/src/routes/indexes/documents.rs
View File

@ -29,7 +29,7 @@ use serde_json::Value;
use std::io::ErrorKind; use std::io::ErrorKind;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use tokio::fs::File; use tokio::fs::File;
use tokio::io::{AsyncWriteExt, BufWriter}; use tokio::io::AsyncWriteExt;
static ACCEPTED_CONTENT_TYPE: Lazy<Vec<String>> = Lazy::new(|| { static ACCEPTED_CONTENT_TYPE: Lazy<Vec<String>> = Lazy::new(|| {
vec!["application/json".to_string(), "application/x-ndjson".to_string(), "text/csv".to_string()] vec!["application/json".to_string(), "application/x-ndjson".to_string(), "text/csv".to_string()]
@ -244,16 +244,22 @@ async fn document_addition(
return Err(MeilisearchHttpError::Payload(ReceivePayloadErr)); return Err(MeilisearchHttpError::Payload(ReceivePayloadErr));
} }
}; };
let mut buffer = BufWriter::new(File::from_std(buffer_file)); let mut buffer = File::from_std(buffer_file);
let mut buffer_write_size: usize = 0; let mut buffer_write_size: usize = 0;
while let Some(bytes) = body.next().await { while let Some(bytes) = body.next().await {
match buffer.write(&bytes?).await { let byte = &bytes?;
Ok(size) => buffer_write_size += size,
if byte.is_empty() && buffer_write_size == 0 {
return Err(MeilisearchHttpError::MissingPayload(format));
}
match buffer.write_all(byte).await {
Ok(()) => buffer_write_size += 1,
Err(e) => { Err(e) => {
error!("bufWriter write error: {}", e); error!("bufWriter write error: {}", e);
return Err(MeilisearchHttpError::Payload(ReceivePayloadErr)); return Err(MeilisearchHttpError::Payload(ReceivePayloadErr));
} }
} };
} }
if let Err(e) = buffer.flush().await { if let Err(e) = buffer.flush().await {