snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

change NameTempFile to tempfile()

Browse Source
This commit is contained in:
jiangbo212 2022-12-07 22:47:32 +08:00
parent cb1d184904
commit 538030c2da
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,9 @@ use serde::Deserialize;
use serde_cs::vec::CS; use serde_cs::vec::CS;
use serde_json::Value; use serde_json::Value;
use std::io::ErrorKind; use std::io::ErrorKind;
use tempfile::NamedTempFile; use tempfile::tempfile;
use tokio::fs::File; use tokio::fs::File;
use tokio::io::AsyncWriteExt; use tokio::io::{AsyncSeekExt, AsyncWriteExt};
use crate::analytics::{Analytics, DocumentDeletionKind}; use crate::analytics::{Analytics, DocumentDeletionKind};
use crate::error::MeilisearchHttpError; use crate::error::MeilisearchHttpError;
@ -230,19 +230,14 @@ async fn document_addition(
let (uuid, mut update_file) = index_scheduler.create_update_file()?; let (uuid, mut update_file) = index_scheduler.create_update_file()?;
let temp_file = match NamedTempFile::new() { let temp_file = match tempfile() {
Ok(temp_file) => temp_file, Ok(temp_file) => temp_file,
Err(e) => { Err(e) => {
return Err(MeilisearchHttpError::Payload(ReceivePayloadErr(Box::new(e)))); return Err(MeilisearchHttpError::Payload(ReceivePayloadErr(Box::new(e))));
} }
}; };
let mut buffer = match File::create(&temp_file.as_ref()).await { let mut buffer = File::from_std(temp_file);
Ok(buffer) => buffer,
Err(e) => {
return Err(MeilisearchHttpError::Payload(ReceivePayloadErr(Box::new(e))));
}
};
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 {
@ -268,12 +263,18 @@ async fn document_addition(
return Err(MeilisearchHttpError::MissingPayload(format)); return Err(MeilisearchHttpError::MissingPayload(format));
} }
if let Err(e) = buffer.seek(std::io::SeekFrom::Start(0)).await {
return Err(MeilisearchHttpError::Payload(ReceivePayloadErr(Box::new(e))));
};
let read_file = buffer.into_std().await;
let documents_count = let documents_count =
tokio::task::spawn_blocking(move || -> Result<_, MeilisearchHttpError> { tokio::task::spawn_blocking(move || -> Result<_, MeilisearchHttpError> {
let documents_count = match format { let documents_count = match format {
PayloadType::Json => read_json(temp_file.as_file(), update_file.as_file_mut())?, PayloadType::Json => read_json(&read_file, update_file.as_file_mut())?,
PayloadType::Csv => read_csv(temp_file.as_file(), update_file.as_file_mut())?, PayloadType::Csv => read_csv(&read_file, update_file.as_file_mut())?,
PayloadType::Ndjson => read_ndjson(temp_file.as_file(), update_file.as_file_mut())?, PayloadType::Ndjson => read_ndjson(&read_file, update_file.as_file_mut())?,
}; };
// we NEED to persist the file here because we moved the `udpate_file` in another task. // we NEED to persist the file here because we moved the `udpate_file` in another task.
update_file.persist()?; update_file.persist()?;