diff --git a/src/postings/json_postings_writer.rs b/src/postings/json_postings_writer.rs index c5f495c75..34a5092e9 100644 --- a/src/postings/json_postings_writer.rs +++ b/src/postings/json_postings_writer.rs @@ -3,7 +3,7 @@ use std::io; use crate::fastfield::MultiValuedFastFieldWriter; use crate::indexer::doc_id_mapping::DocIdMapping; use crate::postings::postings_writer::SpecializedPostingsWriter; -use crate::postings::recorder::{BufferLender, NothingRecorder, Recorder}; +use crate::postings::recorder::{BufferLender, DocIdRecorder, Recorder}; use crate::postings::stacker::Addr; use crate::postings::{ FieldSerializer, IndexingContext, IndexingPosition, PostingsWriter, UnorderedTermId, @@ -16,7 +16,7 @@ use crate::{DocId, Term}; #[derive(Default)] pub(crate) struct JsonPostingsWriter { str_posting_writer: SpecializedPostingsWriter, - non_str_posting_writer: SpecializedPostingsWriter, + non_str_posting_writer: SpecializedPostingsWriter, } impl From> for Box { @@ -77,7 +77,7 @@ impl PostingsWriter for JsonPostingsWriter { serializer, )?; } else { - SpecializedPostingsWriter::::serialize_one_term( + SpecializedPostingsWriter::::serialize_one_term( term, *addr, doc_id_map, diff --git a/src/postings/per_field_postings_writer.rs b/src/postings/per_field_postings_writer.rs index a41487071..b12999d99 100644 --- a/src/postings/per_field_postings_writer.rs +++ b/src/postings/per_field_postings_writer.rs @@ -1,6 +1,6 @@ use crate::postings::json_postings_writer::JsonPostingsWriter; use crate::postings::postings_writer::SpecializedPostingsWriter; -use crate::postings::recorder::{NothingRecorder, TermFrequencyRecorder, TfAndPositionRecorder}; +use crate::postings::recorder::{DocIdRecorder, TermFrequencyRecorder, TfAndPositionRecorder}; use crate::postings::PostingsWriter; use crate::schema::{Field, FieldEntry, FieldType, IndexRecordOption, Schema}; @@ -34,7 +34,7 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box { - SpecializedPostingsWriter::::default().into() + SpecializedPostingsWriter::::default().into() } IndexRecordOption::WithFreqs => { SpecializedPostingsWriter::::default().into() @@ -43,7 +43,7 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box::default().into() } }) - .unwrap_or_else(|| SpecializedPostingsWriter::::default().into()), + .unwrap_or_else(|| SpecializedPostingsWriter::::default().into()), FieldType::U64(_) | FieldType::I64(_) | FieldType::F64(_) @@ -51,12 +51,12 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box Box::new(SpecializedPostingsWriter::::default()), + | FieldType::Facet(_) => Box::new(SpecializedPostingsWriter::::default()), FieldType::JsonObject(ref json_object_options) => { if let Some(text_indexing_option) = json_object_options.get_text_indexing_options() { match text_indexing_option.index_option() { IndexRecordOption::Basic => { - JsonPostingsWriter::::default().into() + JsonPostingsWriter::::default().into() } IndexRecordOption::WithFreqs => { JsonPostingsWriter::::default().into() @@ -66,7 +66,7 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box::default().into() + JsonPostingsWriter::::default().into() } } } diff --git a/src/postings/recorder.rs b/src/postings/recorder.rs index 79a26400d..e66993e09 100644 --- a/src/postings/recorder.rs +++ b/src/postings/recorder.rs @@ -83,21 +83,21 @@ pub(crate) trait Recorder: Copy + Default + Send + Sync + 'static { /// Only records the doc ids #[derive(Clone, Copy)] -pub struct NothingRecorder { +pub struct DocIdRecorder { stack: ExpUnrolledLinkedList, current_doc: DocId, } -impl Default for NothingRecorder { +impl Default for DocIdRecorder { fn default() -> Self { - NothingRecorder { + DocIdRecorder { stack: ExpUnrolledLinkedList::new(), current_doc: u32::MAX, } } } -impl Recorder for NothingRecorder { +impl Recorder for DocIdRecorder { fn current_doc(&self) -> DocId { self.current_doc }