Fixes build for no-default-features

.github/workflows/ci.yml

@@ -1,28 +0,0 @@
-name: Tantivy CI
-
-on: [push]
-
-jobs:
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-

.github/workflows/coveralls.yml

@@ -1,66 +0,0 @@
-on: [push]
-
-name: Code coverage with grcov
-
-jobs:
-  grcov:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-            #- macOS-latest
-            #- windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
-          profile: minimal
-
-      - name: Execute tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all --lib
-        env:
-          CARGO_INCREMENTAL: 0
-          RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"
-
-      # Note that `actions-rs/grcov` Action can install `grcov` too,
-      # but can't use faster installation methods yet.
-      # As a temporary experiment `actions-rs/install` Action plugged in here.
-      # Consider **NOT** to copy that into your workflow,
-      # but use `actions-rs/grcov` only
-      - name: Pre-installing grcov
-        uses: actions-rs/install@v0.1
-        with:
-          crate: grcov
-          use-tool-cache: true
-
-      - name: Gather coverage data
-        id: coverage
-        uses: actions-rs/grcov@v0.1
-        with:
-          coveralls-token: ${{ secrets.COVERALLS_TOKEN }}
-
-      - name: Coveralls upload
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel: true
-          path-to-lcov: ${{ steps.coverage.outputs.report }}
-
-  grcov_finalize:
-    runs-on: ubuntu-latest
-    needs: grcov
-    steps:
-      - name: Coveralls finalization
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true

.gitignore

@@ -1,5 +1,4 @@
 tantivy.iml
-proptest-regressions
 *.swp
 target
 target/debug

CHANGELOG.md

@@ -1,12 +1,5 @@
 Tantivy 0.13.0
 ======================
-Tantivy 0.13 introduce a change in the index format that will require
-you to reindex your index (BlockWAND information are added in the skiplist). 
-The index size increase is minor as this information is only added for
-full blocks.
-If you have a massive index for which reindexing is not an option, please contact me
-so that we can discuss possible solutions.
-
 - Bugfix in `FuzzyTermQuery` not matching terms by prefix when it should (@Peachball)
 - Relaxed constraints on the custom/tweak score functions. At the segment level, they can be mut, and they are not required to be Sync + Send.
 - `MMapDirectory::open` does not return a `Result` anymore.
@@ -24,8 +17,6 @@ while doc != TERMINATED {
 The change made it possible to greatly simplify a lot of the docset's code.
 - Misc internal optimization and introduction of the `Scorer::for_each_pruning` function. (@fulmicoton)
 - Added an offset option to the Top(.*)Collectors. (@robyoung)
-- Added Block WAND. Performance on TOP-K on term-unions should be greatly increased. (@fulmicoton, and special thanks 
-to the PISA team for answering all my questions!)
 
 Tantivy 0.12.0
 ======================

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tantivy"
-version = "0.13.0"
+version = "0.12.0"
 authors = ["Paul Masurel <paul.masurel@gmail.com>"]
 license = "MIT"
 categories = ["database-implementations", "data-structures"]
@@ -58,7 +58,6 @@ winapi = "0.3"
 rand = "0.7"
 maplit = "1"
 matches = "0.1.8"
-proptest = "0.10"
 
 [dev-dependencies.fail]
 version = "0.4"
@@ -80,7 +79,6 @@ lz4-compression = ["lz4"]
 failpoints = ["fail/failpoints"]
 unstable = [] # useful for benches.
 wasm-bindgen = ["uuid/wasm-bindgen"]
-scoref64 = [] # scores are f64 instead of f32. was introduced to debug blockwand.
 
 [workspace]
 members = ["query-grammar"]

examples/custom_collector.rs

@@ -14,7 +14,7 @@ use tantivy::fastfield::FastFieldReader;
 use tantivy::query::QueryParser;
 use tantivy::schema::Field;
 use tantivy::schema::{Schema, FAST, INDEXED, TEXT};
-use tantivy::{doc, Index, Score, SegmentReader, TantivyError};
+use tantivy::{doc, Index, SegmentReader, TantivyError};
 
 #[derive(Default)]
 struct Stats {
@@ -114,7 +114,7 @@ struct StatsSegmentCollector {
 impl SegmentCollector for StatsSegmentCollector {
     type Fruit = Option<Stats>;
 
-    fn collect(&mut self, doc: u32, _score: Score) {
+    fn collect(&mut self, doc: u32, _score: f32) {
         let value = self.fast_field_reader.get(doc) as f64;
         self.stats.count += 1;
         self.stats.sum += value;

examples/iterating_docs_and_positions.rs

@@ -117,16 +117,11 @@ fn main() -> tantivy::Result<()> {
         if let Some(mut block_segment_postings) =
             inverted_index.read_block_postings(&term_the, IndexRecordOption::Basic)
         {
-            loop {
+            while block_segment_postings.advance() {
-                let docs = block_segment_postings.docs();
-                if docs.is_empty() {
-                    break;
-                }
                 // Once again these docs MAY contains deleted documents as well.
                 let docs = block_segment_postings.docs();
                 // Prints `Docs [0, 2].`
                 println!("Docs {:?}", docs);
-                block_segment_postings.advance();
             }
         }
     }

query-grammar/src/occur.rs

@@ -31,12 +31,22 @@ impl Occur {
 
     /// Compose two occur values.
     pub fn compose(left: Occur, right: Occur) -> Occur {
-        match (left, right) {
+        match left {
-            (Occur::Should, _) => right,
+            Occur::Should => right,
-            (Occur::Must, Occur::MustNot) => Occur::MustNot,
+            Occur::Must => {
-            (Occur::Must, _) => Occur::Must,
+                if right == Occur::MustNot {
-            (Occur::MustNot, Occur::MustNot) => Occur::Must,
+                    Occur::MustNot
-            (Occur::MustNot, _) => Occur::MustNot,
+                } else {
+                    Occur::Must
+                }
+            }
+            Occur::MustNot => {
+                if right == Occur::MustNot {
+                    Occur::Must
+                } else {
+                    Occur::MustNot
+                }
+            }
         }
     }
 }
@@ -46,27 +56,3 @@ impl fmt::Display for Occur {
         f.write_char(self.to_char())
     }
 }
-
-#[cfg(test)]
-mod test {
-    use crate::Occur;
-
-    #[test]
-    fn test_Occur_compose() {
-        assert_eq!(Occur::compose(Occur::Should, Occur::Should), Occur::Should);
-        assert_eq!(Occur::compose(Occur::Should, Occur::Must), Occur::Must);
-        assert_eq!(
-            Occur::compose(Occur::Should, Occur::MustNot),
-            Occur::MustNot
-        );
-        assert_eq!(Occur::compose(Occur::Must, Occur::Should), Occur::Must);
-        assert_eq!(Occur::compose(Occur::Must, Occur::Must), Occur::Must);
-        assert_eq!(Occur::compose(Occur::Must, Occur::MustNot), Occur::MustNot);
-        assert_eq!(
-            Occur::compose(Occur::MustNot, Occur::Should),
-            Occur::MustNot
-        );
-        assert_eq!(Occur::compose(Occur::MustNot, Occur::Must), Occur::MustNot);
-        assert_eq!(Occur::compose(Occur::MustNot, Occur::MustNot), Occur::Must);
-    }
-}

query-grammar/src/query_grammar.rs

@@ -180,7 +180,7 @@ fn occur_leaf<'a>() -> impl Parser<&'a str, Output = (Option<Occur>, UserInputAS
     (optional(occur_symbol()), boosted_leaf())
 }
 
-fn positive_float_number<'a>() -> impl Parser<&'a str, Output = f64> {
+fn positive_float_number<'a>() -> impl Parser<&'a str, Output = f32> {
     (many1(digit()), optional((char('.'), many1(digit())))).map(
         |(int_part, decimal_part_opt): (String, Option<(char, String)>)| {
             let mut float_str = int_part;
@@ -188,18 +188,18 @@ fn positive_float_number<'a>() -> impl Parser<&'a str, Output = f64> {
                 float_str.push(chr);
                 float_str.push_str(&decimal_str);
             }
-            float_str.parse::<f64>().unwrap()
+            float_str.parse::<f32>().unwrap()
         },
     )
 }
 
-fn boost<'a>() -> impl Parser<&'a str, Output = f64> {
+fn boost<'a>() -> impl Parser<&'a str, Output = f32> {
     (char('^'), positive_float_number()).map(|(_, boost)| boost)
 }
 
 fn boosted_leaf<'a>() -> impl Parser<&'a str, Output = UserInputAST> {
     (leaf(), optional(boost())).map(|(leaf, boost_opt)| match boost_opt {
-        Some(boost) if (boost - 1.0).abs() > std::f64::EPSILON => {
+        Some(boost) if (boost - 1.0).abs() > std::f32::EPSILON => {
             UserInputAST::Boost(Box::new(leaf), boost)
         }
         _ => leaf,
@@ -282,11 +282,11 @@ mod test {
     use super::*;
     use combine::parser::Parser;
 
-    pub fn nearly_equals(a: f64, b: f64) -> bool {
+    pub fn nearly_equals(a: f32, b: f32) -> bool {
         (a - b).abs() < 0.0005 * (a + b).abs()
     }
 
-    fn assert_nearly_equals(expected: f64, val: f64) {
+    fn assert_nearly_equals(expected: f32, val: f32) {
         assert!(
             nearly_equals(val, expected),
             "Got {}, expected {}.",
@@ -303,7 +303,7 @@ mod test {
 
     #[test]
     fn test_positive_float_number() {
-        fn valid_parse(float_str: &str, expected_val: f64, expected_remaining: &str) {
+        fn valid_parse(float_str: &str, expected_val: f32, expected_remaining: &str) {
             let (val, remaining) = positive_float_number().parse(float_str).unwrap();
             assert_eq!(remaining, expected_remaining);
             assert_nearly_equals(val, expected_val);
@@ -311,9 +311,9 @@ mod test {
         fn error_parse(float_str: &str) {
             assert!(positive_float_number().parse(float_str).is_err());
         }
-        valid_parse("1.0", 1.0, "");
+        valid_parse("1.0", 1.0f32, "");
-        valid_parse("1", 1.0, "");
+        valid_parse("1", 1.0f32, "");
-        valid_parse("0.234234 aaa", 0.234234f64, " aaa");
+        valid_parse("0.234234 aaa", 0.234234f32, " aaa");
         error_parse(".3332");
         error_parse("1.");
         error_parse("-1.");

query-grammar/src/user_input_ast.rs

@@ -87,7 +87,7 @@ impl UserInputBound {
 pub enum UserInputAST {
     Clause(Vec<(Option<Occur>, UserInputAST)>),
     Leaf(Box<UserInputLeaf>),
-    Boost(Box<UserInputAST>, f64),
+    Boost(Box<UserInputAST>, f32),
 }
 
 impl UserInputAST {

src/collector/count_collector.rs

@@ -96,18 +96,18 @@ mod tests {
         }
         {
             let mut count_collector = SegmentCountCollector::default();
-            count_collector.collect(0u32, 1.0);
+            count_collector.collect(0u32, 1f32);
             assert_eq!(count_collector.harvest(), 1);
         }
         {
             let mut count_collector = SegmentCountCollector::default();
-            count_collector.collect(0u32, 1.0);
+            count_collector.collect(0u32, 1f32);
             assert_eq!(count_collector.harvest(), 1);
         }
         {
             let mut count_collector = SegmentCountCollector::default();
-            count_collector.collect(0u32, 1.0);
+            count_collector.collect(0u32, 1f32);
-            count_collector.collect(1u32, 1.0);
+            count_collector.collect(1u32, 1f32);
             assert_eq!(count_collector.harvest(), 2);
         }
     }

src/collector/multi_collector.rs

@@ -55,7 +55,7 @@ impl<TCollector: Collector> Collector for CollectorWrapper<TCollector> {
 impl SegmentCollector for Box<dyn BoxableSegmentCollector> {
     type Fruit = Box<dyn Fruit>;
 
-    fn collect(&mut self, doc: u32, score: Score) {
+    fn collect(&mut self, doc: u32, score: f32) {
         self.as_mut().collect(doc, score);
     }
 
@@ -65,7 +65,7 @@ impl SegmentCollector for Box<dyn BoxableSegmentCollector> {
 }
 
 pub trait BoxableSegmentCollector {
-    fn collect(&mut self, doc: u32, score: Score);
+    fn collect(&mut self, doc: u32, score: f32);
     fn harvest_from_box(self: Box<Self>) -> Box<dyn Fruit>;
 }
 
@@ -74,7 +74,7 @@ pub struct SegmentCollectorWrapper<TSegmentCollector: SegmentCollector>(TSegment
 impl<TSegmentCollector: SegmentCollector> BoxableSegmentCollector
     for SegmentCollectorWrapper<TSegmentCollector>
 {
-    fn collect(&mut self, doc: u32, score: Score) {
+    fn collect(&mut self, doc: u32, score: f32) {
         self.0.collect(doc, score);
     }
 

src/collector/tests.rs

@@ -206,7 +206,7 @@ impl Collector for BytesFastFieldTestCollector {
 impl SegmentCollector for BytesFastFieldSegmentCollector {
     type Fruit = Vec<u8>;
 
-    fn collect(&mut self, doc: u32, _score: Score) {
+    fn collect(&mut self, doc: u32, _score: f32) {
         let data = self.reader.get_bytes(doc);
         self.vals.extend(data);
     }

src/collector/top_score_collector.rs

@@ -52,8 +52,8 @@ use std::fmt;
 /// let query = query_parser.parse_query("diary").unwrap();
 /// let top_docs = searcher.search(&query, &TopDocs::with_limit(2)).unwrap();
 ///
-/// assert_eq!(top_docs[0].1, DocAddress(0, 1));
+/// assert_eq!(&top_docs[0], &(0.7261542, DocAddress(0, 1)));
-/// assert_eq!(top_docs[1].1, DocAddress(0, 3));
+/// assert_eq!(&top_docs[1], &(0.6099695, DocAddress(0, 3)));
 /// ```
 pub struct TopDocs(TopCollector<Score>);
 
@@ -139,8 +139,8 @@ impl TopDocs {
     /// let top_docs = searcher.search(&query, &TopDocs::with_limit(2).and_offset(1)).unwrap();
     ///
     /// assert_eq!(top_docs.len(), 2);
-    /// assert_eq!(top_docs[0].1, DocAddress(0, 4));
+    /// assert_eq!(&top_docs[0], &(0.5204813, DocAddress(0, 4)));
-    /// assert_eq!(top_docs[1].1, DocAddress(0, 3));
+    /// assert_eq!(&top_docs[1], &(0.4793185, DocAddress(0, 3)));
     /// ```
     pub fn and_offset(self, offset: usize) -> TopDocs {
         TopDocs(self.0.and_offset(offset))
@@ -303,7 +303,7 @@ impl TopDocs {
     ///                 let popularity: u64 = popularity_reader.get(doc);
     ///                 // Well.. For the sake of the example we use a simple logarithm
     ///                 // function.
-    ///                 let popularity_boost_score = ((2u64 + popularity) as Score).log2();
+    ///                 let popularity_boost_score = ((2u64 + popularity) as f32).log2();
     ///                 popularity_boost_score * original_score
     ///             }
     ///           });
@@ -479,7 +479,7 @@ impl Collector for TopDocs {
         let mut heap: BinaryHeap<ComparableDoc<Score, DocId>> = BinaryHeap::with_capacity(heap_len);
 
         if let Some(delete_bitset) = reader.delete_bitset() {
-            let mut threshold = Score::MIN;
+            let mut threshold = f32::MIN;
             weight.for_each_pruning(threshold, reader, &mut |doc, score| {
                 if delete_bitset.is_deleted(doc) {
                     return threshold;
@@ -491,16 +491,16 @@ impl Collector for TopDocs {
                 if heap.len() < heap_len {
                     heap.push(heap_item);
                     if heap.len() == heap_len {
-                        threshold = heap.peek().map(|el| el.feature).unwrap_or(Score::MIN);
+                        threshold = heap.peek().map(|el| el.feature).unwrap_or(f32::MIN);
                     }
                     return threshold;
                 }
                 *heap.peek_mut().unwrap() = heap_item;
-                threshold = heap.peek().map(|el| el.feature).unwrap_or(Score::MIN);
+                threshold = heap.peek().map(|el| el.feature).unwrap_or(std::f32::MIN);
                 threshold
             })?;
         } else {
-            weight.for_each_pruning(Score::MIN, reader, &mut |doc, score| {
+            weight.for_each_pruning(f32::MIN, reader, &mut |doc, score| {
                 let heap_item = ComparableDoc {
                     feature: score,
                     doc,
@@ -509,13 +509,13 @@ impl Collector for TopDocs {
                     heap.push(heap_item);
                     // TODO the threshold is suboptimal for heap.len == heap_len
                     if heap.len() == heap_len {
-                        return heap.peek().map(|el| el.feature).unwrap_or(Score::MIN);
+                        return heap.peek().map(|el| el.feature).unwrap_or(f32::MIN);
                     } else {
-                        return Score::MIN;
+                        return f32::MIN;
                     }
                 }
                 *heap.peek_mut().unwrap() = heap_item;
-                heap.peek().map(|el| el.feature).unwrap_or(Score::MIN)
+                heap.peek().map(|el| el.feature).unwrap_or(std::f32::MIN)
             })?;
         }
 
@@ -570,13 +570,6 @@ mod tests {
         index
     }
 
-    fn assert_results_equals(results: &[(Score, DocAddress)], expected: &[(Score, DocAddress)]) {
-        for (result, expected) in results.iter().zip(expected.iter()) {
-            assert_eq!(result.1, expected.1);
-            crate::assert_nearly_equals!(result.0, expected.0);
-        }
-    }
-
     #[test]
     fn test_top_collector_not_at_capacity() {
         let index = make_index();
@@ -589,13 +582,13 @@ mod tests {
             .searcher()
             .search(&text_query, &TopDocs::with_limit(4))
             .unwrap();
-        assert_results_equals(
+        assert_eq!(
-            &score_docs,
+            score_docs,
-            &[
+            vec![
                 (0.81221175, DocAddress(0u32, 1)),
                 (0.5376842, DocAddress(0u32, 2)),
-                (0.48527452, DocAddress(0, 0)),
+                (0.48527452, DocAddress(0, 0))
-            ],
+            ]
         );
     }
 
@@ -611,7 +604,7 @@ mod tests {
             .searcher()
             .search(&text_query, &TopDocs::with_limit(4).and_offset(2))
             .unwrap();
-        assert_results_equals(&score_docs[..], &[(0.48527452, DocAddress(0, 0))]);
+        assert_eq!(score_docs, vec![(0.48527452, DocAddress(0, 0))]);
     }
 
     #[test]
@@ -626,12 +619,12 @@ mod tests {
             .searcher()
             .search(&text_query, &TopDocs::with_limit(2))
             .unwrap();
-        assert_results_equals(
+        assert_eq!(
-            &score_docs,
+            score_docs,
-            &[
+            vec![
                 (0.81221175, DocAddress(0u32, 1)),
                 (0.5376842, DocAddress(0u32, 2)),
-            ],
+            ]
         );
     }
 
@@ -647,12 +640,12 @@ mod tests {
             .searcher()
             .search(&text_query, &TopDocs::with_limit(2).and_offset(1))
             .unwrap();
-        assert_results_equals(
+        assert_eq!(
-            &score_docs[..],
+            score_docs,
-            &[
+            vec![
                 (0.5376842, DocAddress(0u32, 2)),
-                (0.48527452, DocAddress(0, 0)),
+                (0.48527452, DocAddress(0, 0))
-            ],
+            ]
         );
     }
 
@@ -713,8 +706,8 @@ mod tests {
         let top_collector = TopDocs::with_limit(4).order_by_u64_field(size);
         let top_docs: Vec<(u64, DocAddress)> = searcher.search(&query, &top_collector).unwrap();
         assert_eq!(
-            &top_docs[..],
+            top_docs,
-            &[
+            vec![
                 (64, DocAddress(0, 1)),
                 (16, DocAddress(0, 2)),
                 (12, DocAddress(0, 0))

src/common/mod.rs

@@ -10,9 +10,7 @@ pub(crate) use self::bitset::TinySet;
 pub(crate) use self::composite_file::{CompositeFile, CompositeWrite};
 pub use self::counting_writer::CountingWriter;
 pub use self::serialize::{BinarySerializable, FixedSize};
-pub use self::vint::{
+pub use self::vint::{read_u32_vint, serialize_vint_u32, write_u32_vint, VInt};
-    read_u32_vint, read_u32_vint_no_advance, serialize_vint_u32, write_u32_vint, VInt,
-};
 pub use byteorder::LittleEndian as Endianness;
 
 /// Segment's max doc must be `< MAX_DOC_LIMIT`.

src/common/serialize.rs

@@ -89,19 +89,6 @@ impl FixedSize for u64 {
     const SIZE_IN_BYTES: usize = 8;
 }
 
-impl BinarySerializable for f32 {
-    fn serialize<W: Write>(&self, writer: &mut W) -> io::Result<()> {
-        writer.write_f32::<Endianness>(*self)
-    }
-    fn deserialize<R: Read>(reader: &mut R) -> io::Result<Self> {
-        reader.read_f32::<Endianness>()
-    }
-}
-
-impl FixedSize for f32 {
-    const SIZE_IN_BYTES: usize = 4;
-}
-
 impl BinarySerializable for i64 {
     fn serialize<W: Write>(&self, writer: &mut W) -> io::Result<()> {
         writer.write_i64::<Endianness>(*self)

src/common/vint.rs

@@ -5,12 +5,12 @@ use std::io::Read;
 use std::io::Write;
 
 ///   Wrapper over a `u64` that serializes as a variable int.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct VInt(pub u64);
 
 const STOP_BIT: u8 = 128;
 
-pub fn serialize_vint_u32(val: u32, buf: &mut [u8; 8]) -> &[u8] {
+pub fn serialize_vint_u32(val: u32) -> (u64, usize) {
     const START_2: u64 = 1 << 7;
     const START_3: u64 = 1 << 14;
     const START_4: u64 = 1 << 21;
@@ -29,7 +29,7 @@ pub fn serialize_vint_u32(val: u32, buf: &mut [u8; 8]) -> &[u8] {
 
     let val = u64::from(val);
     const STOP_BIT: u64 = 128u64;
-    let (res, num_bytes) = match val {
+    match val {
         0..=STOP_1 => (val | STOP_BIT, 1),
         START_2..=STOP_2 => (
             (val & MASK_1) | ((val & MASK_2) << 1) | (STOP_BIT << (8)),
@@ -56,9 +56,7 @@ pub fn serialize_vint_u32(val: u32, buf: &mut [u8; 8]) -> &[u8] {
                 | (STOP_BIT << (8 * 4)),
             5,
         ),
-    };
+    }
-    LittleEndian::write_u64(&mut buf[..], res);
-    &buf[0..num_bytes]
 }
 
 /// Returns the number of bytes covered by a
@@ -87,26 +85,23 @@ fn vint_len(data: &[u8]) -> usize {
 /// If the buffer does not start by a valid
 /// vint payload
 pub fn read_u32_vint(data: &mut &[u8]) -> u32 {
-    let (result, vlen) = read_u32_vint_no_advance(*data);
+    let vlen = vint_len(*data);
-    *data = &data[vlen..];
-    result
-}
-
-pub fn read_u32_vint_no_advance(data: &[u8]) -> (u32, usize) {
-    let vlen = vint_len(data);
     let mut result = 0u32;
     let mut shift = 0u64;
     for &b in &data[..vlen] {
         result |= u32::from(b & 127u8) << shift;
         shift += 7;
     }
-    (result, vlen)
+    *data = &data[vlen..];
+    result
 }
+
 /// Write a `u32` as a vint payload.
 pub fn write_u32_vint<W: io::Write>(val: u32, writer: &mut W) -> io::Result<()> {
-    let mut buf = [0u8; 8];
+    let (val, num_bytes) = serialize_vint_u32(val);
-    let data = serialize_vint_u32(val, &mut buf);
+    let mut buffer = [0u8; 8];
-    writer.write_all(&data)
+    LittleEndian::write_u64(&mut buffer, val);
+    writer.write_all(&buffer[..num_bytes])
 }
 
 impl VInt {
@@ -177,6 +172,7 @@ mod tests {
     use super::serialize_vint_u32;
     use super::VInt;
     use crate::common::BinarySerializable;
+    use byteorder::{ByteOrder, LittleEndian};
 
     fn aux_test_vint(val: u64) {
         let mut v = [14u8; 10];
@@ -212,10 +208,12 @@ mod tests {
 
     fn aux_test_serialize_vint_u32(val: u32) {
         let mut buffer = [0u8; 10];
-        let mut buffer2 = [0u8; 8];
+        let mut buffer2 = [0u8; 10];
         let len_vint = VInt(val as u64).serialize_into(&mut buffer);
-        let res2 = serialize_vint_u32(val, &mut buffer2);
+        let (vint, len) = serialize_vint_u32(val);
-        assert_eq!(&buffer[..len_vint], res2, "array wrong for {}", val);
+        assert_eq!(len, len_vint, "len wrong for val {}", val);
+        LittleEndian::write_u64(&mut buffer2, vint);
+        assert_eq!(&buffer[..len], &buffer2[..len], "array wrong for {}", val);
     }
 
     #[test]

src/core/index.rs

@@ -283,7 +283,7 @@ impl Index {
                 TantivyError::LockFailure(
                     err,
                     Some(
-                        "Failed to acquire index lock. If you are using \
+                        "Failed to acquire index lock. If you are using\
                          a regular directory, this means there is already an \
                          `IndexWriter` working on this `Directory`, in this process \
                          or in a different process."

src/core/index_meta.rs

@@ -213,7 +213,7 @@ pub struct IndexMeta {
     #[serde(skip_serializing_if = "Option::is_none")]
     /// Payload associated to the last commit.
     ///
-    /// Upon commit, clients can optionally add a small `String` payload to their commit
+    /// Upon commit, clients can optionally add a small `Striing` payload to their commit
     /// to help identify this commit.
     /// This payload is entirely unused by tantivy.
     pub payload: Option<String>,

src/core/segment_reader.rs

@@ -8,7 +8,7 @@ use crate::directory::ReadOnlySource;
 use crate::fastfield::DeleteBitSet;
 use crate::fastfield::FacetReader;
 use crate::fastfield::FastFieldReaders;
-use crate::fieldnorm::{FieldNormReader, FieldNormReaders};
+use crate::fieldnorm::FieldNormReader;
 use crate::schema::Field;
 use crate::schema::FieldType;
 use crate::schema::Schema;
@@ -48,7 +48,7 @@ pub struct SegmentReader {
     positions_composite: CompositeFile,
     positions_idx_composite: CompositeFile,
     fast_fields_readers: Arc<FastFieldReaders>,
-    fieldnorm_readers: FieldNormReaders,
+    fieldnorms_composite: CompositeFile,
 
     store_source: ReadOnlySource,
     delete_bitset_opt: Option<DeleteBitSet>,
@@ -126,8 +126,8 @@ impl SegmentReader {
     /// They are simply stored as a fast field, serialized in
     /// the `.fieldnorm` file of the segment.
     pub fn get_fieldnorms_reader(&self, field: Field) -> FieldNormReader {
-        if let Some(fieldnorm_reader) = self.fieldnorm_readers.get_field(field) {
+        if let Some(fieldnorm_source) = self.fieldnorms_composite.open_read(field) {
-            fieldnorm_reader
+            FieldNormReader::open(fieldnorm_source)
         } else {
             let field_name = self.schema.get_field_name(field);
             let err_msg = format!(
@@ -178,8 +178,8 @@ impl SegmentReader {
         let fast_field_readers =
             Arc::new(FastFieldReaders::load_all(&schema, &fast_fields_composite)?);
 
-        let fieldnorm_data = segment.open_read(SegmentComponent::FIELDNORMS)?;
+        let fieldnorms_data = segment.open_read(SegmentComponent::FIELDNORMS)?;
-        let fieldnorm_readers = FieldNormReaders::open(fieldnorm_data)?;
+        let fieldnorms_composite = CompositeFile::open(&fieldnorms_data)?;
 
         let delete_bitset_opt = if segment.meta().has_deletes() {
             let delete_data = segment.open_read(SegmentComponent::DELETE)?;
@@ -195,7 +195,7 @@ impl SegmentReader {
             termdict_composite,
             postings_composite,
             fast_fields_readers: fast_field_readers,
-            fieldnorm_readers,
+            fieldnorms_composite,
             segment_id: segment.id(),
             store_source,
             delete_bitset_opt,
@@ -295,8 +295,8 @@ impl SegmentReader {
     }
 
     /// Returns an iterator that will iterate over the alive document ids
-    pub fn doc_ids_alive<'a>(&'a self) -> impl Iterator<Item = DocId> + 'a {
+    pub fn doc_ids_alive(&self) -> SegmentReaderAliveDocsIterator<'_> {
-        (0u32..self.max_doc).filter(move |doc| !self.is_deleted(*doc))
+        SegmentReaderAliveDocsIterator::new(&self)
     }
 
     /// Summarize total space usage of this segment.
@@ -308,7 +308,7 @@ impl SegmentReader {
             self.positions_composite.space_usage(),
             self.positions_idx_composite.space_usage(),
             self.fast_fields_readers.space_usage(),
-            self.fieldnorm_readers.space_usage(),
+            self.fieldnorms_composite.space_usage(),
             self.get_store_reader().space_usage(),
             self.delete_bitset_opt
                 .as_ref()
@@ -324,6 +324,52 @@ impl fmt::Debug for SegmentReader {
     }
 }
 
+/// Implements the iterator trait to allow easy iteration
+/// over non-deleted ("alive") DocIds in a SegmentReader
+pub struct SegmentReaderAliveDocsIterator<'a> {
+    reader: &'a SegmentReader,
+    max_doc: DocId,
+    current: DocId,
+}
+
+impl<'a> SegmentReaderAliveDocsIterator<'a> {
+    pub fn new(reader: &'a SegmentReader) -> SegmentReaderAliveDocsIterator<'a> {
+        SegmentReaderAliveDocsIterator {
+            reader,
+            max_doc: reader.max_doc(),
+            current: 0,
+        }
+    }
+}
+
+impl<'a> Iterator for SegmentReaderAliveDocsIterator<'a> {
+    type Item = DocId;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // TODO: Use TinySet (like in BitSetDocSet) to speed this process up
+        if self.current >= self.max_doc {
+            return None;
+        }
+
+        // find the next alive doc id
+        while self.reader.is_deleted(self.current) {
+            self.current += 1;
+
+            if self.current >= self.max_doc {
+                return None;
+            }
+        }
+
+        // capture the current alive DocId
+        let result = Some(self.current);
+
+        // move down the chain
+        self.current += 1;
+
+        result
+    }
+}
+
 #[cfg(test)]
 mod test {
     use crate::core::Index;

src/directory/footer.rs

@@ -94,24 +94,12 @@ impl Footer {
         match &self.versioned_footer {
             VersionedFooter::V1 {
                 crc32: _crc,
-                store_compression,
+                store_compression: compression,
             } => {
-                if &library_version.store_compression != store_compression {
+                if &library_version.store_compression != compression {
                     return Err(Incompatibility::CompressionMismatch {
                         library_compression_format: library_version.store_compression.to_string(),
-                        index_compression_format: store_compression.to_string(),
+                        index_compression_format: compression.to_string(),
-                    });
-                }
-                Ok(())
-            }
-            VersionedFooter::V2 {
-                crc32: _crc,
-                store_compression,
-            } => {
-                if &library_version.store_compression != store_compression {
-                    return Err(Incompatibility::CompressionMismatch {
-                        library_compression_format: library_version.store_compression.to_string(),
-                        index_compression_format: store_compression.to_string(),
                     });
                 }
                 Ok(())
@@ -132,29 +120,24 @@ pub enum VersionedFooter {
         crc32: CrcHashU32,
         store_compression: String,
     },
-    // Introduction of the Block WAND information.
-    V2 {
-        crc32: CrcHashU32,
-        store_compression: String,
-    },
 }
 
 impl BinarySerializable for VersionedFooter {
     fn serialize<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
         let mut buf = Vec::new();
         match self {
-            VersionedFooter::V2 {
+            VersionedFooter::V1 {
                 crc32,
                 store_compression: compression,
             } => {
                 // Serializes a valid `VersionedFooter` or panics if the version is unknown
                 // [   version    |   crc_hash  | compression_mode ]
                 // [    0..4      |     4..8    |     variable     ]
-                BinarySerializable::serialize(&2u32, &mut buf)?;
+                BinarySerializable::serialize(&1u32, &mut buf)?;
                 BinarySerializable::serialize(crc32, &mut buf)?;
                 BinarySerializable::serialize(compression, &mut buf)?;
             }
-            VersionedFooter::V1 { .. } | VersionedFooter::UnknownVersion => {
+            VersionedFooter::UnknownVersion => {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
                     "Cannot serialize an unknown versioned footer ",
@@ -183,30 +166,22 @@ impl BinarySerializable for VersionedFooter {
         reader.read_exact(&mut buf[..])?;
         let mut cursor = &buf[..];
         let version = u32::deserialize(&mut cursor)?;
-        if version != 1 && version != 2 {
+        if version == 1 {
-            return Ok(VersionedFooter::UnknownVersion);
+            let crc32 = u32::deserialize(&mut cursor)?;
-        }
+            let compression = String::deserialize(&mut cursor)?;
-        let crc32 = u32::deserialize(&mut cursor)?;
+            Ok(VersionedFooter::V1 {
-        let store_compression = String::deserialize(&mut cursor)?;
-        Ok(if version == 1 {
-            VersionedFooter::V1 {
                 crc32,
-                store_compression,
+                store_compression: compression,
-            }
+            })
         } else {
-            assert_eq!(version, 2);
+            Ok(VersionedFooter::UnknownVersion)
-            VersionedFooter::V2 {
+        }
-                crc32,
-                store_compression,
-            }
-        })
     }
 }
 
 impl VersionedFooter {
     pub fn crc(&self) -> Option<CrcHashU32> {
         match self {
-            VersionedFooter::V2 { crc32, .. } => Some(*crc32),
             VersionedFooter::V1 { crc32, .. } => Some(*crc32),
             VersionedFooter::UnknownVersion { .. } => None,
         }
@@ -244,7 +219,7 @@ impl<W: TerminatingWrite> Write for FooterProxy<W> {
 impl<W: TerminatingWrite> TerminatingWrite for FooterProxy<W> {
     fn terminate_ref(&mut self, _: AntiCallToken) -> io::Result<()> {
         let crc32 = self.hasher.take().unwrap().finalize();
-        let footer = Footer::new(VersionedFooter::V2 {
+        let footer = Footer::new(VersionedFooter::V1 {
             crc32,
             store_compression: crate::store::COMPRESSION.to_string(),
         });
@@ -273,11 +248,15 @@ mod tests {
         assert!(footer_proxy.terminate().is_ok());
         assert_eq!(vec.len(), 167);
         let footer = Footer::deserialize(&mut &vec[..]).unwrap();
-        assert!(matches!(
+        if let VersionedFooter::V1 {
-           footer.versioned_footer,
+            crc32: _,
-           VersionedFooter::V2 { store_compression, .. }
+            store_compression,
-           if store_compression == crate::store::COMPRESSION
+        } = footer.versioned_footer
-        ));
+        {
+            assert_eq!(store_compression, crate::store::COMPRESSION);
+        } else {
+            panic!("Versioned footer should be V1.");
+        }
         assert_eq!(&footer.version, crate::version());
     }
 
@@ -285,7 +264,7 @@ mod tests {
     fn test_serialize_deserialize_footer() {
         let mut buffer = Vec::new();
         let crc32 = 123456u32;
-        let footer: Footer = Footer::new(VersionedFooter::V2 {
+        let footer: Footer = Footer::new(VersionedFooter::V1 {
             crc32,
             store_compression: "lz4".to_string(),
         });
@@ -297,7 +276,7 @@ mod tests {
     #[test]
     fn footer_length() {
         let crc32 = 1111111u32;
-        let versioned_footer = VersionedFooter::V2 {
+        let versioned_footer = VersionedFooter::V1 {
             crc32,
             store_compression: "lz4".to_string(),
         };
@@ -318,7 +297,7 @@ mod tests {
             // versionned footer length
             12 | 128,
             // index format version
-            2,
+            1,
             0,
             0,
             0,
@@ -337,7 +316,7 @@ mod tests {
         let versioned_footer = VersionedFooter::deserialize(&mut cursor).unwrap();
         assert!(cursor.is_empty());
         let expected_crc: u32 = LittleEndian::read_u32(&v_footer_bytes[5..9]) as CrcHashU32;
-        let expected_versioned_footer: VersionedFooter = VersionedFooter::V2 {
+        let expected_versioned_footer: VersionedFooter = VersionedFooter::V1 {
             crc32: expected_crc,
             store_compression: "lz4".to_string(),
         };

src/directory/watch_event_router.rs

@@ -5,7 +5,7 @@ use std::sync::RwLock;
 use std::sync::Weak;
 
 /// Type alias for callbacks registered when watching files of a `Directory`.
-pub type WatchCallback = Box<dyn Fn() + Sync + Send>;
+pub type WatchCallback = Box<dyn Fn() -> () + Sync + Send>;
 
 /// Helper struct to implement the watch method in `Directory` implementations.
 ///
@@ -32,7 +32,7 @@ impl WatchHandle {
 }
 
 impl WatchCallbackList {
-    /// Subscribes a new callback and returns a handle that controls the lifetime of the callback.
+    /// Suscribes a new callback and returns a handle that controls the lifetime of the callback.
     pub fn subscribe(&self, watch_callback: WatchCallback) -> WatchHandle {
         let watch_callback_arc = Arc::new(watch_callback);
         let watch_callback_weak = Arc::downgrade(&watch_callback_arc);

src/docset.rs

@@ -38,7 +38,6 @@ pub trait DocSet {
     /// Calling `seek(TERMINATED)` is also legal and is the normal way to consume a DocSet.
     fn seek(&mut self, target: DocId) -> DocId {
         let mut doc = self.doc();
-        debug_assert!(doc <= target);
         while doc < target {
             doc = self.advance();
         }

src/fastfield/delete.rs

@@ -9,8 +9,6 @@ use std::io::Write;
 /// Write a delete `BitSet`
 ///
 /// where `delete_bitset` is the set of deleted `DocId`.
-/// Warning: this function does not call terminate. The caller is in charge of
-/// closing the writer properly.
 pub fn write_delete_bitset(
     delete_bitset: &BitSet,
     max_doc: u32,
@@ -44,24 +42,6 @@ pub struct DeleteBitSet {
 }
 
 impl DeleteBitSet {
-    #[cfg(test)]
-    pub(crate) fn for_test(docs: &[DocId], max_doc: u32) -> DeleteBitSet {
-        use crate::directory::{Directory, RAMDirectory, TerminatingWrite};
-        use std::path::Path;
-        assert!(docs.iter().all(|&doc| doc < max_doc));
-        let mut bitset = BitSet::with_max_value(max_doc);
-        for &doc in docs {
-            bitset.insert(doc);
-        }
-        let mut directory = RAMDirectory::create();
-        let path = Path::new("dummydeletebitset");
-        let mut wrt = directory.open_write(path).unwrap();
-        write_delete_bitset(&bitset, max_doc, &mut wrt).unwrap();
-        wrt.terminate().unwrap();
-        let source = directory.open_read(path).unwrap();
-        Self::open(source)
-    }
-
     /// Opens a delete bitset given its data source.
     pub fn open(data: ReadOnlySource) -> DeleteBitSet {
         let num_deleted: usize = data
@@ -103,35 +83,42 @@ impl HasLen for DeleteBitSet {
 
 #[cfg(test)]
 mod tests {
-    use super::DeleteBitSet;
+    use super::*;
-    use crate::common::HasLen;
+    use crate::directory::*;
+    use std::path::PathBuf;
 
-    #[test]
+    fn test_delete_bitset_helper(bitset: &BitSet, max_doc: u32) {
-    fn test_delete_bitset_empty() {
+        let test_path = PathBuf::from("test");
-        let delete_bitset = DeleteBitSet::for_test(&[], 10);
+        let mut directory = RAMDirectory::create();
-        for doc in 0..10 {
+        {
-            assert_eq!(delete_bitset.is_deleted(doc), !delete_bitset.is_alive(doc));
+            let mut writer = directory.open_write(&*test_path).unwrap();
+            write_delete_bitset(bitset, max_doc, &mut writer).unwrap();
+            writer.terminate().unwrap();
         }
-        assert_eq!(delete_bitset.len(), 0);
+        let source = directory.open_read(&test_path).unwrap();
+        let delete_bitset = DeleteBitSet::open(source);
+        for doc in 0..max_doc {
+            assert_eq!(bitset.contains(doc), delete_bitset.is_deleted(doc as DocId));
+        }
+        assert_eq!(delete_bitset.len(), bitset.len());
     }
 
     #[test]
     fn test_delete_bitset() {
-        let delete_bitset = DeleteBitSet::for_test(&[1, 9], 10);
+        {
-        assert!(delete_bitset.is_alive(0));
+            let mut bitset = BitSet::with_max_value(10);
-        assert!(delete_bitset.is_deleted(1));
+            bitset.insert(1);
-        assert!(delete_bitset.is_alive(2));
+            bitset.insert(9);
-        assert!(delete_bitset.is_alive(3));
+            test_delete_bitset_helper(&bitset, 10);
-        assert!(delete_bitset.is_alive(4));
+        }
-        assert!(delete_bitset.is_alive(5));
+        {
-        assert!(delete_bitset.is_alive(6));
+            let mut bitset = BitSet::with_max_value(8);
-        assert!(delete_bitset.is_alive(6));
+            bitset.insert(1);
-        assert!(delete_bitset.is_alive(7));
+            bitset.insert(2);
-        assert!(delete_bitset.is_alive(8));
+            bitset.insert(3);
-        assert!(delete_bitset.is_deleted(9));
+            bitset.insert(5);
-        for doc in 0..10 {
+            bitset.insert(7);
-            assert_eq!(delete_bitset.is_deleted(doc), !delete_bitset.is_alive(doc));
+            test_delete_bitset_helper(&bitset, 8);
         }
-        assert_eq!(delete_bitset.len(), 2);
     }
 }

src/fieldnorm/mod.rs

@@ -21,7 +21,7 @@ mod reader;
 mod serializer;
 mod writer;
 
-pub use self::reader::{FieldNormReader, FieldNormReaders};
+pub use self::reader::FieldNormReader;
 pub use self::serializer::FieldNormsSerializer;
 pub use self::writer::FieldNormsWriter;
 

src/fieldnorm/reader.rs

@@ -1,41 +1,6 @@
 use super::{fieldnorm_to_id, id_to_fieldnorm};
-use crate::common::CompositeFile;
 use crate::directory::ReadOnlySource;
-use crate::schema::Field;
-use crate::space_usage::PerFieldSpaceUsage;
 use crate::DocId;
-use std::sync::Arc;
-
-/// Reader for the fieldnorm (for each document, the number of tokens indexed in the
-/// field) of all indexed fields in the index.
-///
-/// Each fieldnorm is approximately compressed over one byte. We refer to this byte as
-/// `fieldnorm_id`.
-/// The mapping from `fieldnorm` to `fieldnorm_id` is given by monotonic.
-#[derive(Clone)]
-pub struct FieldNormReaders {
-    data: Arc<CompositeFile>,
-}
-
-impl FieldNormReaders {
-    /// Creates a field norm reader.
-    pub fn open(source: ReadOnlySource) -> crate::Result<FieldNormReaders> {
-        let data = CompositeFile::open(&source)?;
-        Ok(FieldNormReaders {
-            data: Arc::new(data),
-        })
-    }
-
-    /// Returns the FieldNormReader for a specific field.
-    pub fn get_field(&self, field: Field) -> Option<FieldNormReader> {
-        self.data.open_read(field).map(FieldNormReader::open)
-    }
-
-    /// Return a break down of the space usage per field.
-    pub fn space_usage(&self) -> PerFieldSpaceUsage {
-        self.data.space_usage()
-    }
-}
 
 /// Reads the fieldnorm associated to a document.
 /// The fieldnorm represents the length associated to
@@ -54,7 +19,6 @@ impl FieldNormReaders {
 /// Apart from compression, this scale also makes it possible to
 /// precompute computationally expensive functions of the fieldnorm
 /// in a very short array.
-#[derive(Clone)]
 pub struct FieldNormReader {
     data: ReadOnlySource,
 }
@@ -65,11 +29,6 @@ impl FieldNormReader {
         FieldNormReader { data }
     }
 
-    /// Returns the number of documents in this segment.
-    pub fn num_docs(&self) -> u32 {
-        self.data.len() as u32
-    }
-
     /// Returns the `fieldnorm` associated to a doc id.
     /// The fieldnorm is a value approximating the number
     /// of tokens in a given field of the `doc_id`.
@@ -103,12 +62,13 @@ impl FieldNormReader {
     pub fn fieldnorm_to_id(fieldnorm: u32) -> u8 {
         fieldnorm_to_id(fieldnorm)
     }
+}
 
-    #[cfg(test)]
+#[cfg(test)]
-    pub fn for_test(field_norms: &[u32]) -> FieldNormReader {
+impl From<Vec<u32>> for FieldNormReader {
+    fn from(field_norms: Vec<u32>) -> FieldNormReader {
         let field_norms_id = field_norms
-            .iter()
+            .into_iter()
-            .cloned()
             .map(FieldNormReader::fieldnorm_to_id)
             .collect::<Vec<u8>>();
         let field_norms_data = ReadOnlySource::from(field_norms_id);
@@ -117,20 +77,3 @@ impl FieldNormReader {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::fieldnorm::FieldNormReader;
-
-    #[test]
-    fn test_from_fieldnorms_array() {
-        let fieldnorms = &[1, 2, 3, 4, 1_000_000];
-        let fieldnorm_reader = FieldNormReader::for_test(fieldnorms);
-        assert_eq!(fieldnorm_reader.num_docs(), 5);
-        assert_eq!(fieldnorm_reader.fieldnorm(0), 1);
-        assert_eq!(fieldnorm_reader.fieldnorm(1), 2);
-        assert_eq!(fieldnorm_reader.fieldnorm(2), 3);
-        assert_eq!(fieldnorm_reader.fieldnorm(3), 4);
-        assert_eq!(fieldnorm_reader.fieldnorm(4), 983_064);
-    }
-}

src/fieldnorm/writer.rs

@@ -78,12 +78,11 @@ impl FieldNormsWriter {
     }
 
     /// Serialize the seen fieldnorm values to the serializer for all fields.
-    pub fn serialize(&self, mut fieldnorms_serializer: FieldNormsSerializer) -> io::Result<()> {
+    pub fn serialize(&self, fieldnorms_serializer: &mut FieldNormsSerializer) -> io::Result<()> {
         for &field in self.fields.iter() {
             let fieldnorm_values: &[u8] = &self.fieldnorms_buffer[field.field_id() as usize][..];
             fieldnorms_serializer.serialize_field(field, fieldnorm_values)?;
         }
-        fieldnorms_serializer.close()?;
         Ok(())
     }
 }

src/indexer/index_writer.rs

@@ -536,7 +536,6 @@ impl IndexWriter {
     /// when no documents are remaining.
     ///
     /// Returns the former segment_ready channel.
-    #[allow(unused_must_use)]
     fn recreate_document_channel(&mut self) -> OperationReceiver {
         let (document_sender, document_receiver): (OperationSender, OperationReceiver) =
             channel::bounded(PIPELINE_MAX_SIZE_IN_DOCS);
@@ -576,7 +575,7 @@ impl IndexWriter {
         //
         // This will drop the document queue, and the thread
         // should terminate.
-        *self = new_index_writer;
+        mem::replace(self, new_index_writer);
 
         // Drains the document receiver pipeline :
         // Workers don't need to index the pending documents.

src/indexer/merger.rs

@@ -8,22 +8,21 @@ use crate::fastfield::DeleteBitSet;
 use crate::fastfield::FastFieldReader;
 use crate::fastfield::FastFieldSerializer;
 use crate::fastfield::MultiValueIntFastFieldReader;
+use crate::fieldnorm::FieldNormReader;
 use crate::fieldnorm::FieldNormsSerializer;
 use crate::fieldnorm::FieldNormsWriter;
-use crate::fieldnorm::{FieldNormReader, FieldNormReaders};
 use crate::indexer::SegmentSerializer;
+use crate::postings::InvertedIndexSerializer;
 use crate::postings::Postings;
-use crate::postings::{InvertedIndexSerializer, SegmentPostings};
 use crate::schema::Cardinality;
 use crate::schema::FieldType;
 use crate::schema::{Field, Schema};
 use crate::store::StoreWriter;
 use crate::termdict::TermMerger;
 use crate::termdict::TermOrdinal;
-use crate::{DocId, InvertedIndexReader, SegmentComponent};
+use crate::DocId;
 use std::cmp;
 use std::collections::HashMap;
-use std::sync::Arc;
 
 fn compute_total_num_tokens(readers: &[SegmentReader], field: Field) -> u64 {
     let mut total_tokens = 0u64;
@@ -168,7 +167,7 @@ impl IndexMerger {
 
     fn write_fieldnorms(
         &self,
-        mut fieldnorms_serializer: FieldNormsSerializer,
+        fieldnorms_serializer: &mut FieldNormsSerializer,
     ) -> crate::Result<()> {
         let fields = FieldNormsWriter::fields_with_fieldnorm(&self.schema);
         let mut fieldnorms_data = Vec::with_capacity(self.max_doc as usize);
@@ -183,7 +182,6 @@ impl IndexMerger {
             }
             fieldnorms_serializer.serialize_field(field, &fieldnorms_data[..])?;
         }
-        fieldnorms_serializer.close()?;
         Ok(())
     }
 
@@ -494,11 +492,10 @@ impl IndexMerger {
         indexed_field: Field,
         field_type: &FieldType,
         serializer: &mut InvertedIndexSerializer,
-        fieldnorm_reader: Option<FieldNormReader>,
     ) -> crate::Result<Option<TermOrdinalMapping>> {
         let mut positions_buffer: Vec<u32> = Vec::with_capacity(1_000);
         let mut delta_computer = DeltaComputer::new();
-        let field_readers: Vec<Arc<InvertedIndexReader>> = self
+        let field_readers = self
             .readers
             .iter()
             .map(|reader| reader.inverted_index(indexed_field))
@@ -553,8 +550,7 @@ impl IndexMerger {
         // - Segment 2's doc ids become  [seg0.max_doc + seg1.max_doc,
         //                                seg0.max_doc + seg1.max_doc + seg2.max_doc]
         // ...
-        let mut field_serializer =
+        let mut field_serializer = serializer.new_field(indexed_field, total_num_tokens)?;
-            serializer.new_field(indexed_field, total_num_tokens, fieldnorm_reader)?;
 
         let field_entry = self.schema.get_field_entry(indexed_field);
 
@@ -564,45 +560,43 @@ impl IndexMerger {
                          indexed. Have you modified the schema?",
         );
 
-        let mut segment_postings_containing_the_term: Vec<(usize, SegmentPostings)> = vec![];
-
         while merged_terms.advance() {
-            segment_postings_containing_the_term.clear();
             let term_bytes: &[u8] = merged_terms.key();
 
-            let mut total_doc_freq = 0;
-
             // Let's compute the list of non-empty posting lists
-            for heap_item in merged_terms.current_kvs() {
+            let segment_postings: Vec<_> = merged_terms
-                let segment_ord = heap_item.segment_ord;
+                .current_kvs()
-                let term_info = heap_item.streamer.value();
+                .iter()
-                let segment_reader = &self.readers[heap_item.segment_ord];
+                .flat_map(|heap_item| {
-                let inverted_index: &InvertedIndexReader = &*field_readers[segment_ord];
+                    let segment_ord = heap_item.segment_ord;
-                let segment_postings =
+                    let term_info = heap_item.streamer.value();
-                    inverted_index.read_postings_from_terminfo(term_info, segment_postings_option);
+                    let segment_reader = &self.readers[heap_item.segment_ord];
-                let delete_bitset_opt = segment_reader.delete_bitset();
+                    let inverted_index = segment_reader.inverted_index(indexed_field);
-                let doc_freq = if let Some(delete_bitset) = delete_bitset_opt {
+                    let mut segment_postings = inverted_index
-                    segment_postings.doc_freq_given_deletes(delete_bitset)
+                        .read_postings_from_terminfo(term_info, segment_postings_option);
-                } else {
+                    let mut doc = segment_postings.doc();
-                    segment_postings.doc_freq()
+                    while doc != TERMINATED {
-                };
+                        if !segment_reader.is_deleted(doc) {
-                if doc_freq > 0u32 {
+                            return Some((segment_ord, segment_postings));
-                    total_doc_freq += doc_freq;
+                        }
-                    segment_postings_containing_the_term.push((segment_ord, segment_postings));
+                        doc = segment_postings.advance();
-                }
+                    }
-            }
+                    None
+                })
+                .collect();
 
             // At this point, `segment_postings` contains the posting list
-            // of all of the segments containing the given term (and that are non-empty)
+            // of all of the segments containing the given term.
             //
             // These segments are non-empty and advance has already been called.
-            if total_doc_freq == 0u32 {
+            if segment_postings.is_empty() {
-                // All docs that used to contain the term have been deleted. The `term` will be
-                // entirely removed.
                 continue;
             }
+            // If not, the `term` will be entirely removed.
 
-            let to_term_ord = field_serializer.new_term(term_bytes, total_doc_freq)?;
+            // We know that there is at least one document containing
+            // the term, so we add it.
+            let to_term_ord = field_serializer.new_term(term_bytes)?;
 
             if let Some(ref mut term_ord_mapping) = term_ord_mapping_opt {
                 for (segment_ord, from_term_ord) in merged_terms.matching_segments() {
@@ -612,9 +606,7 @@ impl IndexMerger {
 
             // We can now serialize this postings, by pushing each document to the
             // postings serializer.
-            for (segment_ord, mut segment_postings) in
+            for (segment_ord, mut segment_postings) in segment_postings {
-                segment_postings_containing_the_term.drain(..)
-            {
                 let old_to_new_doc_id = &merged_doc_id_map[segment_ord];
 
                 let mut doc = segment_postings.doc();
@@ -644,18 +636,13 @@ impl IndexMerger {
     fn write_postings(
         &self,
         serializer: &mut InvertedIndexSerializer,
-        fieldnorm_readers: FieldNormReaders,
     ) -> crate::Result<HashMap<Field, TermOrdinalMapping>> {
         let mut term_ordinal_mappings = HashMap::new();
         for (field, field_entry) in self.schema.fields() {
-            let fieldnorm_reader = fieldnorm_readers.get_field(field);
             if field_entry.is_indexed() {
-                if let Some(term_ordinal_mapping) = self.write_postings_for_field(
+                if let Some(term_ordinal_mapping) =
-                    field,
+                    self.write_postings_for_field(field, field_entry.field_type(), serializer)?
-                    field_entry.field_type(),
+                {
-                    serializer,
-                    fieldnorm_reader,
-                )? {
                     term_ordinal_mappings.insert(field, term_ordinal_mapping);
                 }
             }
@@ -681,15 +668,8 @@ impl IndexMerger {
 
 impl SerializableSegment for IndexMerger {
     fn write(&self, mut serializer: SegmentSerializer) -> crate::Result<u32> {
-        if let Some(fieldnorms_serializer) = serializer.extract_fieldnorms_serializer() {
+        let term_ord_mappings = self.write_postings(serializer.get_postings_serializer())?;
-            self.write_fieldnorms(fieldnorms_serializer)?;
+        self.write_fieldnorms(serializer.get_fieldnorms_serializer())?;
-        }
-        let fieldnorm_data = serializer
-            .segment()
-            .open_read(SegmentComponent::FIELDNORMS)?;
-        let fieldnorm_readers = FieldNormReaders::open(fieldnorm_data)?;
-        let term_ord_mappings =
-            self.write_postings(serializer.get_postings_serializer(), fieldnorm_readers)?;
         self.write_fast_fields(serializer.get_fast_field_serializer(), term_ord_mappings)?;
         self.write_storable_fields(serializer.get_store_writer())?;
         serializer.close()?;
@@ -699,15 +679,15 @@ impl SerializableSegment for IndexMerger {
 
 #[cfg(test)]
 mod tests {
-    use crate::assert_nearly_equals;
     use crate::collector::tests::TEST_COLLECTOR_WITH_SCORE;
     use crate::collector::tests::{BytesFastFieldTestCollector, FastFieldTestCollector};
     use crate::collector::{Count, FacetCollector};
     use crate::core::Index;
     use crate::query::AllQuery;
     use crate::query::BooleanQuery;
-    use crate::query::Scorer;
     use crate::query::TermQuery;
+    use crate::schema;
+    use crate::schema::Cardinality;
     use crate::schema::Document;
     use crate::schema::Facet;
     use crate::schema::IndexRecordOption;
@@ -715,11 +695,9 @@ mod tests {
     use crate::schema::Term;
     use crate::schema::TextFieldIndexing;
     use crate::schema::INDEXED;
-    use crate::schema::{Cardinality, TEXT};
     use crate::DocAddress;
     use crate::IndexWriter;
     use crate::Searcher;
-    use crate::{schema, DocSet, SegmentId};
     use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
     use futures::executor::block_on;
     use std::io::Cursor;
@@ -1526,9 +1504,12 @@ mod tests {
         for i in 0..100 {
             let mut doc = Document::new();
             doc.add_f64(field, 42.0);
+
             doc.add_f64(multi_field, 0.24);
             doc.add_f64(multi_field, 0.27);
+
             writer.add_document(doc);
+
             if i % 5 == 0 {
                 writer.commit()?;
             }
@@ -1540,72 +1521,6 @@ mod tests {
         // If a merging thread fails, we should end up with more
         // than one segment here
         assert_eq!(1, index.searchable_segments()?.len());
-        Ok(())
-    }
-
-    #[test]
-    fn test_merged_index_has_blockwand() -> crate::Result<()> {
-        let mut builder = schema::SchemaBuilder::new();
-        let text = builder.add_text_field("text", TEXT);
-        let index = Index::create_in_ram(builder.build());
-        let mut writer = index.writer_with_num_threads(1, 3_000_000)?;
-        let happy_term = Term::from_field_text(text, "happy");
-        let term_query = TermQuery::new(happy_term, IndexRecordOption::WithFreqs);
-        for _ in 0..62 {
-            writer.add_document(doc!(text=>"hello happy tax payer"));
-        }
-        writer.commit()?;
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let mut term_scorer = term_query
-            .specialized_weight(&searcher, true)
-            .specialized_scorer(searcher.segment_reader(0u32), 1.0)?;
-        assert_eq!(term_scorer.doc(), 0);
-        assert_nearly_equals!(term_scorer.block_max_score(), 0.0079681855);
-        assert_nearly_equals!(term_scorer.score(), 0.0079681855);
-        for _ in 0..81 {
-            writer.add_document(doc!(text=>"hello happy tax payer"));
-        }
-        writer.commit()?;
-        reader.reload()?;
-        let searcher = reader.searcher();
-
-        assert_eq!(searcher.segment_readers().len(), 2);
-        for segment_reader in searcher.segment_readers() {
-            let mut term_scorer = term_query
-                .specialized_weight(&searcher, true)
-                .specialized_scorer(segment_reader, 1.0)?;
-            // the difference compared to before is instrinsic to the bm25 formula. no worries there.
-            for doc in segment_reader.doc_ids_alive() {
-                assert_eq!(term_scorer.doc(), doc);
-                assert_nearly_equals!(term_scorer.block_max_score(), 0.003478312);
-                assert_nearly_equals!(term_scorer.score(), 0.003478312);
-                term_scorer.advance();
-            }
-        }
-
-        let segment_ids: Vec<SegmentId> = searcher
-            .segment_readers()
-            .iter()
-            .map(|reader| reader.segment_id())
-            .collect();
-        block_on(writer.merge(&segment_ids[..]))?;
-
-        reader.reload()?;
-        let searcher = reader.searcher();
-        assert_eq!(searcher.segment_readers().len(), 1);
-
-        let segment_reader = searcher.segment_reader(0u32);
-        let mut term_scorer = term_query
-            .specialized_weight(&searcher, true)
-            .specialized_scorer(segment_reader, 1.0)?;
-        // the difference compared to before is instrinsic to the bm25 formula. no worries there.
-        for doc in segment_reader.doc_ids_alive() {
-            assert_eq!(term_scorer.doc(), doc);
-            assert_nearly_equals!(term_scorer.block_max_score(), 0.003478312);
-            assert_nearly_equals!(term_scorer.score(), 0.003478312);
-            term_scorer.advance();
-        }
 
         Ok(())
     }

src/indexer/segment_serializer.rs

@@ -8,16 +8,15 @@ use crate::store::StoreWriter;
 /// Segment serializer is in charge of laying out on disk
 /// the data accumulated and sorted by the `SegmentWriter`.
 pub struct SegmentSerializer {
-    segment: Segment,
     store_writer: StoreWriter,
     fast_field_serializer: FastFieldSerializer,
-    fieldnorms_serializer: Option<FieldNormsSerializer>,
+    fieldnorms_serializer: FieldNormsSerializer,
     postings_serializer: InvertedIndexSerializer,
 }
 
 impl SegmentSerializer {
     /// Creates a new `SegmentSerializer`.
-    pub fn for_segment(mut segment: Segment) -> crate::Result<SegmentSerializer> {
+    pub fn for_segment(segment: &mut Segment) -> crate::Result<SegmentSerializer> {
         let store_write = segment.open_write(SegmentComponent::STORE)?;
 
         let fast_field_write = segment.open_write(SegmentComponent::FASTFIELDS)?;
@@ -26,20 +25,15 @@ impl SegmentSerializer {
         let fieldnorms_write = segment.open_write(SegmentComponent::FIELDNORMS)?;
         let fieldnorms_serializer = FieldNormsSerializer::from_write(fieldnorms_write)?;
 
-        let postings_serializer = InvertedIndexSerializer::open(&mut segment)?;
+        let postings_serializer = InvertedIndexSerializer::open(segment)?;
         Ok(SegmentSerializer {
-            segment,
             store_writer: StoreWriter::new(store_write),
             fast_field_serializer,
-            fieldnorms_serializer: Some(fieldnorms_serializer),
+            fieldnorms_serializer,
             postings_serializer,
         })
     }
 
-    pub fn segment(&self) -> &Segment {
-        &self.segment
-    }
-
     /// Accessor to the `PostingsSerializer`.
     pub fn get_postings_serializer(&mut self) -> &mut InvertedIndexSerializer {
         &mut self.postings_serializer
@@ -50,11 +44,9 @@ impl SegmentSerializer {
         &mut self.fast_field_serializer
     }
 
-    /// Extract the field norm serializer.
+    /// Accessor to the field norm serializer.
-    ///
+    pub fn get_fieldnorms_serializer(&mut self) -> &mut FieldNormsSerializer {
-    /// Note the fieldnorms serializer can only be extracted once.
+        &mut self.fieldnorms_serializer
-    pub fn extract_fieldnorms_serializer(&mut self) -> Option<FieldNormsSerializer> {
-        self.fieldnorms_serializer.take()
     }
 
     /// Accessor to the `StoreWriter`.
@@ -63,13 +55,11 @@ impl SegmentSerializer {
     }
 
     /// Finalize the segment serialization.
-    pub fn close(mut self) -> crate::Result<()> {
+    pub fn close(self) -> crate::Result<()> {
-        if let Some(fieldnorms_serializer) = self.extract_fieldnorms_serializer() {
-            fieldnorms_serializer.close()?;
-        }
         self.fast_field_serializer.close()?;
         self.postings_serializer.close()?;
         self.store_writer.close()?;
+        self.fieldnorms_serializer.close()?;
         Ok(())
     }
 }

src/indexer/segment_updater.rs

@@ -112,7 +112,7 @@ fn merge(
     target_opstamp: Opstamp,
 ) -> crate::Result<SegmentEntry> {
     // first we need to apply deletes to our segment.
-    let merged_segment = index.new_segment();
+    let mut merged_segment = index.new_segment();
 
     // First we apply all of the delet to the merged segment, up to the target opstamp.
     for segment_entry in &mut segment_entries {
@@ -131,13 +131,12 @@ fn merge(
     let merger: IndexMerger = IndexMerger::open(index.schema(), &segments[..])?;
 
     // ... we just serialize this index merger in our new segment to merge the two segments.
-    let segment_serializer = SegmentSerializer::for_segment(merged_segment.clone())?;
+    let segment_serializer = SegmentSerializer::for_segment(&mut merged_segment)?;
 
     let num_docs = merger.write(segment_serializer)?;
 
-    let merged_segment_id = merged_segment.id();
+    let segment_meta = index.new_segment_meta(merged_segment.id(), num_docs);
 
-    let segment_meta = index.new_segment_meta(merged_segment_id, num_docs);
     Ok(SegmentEntry::new(segment_meta, delete_cursor, None))
 }
 
@@ -522,7 +521,7 @@ impl SegmentUpdater {
     ///
     /// Upon termination of the current merging threads,
     /// merge opportunity may appear.
-    ///
+    //
     /// We keep waiting until the merge policy judges that
     /// no opportunity is available.
     ///

src/indexer/segment_writer.rs

@@ -2,7 +2,7 @@ use super::operation::AddOperation;
 use crate::core::Segment;
 use crate::core::SerializableSegment;
 use crate::fastfield::FastFieldsWriter;
-use crate::fieldnorm::{FieldNormReaders, FieldNormsWriter};
+use crate::fieldnorm::FieldNormsWriter;
 use crate::indexer::segment_serializer::SegmentSerializer;
 use crate::postings::compute_table_size;
 use crate::postings::MultiFieldPostingsWriter;
@@ -14,8 +14,8 @@ use crate::schema::{Field, FieldEntry};
 use crate::tokenizer::{BoxTokenStream, PreTokenizedStream};
 use crate::tokenizer::{FacetTokenizer, TextAnalyzer};
 use crate::tokenizer::{TokenStreamChain, Tokenizer};
+use crate::DocId;
 use crate::Opstamp;
-use crate::{DocId, SegmentComponent};
 use std::io;
 use std::str;
 
@@ -62,12 +62,11 @@ impl SegmentWriter {
     /// - schema
     pub fn for_segment(
         memory_budget: usize,
-        segment: Segment,
+        mut segment: Segment,
         schema: &Schema,
     ) -> crate::Result<SegmentWriter> {
-        let tokenizer_manager = segment.index().tokenizers().clone();
         let table_num_bits = initial_table_size(memory_budget)?;
-        let segment_serializer = SegmentSerializer::for_segment(segment)?;
+        let segment_serializer = SegmentSerializer::for_segment(&mut segment)?;
         let multifield_postings = MultiFieldPostingsWriter::new(schema, table_num_bits);
         let tokenizers = schema
             .fields()
@@ -77,7 +76,7 @@ impl SegmentWriter {
                         .get_indexing_options()
                         .and_then(|text_index_option| {
                             let tokenizer_name = &text_index_option.tokenizer();
-                            tokenizer_manager.get(tokenizer_name)
+                            segment.index().tokenizers().get(tokenizer_name)
                         }),
                     _ => None,
                 },
@@ -281,16 +280,9 @@ fn write(
     fieldnorms_writer: &FieldNormsWriter,
     mut serializer: SegmentSerializer,
 ) -> crate::Result<()> {
-    if let Some(fieldnorms_serializer) = serializer.extract_fieldnorms_serializer() {
+    let term_ord_map = multifield_postings.serialize(serializer.get_postings_serializer())?;
-        fieldnorms_writer.serialize(fieldnorms_serializer)?;
-    }
-    let fieldnorm_data = serializer
-        .segment()
-        .open_read(SegmentComponent::FIELDNORMS)?;
-    let fieldnorm_readers = FieldNormReaders::open(fieldnorm_data)?;
-    let term_ord_map =
-        multifield_postings.serialize(serializer.get_postings_serializer(), fieldnorm_readers)?;
     fast_field_writers.serialize(serializer.get_fast_field_serializer(), &term_ord_map)?;
+    fieldnorms_writer.serialize(serializer.get_fieldnorms_serializer())?;
     serializer.close()?;
     Ok(())
 }

src/lib.rs

@@ -173,7 +173,7 @@ use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
 /// Index format version.
-const INDEX_FORMAT_VERSION: u32 = 2;
+const INDEX_FORMAT_VERSION: u32 = 1;
 
 /// Structure version for the index.
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -245,18 +245,11 @@ pub type DocId = u32;
 /// with opstamp `n+1`.
 pub type Opstamp = u64;
 
-/// A Score that represents the relevance of the document to the query
+/// A f32 that represents the relevance of the document to the query
 ///
-/// This is modelled internally as a `f64`, because tantivy was compiled with the `scoref64`
+/// This is modelled internally as a `f32`. The
-/// feature. The larger the number, the more relevant the document is to the search query.
+/// larger the number, the more relevant the document
-#[cfg(feature = "scoref64")]
+/// to the search
-pub type Score = f64;
-
-/// A Score that represents the relevance of the document to the query
-///
-/// This is modelled internally as a `f32`. The larger the number, the more relevant
-/// the document to the search query.
-#[cfg(not(feature = "scoref64"))]
 pub type Score = f32;
 
 /// A `SegmentLocalId` identifies a segment.
@@ -289,6 +282,7 @@ pub struct DocAddress(pub SegmentLocalId, pub DocId);
 
 #[cfg(test)]
 mod tests {
+
     use crate::collector::tests::TEST_COLLECTOR_WITH_SCORE;
     use crate::core::SegmentReader;
     use crate::docset::{DocSet, TERMINATED};
@@ -304,26 +298,17 @@ mod tests {
     use rand::rngs::StdRng;
     use rand::{Rng, SeedableRng};
 
-    /// Checks if left and right are close one to each other.
+    pub fn assert_nearly_equals(expected: f32, val: f32) {
-    /// Panics if the two values are more than 0.5% apart.
+        assert!(
-    #[macro_export]
+            nearly_equals(val, expected),
-    macro_rules! assert_nearly_equals {
+            "Got {}, expected {}.",
-        ($left:expr, $right:expr) => {{
+            val,
-            match (&$left, &$right) {
+            expected
-                (left_val, right_val) => {
+        );
-                    let diff = (left_val - right_val).abs();
+    }
-                    let add = left_val.abs() + right_val.abs();
+
-                    if diff > 0.0005 * add {
+    pub fn nearly_equals(a: f32, b: f32) -> bool {
-                        panic!(
+        (a - b).abs() < 0.0005 * (a + b).abs()
-                            r#"assertion failed: `(left ~= right)`
-  left: `{:?}`,
- right: `{:?}`"#,
-                            &*left_val, &*right_val
-                        )
-                    }
-                }
-            }
-        }};
     }
 
     pub fn generate_nonunique_unsorted(max_value: u32, n_elems: usize) -> Vec<u32> {

src/positions/reader.rs

@@ -78,7 +78,6 @@ impl Positions {
     }
 }
 
-#[derive(Clone)]
 pub struct PositionReader {
     skip_read: OwnedRead,
     position_read: OwnedRead,

src/postings/block_segment_postings.rs

@@ -1,21 +1,11 @@
 use crate::common::{BinarySerializable, VInt};
 use crate::directory::ReadOnlySource;
-use crate::fieldnorm::FieldNormReader;
 use crate::postings::compression::{
     AlignedBuffer, BlockDecoder, VIntDecoder, COMPRESSION_BLOCK_SIZE,
 };
 use crate::postings::{BlockInfo, FreqReadingOption, SkipReader};
-use crate::query::BM25Weight;
 use crate::schema::IndexRecordOption;
-use crate::{DocId, Score, TERMINATED};
+use crate::{DocId, TERMINATED};
-
-fn max_score<I: Iterator<Item = Score>>(mut it: I) -> Option<Score> {
-    if let Some(first) = it.next() {
-        Some(it.fold(first, Score::max))
-    } else {
-        None
-    }
-}
 
 /// `BlockSegmentPostings` is a cursor iterating over blocks
 /// of documents.
@@ -24,18 +14,16 @@ fn max_score<I: Iterator<Item = Score>>(mut it: I) -> Option<Score> {
 ///
 /// While it is useful for some very specific high-performance
 /// use cases, you should prefer using `SegmentPostings` for most usage.
-#[derive(Clone)]
 pub struct BlockSegmentPostings {
     pub(crate) doc_decoder: BlockDecoder,
     loaded_offset: usize,
     freq_decoder: BlockDecoder,
     freq_reading_option: FreqReadingOption,
-    block_max_score_cache: Option<Score>,
 
-    doc_freq: u32,
+    doc_freq: usize,
 
     data: ReadOnlySource,
-    pub(crate) skip_reader: SkipReader,
+    skip_reader: SkipReader,
 }
 
 fn decode_bitpacked_block(
@@ -59,14 +47,10 @@ fn decode_vint_block(
     doc_offset: DocId,
     num_vint_docs: usize,
 ) {
-    let num_consumed_bytes =
+    doc_decoder.clear();
-        doc_decoder.uncompress_vint_sorted(data, doc_offset, num_vint_docs, TERMINATED);
+    let num_consumed_bytes = doc_decoder.uncompress_vint_sorted(data, doc_offset, num_vint_docs);
     if let Some(freq_decoder) = freq_decoder_opt {
-        freq_decoder.uncompress_vint_unsorted(
+        freq_decoder.uncompress_vint_unsorted(&data[num_consumed_bytes..], num_vint_docs);
-            &data[num_consumed_bytes..],
-            num_vint_docs,
-            TERMINATED,
-        );
     }
 }
 
@@ -105,63 +89,20 @@ impl BlockSegmentPostings {
             None => SkipReader::new(ReadOnlySource::empty(), doc_freq, record_option),
         };
 
+        let doc_freq = doc_freq as usize;
         let mut block_segment_postings = BlockSegmentPostings {
             doc_decoder: BlockDecoder::with_val(TERMINATED),
             loaded_offset: std::usize::MAX,
             freq_decoder: BlockDecoder::with_val(1),
             freq_reading_option,
-            block_max_score_cache: None,
             doc_freq,
             data: postings_data,
             skip_reader,
         };
-        block_segment_postings.load_block();
+        block_segment_postings.advance();
         block_segment_postings
     }
 
-    /// Returns the block_max_score for the current block.
-    /// It does not require the block to be loaded. For instance, it is ok to call this method
-    /// after having called `.shallow_advance(..)`.
-    ///
-    /// See `TermScorer::block_max_score(..)` for more information.
-    pub fn block_max_score(
-        &mut self,
-        fieldnorm_reader: &FieldNormReader,
-        bm25_weight: &BM25Weight,
-    ) -> Score {
-        if let Some(score) = self.block_max_score_cache {
-            return score;
-        }
-        if let Some(skip_reader_max_score) = self.skip_reader.block_max_score(bm25_weight) {
-            // if we are on a full block, the skip reader should have the block max information
-            // for us
-            self.block_max_score_cache = Some(skip_reader_max_score);
-            return skip_reader_max_score;
-        }
-        // this is the last block of the segment posting list.
-        // If it is actually loaded, we can compute block max manually.
-        if self.block_is_loaded() {
-            let docs = self.doc_decoder.output_array().iter().cloned();
-            let freqs = self.freq_decoder.output_array().iter().cloned();
-            let bm25_scores = docs.zip(freqs).map(|(doc, term_freq)| {
-                let fieldnorm_id = fieldnorm_reader.fieldnorm_id(doc);
-                bm25_weight.score(fieldnorm_id, term_freq)
-            });
-            let block_max_score = max_score(bm25_scores).unwrap_or(0.0);
-            self.block_max_score_cache = Some(block_max_score);
-            return block_max_score;
-        }
-        // We do not have access to any good block max value. We return bm25_weight.max_score()
-        // as it is a valid upperbound.
-        //
-        // We do not cache it however, so that it gets computed when once block is loaded.
-        bm25_weight.max_score()
-    }
-
-    pub(crate) fn freq_reading_option(&self) -> FreqReadingOption {
-        self.freq_reading_option
-    }
-
     // Resets the block segment postings on another position
     // in the postings file.
     //
@@ -175,23 +116,21 @@ impl BlockSegmentPostings {
     pub(crate) fn reset(&mut self, doc_freq: u32, postings_data: ReadOnlySource) {
         let (skip_data_opt, postings_data) = split_into_skips_and_postings(doc_freq, postings_data);
         self.data = ReadOnlySource::new(postings_data);
-        self.block_max_score_cache = None;
+        self.loaded_offset = std::usize::MAX;
         self.loaded_offset = std::usize::MAX;
         if let Some(skip_data) = skip_data_opt {
             self.skip_reader.reset(skip_data, doc_freq);
         } else {
             self.skip_reader.reset(ReadOnlySource::empty(), doc_freq);
         }
-        self.doc_freq = doc_freq;
+        self.doc_freq = doc_freq as usize;
-        self.load_block();
     }
 
-    /// Returns the overall number of documents in the block postings.
+    /// Returns the document frequency associated to this block postings.
-    /// It does not take in account whether documents are deleted or not.
     ///
     /// This `doc_freq` is simply the sum of the length of all of the blocks
     /// length, and it does not take in account deleted documents.
-    pub fn doc_freq(&self) -> u32 {
+    pub fn doc_freq(&self) -> usize {
         self.doc_freq
     }
 
@@ -201,20 +140,11 @@ impl BlockSegmentPostings {
     /// returned by `.docs()` is empty.
     #[inline]
     pub fn docs(&self) -> &[DocId] {
-        debug_assert!(self.block_is_loaded());
         self.doc_decoder.output_array()
     }
 
-    /// Returns a full block, regardless of whetehr the block is complete or incomplete (
-    /// as it happens for the last block of the posting list).
-    ///
-    /// In the latter case, the block is guaranteed to be padded with the sentinel value:
-    /// `TERMINATED`. The array is also guaranteed to be aligned on 16 bytes = 128 bits.
-    ///
-    /// This method is useful to run SSE2 linear search.
     #[inline(always)]
     pub(crate) fn docs_aligned(&self) -> &AlignedBuffer {
-        debug_assert!(self.block_is_loaded());
         self.doc_decoder.output_aligned()
     }
 
@@ -227,14 +157,12 @@ impl BlockSegmentPostings {
     /// Return the array of `term freq` in the block.
     #[inline]
     pub fn freqs(&self) -> &[u32] {
-        debug_assert!(self.block_is_loaded());
         self.freq_decoder.output_array()
     }
 
     /// Return the frequency at index `idx` of the block.
     #[inline]
     pub fn freq(&self, idx: usize) -> u32 {
-        debug_assert!(self.block_is_loaded());
         self.freq_decoder.output(idx)
     }
 
@@ -245,40 +173,23 @@ impl BlockSegmentPostings {
     /// of any number between 1 and `NUM_DOCS_PER_BLOCK - 1`
     #[inline]
     pub fn block_len(&self) -> usize {
-        debug_assert!(self.block_is_loaded());
         self.doc_decoder.output_len
     }
 
+    pub(crate) fn position_offset(&self) -> u64 {
+        self.skip_reader.position_offset()
+    }
+
     /// Position on a block that may contains `target_doc`.
     ///
     /// If all docs are smaller than target, the block loaded may be empty,
     /// or be the last an incomplete VInt block.
     pub fn seek(&mut self, target_doc: DocId) {
-        self.shallow_seek(target_doc);
+        self.skip_reader.seek(target_doc);
         self.load_block();
     }
 
-    pub(crate) fn position_offset(&self) -> u64 {
+    fn load_block(&mut self) {
-        self.skip_reader.position_offset()
-    }
-
-    /// Dangerous API! This calls seek on the skip list,
-    /// but does not `.load_block()` afterwards.
-    ///
-    /// `.load_block()` needs to be called manually afterwards.
-    /// If all docs are smaller than target, the block loaded may be empty,
-    /// or be the last an incomplete VInt block.
-    pub(crate) fn shallow_seek(&mut self, target_doc: DocId) {
-        if self.skip_reader.seek(target_doc) {
-            self.block_max_score_cache = None;
-        }
-    }
-
-    pub(crate) fn block_is_loaded(&self) -> bool {
-        self.loaded_offset == self.skip_reader.byte_offset()
-    }
-
-    pub(crate) fn load_block(&mut self) {
         let offset = self.skip_reader.byte_offset();
         if self.loaded_offset == offset {
             return;
@@ -303,14 +214,7 @@ impl BlockSegmentPostings {
                     tf_num_bits,
                 );
             }
-            BlockInfo::VInt { num_docs } => {
+            BlockInfo::VInt(num_vint_docs) => {
-                let data = {
-                    if num_docs == 0 {
-                        &[]
-                    } else {
-                        &self.data.as_slice()[offset..]
-                    }
-                };
                 decode_vint_block(
                     &mut self.doc_decoder,
                     if let FreqReadingOption::ReadFreq = self.freq_reading_option {
@@ -318,9 +222,9 @@ impl BlockSegmentPostings {
                     } else {
                         None
                     },
-                    data,
+                    &self.data.as_slice()[offset..],
                     self.skip_reader.last_doc_in_previous_block,
-                    num_docs as usize,
+                    num_vint_docs as usize,
                 );
             }
         }
@@ -329,20 +233,21 @@ impl BlockSegmentPostings {
     /// Advance to the next block.
     ///
     /// Returns false iff there was no remaining blocks.
-    pub fn advance(&mut self) {
+    pub fn advance(&mut self) -> bool {
-        self.skip_reader.advance();
+        if !self.skip_reader.advance() {
-        self.block_max_score_cache = None;
+            return false;
+        }
         self.load_block();
+        true
     }
 
     /// Returns an empty segment postings object
     pub fn empty() -> BlockSegmentPostings {
         BlockSegmentPostings {
             doc_decoder: BlockDecoder::with_val(TERMINATED),
-            loaded_offset: 0,
+            loaded_offset: std::usize::MAX,
             freq_decoder: BlockDecoder::with_val(1),
             freq_reading_option: FreqReadingOption::NoFreq,
-            block_max_score_cache: None,
             doc_freq: 0,
             data: ReadOnlySource::new(vec![]),
             skip_reader: SkipReader::new(ReadOnlySource::new(vec![]), 0, IndexRecordOption::Basic),
@@ -368,10 +273,8 @@ mod tests {
     #[test]
     fn test_empty_segment_postings() {
         let mut postings = SegmentPostings::empty();
-        assert_eq!(postings.doc(), TERMINATED);
         assert_eq!(postings.advance(), TERMINATED);
         assert_eq!(postings.advance(), TERMINATED);
-        assert_eq!(postings.doc_freq(), 0);
         assert_eq!(postings.len(), 0);
     }
 
@@ -391,10 +294,7 @@ mod tests {
     #[test]
     fn test_empty_block_segment_postings() {
         let mut postings = BlockSegmentPostings::empty();
-        assert!(postings.docs().is_empty());
+        assert!(!postings.advance());
-        assert_eq!(postings.doc_freq(), 0);
-        postings.advance();
-        assert!(postings.docs().is_empty());
         assert_eq!(postings.doc_freq(), 0);
     }
 
@@ -406,14 +306,13 @@ mod tests {
         assert_eq!(block_segments.doc_freq(), 100_000);
         loop {
             let block = block_segments.docs();
-            if block.is_empty() {
-                break;
-            }
             for (i, doc) in block.iter().cloned().enumerate() {
                 assert_eq!(offset + (i as u32), doc);
             }
             offset += block.len() as u32;
-            block_segments.advance();
+            if block_segments.advance() {
+                break;
+            }
         }
     }
 
@@ -474,7 +373,7 @@ mod tests {
     }
 
     #[test]
-    fn test_block_segment_postings_seek() {
+    fn test_block_segment_postings_skip2() {
         let mut docs = vec![0];
         for i in 0..1300 {
             docs.push((i * i / 100) + i);
@@ -522,6 +421,7 @@ mod tests {
             let term_info = inverted_index.get_term_info(&term).unwrap();
             inverted_index.reset_block_postings_from_terminfo(&term_info, &mut block_segments);
         }
+        assert!(block_segments.advance());
         assert_eq!(block_segments.docs(), &[1, 3, 5]);
     }
 }

src/postings/compression/mod.rs

@@ -1,4 +1,5 @@
 use crate::common::FixedSize;
+use crate::docset::TERMINATED;
 use bitpacking::{BitPacker, BitPacker4x};
 
 pub const COMPRESSION_BLOCK_SIZE: usize = BitPacker4x::BLOCK_LEN;
@@ -52,10 +53,8 @@ impl BlockEncoder {
 /// We ensure that the OutputBuffer is align on 128 bits
 /// in order to run SSE2 linear search on it.
 #[repr(align(128))]
-#[derive(Clone)]
 pub(crate) struct AlignedBuffer(pub [u32; COMPRESSION_BLOCK_SIZE]);
 
-#[derive(Clone)]
 pub struct BlockDecoder {
     bitpacker: BitPacker4x,
     output: AlignedBuffer,
@@ -108,6 +107,10 @@ impl BlockDecoder {
     pub fn output(&self, idx: usize) -> u32 {
         self.output.0[idx]
     }
+
+    pub fn clear(&mut self) {
+        self.output.0.iter_mut().for_each(|el| *el = TERMINATED);
+    }
 }
 
 pub trait VIntEncoder {
@@ -144,14 +147,11 @@ pub trait VIntDecoder {
     /// For instance, if delta encoded are `1, 3, 9`, and the
     /// `offset` is 5, then the output will be:
     /// `5 + 1 = 6, 6 + 3= 9, 9 + 9 = 18`
-    ///
-    /// The value given in `padding` will be used to fill the remaining `128 - num_els` values.
     fn uncompress_vint_sorted(
         &mut self,
         compressed_data: &[u8],
         offset: u32,
         num_els: usize,
-        padding: u32,
     ) -> usize;
 
     /// Uncompress an array of `u32s`, compressed using variable
@@ -159,14 +159,7 @@ pub trait VIntDecoder {
     ///
     /// The method takes a number of int to decompress, and returns
     /// the amount of bytes that were read to decompress them.
-    ///
+    fn uncompress_vint_unsorted(&mut self, compressed_data: &[u8], num_els: usize) -> usize;
-    /// The value given in `padding` will be used to fill the remaining `128 - num_els` values.
-    fn uncompress_vint_unsorted(
-        &mut self,
-        compressed_data: &[u8],
-        num_els: usize,
-        padding: u32,
-    ) -> usize;
 }
 
 impl VIntEncoder for BlockEncoder {
@@ -185,21 +178,13 @@ impl VIntDecoder for BlockDecoder {
         compressed_data: &[u8],
         offset: u32,
         num_els: usize,
-        padding: u32,
     ) -> usize {
         self.output_len = num_els;
-        self.output.0.iter_mut().for_each(|el| *el = padding);
         vint::uncompress_sorted(compressed_data, &mut self.output.0[..num_els], offset)
     }
 
-    fn uncompress_vint_unsorted(
+    fn uncompress_vint_unsorted(&mut self, compressed_data: &[u8], num_els: usize) -> usize {
-        &mut self,
-        compressed_data: &[u8],
-        num_els: usize,
-        padding: u32,
-    ) -> usize {
         self.output_len = num_els;
-        self.output.0.iter_mut().for_each(|el| *el = padding);
         vint::uncompress_unsorted(compressed_data, &mut self.output.0[..num_els])
     }
 }
@@ -208,7 +193,6 @@ impl VIntDecoder for BlockDecoder {
 pub mod tests {
 
     use super::*;
-    use crate::TERMINATED;
 
     #[test]
     fn test_encode_sorted_block() {
@@ -287,20 +271,18 @@ pub mod tests {
     }
     #[test]
     fn test_encode_vint() {
-        const PADDING_VALUE: u32 = 234_234_345u32;
+        {
-        let expected_length = 154;
+            let expected_length = 154;
-        let mut encoder = BlockEncoder::new();
+            let mut encoder = BlockEncoder::new();
-        let input: Vec<u32> = (0u32..123u32).map(|i| 4 + i * 7 / 2).into_iter().collect();
+            let input: Vec<u32> = (0u32..123u32).map(|i| 4 + i * 7 / 2).into_iter().collect();
-        for offset in &[0u32, 1u32, 2u32] {
+            for offset in &[0u32, 1u32, 2u32] {
-            let encoded_data = encoder.compress_vint_sorted(&input, *offset);
+                let encoded_data = encoder.compress_vint_sorted(&input, *offset);
-            assert!(encoded_data.len() <= expected_length);
+                assert!(encoded_data.len() <= expected_length);
-            let mut decoder = BlockDecoder::default();
+                let mut decoder = BlockDecoder::default();
-            let consumed_num_bytes =
+                let consumed_num_bytes =
-                decoder.uncompress_vint_sorted(&encoded_data, *offset, input.len(), PADDING_VALUE);
+                    decoder.uncompress_vint_sorted(&encoded_data, *offset, input.len());
-            assert_eq!(consumed_num_bytes, encoded_data.len());
+                assert_eq!(consumed_num_bytes, encoded_data.len());
-            assert_eq!(input, decoder.output_array());
+                assert_eq!(input, decoder.output_array());
-            for i in input.len()..COMPRESSION_BLOCK_SIZE {
-                assert_eq!(decoder.output(i), PADDING_VALUE);
             }
         }
     }

src/postings/mod.rs

@@ -65,42 +65,45 @@ pub mod tests {
     use std::iter;
 
     #[test]
-    pub fn test_position_write() -> crate::Result<()> {
+    pub fn test_position_write() {
         let mut schema_builder = Schema::builder();
         let text_field = schema_builder.add_text_field("text", TEXT);
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut segment = index.new_segment();
-        let mut posting_serializer = InvertedIndexSerializer::open(&mut segment)?;
+        let mut posting_serializer = InvertedIndexSerializer::open(&mut segment).unwrap();
-        let mut field_serializer = posting_serializer.new_field(text_field, 120 * 4, None)?;
+        {
-        field_serializer.new_term("abc".as_bytes(), 12u32)?;
+            let mut field_serializer = posting_serializer.new_field(text_field, 120 * 4).unwrap();
-        for doc_id in 0u32..120u32 {
+            field_serializer.new_term("abc".as_bytes()).unwrap();
-            let delta_positions = vec![1, 2, 3, 2];
+            for doc_id in 0u32..120u32 {
-            field_serializer.write_doc(doc_id, 4, &delta_positions)?;
+                let delta_positions = vec![1, 2, 3, 2];
+                field_serializer
+                    .write_doc(doc_id, 4, &delta_positions)
+                    .unwrap();
+            }
+            field_serializer.close_term().unwrap();
         }
-        field_serializer.close_term()?;
+        posting_serializer.close().unwrap();
-        posting_serializer.close()?;
+        let read = segment.open_read(SegmentComponent::POSITIONS).unwrap();
-        let read = segment.open_read(SegmentComponent::POSITIONS)?;
         assert!(read.len() <= 140);
-        Ok(())
     }
 
     #[test]
-    pub fn test_skip_positions() -> crate::Result<()> {
+    pub fn test_skip_positions() {
         let mut schema_builder = Schema::builder();
         let title = schema_builder.add_text_field("title", TEXT);
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_with_num_threads(1, 30_000_000)?;
+        let mut index_writer = index.writer_with_num_threads(1, 30_000_000).unwrap();
         index_writer.add_document(doc!(title => r#"abc abc abc"#));
         index_writer.add_document(doc!(title => r#"abc be be be be abc"#));
         for _ in 0..1_000 {
             index_writer.add_document(doc!(title => r#"abc abc abc"#));
         }
         index_writer.add_document(doc!(title => r#"abc be be be be abc"#));
-        index_writer.commit()?;
+        index_writer.commit().unwrap();
 
-        let searcher = index.reader()?.searcher();
+        let searcher = index.reader().unwrap().searcher();
         let inverted_index = searcher.segment_reader(0u32).inverted_index(title);
         let term = Term::from_field_text(title, "abc");
         let mut positions = Vec::new();
@@ -155,7 +158,6 @@ pub mod tests {
             postings.positions(&mut positions);
             assert_eq!(&[0, 5], &positions[..]);
         }
-        Ok(())
     }
 
     #[test]
@@ -580,9 +582,6 @@ pub mod tests {
     ) {
         for target in targets {
             let mut postings_opt = postings_factory();
-            if target < postings_opt.doc() {
-                continue;
-            }
             let mut postings_unopt = UnoptimizedDocSet::wrap(postings_factory());
             let skip_result_opt = postings_opt.seek(target);
             let skip_result_unopt = postings_unopt.seek(target);

src/postings/postings_writer.rs

@@ -1,6 +1,5 @@
 use super::stacker::{Addr, MemoryArena, TermHashMap};
 
-use crate::fieldnorm::FieldNormReaders;
 use crate::postings::recorder::{
     BufferLender, NothingRecorder, Recorder, TFAndPositionRecorder, TermFrequencyRecorder,
 };
@@ -129,7 +128,6 @@ impl MultiFieldPostingsWriter {
     pub fn serialize(
         &self,
         serializer: &mut InvertedIndexSerializer,
-        fieldnorm_readers: FieldNormReaders,
     ) -> crate::Result<HashMap<Field, FnvHashMap<UnorderedTermId, TermOrdinal>>> {
         let mut term_offsets: Vec<(&[u8], Addr, UnorderedTermId)> =
             self.term_index.iter().collect();
@@ -163,12 +161,8 @@ impl MultiFieldPostingsWriter {
             }
 
             let postings_writer = &self.per_field_postings_writers[field.field_id() as usize];
-            let fieldnorm_reader = fieldnorm_readers.get_field(field);
+            let mut field_serializer =
-            let mut field_serializer = serializer.new_field(
+                serializer.new_field(field, postings_writer.total_num_tokens())?;
-                field,
-                postings_writer.total_num_tokens(),
-                fieldnorm_reader,
-            )?;
             postings_writer.serialize(
                 &term_offsets[start..stop],
                 &mut field_serializer,
@@ -303,8 +297,7 @@ impl<Rec: Recorder + 'static> PostingsWriter for SpecializedPostingsWriter<Rec>
         let mut buffer_lender = BufferLender::default();
         for &(term_bytes, addr, _) in term_addrs {
             let recorder: Rec = termdict_heap.read(addr);
-            let term_doc_freq = recorder.term_doc_freq().unwrap_or(0u32);
+            serializer.new_term(&term_bytes[4..])?;
-            serializer.new_term(&term_bytes[4..], term_doc_freq)?;
             recorder.serialize(&mut buffer_lender, serializer, heap)?;
             serializer.close_term()?;
         }

src/postings/recorder.rs

@@ -75,10 +75,6 @@ pub(crate) trait Recorder: Copy + 'static {
         serializer: &mut FieldSerializer<'_>,
         heap: &MemoryArena,
     ) -> io::Result<()>;
-    /// Returns the number of document containing this term.
-    ///
-    /// Returns `None` if not available.
-    fn term_doc_freq(&self) -> Option<u32>;
 }
 
 /// Only records the doc ids
@@ -117,16 +113,11 @@ impl Recorder for NothingRecorder {
     ) -> io::Result<()> {
         let buffer = buffer_lender.lend_u8();
         self.stack.read_to_end(heap, buffer);
-        // TODO avoid reading twice.
         for doc in VInt32Reader::new(&buffer[..]) {
             serializer.write_doc(doc as u32, 0u32, &[][..])?;
         }
         Ok(())
     }
-
-    fn term_doc_freq(&self) -> Option<u32> {
-        None
-    }
 }
 
 /// Recorder encoding document ids, and term frequencies
@@ -135,7 +126,6 @@ pub struct TermFrequencyRecorder {
     stack: ExpUnrolledLinkedList,
     current_doc: DocId,
     current_tf: u32,
-    term_doc_freq: u32,
 }
 
 impl Recorder for TermFrequencyRecorder {
@@ -144,7 +134,6 @@ impl Recorder for TermFrequencyRecorder {
             stack: ExpUnrolledLinkedList::new(),
             current_doc: u32::max_value(),
             current_tf: 0u32,
-            term_doc_freq: 0u32,
         }
     }
 
@@ -153,7 +142,6 @@ impl Recorder for TermFrequencyRecorder {
     }
 
     fn new_doc(&mut self, doc: DocId, heap: &mut MemoryArena) {
-        self.term_doc_freq += 1;
         self.current_doc = doc;
         let _ = write_u32_vint(doc, &mut self.stack.writer(heap));
     }
@@ -184,10 +172,6 @@ impl Recorder for TermFrequencyRecorder {
 
         Ok(())
     }
-
-    fn term_doc_freq(&self) -> Option<u32> {
-        Some(self.term_doc_freq)
-    }
 }
 
 /// Recorder encoding term frequencies as well as positions.
@@ -195,14 +179,12 @@ impl Recorder for TermFrequencyRecorder {
 pub struct TFAndPositionRecorder {
     stack: ExpUnrolledLinkedList,
     current_doc: DocId,
-    term_doc_freq: u32,
 }
 impl Recorder for TFAndPositionRecorder {
     fn new() -> Self {
         TFAndPositionRecorder {
             stack: ExpUnrolledLinkedList::new(),
             current_doc: u32::max_value(),
-            term_doc_freq: 0u32,
         }
     }
 
@@ -212,7 +194,6 @@ impl Recorder for TFAndPositionRecorder {
 
     fn new_doc(&mut self, doc: DocId, heap: &mut MemoryArena) {
         self.current_doc = doc;
-        self.term_doc_freq += 1u32;
         let _ = write_u32_vint(doc, &mut self.stack.writer(heap));
     }
 
@@ -252,10 +233,6 @@ impl Recorder for TFAndPositionRecorder {
         }
         Ok(())
     }
-
-    fn term_doc_freq(&self) -> Option<u32> {
-        Some(self.term_doc_freq)
-    }
 }
 
 #[cfg(test)]

src/postings/segment_postings.rs

@@ -10,10 +10,9 @@ use crate::postings::BlockSearcher;
 use crate::postings::Postings;
 
 use crate::schema::IndexRecordOption;
-use crate::{DocId, TERMINATED};
+use crate::DocId;
 
 use crate::directory::ReadOnlySource;
-use crate::fastfield::DeleteBitSet;
 use crate::postings::BlockSegmentPostings;
 
 /// `SegmentPostings` represents the inverted list or postings associated to
@@ -21,9 +20,8 @@ use crate::postings::BlockSegmentPostings;
 ///
 /// As we iterate through the `SegmentPostings`, the frequencies are optionally decoded.
 /// Positions on the other hand, are optionally entirely decoded upfront.
-#[derive(Clone)]
 pub struct SegmentPostings {
-    pub(crate) block_cursor: BlockSegmentPostings,
+    block_cursor: BlockSegmentPostings,
     cur: usize,
     position_reader: Option<PositionReader>,
     block_searcher: BlockSearcher,
@@ -40,31 +38,6 @@ impl SegmentPostings {
         }
     }
 
-    /// Compute the number of non-deleted documents.
-    ///
-    /// This method will clone and scan through the posting lists.
-    /// (this is a rather expensive operation).
-    pub fn doc_freq_given_deletes(&self, delete_bitset: &DeleteBitSet) -> u32 {
-        let mut docset = self.clone();
-        let mut doc_freq = 0;
-        loop {
-            let doc = docset.doc();
-            if doc == TERMINATED {
-                return doc_freq;
-            }
-            if delete_bitset.is_alive(doc) {
-                doc_freq += 1u32;
-            }
-            docset.advance();
-        }
-    }
-
-    /// Returns the overall number of documents in the block postings.
-    /// It does not take in account whether documents are deleted or not.
-    pub fn doc_freq(&self) -> u32 {
-        self.block_cursor.doc_freq()
-    }
-
     /// Creates a segment postings object with the given documents
     /// and no frequency encoded.
     ///
@@ -76,9 +49,7 @@ impl SegmentPostings {
     pub fn create_from_docs(docs: &[u32]) -> SegmentPostings {
         let mut buffer = Vec::new();
         {
-            let mut postings_serializer =
+            let mut postings_serializer = PostingsSerializer::new(&mut buffer, false, false);
-                PostingsSerializer::new(&mut buffer, 0.0, false, false, None);
-            postings_serializer.new_term(docs.len() as u32);
             for &doc in docs {
                 postings_serializer.write_doc(doc, 1u32);
             }
@@ -95,51 +66,6 @@ impl SegmentPostings {
         SegmentPostings::from_block_postings(block_segment_postings, None)
     }
 
-    /// Helper functions to create `SegmentPostings` for tests.
-    #[cfg(test)]
-    pub fn create_from_docs_and_tfs(
-        doc_and_tfs: &[(u32, u32)],
-        fieldnorms: Option<&[u32]>,
-    ) -> SegmentPostings {
-        use crate::fieldnorm::FieldNormReader;
-        use crate::Score;
-        let mut buffer: Vec<u8> = Vec::new();
-        let fieldnorm_reader = fieldnorms.map(FieldNormReader::for_test);
-        let average_field_norm = fieldnorms
-            .map(|fieldnorms| {
-                if fieldnorms.len() == 0 {
-                    return 0.0;
-                }
-                let total_num_tokens: u64 = fieldnorms
-                    .iter()
-                    .map(|&fieldnorm| fieldnorm as u64)
-                    .sum::<u64>();
-                total_num_tokens as Score / fieldnorms.len() as f32
-            })
-            .unwrap_or(0.0);
-        let mut postings_serializer = PostingsSerializer::new(
-            &mut buffer,
-            average_field_norm,
-            true,
-            false,
-            fieldnorm_reader,
-        );
-        postings_serializer.new_term(doc_and_tfs.len() as u32);
-        for &(doc, tf) in doc_and_tfs {
-            postings_serializer.write_doc(doc, tf);
-        }
-        postings_serializer
-            .close_term(doc_and_tfs.len() as u32)
-            .unwrap();
-        let block_segment_postings = BlockSegmentPostings::from_data(
-            doc_and_tfs.len() as u32,
-            ReadOnlySource::from(buffer),
-            IndexRecordOption::WithFreqs,
-            IndexRecordOption::WithFreqs,
-        );
-        SegmentPostings::from_block_postings(block_segment_postings, None)
-    }
-
     /// Reads a Segment postings from an &[u8]
     ///
     /// * `len` - number of document in the posting lists.
@@ -164,7 +90,6 @@ impl DocSet for SegmentPostings {
     // next needs to be called a first time to point to the correct element.
     #[inline]
     fn advance(&mut self) -> DocId {
-        debug_assert!(self.block_cursor.block_is_loaded());
         if self.cur == COMPRESSION_BLOCK_SIZE - 1 {
             self.cur = 0;
             self.block_cursor.advance();
@@ -175,15 +100,14 @@ impl DocSet for SegmentPostings {
     }
 
     fn seek(&mut self, target: DocId) -> DocId {
-        debug_assert!(self.doc() <= target);
+        if self.doc() == target {
-        if self.doc() >= target {
+            return target;
-            return self.doc();
         }
-
         self.block_cursor.seek(target);
 
         // At this point we are on the block, that might contain our document.
         let output = self.block_cursor.docs_aligned();
+
         self.cur = self.block_searcher.search_in_block(&output, target);
 
         // The last block is not full and padded with the value TERMINATED,
@@ -199,7 +123,6 @@ impl DocSet for SegmentPostings {
         // After the search, the cursor should point to the first value of TERMINATED.
         let doc = output.0[self.cur];
         debug_assert!(doc >= target);
-        debug_assert_eq!(doc, self.doc());
         doc
     }
 
@@ -216,7 +139,7 @@ impl DocSet for SegmentPostings {
 
 impl HasLen for SegmentPostings {
     fn len(&self) -> usize {
-        self.block_cursor.doc_freq() as usize
+        self.block_cursor.doc_freq()
     }
 }
 
@@ -271,7 +194,6 @@ mod tests {
     use crate::common::HasLen;
 
     use crate::docset::{DocSet, TERMINATED};
-    use crate::fastfield::DeleteBitSet;
     use crate::postings::postings::Postings;
 
     #[test]
@@ -294,14 +216,4 @@ mod tests {
         let postings = SegmentPostings::empty();
         assert_eq!(postings.term_freq(), 1);
     }
-
-    #[test]
-    fn test_doc_freq() {
-        let docs = SegmentPostings::create_from_docs(&[0, 2, 10]);
-        assert_eq!(docs.doc_freq(), 3);
-        let delete_bitset = DeleteBitSet::for_test(&[2], 12);
-        assert_eq!(docs.doc_freq_given_deletes(&delete_bitset), 2);
-        let all_deleted = DeleteBitSet::for_test(&[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], 12);
-        assert_eq!(docs.doc_freq_given_deletes(&all_deleted), 0);
-    }
 }

src/postings/serializer.rs

@@ -3,16 +3,13 @@ use crate::common::{BinarySerializable, VInt};
 use crate::common::{CompositeWrite, CountingWriter};
 use crate::core::Segment;
 use crate::directory::WritePtr;
-use crate::fieldnorm::FieldNormReader;
 use crate::positions::PositionSerializer;
 use crate::postings::compression::{BlockEncoder, VIntEncoder, COMPRESSION_BLOCK_SIZE};
 use crate::postings::skip::SkipSerializer;
-use crate::query::BM25Weight;
 use crate::schema::Schema;
 use crate::schema::{Field, FieldEntry, FieldType};
 use crate::termdict::{TermDictionaryBuilder, TermOrdinal};
-use crate::{DocId, Score};
+use crate::DocId;
-use std::cmp::Ordering;
 use std::io::{self, Write};
 
 /// `InvertedIndexSerializer` is in charge of serializing
@@ -92,22 +89,20 @@ impl InvertedIndexSerializer {
         &mut self,
         field: Field,
         total_num_tokens: u64,
-        fieldnorm_reader: Option<FieldNormReader>,
     ) -> io::Result<FieldSerializer<'_>> {
         let field_entry: &FieldEntry = self.schema.get_field_entry(field);
         let term_dictionary_write = self.terms_write.for_field(field);
         let postings_write = self.postings_write.for_field(field);
+        total_num_tokens.serialize(postings_write)?;
         let positions_write = self.positions_write.for_field(field);
         let positionsidx_write = self.positionsidx_write.for_field(field);
         let field_type: FieldType = (*field_entry.field_type()).clone();
         FieldSerializer::create(
             &field_type,
-            total_num_tokens,
             term_dictionary_write,
             postings_write,
             positions_write,
             positionsidx_write,
-            fieldnorm_reader,
         )
     }
 
@@ -135,14 +130,11 @@ pub struct FieldSerializer<'a> {
 impl<'a> FieldSerializer<'a> {
     fn create(
         field_type: &FieldType,
-        total_num_tokens: u64,
         term_dictionary_write: &'a mut CountingWriter<WritePtr>,
         postings_write: &'a mut CountingWriter<WritePtr>,
         positions_write: &'a mut CountingWriter<WritePtr>,
         positionsidx_write: &'a mut CountingWriter<WritePtr>,
-        fieldnorm_reader: Option<FieldNormReader>,
     ) -> io::Result<FieldSerializer<'a>> {
-        total_num_tokens.serialize(postings_write)?;
         let (term_freq_enabled, position_enabled): (bool, bool) = match field_type {
             FieldType::Str(ref text_options) => {
                 if let Some(text_indexing_options) = text_options.get_indexing_options() {
@@ -155,17 +147,8 @@ impl<'a> FieldSerializer<'a> {
             _ => (false, false),
         };
         let term_dictionary_builder = TermDictionaryBuilder::create(term_dictionary_write)?;
-        let average_fieldnorm = fieldnorm_reader
+        let postings_serializer =
-            .as_ref()
+            PostingsSerializer::new(postings_write, term_freq_enabled, position_enabled);
-            .map(|ff_reader| (total_num_tokens as Score / ff_reader.num_docs() as Score))
-            .unwrap_or(0.0);
-        let postings_serializer = PostingsSerializer::new(
-            postings_write,
-            average_fieldnorm,
-            term_freq_enabled,
-            position_enabled,
-            fieldnorm_reader,
-        );
         let positions_serializer_opt = if position_enabled {
             Some(PositionSerializer::new(positions_write, positionsidx_write))
         } else {
@@ -198,20 +181,18 @@ impl<'a> FieldSerializer<'a> {
     /// Starts the postings for a new term.
     /// * term - the term. It needs to come after the previous term according
     ///   to the lexicographical order.
-    /// * term_doc_freq - return the number of document containing the term.
+    /// * doc_freq - return the number of document containing the term.
-    pub fn new_term(&mut self, term: &[u8], term_doc_freq: u32) -> io::Result<TermOrdinal> {
+    pub fn new_term(&mut self, term: &[u8]) -> io::Result<TermOrdinal> {
         assert!(
             !self.term_open,
             "Called new_term, while the previous term was not closed."
         );
-
         self.term_open = true;
         self.postings_serializer.clear();
         self.current_term_info = self.current_term_info();
         self.term_dictionary_builder.insert_key(term)?;
         let term_ordinal = self.num_terms;
         self.num_terms += 1;
-        self.postings_serializer.new_term(term_doc_freq);
         Ok(term_ordinal)
     }
 
@@ -325,27 +306,14 @@ pub struct PostingsSerializer<W: Write> {
 
     termfreq_enabled: bool,
     termfreq_sum_enabled: bool,
-    fieldnorm_reader: Option<FieldNormReader>,
-
-    bm25_weight: Option<BM25Weight>,
-
-    num_docs: u32, // Number of docs in the segment
-    avg_fieldnorm: Score, // Average number of term in the field for that segment.
-                   // this value is used to compute the block wand information.
 }
 
 impl<W: Write> PostingsSerializer<W> {
     pub fn new(
         write: W,
-        avg_fieldnorm: Score,
         termfreq_enabled: bool,
         termfreq_sum_enabled: bool,
-        fieldnorm_reader: Option<FieldNormReader>,
     ) -> PostingsSerializer<W> {
-        let num_docs = fieldnorm_reader
-            .as_ref()
-            .map(|fieldnorm_reader| fieldnorm_reader.num_docs())
-            .unwrap_or(0u32);
         PostingsSerializer {
             output_write: CountingWriter::wrap(write),
 
@@ -358,23 +326,6 @@ impl<W: Write> PostingsSerializer<W> {
             last_doc_id_encoded: 0u32,
             termfreq_enabled,
             termfreq_sum_enabled,
-
-            fieldnorm_reader,
-            bm25_weight: None,
-
-            num_docs,
-            avg_fieldnorm,
-        }
-    }
-
-    pub fn new_term(&mut self, term_doc_freq: u32) {
-        if self.termfreq_enabled && self.num_docs > 0 {
-            let bm25_weight = BM25Weight::for_one_term(
-                term_doc_freq as u64,
-                self.num_docs as u64,
-                self.avg_fieldnorm,
-            );
-            self.bm25_weight = Some(bm25_weight);
         }
     }
 
@@ -391,6 +342,7 @@ impl<W: Write> PostingsSerializer<W> {
             self.postings_write.extend(block_encoded);
         }
         if self.termfreq_enabled {
+            // encode the term_freqs
             let (num_bits, block_encoded): (u8, &[u8]) = self
                 .block_encoder
                 .compress_block_unsorted(&self.block.term_freqs());
@@ -400,31 +352,6 @@ impl<W: Write> PostingsSerializer<W> {
                 let sum_freq = self.block.term_freqs().iter().cloned().sum();
                 self.skip_write.write_total_term_freq(sum_freq);
             }
-            let mut blockwand_params = (0u8, 0u32);
-            if let Some(bm25_weight) = self.bm25_weight.as_ref() {
-                if let Some(fieldnorm_reader) = self.fieldnorm_reader.as_ref() {
-                    let docs = self.block.doc_ids().iter().cloned();
-                    let term_freqs = self.block.term_freqs().iter().cloned();
-                    let fieldnorms = docs.map(|doc| fieldnorm_reader.fieldnorm_id(doc));
-                    blockwand_params = fieldnorms
-                        .zip(term_freqs)
-                        .max_by(
-                            |(left_fieldnorm_id, left_term_freq),
-                             (right_fieldnorm_id, right_term_freq)| {
-                                let left_score =
-                                    bm25_weight.tf_factor(*left_fieldnorm_id, *left_term_freq);
-                                let right_score =
-                                    bm25_weight.tf_factor(*right_fieldnorm_id, *right_term_freq);
-                                left_score
-                                    .partial_cmp(&right_score)
-                                    .unwrap_or(Ordering::Equal)
-                            },
-                        )
-                        .unwrap();
-                }
-            }
-            let (fieldnorm_id, term_freq) = blockwand_params;
-            self.skip_write.write_blockwand_max(fieldnorm_id, term_freq);
         }
         self.block.clear();
     }
@@ -473,7 +400,6 @@ impl<W: Write> PostingsSerializer<W> {
         }
         self.skip_write.clear();
         self.postings_write.clear();
-        self.bm25_weight = None;
         Ok(())
     }
 

src/postings/skip.rs

@@ -1,9 +1,8 @@
-use crate::common::{read_u32_vint_no_advance, serialize_vint_u32, BinarySerializable, VInt};
+use crate::common::BinarySerializable;
 use crate::directory::ReadOnlySource;
 use crate::postings::compression::{compressed_block_size, COMPRESSION_BLOCK_SIZE};
-use crate::query::BM25Weight;
 use crate::schema::IndexRecordOption;
-use crate::{DocId, Score, TERMINATED};
+use crate::{DocId, TERMINATED};
 use owned_read::OwnedRead;
 
 pub struct SkipSerializer {
@@ -41,13 +40,6 @@ impl SkipSerializer {
             .expect("Should never fail");
     }
 
-    pub fn write_blockwand_max(&mut self, fieldnorm_id: u8, term_freq: u32) {
-        self.buffer.push(fieldnorm_id);
-        let mut buf = [0u8; 8];
-        let bytes = serialize_vint_u32(term_freq, &mut buf);
-        self.buffer.extend_from_slice(bytes);
-    }
-
     pub fn data(&self) -> &[u8] {
         &self.buffer[..]
     }
@@ -58,7 +50,6 @@ impl SkipSerializer {
     }
 }
 
-#[derive(Clone)]
 pub(crate) struct SkipReader {
     last_doc_in_block: DocId,
     pub(crate) last_doc_in_previous_block: DocId,
@@ -78,74 +69,41 @@ pub(crate) enum BlockInfo {
         doc_num_bits: u8,
         tf_num_bits: u8,
         tf_sum: u32,
-        block_wand_fieldnorm_id: u8,
-        block_wand_term_freq: u32,
-    },
-    VInt {
-        num_docs: u32,
     },
+    VInt(u32),
 }
 
 impl Default for BlockInfo {
     fn default() -> Self {
-        BlockInfo::VInt { num_docs: 0u32 }
+        BlockInfo::VInt(0)
     }
 }
 
 impl SkipReader {
     pub fn new(data: ReadOnlySource, doc_freq: u32, skip_info: IndexRecordOption) -> SkipReader {
-        let mut skip_reader = SkipReader {
+        SkipReader {
-            last_doc_in_block: if doc_freq >= COMPRESSION_BLOCK_SIZE as u32 {
+            last_doc_in_block: 0u32,
-                0
-            } else {
-                TERMINATED
-            },
             last_doc_in_previous_block: 0u32,
             owned_read: OwnedRead::new(data),
             skip_info,
-            block_info: BlockInfo::VInt { num_docs: doc_freq },
+            block_info: BlockInfo::default(),
             byte_offset: 0,
             remaining_docs: doc_freq,
             position_offset: 0u64,
-        };
-        if doc_freq >= COMPRESSION_BLOCK_SIZE as u32 {
-            skip_reader.read_block_info();
         }
-        skip_reader
     }
 
     pub fn reset(&mut self, data: ReadOnlySource, doc_freq: u32) {
-        self.last_doc_in_block = if doc_freq >= COMPRESSION_BLOCK_SIZE as u32 {
+        self.last_doc_in_block = 0u32;
-            0
-        } else {
-            TERMINATED
-        };
         self.last_doc_in_previous_block = 0u32;
         self.owned_read = OwnedRead::new(data);
-        self.block_info = BlockInfo::VInt { num_docs: doc_freq };
+        self.block_info = BlockInfo::default();
         self.byte_offset = 0;
         self.remaining_docs = doc_freq;
-        self.position_offset = 0u64;
-        if doc_freq >= COMPRESSION_BLOCK_SIZE as u32 {
-            self.read_block_info();
-        }
-    }
-
-    // Returns the block max score for this block if available.
-    //
-    // The block max score is available for all full bitpacked block,
-    // but no available for the last VInt encoded incomplete block.
-    pub fn block_max_score(&self, bm25_weight: &BM25Weight) -> Option<Score> {
-        match self.block_info {
-            BlockInfo::BitPacked {
-                block_wand_fieldnorm_id,
-                block_wand_term_freq,
-                ..
-            } => Some(bm25_weight.score(block_wand_fieldnorm_id, block_wand_term_freq)),
-            BlockInfo::VInt { .. } => None,
-        }
     }
 
+    #[cfg(test)]
+    #[inline(always)]
     pub(crate) fn last_doc_in_block(&self) -> DocId {
         self.last_doc_in_block
     }
@@ -169,38 +127,25 @@ impl SkipReader {
                     doc_num_bits,
                     tf_num_bits: 0,
                     tf_sum: 0,
-                    block_wand_fieldnorm_id: 0,
-                    block_wand_term_freq: 0,
                 };
             }
             IndexRecordOption::WithFreqs => {
                 let tf_num_bits = self.owned_read.get(1);
-                let block_wand_fieldnorm_id = self.owned_read.get(2);
-                let data = &self.owned_read.as_ref()[3..];
-                let (block_wand_term_freq, num_bytes) = read_u32_vint_no_advance(data);
-                self.owned_read.advance(3 + num_bytes);
                 self.block_info = BlockInfo::BitPacked {
                     doc_num_bits,
                     tf_num_bits,
                     tf_sum: 0,
-                    block_wand_fieldnorm_id,
-                    block_wand_term_freq,
                 };
+                self.owned_read.advance(2);
             }
             IndexRecordOption::WithFreqsAndPositions => {
                 let tf_num_bits = self.owned_read.get(1);
                 self.owned_read.advance(2);
                 let tf_sum = u32::deserialize(&mut self.owned_read).expect("Failed reading tf_sum");
-                let block_wand_fieldnorm_id = self.owned_read.get(0);
-                self.owned_read.advance(1);
-                let block_wand_term_freq =
-                    VInt::deserialize_u64(&mut self.owned_read).unwrap() as u32;
                 self.block_info = BlockInfo::BitPacked {
                     doc_num_bits,
                     tf_num_bits,
                     tf_sum,
-                    block_wand_fieldnorm_id,
-                    block_wand_term_freq,
                 };
             }
         }
@@ -214,44 +159,35 @@ impl SkipReader {
     ///
     /// If the target is larger than all documents, the skip_reader
     /// then advance to the last Variable In block.
-    pub fn seek(&mut self, target: DocId) -> bool {
+    pub fn seek(&mut self, target: DocId) {
-        if self.last_doc_in_block() >= target {
+        while self.last_doc_in_block < target {
-            return false;
-        }
-        loop {
             self.advance();
-            if self.last_doc_in_block() >= target {
-                return true;
-            }
         }
     }
 
-    pub fn advance(&mut self) {
+    pub fn advance(&mut self) -> bool {
         match self.block_info {
             BlockInfo::BitPacked {
                 doc_num_bits,
                 tf_num_bits,
                 tf_sum,
-                ..
             } => {
                 self.remaining_docs -= COMPRESSION_BLOCK_SIZE as u32;
                 self.byte_offset += compressed_block_size(doc_num_bits + tf_num_bits);
                 self.position_offset += tf_sum as u64;
             }
-            BlockInfo::VInt { num_docs } => {
+            BlockInfo::VInt(num_vint_docs) => {
-                debug_assert_eq!(num_docs, self.remaining_docs);
+                self.remaining_docs -= num_vint_docs;
-                self.remaining_docs = 0;
-                self.byte_offset = std::usize::MAX;
             }
         }
         self.last_doc_in_previous_block = self.last_doc_in_block;
         if self.remaining_docs >= COMPRESSION_BLOCK_SIZE as u32 {
             self.read_block_info();
+            true
         } else {
             self.last_doc_in_block = TERMINATED;
-            self.block_info = BlockInfo::VInt {
+            self.block_info = BlockInfo::VInt(self.remaining_docs);
-                num_docs: self.remaining_docs,
+            self.remaining_docs > 0
-            };
         }
     }
 }
@@ -271,10 +207,8 @@ mod tests {
             let mut skip_serializer = SkipSerializer::new();
             skip_serializer.write_doc(1u32, 2u8);
             skip_serializer.write_term_freq(3u8);
-            skip_serializer.write_blockwand_max(13u8, 3u32);
             skip_serializer.write_doc(5u32, 5u8);
             skip_serializer.write_term_freq(2u8);
-            skip_serializer.write_blockwand_max(8u8, 2u32);
             skip_serializer.data().to_owned()
         };
         let doc_freq = 3u32 + (COMPRESSION_BLOCK_SIZE * 2) as u32;
@@ -283,35 +217,29 @@ mod tests {
             doc_freq,
             IndexRecordOption::WithFreqs,
         );
+        assert!(skip_reader.advance());
         assert_eq!(skip_reader.last_doc_in_block(), 1u32);
         assert_eq!(
-            skip_reader.block_info,
+            skip_reader.block_info(),
             BlockInfo::BitPacked {
                 doc_num_bits: 2u8,
                 tf_num_bits: 3u8,
-                tf_sum: 0,
+                tf_sum: 0
-                block_wand_fieldnorm_id: 13,
-                block_wand_term_freq: 3
             }
         );
-        skip_reader.advance();
+        assert!(skip_reader.advance());
         assert_eq!(skip_reader.last_doc_in_block(), 5u32);
         assert_eq!(
             skip_reader.block_info(),
             BlockInfo::BitPacked {
                 doc_num_bits: 5u8,
                 tf_num_bits: 2u8,
-                tf_sum: 0,
+                tf_sum: 0
-                block_wand_fieldnorm_id: 8,
-                block_wand_term_freq: 2
             }
         );
-        skip_reader.advance();
+        assert!(skip_reader.advance());
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 3u32 });
+        assert_eq!(skip_reader.block_info(), BlockInfo::VInt(3u32));
-        skip_reader.advance();
+        assert!(!skip_reader.advance());
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 0u32 });
-        skip_reader.advance();
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 0u32 });
     }
 
     #[test]
@@ -328,35 +256,29 @@ mod tests {
             doc_freq,
             IndexRecordOption::Basic,
         );
+        assert!(skip_reader.advance());
         assert_eq!(skip_reader.last_doc_in_block(), 1u32);
         assert_eq!(
             skip_reader.block_info(),
             BlockInfo::BitPacked {
                 doc_num_bits: 2u8,
                 tf_num_bits: 0,
-                tf_sum: 0u32,
+                tf_sum: 0u32
-                block_wand_fieldnorm_id: 0,
-                block_wand_term_freq: 0
             }
         );
-        skip_reader.advance();
+        assert!(skip_reader.advance());
         assert_eq!(skip_reader.last_doc_in_block(), 5u32);
         assert_eq!(
             skip_reader.block_info(),
             BlockInfo::BitPacked {
                 doc_num_bits: 5u8,
                 tf_num_bits: 0,
-                tf_sum: 0u32,
+                tf_sum: 0u32
-                block_wand_fieldnorm_id: 0,
-                block_wand_term_freq: 0
             }
         );
-        skip_reader.advance();
+        assert!(skip_reader.advance());
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 3u32 });
+        assert_eq!(skip_reader.block_info(), BlockInfo::VInt(3u32));
-        skip_reader.advance();
+        assert!(!skip_reader.advance());
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 0u32 });
-        skip_reader.advance();
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 0u32 });
     }
 
     #[test]
@@ -372,18 +294,16 @@ mod tests {
             doc_freq,
             IndexRecordOption::Basic,
         );
+        assert!(skip_reader.advance());
         assert_eq!(skip_reader.last_doc_in_block(), 1u32);
         assert_eq!(
             skip_reader.block_info(),
             BlockInfo::BitPacked {
                 doc_num_bits: 2u8,
                 tf_num_bits: 0,
-                tf_sum: 0u32,
+                tf_sum: 0u32
-                block_wand_fieldnorm_id: 0,
-                block_wand_term_freq: 0
             }
         );
-        skip_reader.advance();
+        assert!(!skip_reader.advance());
-        assert_eq!(skip_reader.block_info(), BlockInfo::VInt { num_docs: 0u32 });
     }
 }

src/query/all_query.rs

@@ -9,7 +9,7 @@ use crate::Score;
 
 /// Query that matches all of the documents.
 ///
-/// All of the document get the score 1.0.
+/// All of the document get the score 1f32.
 #[derive(Clone, Debug)]
 pub struct AllQuery;
 
@@ -23,7 +23,7 @@ impl Query for AllQuery {
 pub struct AllWeight;
 
 impl Weight for AllWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> crate::Result<Box<dyn Scorer>> {
         let all_scorer = AllScorer {
             doc: 0u32,
             max_doc: reader.max_doc(),
@@ -35,7 +35,7 @@ impl Weight for AllWeight {
         if doc >= reader.max_doc() {
             return Err(does_not_match(doc));
         }
-        Ok(Explanation::new("AllQuery", 1.0))
+        Ok(Explanation::new("AllQuery", 1f32))
     }
 }
 
@@ -66,7 +66,7 @@ impl DocSet for AllScorer {
 
 impl Scorer for AllScorer {
     fn score(&mut self) -> Score {
-        1.0
+        1f32
     }
 }
 
@@ -100,7 +100,7 @@ mod tests {
         let weight = AllQuery.weight(&searcher, false).unwrap();
         {
             let reader = searcher.segment_reader(0);
-            let mut scorer = weight.scorer(reader, 1.0).unwrap();
+            let mut scorer = weight.scorer(reader, 1.0f32).unwrap();
             assert_eq!(scorer.doc(), 0u32);
             assert_eq!(scorer.advance(), 1u32);
             assert_eq!(scorer.doc(), 1u32);
@@ -108,7 +108,7 @@ mod tests {
         }
         {
             let reader = searcher.segment_reader(1);
-            let mut scorer = weight.scorer(reader, 1.0).unwrap();
+            let mut scorer = weight.scorer(reader, 1.0f32).unwrap();
             assert_eq!(scorer.doc(), 0u32);
             assert_eq!(scorer.advance(), TERMINATED);
         }
@@ -122,14 +122,14 @@ mod tests {
         let weight = AllQuery.weight(&searcher, false).unwrap();
         let reader = searcher.segment_reader(0);
         {
-            let mut scorer = weight.scorer(reader, 2.0).unwrap();
+            let mut scorer = weight.scorer(reader, 2.0f32).unwrap();
             assert_eq!(scorer.doc(), 0u32);
-            assert_eq!(scorer.score(), 2.0);
+            assert_eq!(scorer.score(), 2.0f32);
         }
         {
-            let mut scorer = weight.scorer(reader, 1.5).unwrap();
+            let mut scorer = weight.scorer(reader, 1.5f32).unwrap();
             assert_eq!(scorer.doc(), 0u32);
-            assert_eq!(scorer.score(), 1.5);
+            assert_eq!(scorer.score(), 1.5f32);
         }
     }
 }

src/query/automaton_weight.rs

@@ -5,9 +5,9 @@ use crate::query::{BitSetDocSet, Explanation};
 use crate::query::{Scorer, Weight};
 use crate::schema::{Field, IndexRecordOption};
 use crate::termdict::{TermDictionary, TermStreamer};
+use crate::DocId;
 use crate::Result;
 use crate::TantivyError;
-use crate::{DocId, Score};
 use std::sync::Arc;
 use tantivy_fst::Automaton;
 
@@ -40,9 +40,10 @@ impl<A> Weight for AutomatonWeight<A>
 where
     A: Automaton + Send + Sync + 'static,
 {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> Result<Box<dyn Scorer>> {
         let max_doc = reader.max_doc();
         let mut doc_bitset = BitSet::with_max_value(max_doc);
+
         let inverted_index = reader.inverted_index(self.field);
         let term_dict = inverted_index.terms();
         let mut term_stream = self.automaton_stream(term_dict);
@@ -51,14 +52,12 @@ where
             let mut block_segment_postings = inverted_index
                 .read_block_postings_from_terminfo(term_info, IndexRecordOption::Basic);
             loop {
-                let docs = block_segment_postings.docs();
+                for &doc in block_segment_postings.docs() {
-                if docs.is_empty() {
-                    break;
-                }
-                for &doc in docs {
                     doc_bitset.insert(doc);
                 }
-                block_segment_postings.advance();
+                if !block_segment_postings.advance() {
+                    break;
+                }
             }
         }
         let doc_bitset = BitSetDocSet::from(doc_bitset);
@@ -67,9 +66,9 @@ where
     }
 
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> Result<Explanation> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         if scorer.seek(doc) == doc {
-            Ok(Explanation::new("AutomatonScorer", 1.0))
+            Ok(Explanation::new("AutomatonScorer", 1.0f32))
         } else {
             Err(TantivyError::InvalidArgument(
                 "Document does not exist".to_string(),
@@ -144,13 +143,13 @@ mod tests {
         let reader = index.reader().unwrap();
         let searcher = reader.searcher();
         let mut scorer = automaton_weight
-            .scorer(searcher.segment_reader(0u32), 1.0)
+            .scorer(searcher.segment_reader(0u32), 1.0f32)
             .unwrap();
         assert_eq!(scorer.doc(), 0u32);
-        assert_eq!(scorer.score(), 1.0);
+        assert_eq!(scorer.score(), 1.0f32);
         assert_eq!(scorer.advance(), 2u32);
         assert_eq!(scorer.doc(), 2u32);
-        assert_eq!(scorer.score(), 1.0);
+        assert_eq!(scorer.score(), 1.0f32);
         assert_eq!(scorer.advance(), TERMINATED);
     }
 
@@ -162,9 +161,9 @@ mod tests {
         let reader = index.reader().unwrap();
         let searcher = reader.searcher();
         let mut scorer = automaton_weight
-            .scorer(searcher.segment_reader(0u32), 1.32)
+            .scorer(searcher.segment_reader(0u32), 1.32f32)
             .unwrap();
         assert_eq!(scorer.doc(), 0u32);
-        assert_eq!(scorer.score(), 1.32);
+        assert_eq!(scorer.score(), 1.32f32);
     }
 }

src/query/bitset/mod.rs

@@ -61,23 +61,21 @@ impl DocSet for BitSetDocSet {
     }
 
     fn seek(&mut self, target: DocId) -> DocId {
-        if target >= self.docs.max_value() {
-            self.doc = TERMINATED;
-            return TERMINATED;
-        }
         let target_bucket = target / 64u32;
+
+        // Mask for all of the bits greater or equal
+        // to our target document.
         if target_bucket > self.cursor_bucket {
             self.go_to_bucket(target_bucket);
             let greater_filter: TinySet = TinySet::range_greater_or_equal(target);
             self.cursor_tinybitset = self.cursor_tinybitset.intersect(greater_filter);
-            self.advance()
+            self.advance();
-        } else {
-            let mut doc = self.doc();
-            while doc < target {
-                doc = self.advance();
-            }
-            doc
         }
+        let mut doc = self.doc();
+        while doc < target {
+            doc = self.advance();
+        }
+        doc
     }
 
     /// Returns the current document
@@ -116,13 +114,6 @@ mod tests {
         assert_eq!(empty.advance(), TERMINATED)
     }
 
-    #[test]
-    fn test_seek_terminated() {
-        let bitset = BitSet::with_max_value(1000);
-        let mut empty = BitSetDocSet::from(bitset);
-        assert_eq!(empty.seek(TERMINATED), TERMINATED)
-    }
-
     fn test_go_through_sequential(docs: &[DocId]) {
         let mut docset = create_docbitset(docs, 1_000u32);
         for &doc in docs {

src/query/bm25.rs

@@ -3,24 +3,21 @@ use crate::query::Explanation;
 use crate::Score;
 use crate::Searcher;
 use crate::Term;
-use serde::Deserialize;
-use serde::Serialize;
 
-const K1: Score = 1.2;
+const K1: f32 = 1.2;
-const B: Score = 0.75;
+const B: f32 = 0.75;
 
-fn idf(doc_freq: u64, doc_count: u64) -> Score {
+fn idf(doc_freq: u64, doc_count: u64) -> f32 {
-    assert!(doc_count >= doc_freq, "{} >= {}", doc_count, doc_freq);
+    let x = ((doc_count - doc_freq) as f32 + 0.5) / (doc_freq as f32 + 0.5);
-    let x = ((doc_count - doc_freq) as Score + 0.5) / (doc_freq as Score + 0.5);
+    (1f32 + x).ln()
-    (1.0 + x).ln()
 }
 
-fn cached_tf_component(fieldnorm: u32, average_fieldnorm: Score) -> Score {
+fn cached_tf_component(fieldnorm: u32, average_fieldnorm: f32) -> f32 {
-    K1 * (1.0 - B + B * fieldnorm as Score / average_fieldnorm)
+    K1 * (1f32 - B + B * fieldnorm as f32 / average_fieldnorm)
 }
 
-fn compute_tf_cache(average_fieldnorm: Score) -> [Score; 256] {
+fn compute_tf_cache(average_fieldnorm: f32) -> [f32; 256] {
-    let mut cache: [Score; 256] = [0.0; 256];
+    let mut cache = [0f32; 256];
     for (fieldnorm_id, cache_mut) in cache.iter_mut().enumerate() {
         let fieldnorm = FieldNormReader::id_to_fieldnorm(fieldnorm_id as u8);
         *cache_mut = cached_tf_component(fieldnorm, average_fieldnorm);
@@ -28,22 +25,15 @@ fn compute_tf_cache(average_fieldnorm: Score) -> [Score; 256] {
     cache
 }
 
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
-pub struct BM25Params {
-    pub idf: Score,
-    pub avg_fieldnorm: Score,
-}
-
-#[derive(Clone)]
 pub struct BM25Weight {
     idf_explain: Explanation,
-    weight: Score,
+    weight: f32,
-    cache: [Score; 256],
+    cache: [f32; 256],
-    average_fieldnorm: Score,
+    average_fieldnorm: f32,
 }
 
 impl BM25Weight {
-    pub fn boost_by(&self, boost: Score) -> BM25Weight {
+    pub fn boost_by(&self, boost: f32) -> BM25Weight {
         BM25Weight {
             idf_explain: self.idf_explain.clone(),
             weight: self.weight * boost,
@@ -70,11 +60,19 @@ impl BM25Weight {
             total_num_tokens += inverted_index.total_num_tokens();
             total_num_docs += u64::from(segment_reader.max_doc());
         }
-        let average_fieldnorm = total_num_tokens as Score / total_num_docs as Score;
+        let average_fieldnorm = total_num_tokens as f32 / total_num_docs as f32;
 
+        let mut idf_explain: Explanation;
         if terms.len() == 1 {
             let term_doc_freq = searcher.doc_freq(&terms[0]);
-            BM25Weight::for_one_term(term_doc_freq, total_num_docs, average_fieldnorm)
+            let idf = idf(term_doc_freq, total_num_docs);
+            idf_explain =
+                Explanation::new("idf, computed as log(1 + (N - n + 0.5) / (n + 0.5))", idf);
+            idf_explain.add_const(
+                "n, number of docs containing this term",
+                term_doc_freq as f32,
+            );
+            idf_explain.add_const("N, total number of docs", total_num_docs as f32);
         } else {
             let idf = terms
                 .iter()
@@ -82,30 +80,14 @@ impl BM25Weight {
                     let term_doc_freq = searcher.doc_freq(term);
                     idf(term_doc_freq, total_num_docs)
                 })
-                .sum::<Score>();
+                .sum::<f32>();
-            let idf_explain = Explanation::new("idf", idf);
+            idf_explain = Explanation::new("idf", idf);
-            BM25Weight::new(idf_explain, average_fieldnorm)
         }
+        BM25Weight::new(idf_explain, average_fieldnorm)
     }
 
-    pub fn for_one_term(
+    fn new(idf_explain: Explanation, average_fieldnorm: f32) -> BM25Weight {
-        term_doc_freq: u64,
+        let weight = idf_explain.value() * (1f32 + K1);
-        total_num_docs: u64,
-        avg_fieldnorm: Score,
-    ) -> BM25Weight {
-        let idf = idf(term_doc_freq, total_num_docs);
-        let mut idf_explain =
-            Explanation::new("idf, computed as log(1 + (N - n + 0.5) / (n + 0.5))", idf);
-        idf_explain.add_const(
-            "n, number of docs containing this term",
-            term_doc_freq as Score,
-        );
-        idf_explain.add_const("N, total number of docs", total_num_docs as Score);
-        BM25Weight::new(idf_explain, avg_fieldnorm)
-    }
-
-    fn new(idf_explain: Explanation, average_fieldnorm: Score) -> BM25Weight {
-        let weight = idf_explain.value() * (1.0 + K1);
         BM25Weight {
             idf_explain,
             weight,
@@ -116,27 +98,19 @@ impl BM25Weight {
 
     #[inline(always)]
     pub fn score(&self, fieldnorm_id: u8, term_freq: u32) -> Score {
-        self.weight * self.tf_factor(fieldnorm_id, term_freq)
-    }
-
-    pub fn max_score(&self) -> Score {
-        self.score(255u8, 2_013_265_944)
-    }
-
-    #[inline(always)]
-    pub(crate) fn tf_factor(&self, fieldnorm_id: u8, term_freq: u32) -> Score {
-        let term_freq = term_freq as Score;
         let norm = self.cache[fieldnorm_id as usize];
-        term_freq / (term_freq + norm)
+        let term_freq = term_freq as f32;
+        self.weight * term_freq / (term_freq + norm)
     }
 
     pub fn explain(&self, fieldnorm_id: u8, term_freq: u32) -> Explanation {
         // The explain format is directly copied from Lucene's.
         // (So, Kudos to Lucene)
+
         let score = self.score(fieldnorm_id, term_freq);
 
         let norm = self.cache[fieldnorm_id as usize];
-        let term_freq = term_freq as Score;
+        let term_freq = term_freq as f32;
         let right_factor = term_freq / (term_freq + norm);
 
         let mut tf_explanation = Explanation::new(
@@ -149,12 +123,12 @@ impl BM25Weight {
         tf_explanation.add_const("b, length normalization parameter", B);
         tf_explanation.add_const(
             "dl, length of field",
-            FieldNormReader::id_to_fieldnorm(fieldnorm_id) as Score,
+            FieldNormReader::id_to_fieldnorm(fieldnorm_id) as f32,
         );
         tf_explanation.add_const("avgdl, average length of field", self.average_fieldnorm);
 
         let mut explanation = Explanation::new("TermQuery, product of...", score);
-        explanation.add_detail(Explanation::new("(K1+1)", K1 + 1.0));
+        explanation.add_detail(Explanation::new("(K1+1)", K1 + 1f32));
         explanation.add_detail(self.idf_explain.clone());
         explanation.add_detail(tf_explanation);
         explanation
@@ -165,11 +139,10 @@ impl BM25Weight {
 mod tests {
 
     use super::idf;
-    use crate::{assert_nearly_equals, Score};
+    use crate::tests::assert_nearly_equals;
 
     #[test]
     fn test_idf() {
-        let score: Score = 2.0;
+        assert_nearly_equals(idf(1, 2), 0.6931472);
-        assert_nearly_equals!(idf(1, 2), score.ln());
     }
 }

src/query/boolean_query/block_wand.rs

@@ -1,432 +0,0 @@
-use crate::query::term_query::TermScorer;
-use crate::query::Scorer;
-use crate::{DocId, DocSet, Score, TERMINATED};
-use std::ops::Deref;
-use std::ops::DerefMut;
-
-fn is_sorted<I: Iterator<Item = DocId>>(mut it: I) -> bool {
-    if let Some(first) = it.next() {
-        let mut prev = first;
-        for doc in it {
-            if doc < prev {
-                return false;
-            }
-            prev = doc;
-        }
-    }
-    true
-}
-
-/// Takes a term_scorers sorted by their current doc() and a threshold and returns
-/// Returns (pivot_len, pivot_ord) defined as follows:
-/// - `pivot_doc` lowest document that has a chance of exceeding (>) the threshold score.
-/// - `before_pivot_len` number of term_scorers such that term_scorer.doc() < pivot.
-/// - `pivot_len` number of term_scorers such that term_scorer.doc() <= pivot.
-///
-/// We always have `before_pivot_len` < `pivot_len`.
-///
-/// None is returned if we establish that no document can exceed the threshold.
-fn find_pivot_doc(
-    term_scorers: &[TermScorerWithMaxScore],
-    threshold: Score,
-) -> Option<(usize, usize, DocId)> {
-    let mut max_score = 0.0;
-    let mut before_pivot_len = 0;
-    let mut pivot_doc = TERMINATED;
-    while before_pivot_len < term_scorers.len() {
-        let term_scorer = &term_scorers[before_pivot_len];
-        max_score += term_scorer.max_score;
-        if max_score > threshold {
-            pivot_doc = term_scorer.doc();
-            break;
-        }
-        before_pivot_len += 1;
-    }
-    if pivot_doc == TERMINATED {
-        return None;
-    }
-    // Right now i is an ordinal, we want a len.
-    let mut pivot_len = before_pivot_len + 1;
-    // Some other term_scorer may be positioned on the same document.
-    pivot_len += term_scorers[pivot_len..]
-        .iter()
-        .take_while(|term_scorer| term_scorer.doc() == pivot_doc)
-        .count();
-    Some((before_pivot_len, pivot_len, pivot_doc))
-}
-
-struct TermScorerWithMaxScore<'a> {
-    scorer: &'a mut TermScorer,
-    max_score: Score,
-}
-
-impl<'a> From<&'a mut TermScorer> for TermScorerWithMaxScore<'a> {
-    fn from(scorer: &'a mut TermScorer) -> Self {
-        let max_score = scorer.max_score();
-        TermScorerWithMaxScore { scorer, max_score }
-    }
-}
-
-impl<'a> Deref for TermScorerWithMaxScore<'a> {
-    type Target = TermScorer;
-
-    fn deref(&self) -> &Self::Target {
-        self.scorer
-    }
-}
-
-impl<'a> DerefMut for TermScorerWithMaxScore<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.scorer
-    }
-}
-
-// Before and after calling this method, scorers need to be sorted by their `.doc()`.
-fn block_max_was_too_low_advance_one_scorer(
-    scorers: &mut Vec<TermScorerWithMaxScore>,
-    pivot_len: usize,
-) {
-    let mut scorer_to_seek = pivot_len - 1;
-    let mut doc_to_seek_after = scorers[scorer_to_seek].doc();
-    for scorer_ord in (0..pivot_len - 1).rev() {
-        let scorer = &scorers[scorer_ord];
-        if scorer.last_doc_in_block() <= doc_to_seek_after {
-            doc_to_seek_after = scorer.last_doc_in_block();
-            scorer_to_seek = scorer_ord;
-        }
-    }
-    for scorer in &scorers[pivot_len..] {
-        if scorer.doc() <= doc_to_seek_after {
-            doc_to_seek_after = scorer.doc();
-        }
-    }
-    scorers[scorer_to_seek].seek(doc_to_seek_after + 1);
-    restore_ordering(scorers, scorer_to_seek);
-}
-
-// Given a list of term_scorers and a `ord` and assuming that `term_scorers[ord]` is sorted
-// except term_scorers[ord] that might be in advance compared to its ranks,
-// bubble up term_scorers[ord] in order to restore the ordering.
-fn restore_ordering(term_scorers: &mut Vec<TermScorerWithMaxScore>, ord: usize) {
-    let doc = term_scorers[ord].doc();
-    for i in ord + 1..term_scorers.len() {
-        if term_scorers[i].doc() >= doc {
-            break;
-        }
-        term_scorers.swap(i, i - 1);
-    }
-    debug_assert!(is_sorted(term_scorers.iter().map(|scorer| scorer.doc())));
-}
-
-// Attempts to advance all term_scorers between `&term_scorers[0..before_len]` to the pivot.
-// If this works, return true.
-// If this fails (ie: one of the term_scorer does not contain `pivot_doc` and seek goes past the
-// pivot), reorder the term_scorers to ensure the list is still sorted and returns `false`.
-// If a term_scorer reach TERMINATED in the process return false remove the term_scorer and return.
-fn align_scorers(
-    term_scorers: &mut Vec<TermScorerWithMaxScore>,
-    pivot_doc: DocId,
-    before_pivot_len: usize,
-) -> bool {
-    debug_assert_ne!(pivot_doc, TERMINATED);
-    for i in (0..before_pivot_len).rev() {
-        let new_doc = term_scorers[i].seek(pivot_doc);
-        if new_doc != pivot_doc {
-            if new_doc == TERMINATED {
-                term_scorers.swap_remove(i);
-            }
-            // We went past the pivot.
-            // We just go through the outer loop mechanic (Note that pivot is
-            // still a possible candidate).
-            //
-            // Termination is still guaranteed since we can only consider the same
-            // pivot at most term_scorers.len() - 1 times.
-            restore_ordering(term_scorers, i);
-            return false;
-        }
-    }
-    true
-}
-
-// Assumes terms_scorers[..pivot_len] are positioned on the same doc (pivot_doc).
-// Advance term_scorers[..pivot_len] and out of these removes the terminated scores.
-// Restores the ordering of term_scorers.
-fn advance_all_scorers_on_pivot(term_scorers: &mut Vec<TermScorerWithMaxScore>, pivot_len: usize) {
-    for term_scorer in &mut term_scorers[..pivot_len] {
-        term_scorer.advance();
-    }
-    // TODO use drain_filter when available.
-    let mut i = 0;
-    while i != term_scorers.len() {
-        if term_scorers[i].doc() == TERMINATED {
-            term_scorers.swap_remove(i);
-        } else {
-            i += 1;
-        }
-    }
-    term_scorers.sort_by_key(|scorer| scorer.doc());
-}
-
-pub fn block_wand(
-    mut scorers: Vec<TermScorer>,
-    mut threshold: Score,
-    callback: &mut dyn FnMut(u32, Score) -> Score,
-) {
-    let mut scorers: Vec<TermScorerWithMaxScore> = scorers
-        .iter_mut()
-        .map(TermScorerWithMaxScore::from)
-        .collect();
-    scorers.sort_by_key(|scorer| scorer.doc());
-    loop {
-        // At this point we need to ensure that the scorers are sorted!
-        debug_assert!(is_sorted(scorers.iter().map(|scorer| scorer.doc())));
-        if let Some((before_pivot_len, pivot_len, pivot_doc)) =
-            find_pivot_doc(&scorers[..], threshold)
-        {
-            debug_assert_ne!(pivot_doc, TERMINATED);
-            debug_assert!(before_pivot_len < pivot_len);
-
-            let block_max_score_upperbound: Score = scorers[..pivot_len]
-                .iter_mut()
-                .map(|scorer| {
-                    scorer.shallow_seek(pivot_doc);
-                    scorer.block_max_score()
-                })
-                .sum();
-
-            // Beware after shallow advance, skip readers can be in advance compared to
-            // the segment posting lists.
-            //
-            // `block_segment_postings.load_block()` need to be called separately.
-            if block_max_score_upperbound <= threshold {
-                // Block max condition was not reached
-                // We could get away by simply advancing the scorers to DocId + 1 but it would
-                // be inefficient. The optimization requires proper explanation and was
-                // isolated in a different function.
-                block_max_was_too_low_advance_one_scorer(&mut scorers, pivot_len);
-                continue;
-            }
-
-            // Block max condition is observed.
-            //
-            // Let's try and advance all scorers before the pivot to the pivot.
-            if !align_scorers(&mut scorers, pivot_doc, before_pivot_len) {
-                // At least of the scorer does not contain the pivot.
-                //
-                // Let's stop scoring this pivot and go through the pivot selection again.
-                // Note that the current pivot is not necessarily a bad candidate and it
-                // may be picked again.
-                continue;
-            }
-
-            // At this point, all scorers are positioned on the doc.
-            let score = scorers[..pivot_len]
-                .iter_mut()
-                .map(|scorer| scorer.score())
-                .sum();
-            if score > threshold {
-                threshold = callback(pivot_doc, score);
-            }
-            // let's advance all of the scorers that are currently positioned on the pivot.
-            advance_all_scorers_on_pivot(&mut scorers, pivot_len);
-        } else {
-            return;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::query::score_combiner::SumCombiner;
-    use crate::query::term_query::TermScorer;
-    use crate::query::Union;
-    use crate::query::{BM25Weight, Scorer};
-    use crate::{DocId, DocSet, Score, TERMINATED};
-    use proptest::prelude::*;
-    use std::cmp::Ordering;
-    use std::collections::BinaryHeap;
-    use std::iter;
-
-    struct Float(Score);
-    impl Eq for Float {}
-    impl PartialEq for Float {
-        fn eq(&self, other: &Self) -> bool {
-            self.cmp(&other) == Ordering::Equal
-        }
-    }
-    impl PartialOrd for Float {
-        fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-            Some(self.cmp(other))
-        }
-    }
-    impl Ord for Float {
-        fn cmp(&self, other: &Self) -> Ordering {
-            other.0.partial_cmp(&self.0).unwrap_or(Ordering::Equal)
-        }
-    }
-
-    fn nearly_equals(left: Score, right: Score) -> bool {
-        (left - right).abs() < 0.000001 * (left + right).abs()
-    }
-
-    fn compute_checkpoints_for_each_pruning(
-        term_scorers: Vec<TermScorer>,
-        n: usize,
-    ) -> Vec<(DocId, Score)> {
-        let mut heap: BinaryHeap<Float> = BinaryHeap::with_capacity(n);
-        let mut checkpoints: Vec<(DocId, Score)> = Vec::new();
-        let mut limit: Score = 0.0;
-        super::block_wand(term_scorers, Score::MIN, &mut |doc, score| {
-            heap.push(Float(score));
-            if heap.len() > n {
-                heap.pop().unwrap();
-            }
-            if heap.len() == n {
-                limit = heap.peek().unwrap().0;
-            }
-            if !nearly_equals(score, limit) {
-                checkpoints.push((doc, score));
-            }
-            return limit;
-        });
-        checkpoints
-    }
-
-    fn compute_checkpoints_manual(term_scorers: Vec<TermScorer>, n: usize) -> Vec<(DocId, Score)> {
-        let mut heap: BinaryHeap<Float> = BinaryHeap::with_capacity(n);
-        let mut checkpoints: Vec<(DocId, Score)> = Vec::new();
-        let mut scorer: Union<TermScorer, SumCombiner> = Union::from(term_scorers);
-
-        let mut limit = Score::MIN;
-        loop {
-            if scorer.doc() == TERMINATED {
-                break;
-            }
-            let doc = scorer.doc();
-            let score = scorer.score();
-            if score > limit {
-                heap.push(Float(score));
-                if heap.len() > n {
-                    heap.pop().unwrap();
-                }
-                if heap.len() == n {
-                    limit = heap.peek().unwrap().0;
-                }
-                if !nearly_equals(score, limit) {
-                    checkpoints.push((doc, score));
-                }
-            }
-            scorer.advance();
-        }
-        checkpoints
-    }
-
-    const MAX_TERM_FREQ: u32 = 100u32;
-
-    fn posting_list(max_doc: u32) -> BoxedStrategy<Vec<(DocId, u32)>> {
-        (1..max_doc + 1)
-            .prop_flat_map(move |doc_freq| {
-                (
-                    proptest::bits::bitset::sampled(doc_freq as usize, 0..max_doc as usize),
-                    proptest::collection::vec(1u32..MAX_TERM_FREQ, doc_freq as usize),
-                )
-            })
-            .prop_map(|(docset, term_freqs)| {
-                docset
-                    .iter()
-                    .map(|doc| doc as u32)
-                    .zip(term_freqs.iter().cloned())
-                    .collect::<Vec<_>>()
-            })
-            .boxed()
-    }
-
-    fn gen_term_scorers(num_scorers: usize) -> BoxedStrategy<(Vec<Vec<(DocId, u32)>>, Vec<u32>)> {
-        (1u32..100u32)
-            .prop_flat_map(move |max_doc: u32| {
-                (
-                    proptest::collection::vec(posting_list(max_doc), num_scorers),
-                    proptest::collection::vec(2u32..10u32 * MAX_TERM_FREQ, max_doc as usize),
-                )
-            })
-            .boxed()
-    }
-
-    fn test_block_wand_aux(posting_lists: &[Vec<(DocId, u32)>], fieldnorms: &[u32]) {
-        // We virtually repeat all docs 64 times in order to emulate blocks of 2 documents
-        // and surface blogs more easily.
-        const REPEAT: usize = 64;
-        let fieldnorms_expanded = fieldnorms
-            .iter()
-            .cloned()
-            .flat_map(|fieldnorm| iter::repeat(fieldnorm).take(REPEAT))
-            .collect::<Vec<u32>>();
-
-        let postings_lists_expanded: Vec<Vec<(DocId, u32)>> = posting_lists
-            .iter()
-            .map(|posting_list| {
-                posting_list
-                    .into_iter()
-                    .cloned()
-                    .flat_map(|(doc, term_freq)| {
-                        (0 as u32..REPEAT as u32).map(move |offset| {
-                            (
-                                doc * (REPEAT as u32) + offset,
-                                if offset == 0 { term_freq } else { 1 },
-                            )
-                        })
-                    })
-                    .collect::<Vec<(DocId, u32)>>()
-            })
-            .collect::<Vec<_>>();
-
-        let total_fieldnorms: u64 = fieldnorms_expanded
-            .iter()
-            .cloned()
-            .map(|fieldnorm| fieldnorm as u64)
-            .sum();
-        let average_fieldnorm = (total_fieldnorms as Score) / (fieldnorms_expanded.len() as Score);
-        let max_doc = fieldnorms_expanded.len();
-
-        let term_scorers: Vec<TermScorer> = postings_lists_expanded
-            .iter()
-            .map(|postings| {
-                let bm25_weight = BM25Weight::for_one_term(
-                    postings.len() as u64,
-                    max_doc as u64,
-                    average_fieldnorm,
-                );
-                TermScorer::create_for_test(postings, &fieldnorms_expanded[..], bm25_weight)
-            })
-            .collect();
-        for top_k in 1..4 {
-            let checkpoints_for_each_pruning =
-                compute_checkpoints_for_each_pruning(term_scorers.clone(), top_k);
-            let checkpoints_manual = compute_checkpoints_manual(term_scorers.clone(), top_k);
-            assert_eq!(checkpoints_for_each_pruning.len(), checkpoints_manual.len());
-            for (&(left_doc, left_score), &(right_doc, right_score)) in checkpoints_for_each_pruning
-                .iter()
-                .zip(checkpoints_manual.iter())
-            {
-                assert_eq!(left_doc, right_doc);
-                assert!(nearly_equals(left_score, right_score));
-            }
-        }
-    }
-
-    proptest! {
-        #![proptest_config(ProptestConfig::with_cases(500))]
-        #[test]
-        fn test_block_wand_two_term_scorers((posting_lists, fieldnorms) in gen_term_scorers(2)) {
-            test_block_wand_aux(&posting_lists[..], &fieldnorms[..]);
-        }
-    }
-
-    proptest! {
-        #![proptest_config(ProptestConfig::with_cases(500))]
-        #[test]
-        fn test_block_wand_three_term_scorers((posting_lists, fieldnorms) in gen_term_scorers(3)) {
-            test_block_wand_aux(&posting_lists[..], &fieldnorms[..]);
-        }
-    }
-}

src/query/boolean_query/boolean_weight.rs

@@ -1,5 +1,4 @@
 use crate::core::SegmentReader;
-use crate::postings::FreqReadingOption;
 use crate::query::explanation::does_not_match;
 use crate::query::score_combiner::{DoNothingCombiner, ScoreCombiner, SumWithCoordsCombiner};
 use crate::query::term_query::TermScorer;
@@ -15,12 +14,12 @@ use crate::query::{intersect_scorers, Explanation};
 use crate::{DocId, Score};
 use std::collections::HashMap;
 
-enum SpecializedScorer {
+enum SpecializedScorer<TScoreCombiner: ScoreCombiner> {
-    TermUnion(Vec<TermScorer>),
+    TermUnion(Union<TermScorer, TScoreCombiner>),
     Other(Box<dyn Scorer>),
 }
 
-fn scorer_union<TScoreCombiner>(scorers: Vec<Box<dyn Scorer>>) -> SpecializedScorer
+fn scorer_union<TScoreCombiner>(scorers: Vec<Box<dyn Scorer>>) -> SpecializedScorer<TScoreCombiner>
 where
     TScoreCombiner: ScoreCombiner,
 {
@@ -36,29 +35,20 @@ where
                 .into_iter()
                 .map(|scorer| *(scorer.downcast::<TermScorer>().map_err(|_| ()).unwrap()))
                 .collect();
-            if scorers
+            return SpecializedScorer::TermUnion(Union::<TermScorer, TScoreCombiner>::from(
-                .iter()
+                scorers,
-                .all(|scorer| scorer.freq_reading_option() == FreqReadingOption::ReadFreq)
+            ));
-            {
-                // Block wand is only available iff we read frequencies.
-                return SpecializedScorer::TermUnion(scorers);
-            } else {
-                return SpecializedScorer::Other(Box::new(Union::<_, TScoreCombiner>::from(
-                    scorers,
-                )));
-            }
         }
     }
     SpecializedScorer::Other(Box::new(Union::<_, TScoreCombiner>::from(scorers)))
 }
 
-fn into_box_scorer<TScoreCombiner: ScoreCombiner>(scorer: SpecializedScorer) -> Box<dyn Scorer> {
+impl<TScoreCombiner: ScoreCombiner> Into<Box<dyn Scorer>> for SpecializedScorer<TScoreCombiner> {
-    match scorer {
+    fn into(self) -> Box<dyn Scorer> {
-        SpecializedScorer::TermUnion(term_scorers) => {
+        match self {
-            let union_scorer = Union::<TermScorer, TScoreCombiner>::from(term_scorers);
+            Self::TermUnion(union) => Box::new(union),
-            Box::new(union_scorer)
+            Self::Other(scorer) => scorer,
         }
-        SpecializedScorer::Other(scorer) => scorer,
     }
 }
 
@@ -78,7 +68,7 @@ impl BooleanWeight {
     fn per_occur_scorers(
         &self,
         reader: &SegmentReader,
-        boost: Score,
+        boost: f32,
     ) -> crate::Result<HashMap<Occur, Vec<Box<dyn Scorer>>>> {
         let mut per_occur_scorers: HashMap<Occur, Vec<Box<dyn Scorer>>> = HashMap::new();
         for &(ref occur, ref subweight) in &self.weights {
@@ -94,48 +84,47 @@ impl BooleanWeight {
     fn complex_scorer<TScoreCombiner: ScoreCombiner>(
         &self,
         reader: &SegmentReader,
-        boost: Score,
+        boost: f32,
-    ) -> crate::Result<SpecializedScorer> {
+    ) -> crate::Result<SpecializedScorer<TScoreCombiner>> {
         let mut per_occur_scorers = self.per_occur_scorers(reader, boost)?;
 
-        let should_scorer_opt: Option<SpecializedScorer> = per_occur_scorers
+        let should_scorer_opt: Option<SpecializedScorer<TScoreCombiner>> = per_occur_scorers
             .remove(&Occur::Should)
             .map(scorer_union::<TScoreCombiner>);
 
         let exclude_scorer_opt: Option<Box<dyn Scorer>> = per_occur_scorers
             .remove(&Occur::MustNot)
-            .map(scorer_union::<DoNothingCombiner>)
+            .map(scorer_union::<TScoreCombiner>)
-            .map(into_box_scorer::<DoNothingCombiner>);
+            .map(Into::into);
 
         let must_scorer_opt: Option<Box<dyn Scorer>> = per_occur_scorers
             .remove(&Occur::Must)
             .map(intersect_scorers);
 
-        let positive_scorer: SpecializedScorer = match (should_scorer_opt, must_scorer_opt) {
+        let positive_scorer: SpecializedScorer<TScoreCombiner> =
-            (Some(should_scorer), Some(must_scorer)) => {
+            match (should_scorer_opt, must_scorer_opt) {
-                if self.scoring_enabled {
+                (Some(should_scorer), Some(must_scorer)) => {
-                    SpecializedScorer::Other(Box::new(RequiredOptionalScorer::<
+                    if self.scoring_enabled {
-                        Box<dyn Scorer>,
+                        SpecializedScorer::Other(Box::new(RequiredOptionalScorer::<
-                        Box<dyn Scorer>,
+                            Box<dyn Scorer>,
-                        TScoreCombiner,
+                            Box<dyn Scorer>,
-                    >::new(
+                            TScoreCombiner,
-                        must_scorer,
+                        >::new(
-                        into_box_scorer::<TScoreCombiner>(should_scorer),
+                            must_scorer, should_scorer.into()
-                    )))
+                        )))
-                } else {
+                    } else {
-                    SpecializedScorer::Other(must_scorer)
+                        SpecializedScorer::Other(must_scorer)
+                    }
                 }
-            }
+                (None, Some(must_scorer)) => SpecializedScorer::Other(must_scorer),
-            (None, Some(must_scorer)) => SpecializedScorer::Other(must_scorer),
+                (Some(should_scorer), None) => should_scorer,
-            (Some(should_scorer), None) => should_scorer,
+                (None, None) => {
-            (None, None) => {
+                    return Ok(SpecializedScorer::Other(Box::new(EmptyScorer)));
-                return Ok(SpecializedScorer::Other(Box::new(EmptyScorer)));
+                }
-            }
+            };
-        };
 
         if let Some(exclude_scorer) = exclude_scorer_opt {
-            let positive_scorer_boxed: Box<dyn Scorer> =
+            let positive_scorer_boxed: Box<dyn Scorer> = positive_scorer.into();
-                into_box_scorer::<TScoreCombiner>(positive_scorer);
             Ok(SpecializedScorer::Other(Box::new(Exclude::new(
                 positive_scorer_boxed,
                 exclude_scorer,
@@ -147,7 +136,7 @@ impl BooleanWeight {
 }
 
 impl Weight for BooleanWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> crate::Result<Box<dyn Scorer>> {
         if self.weights.is_empty() {
             Ok(Box::new(EmptyScorer))
         } else if self.weights.len() == 1 {
@@ -159,22 +148,20 @@ impl Weight for BooleanWeight {
             }
         } else if self.scoring_enabled {
             self.complex_scorer::<SumWithCoordsCombiner>(reader, boost)
-                .map(|specialized_scorer| {
+                .map(Into::into)
-                    into_box_scorer::<SumWithCoordsCombiner>(specialized_scorer)
-                })
         } else {
             self.complex_scorer::<DoNothingCombiner>(reader, boost)
-                .map(into_box_scorer::<DoNothingCombiner>)
+                .map(Into::into)
         }
     }
 
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> crate::Result<Explanation> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         if scorer.seek(doc) != doc {
             return Err(does_not_match(doc));
         }
         if !self.scoring_enabled {
-            return Ok(Explanation::new("BooleanQuery with no scoring", 1.0));
+            return Ok(Explanation::new("BooleanQuery with no scoring", 1f32));
         }
 
         let mut explanation = Explanation::new("BooleanClause. Sum of ...", scorer.score());
@@ -193,11 +180,9 @@ impl Weight for BooleanWeight {
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score),
     ) -> crate::Result<()> {
-        let scorer = self.complex_scorer::<SumWithCoordsCombiner>(reader, 1.0)?;
+        let scorer = self.complex_scorer::<SumWithCoordsCombiner>(reader, 1.0f32)?;
         match scorer {
-            SpecializedScorer::TermUnion(term_scorers) => {
+            SpecializedScorer::TermUnion(mut union_scorer) => {
-                let mut union_scorer =
-                    Union::<TermScorer, SumWithCoordsCombiner>::from(term_scorers);
                 for_each_scorer(&mut union_scorer, callback);
             }
             SpecializedScorer::Other(mut scorer) => {
@@ -219,14 +204,14 @@ impl Weight for BooleanWeight {
     /// important optimization (e.g. BlockWAND for union).
     fn for_each_pruning(
         &self,
-        threshold: Score,
+        threshold: f32,
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score) -> Score,
     ) -> crate::Result<()> {
-        let scorer = self.complex_scorer::<SumWithCoordsCombiner>(reader, 1.0)?;
+        let scorer = self.complex_scorer::<SumWithCoordsCombiner>(reader, 1.0f32)?;
         match scorer {
-            SpecializedScorer::TermUnion(term_scorers) => {
+            SpecializedScorer::TermUnion(mut union_scorer) => {
-                super::block_wand(term_scorers, threshold, callback);
+                for_each_pruning_scorer(&mut union_scorer, threshold, callback);
             }
             SpecializedScorer::Other(mut scorer) => {
                 for_each_pruning_scorer(scorer.as_mut(), threshold, callback);

src/query/boolean_query/mod.rs

@@ -1,17 +1,13 @@
-mod block_wand;
 mod boolean_query;
 mod boolean_weight;
 
-pub(crate) use self::block_wand::block_wand;
 pub use self::boolean_query::BooleanQuery;
 
 #[cfg(test)]
 mod tests {
 
     use super::*;
-    use crate::assert_nearly_equals;
     use crate::collector::tests::TEST_COLLECTOR_WITH_SCORE;
-    use crate::collector::TopDocs;
     use crate::query::score_combiner::SumWithCoordsCombiner;
     use crate::query::term_query::TermScorer;
     use crate::query::Intersection;
@@ -22,8 +18,9 @@ mod tests {
     use crate::query::Scorer;
     use crate::query::TermQuery;
     use crate::schema::*;
+    use crate::tests::assert_nearly_equals;
     use crate::Index;
-    use crate::{DocAddress, DocId, Score};
+    use crate::{DocAddress, DocId};
 
     fn aux_test_helper() -> (Index, Field) {
         let mut schema_builder = Schema::builder();
@@ -61,7 +58,9 @@ mod tests {
         let query = query_parser.parse_query("+a").unwrap();
         let searcher = index.reader().unwrap().searcher();
         let weight = query.weight(&searcher, true).unwrap();
-        let scorer = weight.scorer(searcher.segment_reader(0u32), 1.0).unwrap();
+        let scorer = weight
+            .scorer(searcher.segment_reader(0u32), 1.0f32)
+            .unwrap();
         assert!(scorer.is::<TermScorer>());
     }
 
@@ -73,13 +72,17 @@ mod tests {
         {
             let query = query_parser.parse_query("+a +b +c").unwrap();
             let weight = query.weight(&searcher, true).unwrap();
-            let scorer = weight.scorer(searcher.segment_reader(0u32), 1.0).unwrap();
+            let scorer = weight
+                .scorer(searcher.segment_reader(0u32), 1.0f32)
+                .unwrap();
             assert!(scorer.is::<Intersection<TermScorer>>());
         }
         {
             let query = query_parser.parse_query("+a +(b c)").unwrap();
             let weight = query.weight(&searcher, true).unwrap();
-            let scorer = weight.scorer(searcher.segment_reader(0u32), 1.0).unwrap();
+            let scorer = weight
+                .scorer(searcher.segment_reader(0u32), 1.0f32)
+                .unwrap();
             assert!(scorer.is::<Intersection<Box<dyn Scorer>>>());
         }
     }
@@ -92,7 +95,9 @@ mod tests {
         {
             let query = query_parser.parse_query("+a b").unwrap();
             let weight = query.weight(&searcher, true).unwrap();
-            let scorer = weight.scorer(searcher.segment_reader(0u32), 1.0).unwrap();
+            let scorer = weight
+                .scorer(searcher.segment_reader(0u32), 1.0f32)
+                .unwrap();
             assert!(scorer.is::<RequiredOptionalScorer<
                 Box<dyn Scorer>,
                 Box<dyn Scorer>,
@@ -102,7 +107,9 @@ mod tests {
         {
             let query = query_parser.parse_query("+a b").unwrap();
             let weight = query.weight(&searcher, false).unwrap();
-            let scorer = weight.scorer(searcher.segment_reader(0u32), 1.0).unwrap();
+            let scorer = weight
+                .scorer(searcher.segment_reader(0u32), 1.0f32)
+                .unwrap();
             assert!(scorer.is::<TermScorer>());
         }
     }
@@ -133,6 +140,7 @@ mod tests {
                 .map(|doc| doc.1)
                 .collect::<Vec<DocId>>()
         };
+
         {
             let boolean_query = BooleanQuery::from(vec![(Occur::Must, make_term_query("a"))]);
             assert_eq!(matching_docs(&boolean_query), vec![0, 1, 3]);
@@ -169,54 +177,6 @@ mod tests {
         }
     }
 
-    #[test]
-    pub fn test_boolean_query_two_excluded() {
-        let (index, text_field) = aux_test_helper();
-
-        let make_term_query = |text: &str| {
-            let term_query = TermQuery::new(
-                Term::from_field_text(text_field, text),
-                IndexRecordOption::Basic,
-            );
-            let query: Box<dyn Query> = Box::new(term_query);
-            query
-        };
-
-        let reader = index.reader().unwrap();
-
-        let matching_topdocs = |query: &dyn Query| {
-            reader
-                .searcher()
-                .search(query, &TopDocs::with_limit(3))
-                .unwrap()
-        };
-
-        let score_doc_4: Score; // score of doc 4 should not be influenced by exclusion
-        {
-            let boolean_query_no_excluded =
-                BooleanQuery::from(vec![(Occur::Must, make_term_query("d"))]);
-            let topdocs_no_excluded = matching_topdocs(&boolean_query_no_excluded);
-            assert_eq!(topdocs_no_excluded.len(), 2);
-            let (top_score, top_doc) = topdocs_no_excluded[0];
-            assert_eq!(top_doc, DocAddress(0, 4));
-            assert_eq!(topdocs_no_excluded[1].1, DocAddress(0, 3)); // ignore score of doc 3.
-            score_doc_4 = top_score;
-        }
-
-        {
-            let boolean_query_two_excluded = BooleanQuery::from(vec![
-                (Occur::Must, make_term_query("d")),
-                (Occur::MustNot, make_term_query("a")),
-                (Occur::MustNot, make_term_query("b")),
-            ]);
-            let topdocs_excluded = matching_topdocs(&boolean_query_two_excluded);
-            assert_eq!(topdocs_excluded.len(), 1);
-            let (top_score, top_doc) = topdocs_excluded[0];
-            assert_eq!(top_doc, DocAddress(0, 4));
-            assert_eq!(top_score, score_doc_4);
-        }
-    }
-
     #[test]
     pub fn test_boolean_query_with_weight() {
         let mut schema_builder = Schema::builder();
@@ -245,17 +205,17 @@ mod tests {
         let boolean_weight = boolean_query.weight(&searcher, true).unwrap();
         {
             let mut boolean_scorer = boolean_weight
-                .scorer(searcher.segment_reader(0u32), 1.0)
+                .scorer(searcher.segment_reader(0u32), 1.0f32)
                 .unwrap();
             assert_eq!(boolean_scorer.doc(), 0u32);
-            assert_nearly_equals!(boolean_scorer.score(), 0.84163445);
+            assert_nearly_equals(boolean_scorer.score(), 0.84163445f32);
         }
         {
             let mut boolean_scorer = boolean_weight
-                .scorer(searcher.segment_reader(0u32), 2.0)
+                .scorer(searcher.segment_reader(0u32), 2.0f32)
                 .unwrap();
             assert_eq!(boolean_scorer.doc(), 0u32);
-            assert_nearly_equals!(boolean_scorer.score(), 1.6832689);
+            assert_nearly_equals(boolean_scorer.score(), 1.6832689f32);
         }
     }
 
@@ -285,9 +245,170 @@ mod tests {
                 (Occur::Must, make_term_query("a")),
                 (Occur::Must, make_term_query("b")),
             ]);
-            let scores = score_docs(&boolean_query);
+            assert_eq!(score_docs(&boolean_query), vec![0.977973, 0.84699446]);
-            assert_nearly_equals!(scores[0], 0.977973);
-            assert_nearly_equals!(scores[1], 0.84699446);
         }
     }
+
+    // motivated by #554
+    #[test]
+    fn test_bm25_several_fields() {
+        let mut schema_builder = Schema::builder();
+        let title = schema_builder.add_text_field("title", TEXT);
+        let text = schema_builder.add_text_field("text", TEXT);
+        let schema = schema_builder.build();
+        let index = Index::create_in_ram(schema);
+
+        let mut index_writer = index.writer_with_num_threads(1, 3_000_000).unwrap();
+        index_writer.add_document(doc!(
+            // tf = 1 0
+            title =>  "Законы притяжения   Оксана Кулакова",
+            // tf = 1 0
+            text => "Законы притяжения Оксана Кулакова]  \n\nТема: Сексуальное искусство, Женственность\nТип товара: Запись вебинара (аудио)\nПродолжительность: 1,5 часа\n\nСсылка на вебинар:\n  ",
+        ));
+        index_writer.add_document(doc!(
+            // tf = 1 0
+            title => "Любимые русские пироги (Оксана Путан)",
+            // tf = 2 0
+            text => "http://i95.fastpic.ru/big/2017/0628/9a/615b9c8504d94a3893d7f496ac53539a.jpg \n\nОт издателя\nОксана Путан   профессиональный повар, автор кулинарных книг и известный кулинарный блогер. Ее рецепты отличаются практичностью, доступностью и пользуются огромной популярностью в русскоязычном интернете. Это третья книга автора о самом вкусном и ароматном   настоящих русских пирогах и выпечке!\nДаже новички на кухне легко готовят по ее рецептам. Оксана описывает процесс приготовления настолько подробно и понятно, что вам остается только наслаждаться готовкой и не тратить время на лишние усилия. Готовьте легко и просто!\n\nhttps://www.ozon.ru/context/detail/id/139872462/"
+        ));
+        index_writer.add_document(doc!(
+            // tf = 1 1
+            title =>  "PDF Мастер Класс \"Морячок\" (Оксана Лифенко)",
+            // tf = 0 0 
+            text => "https://i.ibb.co/pzvHrDN/I3d U T6 Gg TM.jpg\nhttps://i.ibb.co/NFrb6v6/N0ls Z9nwjb U.jpg\nВ описание входит штаны, кофта, берет, матросский воротник. Описание продается в формате PDF, состоит из 12 страниц формата А4 и может быть напечатано на любом принтере.\nОписание предназначено для кукол BJD RealPuki от FairyLand, но может подойти и другим подобным куклам. Также вы можете вязать этот наряд из обычной пряжи, и он подойдет для куколок побольше.\nhttps://vk.com/market 95724412?w=product 95724412_2212"
+        ));
+        for _ in 0..1_000 {
+            index_writer.add_document(doc!(
+                title =>  "a b d e f g",
+                text => "maitre corbeau sur un arbre perche tenait dans son bec un fromage Maitre rnard par lodeur alleche lui tint a peu pres ce langage."
+            ));
+        }
+        index_writer.commit().unwrap();
+        let reader = index.reader().unwrap();
+        let searcher = reader.searcher();
+        let query_parser = QueryParser::for_index(&index, vec![title, text]);
+        let query = query_parser.parse_query("Оксана Лифенко").unwrap();
+        let weight = query.weight(&searcher, true).unwrap();
+        let mut scorer = weight
+            .scorer(searcher.segment_reader(0u32), 1.0f32)
+            .unwrap();
+        scorer.advance();
+
+        let explanation = query.explain(&searcher, DocAddress(0u32, 0u32)).unwrap();
+        assert_eq!(
+            explanation.to_pretty_json(),
+            r#"{
+  "value": 12.997711,
+  "description": "BooleanClause. Sum of ...",
+  "details": [
+    {
+      "value": 12.997711,
+      "description": "BooleanClause. Sum of ...",
+      "details": [
+        {
+          "value": 6.551476,
+          "description": "TermQuery, product of...",
+          "details": [
+            {
+              "value": 2.2,
+              "description": "(K1+1)"
+            },
+            {
+              "value": 5.658984,
+              "description": "idf, computed as log(1 + (N - n + 0.5) / (n + 0.5))",
+              "details": [
+                {
+                  "value": 3.0,
+                  "description": "n, number of docs containing this term"
+                },
+                {
+                  "value": 1003.0,
+                  "description": "N, total number of docs"
+                }
+              ]
+            },
+            {
+              "value": 0.5262329,
+              "description": "freq / (freq + k1 * (1 - b + b * dl / avgdl))",
+              "details": [
+                {
+                  "value": 1.0,
+                  "description": "freq, occurrences of term within document"
+                },
+                {
+                  "value": 1.2,
+                  "description": "k1, term saturation parameter"
+                },
+                {
+                  "value": 0.75,
+                  "description": "b, length normalization parameter"
+                },
+                {
+                  "value": 4.0,
+                  "description": "dl, length of field"
+                },
+                {
+                  "value": 5.997009,
+                  "description": "avgdl, average length of field"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "value": 6.446235,
+          "description": "TermQuery, product of...",
+          "details": [
+            {
+              "value": 2.2,
+              "description": "(K1+1)"
+            },
+            {
+              "value": 5.9954567,
+              "description": "idf, computed as log(1 + (N - n + 0.5) / (n + 0.5))",
+              "details": [
+                {
+                  "value": 2.0,
+                  "description": "n, number of docs containing this term"
+                },
+                {
+                  "value": 1003.0,
+                  "description": "N, total number of docs"
+                }
+              ]
+            },
+            {
+              "value": 0.4887212,
+              "description": "freq / (freq + k1 * (1 - b + b * dl / avgdl))",
+              "details": [
+                {
+                  "value": 1.0,
+                  "description": "freq, occurrences of term within document"
+                },
+                {
+                  "value": 1.2,
+                  "description": "k1, term saturation parameter"
+                },
+                {
+                  "value": 0.75,
+                  "description": "b, length normalization parameter"
+                },
+                {
+                  "value": 20.0,
+                  "description": "dl, length of field"
+                },
+                {
+                  "value": 24.123629,
+                  "description": "avgdl, average length of field"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}"#
+        );
+    }
 }

src/query/boost_query.rs

@@ -1,7 +1,7 @@
 use crate::fastfield::DeleteBitSet;
 use crate::query::explanation::does_not_match;
 use crate::query::{Explanation, Query, Scorer, Weight};
-use crate::{DocId, DocSet, Score, Searcher, SegmentReader, Term};
+use crate::{DocId, DocSet, Searcher, SegmentReader, Term};
 use std::collections::BTreeSet;
 use std::fmt;
 
@@ -12,12 +12,12 @@ use std::fmt;
 /// factor.
 pub struct BoostQuery {
     query: Box<dyn Query>,
-    boost: Score,
+    boost: f32,
 }
 
 impl BoostQuery {
     /// Builds a boost query.
-    pub fn new(query: Box<dyn Query>, boost: Score) -> BoostQuery {
+    pub fn new(query: Box<dyn Query>, boost: f32) -> BoostQuery {
         BoostQuery { query, boost }
     }
 }
@@ -55,22 +55,22 @@ impl Query for BoostQuery {
 
 pub(crate) struct BoostWeight {
     weight: Box<dyn Weight>,
-    boost: Score,
+    boost: f32,
 }
 
 impl BoostWeight {
-    pub fn new(weight: Box<dyn Weight>, boost: Score) -> Self {
+    pub fn new(weight: Box<dyn Weight>, boost: f32) -> Self {
         BoostWeight { weight, boost }
     }
 }
 
 impl Weight for BoostWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> crate::Result<Box<dyn Scorer>> {
         self.weight.scorer(reader, boost * self.boost)
     }
 
     fn explain(&self, reader: &SegmentReader, doc: u32) -> crate::Result<Explanation> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         if scorer.seek(doc) != doc {
             return Err(does_not_match(doc));
         }
@@ -88,11 +88,11 @@ impl Weight for BoostWeight {
 
 pub(crate) struct BoostScorer<S: Scorer> {
     underlying: S,
-    boost: Score,
+    boost: f32,
 }
 
 impl<S: Scorer> BoostScorer<S> {
-    pub fn new(underlying: S, boost: Score) -> BoostScorer<S> {
+    pub fn new(underlying: S, boost: f32) -> BoostScorer<S> {
         BoostScorer { underlying, boost }
     }
 }
@@ -128,7 +128,7 @@ impl<S: Scorer> DocSet for BoostScorer<S> {
 }
 
 impl<S: Scorer> Scorer for BoostScorer<S> {
-    fn score(&mut self) -> Score {
+    fn score(&mut self) -> f32 {
         self.underlying.score() * self.boost
     }
 }

src/query/empty_query.rs

@@ -34,7 +34,7 @@ impl Query for EmptyQuery {
 /// It is useful for tests and handling edge cases.
 pub struct EmptyWeight;
 impl Weight for EmptyWeight {
-    fn scorer(&self, _reader: &SegmentReader, _boost: Score) -> crate::Result<Box<dyn Scorer>> {
+    fn scorer(&self, _reader: &SegmentReader, _boost: f32) -> crate::Result<Box<dyn Scorer>> {
         Ok(Box::new(EmptyScorer))
     }
 
@@ -64,7 +64,7 @@ impl DocSet for EmptyScorer {
 
 impl Scorer for EmptyScorer {
     fn score(&mut self) -> Score {
-        0.0
+        0f32
     }
 }
 

src/query/exclude.rs

@@ -3,11 +3,6 @@ use crate::query::Scorer;
 use crate::DocId;
 use crate::Score;
 
-#[inline(always)]
-fn is_within<TDocSetExclude: DocSet>(docset: &mut TDocSetExclude, doc: DocId) -> bool {
-    docset.doc() <= doc && docset.seek(doc) == doc
-}
-
 /// Filters a given `DocSet` by removing the docs from a given `DocSet`.
 ///
 /// The excluding docset has no impact on scoring.
@@ -28,7 +23,8 @@ where
     ) -> Exclude<TDocSet, TDocSetExclude> {
         while underlying_docset.doc() != TERMINATED {
             let target = underlying_docset.doc();
-            if !is_within(&mut excluding_docset, target) {
+            if excluding_docset.seek(target) != target {
+                // this document is not excluded.
                 break;
             }
             underlying_docset.advance();
@@ -40,30 +36,42 @@ where
     }
 }
 
+impl<TDocSet, TDocSetExclude> Exclude<TDocSet, TDocSetExclude>
+where
+    TDocSet: DocSet,
+    TDocSetExclude: DocSet,
+{
+    /// Returns true iff the doc is not removed.
+    ///
+    /// The method has to be called with non strictly
+    /// increasing `doc`.
+    fn accept(&mut self) -> bool {
+        let doc = self.underlying_docset.doc();
+        self.excluding_docset.seek(doc) != doc
+    }
+}
+
 impl<TDocSet, TDocSetExclude> DocSet for Exclude<TDocSet, TDocSetExclude>
 where
     TDocSet: DocSet,
     TDocSetExclude: DocSet,
 {
     fn advance(&mut self) -> DocId {
-        loop {
+        while self.underlying_docset.advance() != TERMINATED {
-            let candidate = self.underlying_docset.advance();
+            if self.accept() {
-            if candidate == TERMINATED {
+                return self.doc();
-                return TERMINATED;
-            }
-            if !is_within(&mut self.excluding_docset, candidate) {
-                return candidate;
             }
         }
+        TERMINATED
     }
 
     fn seek(&mut self, target: DocId) -> DocId {
-        let candidate = self.underlying_docset.seek(target);
+        let underlying_seek_result = self.underlying_docset.seek(target);
-        if candidate == TERMINATED {
+        if underlying_seek_result == TERMINATED {
             return TERMINATED;
         }
-        if !is_within(&mut self.excluding_docset, candidate) {
+        if self.accept() {
-            return candidate;
+            return underlying_seek_result;
         }
         self.advance()
     }
@@ -121,7 +129,7 @@ mod tests {
                     VecDocSet::from(vec![1, 2, 3, 10, 16, 24]),
                 ))
             },
-            vec![5, 8, 10, 15, 24],
+            vec![1, 2, 5, 8, 10, 15, 24],
         );
     }
 

src/query/explanation.rs

@@ -1,6 +1,5 @@
-use crate::{DocId, Score, TantivyError};
+use crate::{DocId, TantivyError};
 use serde::Serialize;
-use std::fmt;
 
 pub(crate) fn does_not_match(doc: DocId) -> TantivyError {
     TantivyError::InvalidArgument(format!("Document #({}) does not match", doc))
@@ -13,21 +12,15 @@ pub(crate) fn does_not_match(doc: DocId) -> TantivyError {
 /// representation of this tree when debugging a given score.
 #[derive(Clone, Serialize)]
 pub struct Explanation {
-    value: Score,
+    value: f32,
     description: String,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     details: Vec<Explanation>,
 }
 
-impl fmt::Debug for Explanation {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Explanation({})", self.to_pretty_json())
-    }
-}
-
 impl Explanation {
     /// Creates a new explanation object.
-    pub fn new<T: ToString>(description: T, value: Score) -> Explanation {
+    pub fn new<T: ToString>(description: T, value: f32) -> Explanation {
         Explanation {
             value,
             description: description.to_string(),
@@ -36,7 +29,7 @@ impl Explanation {
     }
 
     /// Returns the value associated to the current node.
-    pub fn value(&self) -> Score {
+    pub fn value(&self) -> f32 {
         self.value
     }
 
@@ -48,7 +41,7 @@ impl Explanation {
     }
 
     /// Shortcut for `self.details.push(Explanation::new(name, value));`
-    pub fn add_const<T: ToString>(&mut self, name: T, value: Score) {
+    pub fn add_const<T: ToString>(&mut self, name: T, value: f32) {
         self.details.push(Explanation::new(name, value));
     }
 

src/query/fuzzy_query.rs

@@ -163,10 +163,10 @@ impl Query for FuzzyTermQuery {
 #[cfg(test)]
 mod test {
     use super::FuzzyTermQuery;
-    use crate::assert_nearly_equals;
     use crate::collector::TopDocs;
     use crate::schema::Schema;
     use crate::schema::TEXT;
+    use crate::tests::assert_nearly_equals;
     use crate::Index;
     use crate::Term;
 
@@ -199,7 +199,7 @@ mod test {
                 .unwrap();
             assert_eq!(top_docs.len(), 1, "Expected only 1 document");
             let (score, _) = top_docs[0];
-            assert_nearly_equals!(1.0, score);
+            assert_nearly_equals(1f32, score);
         }
 
         // fails because non-prefix Levenshtein distance is more than 1 (add 'a' and 'n')
@@ -223,7 +223,7 @@ mod test {
                 .unwrap();
             assert_eq!(top_docs.len(), 1, "Expected only 1 document");
             let (score, _) = top_docs[0];
-            assert_nearly_equals!(1.0, score);
+            assert_nearly_equals(1f32, score);
         }
     }
 }

src/query/intersection.rs

@@ -53,8 +53,7 @@ pub struct Intersection<TDocSet: DocSet, TOtherDocSet: DocSet = Box<dyn Scorer>>
 }
 
 fn go_to_first_doc<TDocSet: DocSet>(docsets: &mut [TDocSet]) -> DocId {
-    assert!(!docsets.is_empty());
+    let mut candidate = 0;
-    let mut candidate = docsets.iter().map(TDocSet::doc).max().unwrap();
     'outer: loop {
         for docset in docsets.iter_mut() {
             let seek_doc = docset.seek(candidate);
@@ -119,9 +118,7 @@ impl<TDocSet: DocSet, TOtherDocSet: DocSet> DocSet for Intersection<TDocSet, TOt
                     continue 'outer;
                 }
             }
-            debug_assert_eq!(candidate, self.left.doc());
+
-            debug_assert_eq!(candidate, self.right.doc());
-            debug_assert!(self.others.iter().all(|docset| docset.doc() == candidate));
             return candidate;
         }
     }
@@ -132,10 +129,7 @@ impl<TDocSet: DocSet, TOtherDocSet: DocSet> DocSet for Intersection<TDocSet, TOt
         for docset in &mut self.others {
             docsets.push(docset);
         }
-        let doc = go_to_first_doc(&mut docsets[..]);
+        go_to_first_doc(&mut docsets[..])
-        debug_assert!(docsets.iter().all(|docset| docset.doc() == doc));
-        debug_assert!(doc >= target);
-        doc
     }
 
     fn doc(&self) -> DocId {

src/query/mod.rs

@@ -26,7 +26,6 @@ mod weight;
 mod vec_docset;
 
 pub(crate) mod score_combiner;
-pub(crate) use self::bm25::BM25Weight;
 pub use self::intersection::Intersection;
 pub use self::union::Union;
 

src/query/phrase_query/mod.rs

@@ -10,13 +10,12 @@ pub use self::phrase_weight::PhraseWeight;
 pub mod tests {
 
     use super::*;
-    use crate::assert_nearly_equals;
     use crate::collector::tests::{TEST_COLLECTOR_WITHOUT_SCORE, TEST_COLLECTOR_WITH_SCORE};
     use crate::core::Index;
-    use crate::query::Weight;
     use crate::schema::{Schema, Term, TEXT};
+    use crate::tests::assert_nearly_equals;
+    use crate::DocAddress;
     use crate::DocId;
-    use crate::{DocAddress, TERMINATED};
 
     pub fn create_index(texts: &[&'static str]) -> Index {
         let mut schema_builder = Schema::builder();
@@ -68,23 +67,6 @@ pub mod tests {
         assert!(test_query(vec!["g", "a"]).is_empty());
     }
 
-    #[test]
-    pub fn test_phrase_query_simple() -> crate::Result<()> {
-        let index = create_index(&["a b b d c g c", "a b a b c"]);
-        let text_field = index.schema().get_field("text").unwrap();
-        let searcher = index.reader()?.searcher();
-        let terms: Vec<Term> = vec!["a", "b", "c"]
-            .iter()
-            .map(|text| Term::from_field_text(text_field, text))
-            .collect();
-        let phrase_query = PhraseQuery::new(terms);
-        let phrase_weight = phrase_query.phrase_weight(&searcher, false)?;
-        let mut phrase_scorer = phrase_weight.scorer(searcher.segment_reader(0), 1.0)?;
-        assert_eq!(phrase_scorer.doc(), 1);
-        assert_eq!(phrase_scorer.advance(), TERMINATED);
-        Ok(())
-    }
-
     #[test]
     pub fn test_phrase_query_no_score() {
         let index = create_index(&[
@@ -175,8 +157,8 @@ pub mod tests {
                 .to_vec()
         };
         let scores = test_query(vec!["a", "b"]);
-        assert_nearly_equals!(scores[0], 0.40618482);
+        assert_nearly_equals(scores[0], 0.40618482);
-        assert_nearly_equals!(scores[1], 0.46844664);
+        assert_nearly_equals(scores[1], 0.46844664);
     }
 
     #[test] // motivated by #234

src/query/phrase_query/phrase_scorer.rs

@@ -3,7 +3,7 @@ use crate::fieldnorm::FieldNormReader;
 use crate::postings::Postings;
 use crate::query::bm25::BM25Weight;
 use crate::query::{Intersection, Scorer};
-use crate::{DocId, Score};
+use crate::DocId;
 use std::cmp::Ordering;
 
 struct PostingsWithOffset<TPostings> {
@@ -239,7 +239,6 @@ impl<TPostings: Postings> DocSet for PhraseScorer<TPostings> {
     }
 
     fn seek(&mut self, target: DocId) -> DocId {
-        debug_assert!(target >= self.doc());
         let doc = self.intersection_docset.seek(target);
         if doc == TERMINATED || self.phrase_match() {
             return doc;
@@ -257,7 +256,7 @@ impl<TPostings: Postings> DocSet for PhraseScorer<TPostings> {
 }
 
 impl<TPostings: Postings> Scorer for PhraseScorer<TPostings> {
-    fn score(&mut self) -> Score {
+    fn score(&mut self) -> f32 {
         let doc = self.doc();
         let fieldnorm_id = self.fieldnorm_reader.fieldnorm_id(doc);
         self.similarity_weight
@@ -267,6 +266,7 @@ impl<TPostings: Postings> Scorer for PhraseScorer<TPostings> {
 
 #[cfg(test)]
 mod tests {
+
     use super::{intersection, intersection_count};
 
     fn test_intersection_sym(left: &[u32], right: &[u32], expected: &[u32]) {

src/query/phrase_query/phrase_weight.rs

@@ -9,8 +9,8 @@ use crate::query::Weight;
 use crate::query::{EmptyScorer, Explanation};
 use crate::schema::IndexRecordOption;
 use crate::schema::Term;
+use crate::Result;
 use crate::{DocId, DocSet};
-use crate::{Result, Score};
 
 pub struct PhraseWeight {
     phrase_terms: Vec<(usize, Term)>,
@@ -40,7 +40,7 @@ impl PhraseWeight {
     fn phrase_scorer(
         &self,
         reader: &SegmentReader,
-        boost: Score,
+        boost: f32,
     ) -> Result<Option<PhraseScorer<SegmentPostings>>> {
         let similarity_weight = self.similarity_weight.boost_by(boost);
         let fieldnorm_reader = self.fieldnorm_reader(reader);
@@ -85,7 +85,7 @@ impl PhraseWeight {
 }
 
 impl Weight for PhraseWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> Result<Box<dyn Scorer>> {
         if let Some(scorer) = self.phrase_scorer(reader, boost)? {
             Ok(Box::new(scorer))
         } else {
@@ -94,7 +94,7 @@ impl Weight for PhraseWeight {
     }
 
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> Result<Explanation> {
-        let scorer_opt = self.phrase_scorer(reader, 1.0)?;
+        let scorer_opt = self.phrase_scorer(reader, 1.0f32)?;
         if scorer_opt.is_none() {
             return Err(does_not_match(doc));
         }
@@ -130,7 +130,7 @@ mod tests {
         ]);
         let phrase_weight = phrase_query.phrase_weight(&searcher, true).unwrap();
         let mut phrase_scorer = phrase_weight
-            .phrase_scorer(searcher.segment_reader(0u32), 1.0)
+            .phrase_scorer(searcher.segment_reader(0u32), 1.0f32)
             .unwrap()
             .unwrap();
         assert_eq!(phrase_scorer.doc(), 1);

src/query/query_parser/logical_ast.rs

@@ -2,7 +2,6 @@ use crate::query::Occur;
 use crate::schema::Field;
 use crate::schema::Term;
 use crate::schema::Type;
-use crate::Score;
 use std::fmt;
 use std::ops::Bound;
 
@@ -22,12 +21,12 @@ pub enum LogicalLiteral {
 pub enum LogicalAST {
     Clause(Vec<(Occur, LogicalAST)>),
     Leaf(Box<LogicalLiteral>),
-    Boost(Box<LogicalAST>, Score),
+    Boost(Box<LogicalAST>, f32),
 }
 
 impl LogicalAST {
-    pub fn boost(self, boost: Score) -> LogicalAST {
+    pub fn boost(self, boost: f32) -> LogicalAST {
-        if (boost - 1.0).abs() < Score::EPSILON {
+        if (boost - 1.0f32).abs() < std::f32::EPSILON {
             self
         } else {
             LogicalAST::Boost(Box::new(self), boost)

src/query/query_parser/query_parser.rs

@@ -12,7 +12,6 @@ use crate::schema::{Facet, IndexRecordOption};
 use crate::schema::{Field, Schema};
 use crate::schema::{FieldType, Term};
 use crate::tokenizer::TokenizerManager;
-use crate::Score;
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::num::{ParseFloatError, ParseIntError};
@@ -114,7 +113,7 @@ fn trim_ast(logical_ast: LogicalAST) -> Option<LogicalAST> {
 /// The language covered by the current parser is extremely simple.
 ///
 /// * simple terms: "e.g.: `Barack Obama` are simply tokenized using
-///   tantivy's [`SimpleTokenizer`](../tokenizer/struct.SimpleTokenizer.html), hence
+///   tantivy's [`SimpleTokenizer`](tantivy::tokenizer::SimpleTokenizer), hence
 ///   becoming `["barack", "obama"]`. The terms are then searched within
 ///   the default terms of the query parser.
 ///
@@ -173,7 +172,7 @@ pub struct QueryParser {
     default_fields: Vec<Field>,
     conjunction_by_default: bool,
     tokenizer_manager: TokenizerManager,
-    boost: HashMap<Field, Score>,
+    boost: HashMap<Field, f32>,
 }
 
 fn all_negative(ast: &LogicalAST) -> bool {
@@ -229,7 +228,7 @@ impl QueryParser {
     /// If the query defines a query boost through the query language (e.g: `country:France^3.0`),
     /// the two boosts (the one defined in the query, and the one defined in the `QueryParser`)
     /// are multiplied together.
-    pub fn set_field_boost(&mut self, field: Field, boost: Score) {
+    pub fn set_field_boost(&mut self, field: Field, boost: f32) {
         self.boost.insert(field, boost);
     }
 
@@ -441,14 +440,14 @@ impl QueryParser {
             }
             UserInputAST::Boost(ast, boost) => {
                 let ast = self.compute_logical_ast_with_occur(*ast)?;
-                Ok(ast.boost(boost as Score))
+                Ok(ast.boost(boost))
             }
             UserInputAST::Leaf(leaf) => self.compute_logical_ast_from_leaf(*leaf),
         }
     }
 
-    fn field_boost(&self, field: Field) -> Score {
+    fn field_boost(&self, field: Field) -> f32 {
-        self.boost.get(&field).cloned().unwrap_or(1.0)
+        self.boost.get(&field).cloned().unwrap_or(1.0f32)
     }
 
     fn compute_logical_ast_from_leaf(
@@ -659,7 +658,7 @@ mod test {
         let mut query_parser = make_query_parser();
         let schema = make_schema();
         let text_field = schema.get_field("text").unwrap();
-        query_parser.set_field_boost(text_field, 2.0);
+        query_parser.set_field_boost(text_field, 2.0f32);
         let query = query_parser.parse_query("text:hello").unwrap();
         assert_eq!(
             format!("{:?}", query),
@@ -672,7 +671,7 @@ mod test {
         let mut query_parser = make_query_parser();
         let schema = make_schema();
         let title_field = schema.get_field("title").unwrap();
-        query_parser.set_field_boost(title_field, 2.0);
+        query_parser.set_field_boost(title_field, 2.0f32);
         let query = query_parser.parse_query("title:[A TO B]").unwrap();
         assert_eq!(
             format!("{:?}", query),
@@ -685,7 +684,7 @@ mod test {
         let mut query_parser = make_query_parser();
         let schema = make_schema();
         let text_field = schema.get_field("text").unwrap();
-        query_parser.set_field_boost(text_field, 2.0);
+        query_parser.set_field_boost(text_field, 2.0f32);
         let query = query_parser.parse_query("text:hello^2").unwrap();
         assert_eq!(
             format!("{:?}", query),

src/query/range_query.rs

@@ -9,8 +9,8 @@ use crate::query::{Query, Scorer, Weight};
 use crate::schema::Type;
 use crate::schema::{Field, IndexRecordOption, Term};
 use crate::termdict::{TermDictionary, TermStreamer};
+use crate::DocId;
 use crate::Result;
-use crate::{DocId, Score};
 use std::collections::Bound;
 use std::ops::Range;
 
@@ -289,7 +289,7 @@ impl RangeWeight {
 }
 
 impl Weight for RangeWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> Result<Box<dyn Scorer>> {
         let max_doc = reader.max_doc();
         let mut doc_bitset = BitSet::with_max_value(max_doc);
 
@@ -301,14 +301,12 @@ impl Weight for RangeWeight {
             let mut block_segment_postings = inverted_index
                 .read_block_postings_from_terminfo(term_info, IndexRecordOption::Basic);
             loop {
-                let docs = block_segment_postings.docs();
-                if docs.is_empty() {
-                    break;
-                }
                 for &doc in block_segment_postings.docs() {
                     doc_bitset.insert(doc);
                 }
-                block_segment_postings.advance();
+                if !block_segment_postings.advance() {
+                    break;
+                }
             }
         }
         let doc_bitset = BitSetDocSet::from(doc_bitset);
@@ -316,11 +314,11 @@ impl Weight for RangeWeight {
     }
 
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> Result<Explanation> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         if scorer.seek(doc) != doc {
             return Err(does_not_match(doc));
         }
-        Ok(Explanation::new("RangeQuery", 1.0))
+        Ok(Explanation::new("RangeQuery", 1.0f32))
     }
 }
 
@@ -328,9 +326,8 @@ impl Weight for RangeWeight {
 mod tests {
 
     use super::RangeQuery;
-    use crate::collector::{Count, TopDocs};
+    use crate::collector::Count;
-    use crate::query::QueryParser;
+    use crate::schema::{Document, Field, Schema, INDEXED};
-    use crate::schema::{Document, Field, Schema, INDEXED, TEXT};
     use crate::Index;
     use std::collections::Bound;
 
@@ -477,28 +474,4 @@ mod tests {
             91
         );
     }
-
-    #[test]
-    fn test_bug_reproduce_range_query() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        schema_builder.add_text_field("title", TEXT);
-        schema_builder.add_i64_field("year", INDEXED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema.clone());
-        let mut index_writer = index.writer_with_num_threads(1, 10_000_000)?;
-        let title = schema.get_field("title").unwrap();
-        let year = schema.get_field("year").unwrap();
-        index_writer.add_document(doc!(
-          title => "hemoglobin blood",
-          year => 1990 as i64
-        ));
-        index_writer.commit()?;
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let query_parser = QueryParser::for_index(&index, vec![title]);
-        let query = query_parser.parse_query("hemoglobin AND year:[1970 TO 1990]")?;
-        let top_docs = searcher.search(&query, &TopDocs::with_limit(10))?;
-        assert_eq!(top_docs.len(), 1);
-        Ok(())
-    }
 }

src/query/regex_query.rs

@@ -89,10 +89,10 @@ impl Query for RegexQuery {
 #[cfg(test)]
 mod test {
     use super::RegexQuery;
-    use crate::assert_nearly_equals;
     use crate::collector::TopDocs;
     use crate::schema::TEXT;
     use crate::schema::{Field, Schema};
+    use crate::tests::assert_nearly_equals;
     use crate::{Index, IndexReader};
     use std::sync::Arc;
     use tantivy_fst::Regex;
@@ -129,7 +129,7 @@ mod test {
                 .unwrap();
             assert_eq!(scored_docs.len(), 1, "Expected only 1 document");
             let (score, _) = scored_docs[0];
-            assert_nearly_equals!(1.0, score);
+            assert_nearly_equals(1f32, score);
         }
         let top_docs = searcher
             .search(&query_matching_zero, &TopDocs::with_limit(2))

src/query/reqopt_scorer.rs

@@ -72,7 +72,7 @@ where
         let doc = self.doc();
         let mut score_combiner = TScoreCombiner::default();
         score_combiner.update(&mut self.req_scorer);
-        if self.opt_scorer.doc() <= doc && self.opt_scorer.seek(doc) == doc {
+        if self.opt_scorer.seek(doc) == doc {
             score_combiner.update(&mut self.opt_scorer);
         }
         let score = score_combiner.score();
@@ -112,47 +112,47 @@ mod tests {
     fn test_reqopt_scorer() {
         let mut reqoptscorer: RequiredOptionalScorer<_, _, SumCombiner> =
             RequiredOptionalScorer::new(
-                ConstScorer::new(VecDocSet::from(vec![1, 3, 7, 8, 9, 10, 13, 15]), 1.0),
+                ConstScorer::new(VecDocSet::from(vec![1, 3, 7, 8, 9, 10, 13, 15]), 1.0f32),
-                ConstScorer::new(VecDocSet::from(vec![1, 2, 7, 11, 12, 15]), 1.0),
+                ConstScorer::new(VecDocSet::from(vec![1, 2, 7, 11, 12, 15]), 1.0f32),
             );
         {
             assert_eq!(reqoptscorer.doc(), 1);
-            assert_eq!(reqoptscorer.score(), 2.0);
+            assert_eq!(reqoptscorer.score(), 2f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 3);
             assert_eq!(reqoptscorer.doc(), 3);
-            assert_eq!(reqoptscorer.score(), 1.0);
+            assert_eq!(reqoptscorer.score(), 1f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 7);
             assert_eq!(reqoptscorer.doc(), 7);
-            assert_eq!(reqoptscorer.score(), 2.0);
+            assert_eq!(reqoptscorer.score(), 2f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 8);
             assert_eq!(reqoptscorer.doc(), 8);
-            assert_eq!(reqoptscorer.score(), 1.0);
+            assert_eq!(reqoptscorer.score(), 1f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 9);
             assert_eq!(reqoptscorer.doc(), 9);
-            assert_eq!(reqoptscorer.score(), 1.0);
+            assert_eq!(reqoptscorer.score(), 1f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 10);
             assert_eq!(reqoptscorer.doc(), 10);
-            assert_eq!(reqoptscorer.score(), 1.0);
+            assert_eq!(reqoptscorer.score(), 1f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 13);
             assert_eq!(reqoptscorer.doc(), 13);
-            assert_eq!(reqoptscorer.score(), 1.0);
+            assert_eq!(reqoptscorer.score(), 1f32);
         }
         {
             assert_eq!(reqoptscorer.advance(), 15);
             assert_eq!(reqoptscorer.doc(), 15);
-            assert_eq!(reqoptscorer.score(), 2.0);
+            assert_eq!(reqoptscorer.score(), 2f32);
         }
         assert_eq!(reqoptscorer.advance(), TERMINATED);
     }

src/query/score_combiner.rs

@@ -31,7 +31,7 @@ impl ScoreCombiner for DoNothingCombiner {
     fn clear(&mut self) {}
 
     fn score(&self) -> Score {
-        1.0
+        1f32
     }
 }
 
@@ -47,7 +47,7 @@ impl ScoreCombiner for SumCombiner {
     }
 
     fn clear(&mut self) {
-        self.score = 0.0;
+        self.score = 0f32;
     }
 
     fn score(&self) -> Score {
@@ -70,7 +70,7 @@ impl ScoreCombiner for SumWithCoordsCombiner {
     }
 
     fn clear(&mut self) {
-        self.score = 0.0;
+        self.score = 0f32;
         self.num_fields = 0;
     }
 

src/query/scorer.rs

@@ -35,14 +35,14 @@ pub struct ConstScorer<TDocSet: DocSet> {
 
 impl<TDocSet: DocSet> ConstScorer<TDocSet> {
     /// Creates a new `ConstScorer`.
-    pub fn new(docset: TDocSet, score: Score) -> ConstScorer<TDocSet> {
+    pub fn new(docset: TDocSet, score: f32) -> ConstScorer<TDocSet> {
         ConstScorer { docset, score }
     }
 }
 
 impl<TDocSet: DocSet> From<TDocSet> for ConstScorer<TDocSet> {
     fn from(docset: TDocSet) -> Self {
-        ConstScorer::new(docset, 1.0)
+        ConstScorer::new(docset, 1.0f32)
     }
 }
 

src/query/term_query/mod.rs

@@ -9,13 +9,13 @@ pub use self::term_weight::TermWeight;
 #[cfg(test)]
 mod tests {
 
-    use crate::assert_nearly_equals;
     use crate::collector::TopDocs;
     use crate::docset::DocSet;
-    use crate::postings::compression::COMPRESSION_BLOCK_SIZE;
     use crate::query::{Query, QueryParser, Scorer, TermQuery};
     use crate::schema::{Field, IndexRecordOption, Schema, STRING, TEXT};
-    use crate::{Index, Term, TERMINATED};
+    use crate::tests::assert_nearly_equals;
+    use crate::Index;
+    use crate::Term;
 
     #[test]
     pub fn test_term_query_no_freq() {
@@ -37,44 +37,9 @@ mod tests {
         );
         let term_weight = term_query.weight(&searcher, true).unwrap();
         let segment_reader = searcher.segment_reader(0);
-        let mut term_scorer = term_weight.scorer(segment_reader, 1.0).unwrap();
+        let mut term_scorer = term_weight.scorer(segment_reader, 1.0f32).unwrap();
         assert_eq!(term_scorer.doc(), 0);
-        assert_nearly_equals!(term_scorer.score(), 0.28768212);
+        assert_eq!(term_scorer.score(), 0.28768212);
-    }
-
-    #[test]
-    pub fn test_term_query_multiple_of_block_len() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let text_field = schema_builder.add_text_field("text", STRING);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        {
-            // writing the segment
-            let mut index_writer = index.writer_with_num_threads(1, 3_000_000)?;
-            for _ in 0..COMPRESSION_BLOCK_SIZE {
-                let doc = doc!(text_field => "a");
-                index_writer.add_document(doc);
-            }
-            index_writer.commit()?;
-        }
-        let searcher = index.reader()?.searcher();
-        let term_query = TermQuery::new(
-            Term::from_field_text(text_field, "a"),
-            IndexRecordOption::Basic,
-        );
-        let term_weight = term_query.weight(&searcher, true)?;
-        let segment_reader = searcher.segment_reader(0);
-        let mut term_scorer = term_weight.scorer(segment_reader, 1.0)?;
-        for i in 0u32..COMPRESSION_BLOCK_SIZE as u32 {
-            assert_eq!(term_scorer.doc(), i);
-            if i == COMPRESSION_BLOCK_SIZE as u32 - 1u32 {
-                assert_eq!(term_scorer.advance(), TERMINATED);
-            } else {
-                assert_eq!(term_scorer.advance(), i + 1);
-            }
-        }
-        assert_eq!(term_scorer.doc(), TERMINATED);
-        Ok(())
     }
 
     #[test]
@@ -104,7 +69,7 @@ mod tests {
                 .unwrap();
             assert_eq!(topdocs.len(), 1);
             let (score, _) = topdocs[0];
-            assert_nearly_equals!(0.77802235, score);
+            assert_nearly_equals(0.77802235, score);
         }
         {
             let term = Term::from_field_text(left_field, "left1");
@@ -114,9 +79,9 @@ mod tests {
                 .unwrap();
             assert_eq!(top_docs.len(), 2);
             let (score1, _) = top_docs[0];
-            assert_nearly_equals!(0.27101856, score1);
+            assert_nearly_equals(0.27101856, score1);
             let (score2, _) = top_docs[1];
-            assert_nearly_equals!(0.13736556, score2);
+            assert_nearly_equals(0.13736556, score2);
         }
         {
             let query_parser = QueryParser::for_index(&index, vec![]);
@@ -124,9 +89,9 @@ mod tests {
             let top_docs = searcher.search(&query, &TopDocs::with_limit(2)).unwrap();
             assert_eq!(top_docs.len(), 2);
             let (score1, _) = top_docs[0];
-            assert_nearly_equals!(0.9153879, score1);
+            assert_nearly_equals(0.9153879, score1);
             let (score2, _) = top_docs[1];
-            assert_nearly_equals!(0.27101856, score2);
+            assert_nearly_equals(0.27101856, score2);
         }
     }
 
@@ -147,27 +112,6 @@ mod tests {
         assert_eq!(term_query.count(&*reader.searcher()).unwrap(), 1);
     }
 
-    #[test]
-    fn test_term_query_simple_seek() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let text_field = schema_builder.add_text_field("text", TEXT);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_with_num_threads(1, 3_000_000).unwrap();
-        index_writer.add_document(doc!(text_field=>"a"));
-        index_writer.add_document(doc!(text_field=>"a"));
-        index_writer.commit()?;
-        let term_a = Term::from_field_text(text_field, "a");
-        let term_query = TermQuery::new(term_a, IndexRecordOption::Basic);
-        let searcher = index.reader()?.searcher();
-        let term_weight = term_query.weight(&searcher, false)?;
-        let mut term_scorer = term_weight.scorer(searcher.segment_reader(0u32), 1.0)?;
-        assert_eq!(term_scorer.doc(), 0u32);
-        term_scorer.seek(1u32);
-        assert_eq!(term_scorer.doc(), 1u32);
-        Ok(())
-    }
-
     #[test]
     fn test_term_query_debug() {
         let term_query = TermQuery::new(

src/query/term_query/term_scorer.rs

@@ -4,11 +4,10 @@ use crate::DocId;
 use crate::Score;
 
 use crate::fieldnorm::FieldNormReader;
+use crate::postings::Postings;
 use crate::postings::SegmentPostings;
-use crate::postings::{FreqReadingOption, Postings};
 use crate::query::bm25::BM25Weight;
 
-#[derive(Clone)]
 pub struct TermScorer {
     postings: SegmentPostings,
     fieldnorm_reader: FieldNormReader,
@@ -27,56 +26,9 @@ impl TermScorer {
             similarity_weight,
         }
     }
+}
 
-    pub(crate) fn shallow_seek(&mut self, target_doc: DocId) {
+impl TermScorer {
-        self.postings.block_cursor.shallow_seek(target_doc);
-    }
-
-    #[cfg(test)]
-    pub fn create_for_test(
-        doc_and_tfs: &[(DocId, u32)],
-        fieldnorms: &[u32],
-        similarity_weight: BM25Weight,
-    ) -> TermScorer {
-        assert!(!doc_and_tfs.is_empty());
-        assert!(
-            doc_and_tfs
-                .iter()
-                .map(|(doc, _tf)| *doc)
-                .max()
-                .unwrap_or(0u32)
-                < fieldnorms.len() as u32
-        );
-        let segment_postings =
-            SegmentPostings::create_from_docs_and_tfs(doc_and_tfs, Some(fieldnorms));
-        let fieldnorm_reader = FieldNormReader::for_test(fieldnorms);
-        TermScorer::new(segment_postings, fieldnorm_reader, similarity_weight)
-    }
-
-    /// See `FreqReadingOption`.
-    pub(crate) fn freq_reading_option(&self) -> FreqReadingOption {
-        self.postings.block_cursor.freq_reading_option()
-    }
-
-    /// Returns the maximum score for the current block.
-    ///
-    /// In some rare case, the result may not be exact. In this case a lower value is returned,
-    /// (and may lead us to return a lesser document).
-    ///
-    /// At index time, we store the (fieldnorm_id, term frequency) pair that maximizes the
-    /// score assuming the average fieldnorm computed on this segment.
-    ///
-    /// Though extremely rare, it is theoretically possible that the actual average fieldnorm
-    /// is different enough from the current segment average fieldnorm that the maximum over a
-    /// specific is achieved on a different document.
-    ///
-    /// (The result is on the other hand guaranteed to be correct if there is only one segment).
-    pub fn block_max_score(&mut self) -> Score {
-        self.postings
-            .block_cursor
-            .block_max_score(&self.fieldnorm_reader, &self.similarity_weight)
-    }
-
     pub fn term_freq(&self) -> u32 {
         self.postings.term_freq()
     }
@@ -90,14 +42,6 @@ impl TermScorer {
         let term_freq = self.term_freq();
         self.similarity_weight.explain(fieldnorm_id, term_freq)
     }
-
-    pub fn max_score(&self) -> Score {
-        self.similarity_weight.max_score()
-    }
-
-    pub fn last_doc_in_block(&self) -> DocId {
-        self.postings.block_cursor.skip_reader.last_doc_in_block()
-    }
 }
 
 impl DocSet for TermScorer {
@@ -125,213 +69,3 @@ impl Scorer for TermScorer {
         self.similarity_weight.score(fieldnorm_id, term_freq)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::merge_policy::NoMergePolicy;
-    use crate::postings::compression::COMPRESSION_BLOCK_SIZE;
-    use crate::query::term_query::TermScorer;
-    use crate::query::{BM25Weight, Scorer, TermQuery};
-    use crate::schema::{IndexRecordOption, Schema, TEXT};
-    use crate::Score;
-    use crate::{assert_nearly_equals, Index, Searcher, SegmentId, Term};
-    use crate::{DocId, DocSet, TERMINATED};
-    use futures::executor::block_on;
-    use proptest::prelude::*;
-
-    #[test]
-    fn test_term_scorer_max_score() -> crate::Result<()> {
-        let bm25_weight = BM25Weight::for_one_term(3, 6, 10.0);
-        let mut term_scorer = TermScorer::create_for_test(
-            &[(2, 3), (3, 12), (7, 8)],
-            &[0, 0, 10, 12, 0, 0, 0, 100],
-            bm25_weight,
-        );
-        let max_scorer = term_scorer.max_score();
-        crate::assert_nearly_equals!(max_scorer, 1.3990127);
-        assert_eq!(term_scorer.doc(), 2);
-        assert_eq!(term_scorer.term_freq(), 3);
-        assert_nearly_equals!(term_scorer.block_max_score(), 1.3676447);
-        assert_nearly_equals!(term_scorer.score(), 1.0892314);
-        assert_eq!(term_scorer.advance(), 3);
-        assert_eq!(term_scorer.doc(), 3);
-        assert_eq!(term_scorer.term_freq(), 12);
-        assert_nearly_equals!(term_scorer.score(), 1.3676447);
-        assert_eq!(term_scorer.advance(), 7);
-        assert_eq!(term_scorer.doc(), 7);
-        assert_eq!(term_scorer.term_freq(), 8);
-        assert_nearly_equals!(term_scorer.score(), 0.72015285);
-        assert_eq!(term_scorer.advance(), TERMINATED);
-        Ok(())
-    }
-
-    #[test]
-    fn test_term_scorer_shallow_advance() -> crate::Result<()> {
-        let bm25_weight = BM25Weight::for_one_term(300, 1024, 10.0);
-        let mut doc_and_tfs = vec![];
-        for i in 0u32..300u32 {
-            let doc = i * 10;
-            doc_and_tfs.push((doc, 1u32 + doc % 3u32));
-        }
-        let fieldnorms: Vec<u32> = std::iter::repeat(10u32).take(3_000).collect();
-        let mut term_scorer = TermScorer::create_for_test(&doc_and_tfs, &fieldnorms, bm25_weight);
-        assert_eq!(term_scorer.doc(), 0u32);
-        term_scorer.shallow_seek(1289);
-        assert_eq!(term_scorer.doc(), 0u32);
-        term_scorer.seek(1289);
-        assert_eq!(term_scorer.doc(), 1290);
-        Ok(())
-    }
-
-    proptest! {
-        #[test]
-        fn test_term_scorer_block_max_score(term_freqs_fieldnorms in proptest::collection::vec((1u32..10u32, 0u32..100u32), 80..300)) {
-        let term_doc_freq = term_freqs_fieldnorms.len();
-         let doc_tfs: Vec<(u32, u32)> = term_freqs_fieldnorms.iter()
-                   .cloned()
-                  .enumerate()
-                  .map(|(doc, (tf, _))| (doc as u32, tf))
-                  .collect();
-
-         let mut fieldnorms: Vec<u32> = vec![];
-         for i in 0..term_doc_freq {
-             let (tf, num_extra_terms) = term_freqs_fieldnorms[i];
-             fieldnorms.push(tf + num_extra_terms);
-         }
-         let average_fieldnorm = fieldnorms
-             .iter()
-             .cloned()
-             .sum::<u32>() as Score / term_doc_freq as Score;
-             // Average fieldnorm is over the entire index,
-             // not necessarily the docs that are in the posting list.
-             // For this reason we multiply by 1.1 to make a realistic value.
-         let bm25_weight = BM25Weight::for_one_term(term_doc_freq as u64,
-            term_doc_freq as u64 * 10u64,
-            average_fieldnorm);
-
-         let mut term_scorer =
-              TermScorer::create_for_test(&doc_tfs[..], &fieldnorms[..], bm25_weight);
-
-         let docs: Vec<DocId> = (0..term_doc_freq).map(|doc| doc as DocId).collect();
-         for block in docs.chunks(COMPRESSION_BLOCK_SIZE) {
-             let block_max_score: Score = term_scorer.block_max_score();
-             let mut block_max_score_computed: Score = 0.0;
-             for &doc in block {
-                assert_eq!(term_scorer.doc(), doc);
-                block_max_score_computed = block_max_score_computed.max(term_scorer.score());
-                term_scorer.advance();
-             }
-             assert_nearly_equals!(block_max_score_computed, block_max_score);
-         }
-        }
-    }
-
-    #[test]
-    fn test_block_wand() {
-        let mut doc_tfs: Vec<(u32, u32)> = vec![];
-        for doc in 0u32..128u32 {
-            doc_tfs.push((doc, 1u32));
-        }
-        for doc in 128u32..256u32 {
-            doc_tfs.push((doc, if doc == 200 { 2u32 } else { 1u32 }));
-        }
-        doc_tfs.push((256, 1u32));
-        doc_tfs.push((257, 3u32));
-        doc_tfs.push((258, 1u32));
-
-        let fieldnorms: Vec<u32> = std::iter::repeat(20u32).take(300).collect();
-        let bm25_weight = BM25Weight::for_one_term(10, 129, 20.0);
-        let mut docs = TermScorer::create_for_test(&doc_tfs[..], &fieldnorms[..], bm25_weight);
-        assert_nearly_equals!(docs.block_max_score(), 2.5161593);
-        docs.shallow_seek(135);
-        assert_nearly_equals!(docs.block_max_score(), 3.4597192);
-        docs.shallow_seek(256);
-        // the block is not loaded yet.
-        assert_nearly_equals!(docs.block_max_score(), 5.2971773);
-        assert_eq!(256, docs.seek(256));
-        assert_nearly_equals!(docs.block_max_score(), 3.9539647);
-    }
-
-    fn test_block_wand_aux(term_query: &TermQuery, searcher: &Searcher) -> crate::Result<()> {
-        let term_weight = term_query.specialized_weight(&searcher, true);
-        for reader in searcher.segment_readers() {
-            let mut block_max_scores = vec![];
-            let mut block_max_scores_b = vec![];
-            let mut docs = vec![];
-            {
-                let mut term_scorer = term_weight.specialized_scorer(reader, 1.0)?;
-                while term_scorer.doc() != TERMINATED {
-                    let mut score = term_scorer.score();
-                    docs.push(term_scorer.doc());
-                    for _ in 0..128 {
-                        score = score.max(term_scorer.score());
-                        if term_scorer.advance() == TERMINATED {
-                            break;
-                        }
-                    }
-                    block_max_scores.push(score);
-                }
-            }
-            {
-                let mut term_scorer = term_weight.specialized_scorer(reader, 1.0)?;
-                for d in docs {
-                    term_scorer.shallow_seek(d);
-                    block_max_scores_b.push(term_scorer.block_max_score());
-                }
-            }
-            for (l, r) in block_max_scores
-                .iter()
-                .cloned()
-                .zip(block_max_scores_b.iter().cloned())
-            {
-                assert_nearly_equals!(l, r);
-            }
-        }
-        Ok(())
-    }
-
-    #[ignore]
-    #[test]
-    fn test_block_wand_long_test() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let text_field = schema_builder.add_text_field("text", TEXT);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut writer = index.writer_with_num_threads(3, 30_000_000)?;
-        use rand::Rng;
-        let mut rng = rand::thread_rng();
-        writer.set_merge_policy(Box::new(NoMergePolicy));
-        for _ in 0..3_000 {
-            let term_freq = rng.gen_range(1, 10000);
-            let words: Vec<&str> = std::iter::repeat("bbbb").take(term_freq).collect();
-            let text = words.join(" ");
-            writer.add_document(doc!(text_field=>text));
-        }
-        writer.commit()?;
-        let term_query = TermQuery::new(
-            Term::from_field_text(text_field, &"bbbb"),
-            IndexRecordOption::WithFreqs,
-        );
-        let segment_ids: Vec<SegmentId>;
-        let reader = index.reader()?;
-        {
-            let searcher = reader.searcher();
-            segment_ids = searcher
-                .segment_readers()
-                .iter()
-                .map(|segment| segment.segment_id())
-                .collect();
-            test_block_wand_aux(&term_query, &searcher)?;
-        }
-        {
-            let _ = block_on(writer.merge(&segment_ids[..]));
-        }
-        {
-            reader.reload()?;
-            let searcher = reader.searcher();
-            assert_eq!(searcher.segment_readers().len(), 1);
-            test_block_wand_aux(&term_query, &searcher)?;
-        }
-        Ok(())
-    }
-}

src/query/term_query/term_weight.rs

@@ -19,13 +19,13 @@ pub struct TermWeight {
 }
 
 impl Weight for TermWeight {
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> Result<Box<dyn Scorer>> {
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> Result<Box<dyn Scorer>> {
-        let term_scorer = self.specialized_scorer(reader, boost)?;
+        let term_scorer = self.scorer_specialized(reader, boost)?;
         Ok(Box::new(term_scorer))
     }
 
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> Result<Explanation> {
-        let mut scorer = self.specialized_scorer(reader, 1.0)?;
+        let mut scorer = self.scorer_specialized(reader, 1.0f32)?;
         if scorer.seek(doc) != doc {
             return Err(does_not_match(doc));
         }
@@ -34,7 +34,7 @@ impl Weight for TermWeight {
 
     fn count(&self, reader: &SegmentReader) -> Result<u32> {
         if let Some(delete_bitset) = reader.delete_bitset() {
-            Ok(self.scorer(reader, 1.0)?.count(delete_bitset))
+            Ok(self.scorer(reader, 1.0f32)?.count(delete_bitset))
         } else {
             let field = self.term.field();
             Ok(reader
@@ -52,7 +52,7 @@ impl Weight for TermWeight {
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score),
     ) -> crate::Result<()> {
-        let mut scorer = self.specialized_scorer(reader, 1.0)?;
+        let mut scorer = self.scorer_specialized(reader, 1.0f32)?;
         for_each_scorer(&mut scorer, callback);
         Ok(())
     }
@@ -69,11 +69,11 @@ impl Weight for TermWeight {
     /// important optimization (e.g. BlockWAND for union).
     fn for_each_pruning(
         &self,
-        threshold: Score,
+        threshold: f32,
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score) -> Score,
     ) -> crate::Result<()> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         for_each_pruning_scorer(&mut scorer, threshold, callback);
         Ok(())
     }
@@ -92,11 +92,7 @@ impl TermWeight {
         }
     }
 
-    pub(crate) fn specialized_scorer(
+    fn scorer_specialized(&self, reader: &SegmentReader, boost: f32) -> Result<TermScorer> {
-        &self,
-        reader: &SegmentReader,
-        boost: Score,
-    ) -> Result<TermScorer> {
         let field = self.term.field();
         let inverted_index = reader.inverted_index(field);
         let fieldnorm_reader = reader.get_fieldnorms_reader(field);

src/query/union.rs

@@ -55,7 +55,7 @@ where
             cursor: HORIZON_NUM_TINYBITSETS,
             offset: 0,
             doc: 0,
-            score: 0.0,
+            score: 0f32,
         };
         if union.refill() {
             union.advance();
@@ -183,10 +183,7 @@ where
             // advance all docsets to a doc >= to the target.
             #[cfg_attr(feature = "cargo-clippy", allow(clippy::clippy::collapsible_if))]
             unordered_drain_filter(&mut self.docsets, |docset| {
-                if docset.doc() < target {
+                docset.seek(target) == TERMINATED
-                    docset.seek(target);
-                }
-                docset.doc() == TERMINATED
             });
 
             // at this point all of the docsets
@@ -274,7 +271,7 @@ mod tests {
                 vals.iter()
                     .cloned()
                     .map(VecDocSet::from)
-                    .map(|docset| ConstScorer::new(docset, 1.0))
+                    .map(|docset| ConstScorer::new(docset, 1.0f32))
                     .collect::<Vec<ConstScorer<VecDocSet>>>(),
             )
         };
@@ -321,7 +318,7 @@ mod tests {
                     .iter()
                     .map(|docs| docs.clone())
                     .map(VecDocSet::from)
-                    .map(|docset| ConstScorer::new(docset, 1.0))
+                    .map(|docset| ConstScorer::new(docset, 1.0f32))
                     .collect::<Vec<_>>(),
             ));
             res

src/query/weight.rs

@@ -28,7 +28,7 @@ pub(crate) fn for_each_scorer<TScorer: Scorer + ?Sized>(
 /// important optimization (e.g. BlockWAND for union).
 pub(crate) fn for_each_pruning_scorer<TScorer: Scorer + ?Sized>(
     scorer: &mut TScorer,
-    mut threshold: Score,
+    mut threshold: f32,
     callback: &mut dyn FnMut(DocId, Score) -> Score,
 ) {
     let mut doc = scorer.doc();
@@ -51,14 +51,14 @@ pub trait Weight: Send + Sync + 'static {
     /// `boost` is a multiplier to apply to the score.
     ///
     /// See [`Query`](./trait.Query.html).
-    fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::Result<Box<dyn Scorer>>;
+    fn scorer(&self, reader: &SegmentReader, boost: f32) -> crate::Result<Box<dyn Scorer>>;
 
     /// Returns an `Explanation` for the given document.
     fn explain(&self, reader: &SegmentReader, doc: DocId) -> crate::Result<Explanation>;
 
     /// Returns the number documents within the given `SegmentReader`.
     fn count(&self, reader: &SegmentReader) -> crate::Result<u32> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         if let Some(delete_bitset) = reader.delete_bitset() {
             Ok(scorer.count(delete_bitset))
         } else {
@@ -73,7 +73,7 @@ pub trait Weight: Send + Sync + 'static {
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score),
     ) -> crate::Result<()> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         for_each_scorer(scorer.as_mut(), callback);
         Ok(())
     }
@@ -90,11 +90,11 @@ pub trait Weight: Send + Sync + 'static {
     /// important optimization (e.g. BlockWAND for union).
     fn for_each_pruning(
         &self,
-        threshold: Score,
+        threshold: f32,
         reader: &SegmentReader,
         callback: &mut dyn FnMut(DocId, Score) -> Score,
     ) -> crate::Result<()> {
-        let mut scorer = self.scorer(reader, 1.0)?;
+        let mut scorer = self.scorer(reader, 1.0f32)?;
         for_each_pruning_scorer(scorer.as_mut(), threshold, callback);
         Ok(())
     }

src/reader/mod.rs

@@ -22,7 +22,7 @@ pub enum ReloadPolicy {
     /// The index is entirely reloaded manually.
     /// All updates of the index should be manual.
     ///
-    /// No change is reflected automatically. You are required to call `IndexReader::reload()` manually.
+    /// No change is reflected automatically. You are required to call `.load_seacher()` manually.
     Manual,
     /// The index is reloaded within milliseconds after a new commit is available.
     /// This is made possible by watching changes in the `meta.json` file.

src/schema/field_entry.rs

@@ -14,7 +14,7 @@ use std::fmt;
 /// - a field name
 /// - a field type, itself wrapping up options describing
 /// how the field should be indexed.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FieldEntry {
     name: String,
     field_type: FieldType,

src/schema/field_type.rs

@@ -48,7 +48,7 @@ pub enum Type {
 
 /// A `FieldType` describes the type (text, u64) of a field as well as
 /// how it should be handled by tantivy.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum FieldType {
     /// String field type configuration
     Str(TextOptions),

src/schema/text_options.rs

@@ -6,7 +6,7 @@ use std::borrow::Cow;
 use std::ops::BitOr;
 
 /// Define how a text field should be handled by tantivy.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TextOptions {
     indexing: Option<TextFieldIndexing>,
     stored: bool,
@@ -51,7 +51,7 @@ impl Default for TextOptions {
 /// - the amount of information that should be stored about the presence of a term in a document.
 /// Essentially, should we store the term frequency and/or the positions (See [`IndexRecordOption`](./enum.IndexRecordOption.html)).
 /// - the name of the `Tokenizer` that should be used to process the field.
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
 pub struct TextFieldIndexing {
     record: IndexRecordOption,
     tokenizer: Cow<'static, str>,

src/snippet/mod.rs

@@ -2,8 +2,8 @@ use crate::query::Query;
 use crate::schema::Field;
 use crate::schema::Value;
 use crate::tokenizer::{TextAnalyzer, Token};
+use crate::Document;
 use crate::Searcher;
-use crate::{Document, Score};
 use htmlescape::encode_minimal;
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
@@ -30,7 +30,7 @@ impl HighlightSection {
 
 #[derive(Debug)]
 pub struct FragmentCandidate {
-    score: Score,
+    score: f32,
     start_offset: usize,
     stop_offset: usize,
     num_chars: usize,
@@ -58,7 +58,7 @@ impl FragmentCandidate {
     /// taking the token and terms, the token is added to the fragment.
     /// if the token is one of the terms, the score
     /// and highlighted fields are updated in the fragment.
-    fn try_add_token(&mut self, token: &Token, terms: &BTreeMap<String, Score>) {
+    fn try_add_token(&mut self, token: &Token, terms: &BTreeMap<String, f32>) {
         self.stop_offset = token.offset_to;
 
         if let Some(&score) = terms.get(&token.text.to_lowercase()) {
@@ -142,7 +142,7 @@ impl Snippet {
 fn search_fragments<'a>(
     tokenizer: &TextAnalyzer,
     text: &'a str,
-    terms: &BTreeMap<String, Score>,
+    terms: &BTreeMap<String, f32>,
     max_num_chars: usize,
 ) -> Vec<FragmentCandidate> {
     let mut token_stream = tokenizer.token_stream(text);
@@ -248,7 +248,7 @@ fn select_best_fragment_combination(fragments: &[FragmentCandidate], text: &str)
 /// # }
 /// ```
 pub struct SnippetGenerator {
-    terms_text: BTreeMap<String, Score>,
+    terms_text: BTreeMap<String, f32>,
     tokenizer: TextAnalyzer,
     field: Field,
     max_num_chars: usize,
@@ -263,12 +263,12 @@ impl SnippetGenerator {
     ) -> crate::Result<SnippetGenerator> {
         let mut terms = BTreeSet::new();
         query.query_terms(&mut terms);
-        let terms_text: BTreeMap<String, Score> = terms
+        let terms_text: BTreeMap<String, f32> = terms
             .into_iter()
             .filter(|term| term.field() == field)
             .flat_map(|term| {
                 let doc_freq = searcher.doc_freq(&term);
-                let score = 1.0 / (1.0 + doc_freq as Score);
+                let score = 1f32 / (1f32 + doc_freq as f32);
                 if doc_freq > 0 {
                     Some((term.text().to_string(), score))
                 } else {
@@ -291,7 +291,7 @@ impl SnippetGenerator {
     }
 
     #[cfg(test)]
-    pub fn terms_text(&self) -> &BTreeMap<String, Score> {
+    pub fn terms_text(&self) -> &BTreeMap<String, f32> {
         &self.terms_text
     }
 
@@ -373,8 +373,8 @@ Survey in 2016, 2017, and 2018."#;
     fn test_snippet_scored_fragment() {
         {
             let terms = btreemap! {
-                String::from("rust") =>1.0,
+                String::from("rust") =>1.0f32,
-                String::from("language") => 0.9
+                String::from("language") => 0.9f32
             };
             let fragments = search_fragments(&From::from(SimpleTokenizer), TEST_TEXT, &terms, 20);
             {
@@ -387,8 +387,8 @@ Survey in 2016, 2017, and 2018."#;
         }
         {
             let terms = btreemap! {
-                String::from("rust") =>0.9,
+                String::from("rust") =>0.9f32,
-                String::from("language") => 1.0
+                String::from("language") => 1.0f32
             };
             let fragments = search_fragments(&From::from(SimpleTokenizer), TEST_TEXT, &terms, 20);
             //assert_eq!(fragments.len(), 7);
@@ -525,7 +525,7 @@ Survey in 2016, 2017, and 2018."#;
             let snippet_generator =
                 SnippetGenerator::create(&searcher, &*query, text_field).unwrap();
             assert_eq!(
-                &btreemap!("a".to_string() => 0.25),
+                &btreemap!("a".to_string() => 0.25f32),
                 snippet_generator.terms_text()
             );
         }
@@ -534,7 +534,7 @@ Survey in 2016, 2017, and 2018."#;
             let snippet_generator =
                 SnippetGenerator::create(&searcher, &*query, text_field).unwrap();
             assert_eq!(
-                &btreemap!("a".to_string() => 0.25, "b".to_string() => 0.5),
+                &btreemap!("a".to_string() => 0.25f32, "b".to_string() => 0.5),
                 snippet_generator.terms_text()
             );
         }
@@ -543,7 +543,7 @@ Survey in 2016, 2017, and 2018."#;
             let snippet_generator =
                 SnippetGenerator::create(&searcher, &*query, text_field).unwrap();
             assert_eq!(
-                &btreemap!("a".to_string() => 0.25, "b".to_string() => 0.5),
+                &btreemap!("a".to_string() => 0.25f32, "b".to_string() => 0.5),
                 snippet_generator.terms_text()
             );
         }