diff --git a/src/fastfield/readers.rs b/src/fastfield/readers.rs index 083f79532..213d61d8e 100644 --- a/src/fastfield/readers.rs +++ b/src/fastfield/readers.rs @@ -25,7 +25,7 @@ pub struct FastFieldReaders { } impl FastFieldReaders { - pub(crate) fn open(fast_field_file: FileSlice, schema: Schema) -> io::Result { + pub fn open(fast_field_file: FileSlice, schema: Schema) -> io::Result { let columnar = Arc::new(ColumnarReader::open(fast_field_file)?); Ok(FastFieldReaders { columnar, schema }) } @@ -39,7 +39,7 @@ impl FastFieldReaders { self.resolve_column_name_given_default_field(column_name, default_field_opt) } - pub(crate) fn space_usage(&self) -> io::Result { + pub fn space_usage(&self) -> io::Result { let mut per_field_usages: Vec = Default::default(); for (mut field_name, column_handle) in self.columnar.iter_columns()? { json_path_sep_to_dot(&mut field_name); @@ -51,7 +51,7 @@ impl FastFieldReaders { Ok(PerFieldSpaceUsage::new(per_field_usages)) } - pub(crate) fn columnar(&self) -> &ColumnarReader { + pub fn columnar(&self) -> &ColumnarReader { self.columnar.as_ref() } diff --git a/src/index/inverted_index_reader.rs b/src/index/inverted_index_reader.rs index 9be0dc6dd..3b8de821e 100644 --- a/src/index/inverted_index_reader.rs +++ b/src/index/inverted_index_reader.rs @@ -200,7 +200,7 @@ impl TantivyInvertedIndexReader { }) } - pub(crate) fn new( + pub fn new( termdict: TermDictionary, postings_file_slice: FileSlice, positions_file_slice: FileSlice, diff --git a/src/index/segment_reader.rs b/src/index/segment_reader.rs index 8d81f4c09..7d0cc017d 100644 --- a/src/index/segment_reader.rs +++ b/src/index/segment_reader.rs @@ -65,10 +65,6 @@ pub trait SegmentReader: Send + Sync { /// Accessor to the segment's `Field norms`'s reader. fn get_fieldnorms_reader(&self, field: Field) -> crate::Result; - /// Accessor to the segment's field norms readers. - #[doc(hidden)] - fn fieldnorms_readers(&self) -> &FieldNormReaders; - /// Accessor to the segment's [`StoreReader`](crate::store::StoreReader). fn get_store_reader(&self, cache_num_blocks: usize) -> io::Result; @@ -295,10 +291,6 @@ impl SegmentReader for TantivySegmentReader { }) } - fn fieldnorms_readers(&self) -> &FieldNormReaders { - &self.fieldnorm_readers - } - fn get_store_reader(&self, cache_num_blocks: usize) -> io::Result { StoreReader::open(self.store_file.clone(), cache_num_blocks) } diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs index f1c13beb0..91b918b7c 100644 --- a/src/indexer/merger.rs +++ b/src/indexer/merger.rs @@ -43,7 +43,7 @@ fn estimate_total_num_tokens_in_single_segment( // When there are deletes, we use an approximation either // by using the fieldnorm. - if let Some(fieldnorm_reader) = reader.fieldnorms_readers().get_field(field)? { + if let Some(fieldnorm_reader) = reader.get_fieldnorms_reader(field)? { let mut count: [usize; 256] = [0; 256]; for doc in reader.doc_ids_alive() { let fieldnorm_id = fieldnorm_reader.fieldnorm_id(doc); diff --git a/src/query/phrase_prefix_query/phrase_prefix_weight.rs b/src/query/phrase_prefix_query/phrase_prefix_weight.rs index 6c68402f6..2128898d1 100644 --- a/src/query/phrase_prefix_query/phrase_prefix_weight.rs +++ b/src/query/phrase_prefix_query/phrase_prefix_weight.rs @@ -34,7 +34,7 @@ impl PhrasePrefixWeight { fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result { let field = self.phrase_terms[0].1.field(); if self.similarity_weight_opt.is_some() { - if let Some(fieldnorm_reader) = reader.fieldnorms_readers().get_field(field)? { + if let Ok(fieldnorm_reader) = reader.get_fieldnorms_reader(field) { return Ok(fieldnorm_reader); } } diff --git a/src/query/phrase_query/phrase_weight.rs b/src/query/phrase_query/phrase_weight.rs index 489c9fa5e..824db872f 100644 --- a/src/query/phrase_query/phrase_weight.rs +++ b/src/query/phrase_query/phrase_weight.rs @@ -30,7 +30,7 @@ impl PhraseWeight { fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result { let field = self.phrase_terms[0].1.field(); if self.similarity_weight_opt.is_some() { - if let Some(fieldnorm_reader) = reader.fieldnorms_readers().get_field(field)? { + if let Ok(fieldnorm_reader) = reader.get_fieldnorms_reader(field) { return Ok(fieldnorm_reader); } } diff --git a/src/query/phrase_query/regex_phrase_weight.rs b/src/query/phrase_query/regex_phrase_weight.rs index b7009098e..90331ffaa 100644 --- a/src/query/phrase_query/regex_phrase_weight.rs +++ b/src/query/phrase_query/regex_phrase_weight.rs @@ -49,7 +49,7 @@ impl RegexPhraseWeight { fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result { if self.similarity_weight_opt.is_some() { - if let Some(fieldnorm_reader) = reader.fieldnorms_readers().get_field(self.field)? { + if let Ok(fieldnorm_reader) = reader.get_fieldnorms_reader(self.field) { return Ok(fieldnorm_reader); } } diff --git a/src/query/term_query/term_weight.rs b/src/query/term_query/term_weight.rs index 1b6465ce1..f976f5766 100644 --- a/src/query/term_query/term_weight.rs +++ b/src/query/term_query/term_weight.rs @@ -212,10 +212,7 @@ impl TermWeight { segment_reader: &dyn SegmentReader, ) -> crate::Result { if self.scoring_enabled { - if let Some(field_norm_reader) = segment_reader - .fieldnorms_readers() - .get_field(self.term.field())? - { + if let Ok(field_norm_reader) = segment_reader.get_fieldnorms_reader(self.term.field()) { return Ok(field_norm_reader); } } diff --git a/src/space_usage/mod.rs b/src/space_usage/mod.rs index 4c1f9c76a..b8c4a078a 100644 --- a/src/space_usage/mod.rs +++ b/src/space_usage/mod.rs @@ -34,7 +34,7 @@ pub struct SearcherSpaceUsage { } impl SearcherSpaceUsage { - pub(crate) fn new() -> SearcherSpaceUsage { + pub fn new() -> SearcherSpaceUsage { SearcherSpaceUsage { segments: Vec::new(), total: Default::default(), @@ -80,7 +80,7 @@ pub struct SegmentSpaceUsage { impl SegmentSpaceUsage { #[expect(clippy::too_many_arguments)] - pub(crate) fn new( + pub fn new( num_docs: u32, termdict: PerFieldSpaceUsage, postings: PerFieldSpaceUsage,