Replace Column::first_vals with Column::first_vals_in_value_range.

This commit is contained in:
Stu Hood
2025-12-25 15:26:33 -07:00
parent efc9e585a9
commit e8a4adeedd
6 changed files with 128 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
use std::marker::PhantomData;
use columnar::Column;
use columnar::{Column, ValueRange};
use crate::collector::sort_key::NaturalComparator;
use crate::collector::{SegmentSortKeyComputer, SortKeyComputer};
@@ -94,7 +94,8 @@ impl<T: FastValue> SegmentSortKeyComputer for SortByFastValueSegmentSortKeyCompu
fn segment_sort_keys(&mut self, docs: &[DocId]) -> &mut Vec<Self::SegmentSortKey> {
self.buffer.resize(docs.len(), None);
self.sort_column.first_vals(docs, &mut self.buffer);
self.sort_column
.first_vals_in_value_range(docs, &mut self.buffer, ValueRange::All);
&mut self.buffer
}

View File

@@ -1,4 +1,4 @@
use columnar::StrColumn;
use columnar::{StrColumn, ValueRange};
use crate::collector::sort_key::NaturalComparator;
use crate::collector::{SegmentSortKeyComputer, SortKeyComputer};
@@ -64,7 +64,9 @@ impl SegmentSortKeyComputer for ByStringColumnSegmentSortKeyComputer {
fn segment_sort_keys(&mut self, docs: &[DocId]) -> &mut Vec<Self::SegmentSortKey> {
self.buffer.resize(docs.len(), None);
if let Some(str_column) = &self.str_column_opt {
str_column.ords().first_vals(docs, &mut self.buffer);
str_column
.ords()
.first_vals_in_value_range(docs, &mut self.buffer, ValueRange::All);
}
&mut self.buffer
}