snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

clippy: Replace seek 0 by rewind

Browse Source
This commit is contained in:
Louis Dureuil 2023-01-30 17:17:35 +01:00
parent bfb1f9279b
commit 89675e5f15
No known key found for this signature in database
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dump/src/lib.rs
View File

@ -198,7 +198,7 @@ impl From<KindWithContent> for KindDump {
#[cfg(test)] #[cfg(test)]
pub(crate) mod test { pub(crate) mod test {
use std::fs::File; use std::fs::File;
use std::io::{Seek, SeekFrom}; use std::io::Seek;
use std::str::FromStr; use std::str::FromStr;
use big_s::S; use big_s::S;
@ -410,7 +410,7 @@ pub(crate) mod test {
// create the dump // create the dump
let mut file = tempfile::tempfile().unwrap(); let mut file = tempfile::tempfile().unwrap();
dump.persist_to(&mut file).unwrap(); dump.persist_to(&mut file).unwrap();
file.seek(SeekFrom::Start(0)).unwrap(); file.rewind().unwrap();
file file
} }

4
dump/src/reader/v5/mod.rs
View File

@ -33,7 +33,7 @@
//! //!
use std::fs::{self, File}; use std::fs::{self, File};
use std::io::{BufRead, BufReader, ErrorKind, Seek, SeekFrom}; use std::io::{BufRead, BufReader, ErrorKind, Seek};
use std::path::Path; use std::path::Path;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -178,7 +178,7 @@ impl V5Reader {
} }
pub fn keys(&mut self) -> Result<Box<dyn Iterator<Item = Result<Key>> + '_>> { pub fn keys(&mut self) -> Result<Box<dyn Iterator<Item = Result<Key>> + '_>> {
self.keys.seek(SeekFrom::Start(0))?; self.keys.rewind()?;
Ok(Box::new( Ok(Box::new(
(&mut self.keys).lines().map(|line| -> Result<_> { Ok(serde_json::from_str(&line?)?) }), (&mut self.keys).lines().map(|line| -> Result<_> { Ok(serde_json::from_str(&line?)?) }),
)) ))

4
milli/src/update/index_documents/helpers/grenad_helpers.rs
View File

@ -1,6 +1,6 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::fs::File; use std::fs::File;
use std::io::{self, Seek, SeekFrom}; use std::io::{self, Seek};
use std::time::Instant; use std::time::Instant;
use grenad::{CompressionType, Sorter}; use grenad::{CompressionType, Sorter};
@ -66,7 +66,7 @@ pub fn sorter_into_reader(
pub fn writer_into_reader(writer: grenad::Writer<File>) -> Result<grenad::Reader<File>> { pub fn writer_into_reader(writer: grenad::Writer<File>) -> Result<grenad::Reader<File>> {
let mut file = writer.into_inner()?; let mut file = writer.into_inner()?;
file.seek(SeekFrom::Start(0))?; file.rewind()?;
grenad::Reader::new(file).map_err(Into::into) grenad::Reader::new(file).map_err(Into::into)
} }

10
milli/src/update/index_documents/transform.rs
View File

@ -2,7 +2,7 @@ use std::borrow::Cow;
use std::collections::hash_map::Entry; use std::collections::hash_map::Entry;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::fs::File; use std::fs::File;
use std::io::{Read, Seek, SeekFrom}; use std::io::{Read, Seek};
use fxhash::FxHashMap; use fxhash::FxHashMap;
use heed::RoTxn; use heed::RoTxn;
@ -510,7 +510,7 @@ impl<'a, 'i> Transform<'a, 'i> {
let mut original_documents = writer.into_inner()?; let mut original_documents = writer.into_inner()?;
// We then extract the file and reset the seek to be able to read it again. // We then extract the file and reset the seek to be able to read it again.
original_documents.seek(SeekFrom::Start(0))?; original_documents.rewind()?;
// We create a final writer to write the new documents in order from the sorter. // We create a final writer to write the new documents in order from the sorter.
let mut writer = create_writer( let mut writer = create_writer(
@ -522,7 +522,7 @@ impl<'a, 'i> Transform<'a, 'i> {
// into this writer, extract the file and reset the seek to be able to read it again. // into this writer, extract the file and reset the seek to be able to read it again.
self.flattened_sorter.write_into_stream_writer(&mut writer)?; self.flattened_sorter.write_into_stream_writer(&mut writer)?;
let mut flattened_documents = writer.into_inner()?; let mut flattened_documents = writer.into_inner()?;
flattened_documents.seek(SeekFrom::Start(0))?; flattened_documents.rewind()?;
let mut new_external_documents_ids_builder: Vec<_> = let mut new_external_documents_ids_builder: Vec<_> =
self.new_external_documents_ids_builder.into_iter().collect(); self.new_external_documents_ids_builder.into_iter().collect();
@ -650,10 +650,10 @@ impl<'a, 'i> Transform<'a, 'i> {
// Once we have written all the documents, we extract // Once we have written all the documents, we extract
// the file and reset the seek to be able to read it again. // the file and reset the seek to be able to read it again.
let mut original_documents = original_writer.into_inner()?; let mut original_documents = original_writer.into_inner()?;
original_documents.seek(SeekFrom::Start(0))?; original_documents.rewind()?;
let mut flattened_documents = flattened_writer.into_inner()?; let mut flattened_documents = flattened_writer.into_inner()?;
flattened_documents.seek(SeekFrom::Start(0))?; flattened_documents.rewind()?;
let output = TransformOutput { let output = TransformOutput {
primary_key, primary_key,