diff --git a/columnar/src/column/dictionary_encoded.rs b/columnar/src/column/dictionary_encoded.rs index 51d199e0e..5cfbf7140 100644 --- a/columnar/src/column/dictionary_encoded.rs +++ b/columnar/src/column/dictionary_encoded.rs @@ -36,7 +36,7 @@ impl BytesColumn { } pub fn term_ords(&self, row_id: RowId) -> impl Iterator + '_ { - self.term_ord_column.values(row_id) + self.term_ord_column.values_for_doc(row_id) } /// Returns the column of ordinals diff --git a/columnar/src/column/mod.rs b/columnar/src/column/mod.rs index dcca5d3ef..0cd11a8ab 100644 --- a/columnar/src/column/mod.rs +++ b/columnar/src/column/mod.rs @@ -64,10 +64,10 @@ impl Column { } pub fn first(&self, row_id: RowId) -> Option { - self.values(row_id).next() + self.values_for_doc(row_id).next() } - pub fn values(&self, row_id: RowId) -> impl Iterator + '_ { + pub fn values_for_doc(&self, row_id: RowId) -> impl Iterator + '_ { self.value_row_ids(row_id) .map(|value_row_id: RowId| self.values.get_val(value_row_id)) } @@ -97,7 +97,7 @@ impl Column { /// This method clears the `output` vector. pub fn fill_vals(&self, row_id: RowId, output: &mut Vec) { output.clear(); - output.extend(self.values(row_id)); + output.extend(self.values_for_doc(row_id)); } pub fn first_or_default_col(self, default_value: T) -> Arc> { diff --git a/columnar/src/columnar/merge/merge_dict_column.rs b/columnar/src/columnar/merge/merge_dict_column.rs index ce1ba49f2..464aa49b1 100644 --- a/columnar/src/columnar/merge/merge_dict_column.rs +++ b/columnar/src/columnar/merge/merge_dict_column.rs @@ -96,7 +96,7 @@ fn compute_term_bitset(column: &BytesColumn, row_bitset: &ReadOnlyBitSet) -> Bit let num_terms = column.dictionary().num_terms(); let mut term_bitset = BitSet::with_max_value(num_terms as u32); for row_id in row_bitset.iter() { - for term_ord in column.term_ord_column.values(row_id) { + for term_ord in column.term_ord_column.values_for_doc(row_id) { term_bitset.insert(term_ord as u32); } } diff --git a/examples/custom_collector.rs b/examples/custom_collector.rs index c0fb7d8f7..743e1be36 100644 --- a/examples/custom_collector.rs +++ b/examples/custom_collector.rs @@ -105,7 +105,7 @@ impl SegmentCollector for StatsSegmentCollector { fn collect(&mut self, doc: u32, _score: Score) { // Since we know the values are single value, we could call `first_or_default_col` on the // column and fetch single values. - for value in self.fast_field_reader.values(doc) { + for value in self.fast_field_reader.values_for_doc(doc) { let value = value as f64; self.stats.count += 1; self.stats.sum += value; diff --git a/src/aggregation/bucket/histogram/histogram.rs b/src/aggregation/bucket/histogram/histogram.rs index 5dad7cce7..76ef3d41b 100644 --- a/src/aggregation/bucket/histogram/histogram.rs +++ b/src/aggregation/bucket/histogram/histogram.rs @@ -253,7 +253,7 @@ impl SegmentAggregationCollector for SegmentHistogramCollector { let get_bucket_pos = |val| (get_bucket_pos_f64(val, interval, offset) as i64); for doc in docs { - for val in accessor.values(*doc) { + for val in accessor.values_for_doc(*doc) { let val = self.f64_from_fastfield_u64(val); let bucket_pos = get_bucket_pos(val); diff --git a/src/aggregation/bucket/range.rs b/src/aggregation/bucket/range.rs index 043a12523..85c36dcee 100644 --- a/src/aggregation/bucket/range.rs +++ b/src/aggregation/bucket/range.rs @@ -225,7 +225,7 @@ impl SegmentAggregationCollector for SegmentRangeCollector { let sub_aggregation_accessor = &agg_with_accessor.buckets.values[self.accessor_idx].sub_aggregation; for doc in docs { - for val in accessor.values(*doc) { + for val in accessor.values_for_doc(*doc) { let bucket_pos = self.get_bucket_pos(val); let bucket = &mut self.buckets[bucket_pos]; diff --git a/src/aggregation/bucket/term_agg.rs b/src/aggregation/bucket/term_agg.rs index e8130fdd3..570ef5a71 100644 --- a/src/aggregation/bucket/term_agg.rs +++ b/src/aggregation/bucket/term_agg.rs @@ -319,7 +319,7 @@ impl SegmentAggregationCollector for SegmentTermCollector { } } else { for doc in docs { - for term_id in accessor.values(*doc) { + for term_id in accessor.values_for_doc(*doc) { let entry = self .term_buckets .entries diff --git a/src/aggregation/metric/stats.rs b/src/aggregation/metric/stats.rs index b4b1690c9..495c17212 100644 --- a/src/aggregation/metric/stats.rs +++ b/src/aggregation/metric/stats.rs @@ -181,7 +181,7 @@ impl SegmentStatsCollector { } } else { for doc in docs { - for val in field.values(*doc) { + for val in field.values_for_doc(*doc) { let val1 = f64_from_fastfield_u64(val, &self.field_type); self.stats.collect(val1); } @@ -234,7 +234,7 @@ impl SegmentAggregationCollector for SegmentStatsCollector { ) -> crate::Result<()> { let field = &agg_with_accessor.metrics.values[self.accessor_idx].accessor; - for val in field.values(doc) { + for val in field.values_for_doc(doc) { let val1 = f64_from_fastfield_u64(val, &self.field_type); self.stats.collect(val1); } diff --git a/src/collector/tests.rs b/src/collector/tests.rs index f3a71db90..b54541353 100644 --- a/src/collector/tests.rs +++ b/src/collector/tests.rs @@ -200,7 +200,7 @@ impl SegmentCollector for FastFieldSegmentCollector { type Fruit = Vec; fn collect(&mut self, doc: DocId, _score: Score) { - self.vals.extend(self.reader.values(doc)); + self.vals.extend(self.reader.values_for_doc(doc)); } fn harvest(self) -> Vec { diff --git a/src/fastfield/facet_reader.rs b/src/fastfield/facet_reader.rs index d09ce8d9e..4351b3f97 100644 --- a/src/fastfield/facet_reader.rs +++ b/src/fastfield/facet_reader.rs @@ -51,7 +51,7 @@ impl FacetReader { /// Return the list of facet ordinals associated with a document. pub fn facet_ords(&self, doc: DocId) -> impl Iterator + '_ { - self.facet_column.ords().values(doc) + self.facet_column.ords().values_for_doc(doc) } /// Accessor to the facet dictionary. diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index 26301bce7..3f5f03e4d 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -467,7 +467,7 @@ mod tests { fn get_vals_for_docs(column: &Column, docs: Range) -> Vec { docs.into_iter() - .flat_map(|doc| column.values(doc)) + .flat_map(|doc| column.values_for_doc(doc)) .collect() } @@ -515,11 +515,11 @@ mod tests { let segment_reader = searcher.segment_reader(0); let fast_fields = segment_reader.fast_fields(); let str_column = fast_fields.str("text").unwrap().unwrap(); - assert!(str_column.ords().values(0u32).eq([1, 0]),); - assert!(str_column.ords().values(1u32).next().is_none()); - assert!(str_column.ords().values(2u32).eq([0]),); - assert!(str_column.ords().values(3u32).eq([0, 1]),); - assert!(str_column.ords().values(4u32).eq([2]),); + assert!(str_column.ords().values_for_doc(0u32).eq([1, 0]),); + assert!(str_column.ords().values_for_doc(1u32).next().is_none()); + assert!(str_column.ords().values_for_doc(2u32).eq([0]),); + assert!(str_column.ords().values_for_doc(3u32).eq([0, 1]),); + assert!(str_column.ords().values_for_doc(4u32).eq([2]),); let mut str_term = String::default(); assert!(str_column.ord_to_str(0, &mut str_term).unwrap()); diff --git a/src/fastfield/writer.rs b/src/fastfield/writer.rs index 1f9d73083..69f881619 100644 --- a/src/fastfield/writer.rs +++ b/src/fastfield/writer.rs @@ -338,20 +338,23 @@ mod tests { let column_float_opt: Option> = columns[1].1.open().unwrap().into(); assert!(column_float_opt .unwrap() - .values(0) + .values_for_doc(0) .eq([1.02f64].into_iter())); } { assert_eq!(columns[2].0, "nested\u{1}child"); let column_nest_child_opt: Option> = columns[2].1.open().unwrap().into(); - assert!(column_nest_child_opt.unwrap().values(0).eq([3].into_iter())); + assert!(column_nest_child_opt + .unwrap() + .values_for_doc(0) + .eq([3].into_iter())); } { assert_eq!(columns[3].0, "nested\u{1}child2"); let column_nest_child2_opt: Option> = columns[3].1.open().unwrap().into(); assert!(column_nest_child2_opt .unwrap() - .values(0) + .values_for_doc(0) .eq([5].into_iter())); } { @@ -390,7 +393,7 @@ mod tests { assert_eq!(columns[0].0, "obj"); let dynamic_column = columns[0].1.open().unwrap(); let col: Option> = dynamic_column.into(); - let vals: Vec = col.unwrap().values(0).collect(); + let vals: Vec = col.unwrap().values_for_doc(0).collect(); assert_eq!(&vals, &[18, 19]) } diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs index 2a4d4f5da..bd071f81f 100644 --- a/src/indexer/index_writer.rs +++ b/src/indexer/index_writer.rs @@ -1490,7 +1490,7 @@ mod tests { let in_order_alive_ids: Vec = segment_reader .doc_ids_alive() - .flat_map(|doc| fast_field_reader.values(doc)) + .flat_map(|doc| fast_field_reader.values_for_doc(doc)) .collect(); assert_eq!(&in_order_alive_ids[..], &[9, 8, 7, 6, 5, 4, 1, 0]); Ok(()) @@ -1550,7 +1550,7 @@ mod tests { let fast_field_reader = segment_reader.fast_fields().u64("id")?; let in_order_alive_ids: Vec = segment_reader .doc_ids_alive() - .flat_map(|doc| fast_field_reader.values(doc)) + .flat_map(|doc| fast_field_reader.values_for_doc(doc)) .collect(); assert_eq!(&in_order_alive_ids[..], &[9, 8, 7, 6, 5, 4, 2, 0]); Ok(()) @@ -1795,7 +1795,7 @@ mod tests { let ff_reader = segment_reader.fast_fields().u64("id").unwrap(); segment_reader .doc_ids_alive() - .flat_map(move |doc| ff_reader.values(doc).collect_vec().into_iter()) + .flat_map(move |doc| ff_reader.values_for_doc(doc).collect_vec().into_iter()) }) .collect(); @@ -1806,7 +1806,7 @@ mod tests { let ff_reader = segment_reader.fast_fields().u64("id").unwrap(); segment_reader .doc_ids_alive() - .flat_map(move |doc| ff_reader.values(doc).collect_vec().into_iter()) + .flat_map(move |doc| ff_reader.values_for_doc(doc).collect_vec().into_iter()) }) .collect(); @@ -1824,7 +1824,7 @@ mod tests { .unwrap() .unwrap(); for doc in segment_reader.doc_ids_alive() { - all_ips.extend(ip_reader.values(doc)); + all_ips.extend(ip_reader.values_for_doc(doc)); } num_ips += ip_reader.values.num_vals(); } @@ -1883,7 +1883,7 @@ mod tests { for reader in searcher.segment_readers() { if let Some(ff_reader) = reader.fast_fields().column_opt::("ips").unwrap() { for doc in reader.doc_ids_alive() { - ips.extend(ff_reader.values(doc)); + ips.extend(ff_reader.values_for_doc(doc)); } } } @@ -1915,7 +1915,7 @@ mod tests { for reader in searcher.segment_readers() { if let Some(ff_reader) = reader.fast_fields().column_opt::("ips").unwrap() { for doc in reader.doc_ids_alive() { - ips.extend(ff_reader.values(doc)); + ips.extend(ff_reader.values_for_doc(doc)); } } } @@ -1935,12 +1935,12 @@ mod tests { .unwrap() .unwrap(); for doc in segment_reader.doc_ids_alive() { - let vals: Vec = ff_reader.values(doc).collect(); + let vals: Vec = ff_reader.values_for_doc(doc).collect(); assert_eq!(vals.len(), 2); assert_eq!(vals[0], vals[1]); assert_eq!(id_reader.first(doc), Some(vals[0])); - let bool_vals: Vec = bool_ff_reader.values(doc).collect(); + let bool_vals: Vec = bool_ff_reader.values_for_doc(doc).collect(); assert_eq!(bool_vals.len(), 2); assert_ne!(bool_vals[0], bool_vals[1]); @@ -2236,8 +2236,8 @@ mod tests { assert_eq!(val_col.get_cardinality(), Cardinality::Multivalued); assert_eq!(id_col.first(0u32), Some(1u64)); assert_eq!(id_col.first(1u32), Some(2u64)); - assert!(val_col.values(0u32).eq([1u64, 1u64].into_iter())); - assert!(val_col.values(1u32).eq([2u64, 2u64].into_iter())); + assert!(val_col.values_for_doc(0u32).eq([1u64, 1u64].into_iter())); + assert!(val_col.values_for_doc(1u32).eq([2u64, 2u64].into_iter())); } #[test] diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs index e672613d6..c41598c94 100644 --- a/src/indexer/merger.rs +++ b/src/indexer/merger.rs @@ -1497,7 +1497,7 @@ mod tests { let mut vals: Vec = Vec::new(); let mut test_vals = move |col: &Column, doc: DocId, expected: &[u64]| { vals.clear(); - vals.extend(col.values(doc)); + vals.extend(col.values_for_doc(doc)); assert_eq!(&vals[..], expected); };