mirror of
https://github.com/meilisearch/MeiliSearch
synced 2025-02-08 19:43:28 +01:00
Do only one convertion to u64
This commit is contained in:
parent
5d5615ef45
commit
7b2f2a4f9c
@ -1190,7 +1190,7 @@ mod tests {
|
|||||||
pub fn read_json(
|
pub fn read_json(
|
||||||
bytes: &[u8],
|
bytes: &[u8],
|
||||||
write: impl Write + Seek,
|
write: impl Write + Seek,
|
||||||
) -> std::result::Result<usize, DocumentFormatError> {
|
) -> std::result::Result<u64, 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_all(bytes).unwrap();
|
buffer.write_all(bytes).unwrap();
|
||||||
|
@ -101,7 +101,7 @@ impl ErrorCode for DocumentFormatError {
|
|||||||
internal_error!(DocumentFormatError: io::Error);
|
internal_error!(DocumentFormatError: io::Error);
|
||||||
|
|
||||||
/// Reads CSV from input and write an obkv batch to writer.
|
/// Reads CSV from input and write an obkv batch to writer.
|
||||||
pub fn read_csv(file: &File, writer: impl Write + Seek) -> Result<usize> {
|
pub fn read_csv(file: &File, writer: impl Write + Seek) -> Result<u64> {
|
||||||
let mut builder = DocumentsBatchBuilder::new(writer);
|
let mut builder = DocumentsBatchBuilder::new(writer);
|
||||||
let mmap = unsafe { MmapOptions::new().map(file)? };
|
let mmap = unsafe { MmapOptions::new().map(file)? };
|
||||||
let csv = csv::Reader::from_reader(mmap.as_ref());
|
let csv = csv::Reader::from_reader(mmap.as_ref());
|
||||||
@ -110,16 +110,16 @@ pub fn read_csv(file: &File, writer: impl Write + Seek) -> Result<usize> {
|
|||||||
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(Into::into).map_err(DocumentFormatError::Internal)?;
|
||||||
|
|
||||||
Ok(count as usize)
|
Ok(count as u64)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Reads JSON from temporary file and write an obkv batch to writer.
|
/// Reads JSON from temporary file and write an obkv batch to writer.
|
||||||
pub fn read_json(file: &File, writer: impl Write + Seek) -> Result<usize> {
|
pub fn read_json(file: &File, writer: impl Write + Seek) -> Result<u64> {
|
||||||
read_json_inner(file, writer, PayloadType::Json)
|
read_json_inner(file, writer, PayloadType::Json)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Reads JSON from temporary file and write an obkv batch to writer.
|
/// Reads JSON from temporary file and write an obkv batch to writer.
|
||||||
pub fn read_ndjson(file: &File, writer: impl Write + Seek) -> Result<usize> {
|
pub fn read_ndjson(file: &File, writer: impl Write + Seek) -> Result<u64> {
|
||||||
read_json_inner(file, writer, PayloadType::Ndjson)
|
read_json_inner(file, writer, PayloadType::Ndjson)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ fn read_json_inner(
|
|||||||
file: &File,
|
file: &File,
|
||||||
writer: impl Write + Seek,
|
writer: impl Write + Seek,
|
||||||
payload_type: PayloadType,
|
payload_type: PayloadType,
|
||||||
) -> Result<usize> {
|
) -> Result<u64> {
|
||||||
let mut builder = DocumentsBatchBuilder::new(writer);
|
let mut builder = DocumentsBatchBuilder::new(writer);
|
||||||
let mmap = unsafe { MmapOptions::new().map(file)? };
|
let mmap = unsafe { MmapOptions::new().map(file)? };
|
||||||
let mut deserializer = serde_json::Deserializer::from_slice(&mmap);
|
let mut deserializer = serde_json::Deserializer::from_slice(&mmap);
|
||||||
@ -155,7 +155,7 @@ fn read_json_inner(
|
|||||||
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(Into::into).map_err(DocumentFormatError::Internal)?;
|
||||||
|
|
||||||
Ok(count as usize)
|
Ok(count as u64)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The actual handling of the deserialization process in serde
|
/// The actual handling of the deserialization process in serde
|
||||||
|
@ -279,7 +279,7 @@ async fn document_addition(
|
|||||||
.await;
|
.await;
|
||||||
|
|
||||||
let documents_count = match documents_count {
|
let documents_count = match documents_count {
|
||||||
Ok(Ok(documents_count)) => documents_count as u64,
|
Ok(Ok(documents_count)) => documents_count,
|
||||||
// in this case the file has not possibly be persisted.
|
// in this case the file has not possibly be persisted.
|
||||||
Ok(Err(e)) => return Err(e),
|
Ok(Err(e)) => return Err(e),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user