From 52b1eb2c37398b3d5c3dbc1b26fcac453cc604c3 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Wed, 10 Mar 2021 14:35:51 +0900 Subject: [PATCH] Clippy fix --- src/collector/custom_score_top_collector.rs | 4 +-- src/collector/top_collector.rs | 7 ++--- src/collector/top_score_collector.rs | 2 +- src/collector/tweak_score_top_collector.rs | 4 +-- src/core/index.rs | 12 ++++---- src/core/segment_reader.rs | 6 ++-- src/directory/mmap_directory.rs | 6 ++-- src/fastfield/bytes/writer.rs | 2 +- src/fastfield/readers.rs | 9 ++---- src/fastfield/serializer.rs | 8 ++---- src/indexer/merger.rs | 2 +- src/postings/serializer.rs | 32 ++++++--------------- src/store/index/mod.rs | 2 +- 13 files changed, 33 insertions(+), 63 deletions(-) diff --git a/src/collector/custom_score_top_collector.rs b/src/collector/custom_score_top_collector.rs index d8037175d..0a804cf5c 100644 --- a/src/collector/custom_score_top_collector.rs +++ b/src/collector/custom_score_top_collector.rs @@ -58,9 +58,7 @@ where segment_local_id: u32, segment_reader: &SegmentReader, ) -> crate::Result { - let segment_collector = self - .collector - .for_segment(segment_local_id, segment_reader)?; + let segment_collector = self.collector.for_segment(segment_local_id, segment_reader); let segment_scorer = self.custom_scorer.segment_scorer(segment_reader)?; Ok(CustomScoreTopSegmentCollector { segment_collector, diff --git a/src/collector/top_collector.rs b/src/collector/top_collector.rs index a32ff5290..46748c38b 100644 --- a/src/collector/top_collector.rs +++ b/src/collector/top_collector.rs @@ -120,11 +120,8 @@ where &self, segment_id: SegmentLocalId, _: &SegmentReader, - ) -> crate::Result> { - Ok(TopSegmentCollector::new( - segment_id, - self.limit + self.offset, - )) + ) -> TopSegmentCollector { + TopSegmentCollector::new(segment_id, self.limit + self.offset) } /// Create a new TopCollector with the same limit and offset. diff --git a/src/collector/top_score_collector.rs b/src/collector/top_score_collector.rs index 45ba24cf4..5f85cc65c 100644 --- a/src/collector/top_score_collector.rs +++ b/src/collector/top_score_collector.rs @@ -603,7 +603,7 @@ impl Collector for TopDocs { segment_local_id: SegmentLocalId, reader: &SegmentReader, ) -> crate::Result { - let collector = self.0.for_segment(segment_local_id, reader)?; + let collector = self.0.for_segment(segment_local_id, reader); Ok(TopScoreSegmentCollector(collector)) } diff --git a/src/collector/tweak_score_top_collector.rs b/src/collector/tweak_score_top_collector.rs index 87dda2d07..d524e0a00 100644 --- a/src/collector/tweak_score_top_collector.rs +++ b/src/collector/tweak_score_top_collector.rs @@ -62,9 +62,7 @@ where segment_reader: &SegmentReader, ) -> Result { let segment_scorer = self.score_tweaker.segment_tweaker(segment_reader)?; - let segment_collector = self - .collector - .for_segment(segment_local_id, segment_reader)?; + let segment_collector = self.collector.for_segment(segment_local_id, segment_reader); Ok(TopTweakedScoreSegmentCollector { segment_collector, segment_scorer, diff --git a/src/core/index.rs b/src/core/index.rs index 32f064ac1..8784162fe 100644 --- a/src/core/index.rs +++ b/src/core/index.rs @@ -165,7 +165,8 @@ impl Index { fn from_directory(directory: ManagedDirectory, schema: Schema) -> crate::Result { save_new_metas(schema.clone(), &directory)?; let metas = IndexMeta::with_schema(schema); - Index::create_from_metas(directory, &metas, SegmentMetaInventory::default()) + let index = Index::create_from_metas(directory, &metas, SegmentMetaInventory::default()); + Ok(index) } /// Creates a new index given a directory and an `IndexMeta`. @@ -173,15 +174,15 @@ impl Index { directory: ManagedDirectory, metas: &IndexMeta, inventory: SegmentMetaInventory, - ) -> crate::Result { + ) -> Index { let schema = metas.schema.clone(); - Ok(Index { + Index { directory, schema, tokenizers: TokenizerManager::default(), executor: Arc::new(Executor::single_thread()), inventory, - }) + } } /// Accessor for the tokenizer manager. @@ -256,7 +257,8 @@ impl Index { let directory = ManagedDirectory::wrap(directory)?; let inventory = SegmentMetaInventory::default(); let metas = load_metas(&directory, &inventory)?; - Index::create_from_metas(directory, &metas, inventory) + let index = Index::create_from_metas(directory, &metas, inventory); + Ok(index) } /// Reads the index meta file from the directory. diff --git a/src/core/segment_reader.rs b/src/core/segment_reader.rs index 2a45861d2..5eea06473 100644 --- a/src/core/segment_reader.rs +++ b/src/core/segment_reader.rs @@ -178,10 +178,8 @@ impl SegmentReader { let fast_fields_data = segment.open_read(SegmentComponent::FASTFIELDS)?; let fast_fields_composite = CompositeFile::open(&fast_fields_data)?; - let fast_field_readers = Arc::new(FastFieldReaders::new( - schema.clone(), - fast_fields_composite, - )?); + let fast_field_readers = + Arc::new(FastFieldReaders::new(schema.clone(), fast_fields_composite)); let fieldnorm_data = segment.open_read(SegmentComponent::FIELDNORMS)?; let fieldnorm_readers = FieldNormReaders::open(fieldnorm_data)?; diff --git a/src/directory/mmap_directory.rs b/src/directory/mmap_directory.rs index 184795d9e..2e8af1d0d 100644 --- a/src/directory/mmap_directory.rs +++ b/src/directory/mmap_directory.rs @@ -163,8 +163,8 @@ impl MmapDirectoryInner { } } - fn watch(&self, callback: WatchCallback) -> crate::Result { - Ok(self.watcher.watch(callback)) + fn watch(&self, callback: WatchCallback) -> WatchHandle { + self.watcher.watch(callback) } } @@ -474,7 +474,7 @@ impl Directory for MmapDirectory { } fn watch(&self, watch_callback: WatchCallback) -> crate::Result { - self.inner.watch(watch_callback) + Ok(self.inner.watch(watch_callback)) } } diff --git a/src/fastfield/bytes/writer.rs b/src/fastfield/bytes/writer.rs index 454078215..e98d089c1 100644 --- a/src/fastfield/bytes/writer.rs +++ b/src/fastfield/bytes/writer.rs @@ -80,7 +80,7 @@ impl BytesFastFieldWriter { doc_index_serializer.close_field()?; // writing the values themselves serializer - .new_bytes_fast_field_with_idx(self.field, 1)? + .new_bytes_fast_field_with_idx(self.field, 1) .write_all(&self.vals)?; Ok(()) } diff --git a/src/fastfield/readers.rs b/src/fastfield/readers.rs index 7b2bdbc95..880e95aa2 100644 --- a/src/fastfield/readers.rs +++ b/src/fastfield/readers.rs @@ -44,14 +44,11 @@ fn type_and_cardinality(field_type: &FieldType) -> Option<(FastType, Cardinality } impl FastFieldReaders { - pub(crate) fn new( - schema: Schema, - fast_fields_composite: CompositeFile, - ) -> crate::Result { - Ok(FastFieldReaders { + pub(crate) fn new(schema: Schema, fast_fields_composite: CompositeFile) -> FastFieldReaders { + FastFieldReaders { fast_fields_composite, schema, - }) + } } pub(crate) fn space_usage(&self) -> PerFieldSpaceUsage { diff --git a/src/fastfield/serializer.rs b/src/fastfield/serializer.rs index 60f3c1b97..d2871d651 100644 --- a/src/fastfield/serializer.rs +++ b/src/fastfield/serializer.rs @@ -66,9 +66,9 @@ impl FastFieldSerializer { &mut self, field: Field, idx: usize, - ) -> io::Result>> { + ) -> FastBytesFieldSerializer<'_, CountingWriter> { let field_write = self.composite_write.for_field_with_idx(field, idx); - FastBytesFieldSerializer::open(field_write) + FastBytesFieldSerializer { write: field_write } } /// Closes the serializer @@ -132,10 +132,6 @@ pub struct FastBytesFieldSerializer<'a, W: Write> { } impl<'a, W: Write> FastBytesFieldSerializer<'a, W> { - fn open(write: &'a mut W) -> io::Result> { - Ok(FastBytesFieldSerializer { write }) - } - pub fn write_all(&mut self, vals: &[u8]) -> io::Result<()> { self.write.write_all(vals) } diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs index d91f2f8e3..271c3d505 100644 --- a/src/indexer/merger.rs +++ b/src/indexer/merger.rs @@ -476,7 +476,7 @@ impl IndexMerger { serialize_idx.close_field()?; } - let mut serialize_vals = fast_field_serializer.new_bytes_fast_field_with_idx(field, 1)?; + let mut serialize_vals = fast_field_serializer.new_bytes_fast_field_with_idx(field, 1); for segment_reader in &self.readers { let bytes_reader = segment_reader.fast_fields().bytes(field) .expect("Failed to find bytes field in fast field reader. This is a bug in tantivy. Please report."); diff --git a/src/postings/serializer.rs b/src/postings/serializer.rs index b326a017f..3913d5532 100644 --- a/src/postings/serializer.rs +++ b/src/postings/serializer.rs @@ -55,33 +55,17 @@ pub struct InvertedIndexSerializer { } impl InvertedIndexSerializer { - /// Open a new `InvertedIndexSerializer` for the given segment - fn create( - terms_write: CompositeWrite, - postings_write: CompositeWrite, - positions_write: CompositeWrite, - positionsidx_write: CompositeWrite, - schema: Schema, - ) -> crate::Result { - Ok(InvertedIndexSerializer { - terms_write, - postings_write, - positions_write, - positionsidx_write, - schema, - }) - } - /// Open a new `PostingsSerializer` for the given segment pub fn open(segment: &mut Segment) -> crate::Result { use crate::SegmentComponent::{POSITIONS, POSITIONSSKIP, POSTINGS, TERMS}; - InvertedIndexSerializer::create( - CompositeWrite::wrap(segment.open_write(TERMS)?), - CompositeWrite::wrap(segment.open_write(POSTINGS)?), - CompositeWrite::wrap(segment.open_write(POSITIONS)?), - CompositeWrite::wrap(segment.open_write(POSITIONSSKIP)?), - segment.schema(), - ) + let inv_index_serializer = InvertedIndexSerializer { + terms_write: CompositeWrite::wrap(segment.open_write(TERMS)?), + postings_write: CompositeWrite::wrap(segment.open_write(POSTINGS)?), + positions_write: CompositeWrite::wrap(segment.open_write(POSITIONS)?), + positionsidx_write: CompositeWrite::wrap(segment.open_write(POSITIONSSKIP)?), + schema: segment.schema(), + }; + Ok(inv_index_serializer) } /// Must be called before starting pushing terms of diff --git a/src/store/index/mod.rs b/src/store/index/mod.rs index cdf4167ff..ae6431285 100644 --- a/src/store/index/mod.rs +++ b/src/store/index/mod.rs @@ -27,7 +27,7 @@ pub struct Checkpoint { impl Checkpoint { pub(crate) fn follows(&self, other: &Checkpoint) -> bool { (self.doc_range.start == other.doc_range.end) - && (self.doc_range.start == other.doc_range.end) + && (self.byte_range.start == other.byte_range.end) } }