diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs index fd94f2404..f3984df6e 100644 --- a/src/fastfield/mod.rs +++ b/src/fastfield/mod.rs @@ -981,13 +981,13 @@ mod bench { use std::collections::HashMap; use std::path::Path; + use fastfield_codecs::Column; use test::{self, Bencher}; use super::tests::{generate_permutation, FIELD, SCHEMA}; use super::*; use crate::directory::{CompositeFile, Directory, RamDirectory, WritePtr}; use crate::fastfield::tests::generate_permutation_gcd; - use crate::fastfield::FastFieldReader; #[bench] fn bench_intfastfield_linear_veclookup(b: &mut Bencher) { @@ -1042,7 +1042,7 @@ mod bench { let n = test::black_box(7000u32); let mut a = 0u64; for i in (0u32..n / 7).map(|val| val * 7) { - a ^= fast_field_reader.get(i); + a ^= fast_field_reader.get_val(i as u64); } a }); @@ -1074,8 +1074,8 @@ mod bench { b.iter(|| { let mut a = 0u32; - for i in 0u32..permutation.len() as u32 { - a = fast_field_reader.get(i) as u32; + for i in 0u64..permutation.len() as u64 { + a = fast_field_reader.get_val(i) as u32; } a }); @@ -1108,7 +1108,7 @@ mod bench { b.iter(|| { let mut a = 0u32; for i in 0u32..permutation.len() as u32 { - a = fast_field_reader.get(i) as u32; + a = fast_field_reader.get_val(i as u64) as u32; } a }); diff --git a/src/indexer/merger_sorted_index_test.rs b/src/indexer/merger_sorted_index_test.rs index a2805d5cc..8cc1c05d6 100644 --- a/src/indexer/merger_sorted_index_test.rs +++ b/src/indexer/merger_sorted_index_test.rs @@ -480,11 +480,11 @@ mod tests { #[cfg(all(test, feature = "unstable"))] mod bench_sorted_index_merge { + use fastfield_codecs::Column; use test::{self, Bencher}; use crate::core::Index; - // use cratedoc_id, readerdoc_id_mappinglet vals = reader.fate::schema; - use crate::fastfield::{DynamicFastFieldReader, FastFieldReader}; + use crate::fastfield::DynamicFastFieldReader; use crate::indexer::merger::IndexMerger; use crate::schema::{Cardinality, NumericOptions, Schema}; use crate::{IndexSettings, IndexSortByField, IndexWriter, Order}; @@ -546,7 +546,7 @@ mod bench_sorted_index_merge { // add values in order of the new doc_ids let mut val = 0; for (doc_id, _reader, field_reader) in sorted_doc_ids { - val = field_reader.get(doc_id); + val = field_reader.get_val(doc_id as u64); } val