remove fieldnorms_readers

This commit is contained in:
Pascal Seitz
2026-02-11 19:40:45 +01:00
parent 6038455761
commit 70bb97231b
9 changed files with 11 additions and 22 deletions

View File

@@ -25,7 +25,7 @@ pub struct FastFieldReaders {
}
impl FastFieldReaders {
pub(crate) fn open(fast_field_file: FileSlice, schema: Schema) -> io::Result<FastFieldReaders> {
pub fn open(fast_field_file: FileSlice, schema: Schema) -> io::Result<FastFieldReaders> {
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<PerFieldSpaceUsage> {
pub fn space_usage(&self) -> io::Result<PerFieldSpaceUsage> {
let mut per_field_usages: Vec<FieldUsage> = 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()
}

View File

@@ -200,7 +200,7 @@ impl TantivyInvertedIndexReader {
})
}
pub(crate) fn new(
pub fn new(
termdict: TermDictionary,
postings_file_slice: FileSlice,
positions_file_slice: FileSlice,

View File

@@ -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<FieldNormReader>;
/// 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<StoreReader>;
@@ -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> {
StoreReader::open(self.store_file.clone(), cache_num_blocks)
}

View File

@@ -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);

View File

@@ -34,7 +34,7 @@ impl PhrasePrefixWeight {
fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result<FieldNormReader> {
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);
}
}

View File

@@ -30,7 +30,7 @@ impl PhraseWeight {
fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result<FieldNormReader> {
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);
}
}

View File

@@ -49,7 +49,7 @@ impl RegexPhraseWeight {
fn fieldnorm_reader(&self, reader: &dyn SegmentReader) -> crate::Result<FieldNormReader> {
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);
}
}

View File

@@ -212,10 +212,7 @@ impl TermWeight {
segment_reader: &dyn SegmentReader,
) -> crate::Result<FieldNormReader> {
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);
}
}

View File

@@ -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,