Add an option to opt out fieldnorms for indexed fields.

Closes #922

.github/ISSUE_TEMPLATE/actions.md

@@ -1,13 +0,0 @@
----
-name: Actions
-about: Actions not directly related to producing code.
-
----
-
-# Actions title
-
-Action description. 
-e.g. 
-- benchmark
-- investigate and report
-- etc.

ARCHITECTURE.md

@@ -1,297 +0,0 @@
-# Tantivy
-
-## What is tantivy?
-
-Tantivy is a library that is meant to build search engines. Although it is by no mean a port of Lucene, its architecture is strongly inspired by it. If you are familiar with Lucene, you may be struck by the overlapping vocabulary.
-This is not fortuitous.
-
-Tantivy's bread and butter is to address the problem of full-text search :
-
-Given a large set of textual documents, and a text query, return the K-most relevant documents in a very efficient way. In order to execute these queries rapidly, the tantivy need to build an index beforehand. The relevance score implemented in the tantivy is not configurable. Tantivy uses the same score as the default similarity used in Lucene / Elasticsearch, called [BM25](https://en.wikipedia.org/wiki/Okapi_BM25).
-
-But tantivy's scope does not stop there. Numerous features are required to power rich search applications. For instance, one may want to:
-- compute the count of documents matching a query in the different section of an e-commerce website,
-- display an average price per meter square for a real estate search engine,
-- take in account historical user data to rank documents in a specific way,
-- or even use tantivy to power an OLAP database.
-
-A more abstract description of the problem space tantivy is trying to address is the following.
-
-Ingest a large set of documents, create an index that makes it possible to
-rapidly select all documents matching a given predicate (also known as a query) and
-collect some information about them (See collector).
-
-Roughly speaking the design is following these guiding principles:
-- Search should be O(1) in memory.
-- Indexing should be O(1) in memory. (In practise it is just sublinear)
-- Search should be as fast as possible
-
-This comes at the cost of the dynamicity of the index : while it is possible to add, and delete documents from our corpus, the tantivy is designed to handle these updates in large batches.
-
-## [core/](src/core): Index, segments, searchers.
-
-Core contains all of the high level code to make it possible for to create an index, add documents, delete documents and commit.
-
-This is both the most high-level part of tantivy, the least performance sensitive one, the seemingly most mundane code... And paradoxically the most complicated part.
-
-### Index and Segments...
-
-A tantivy index is in fact a collection of smaller independent immutable segments.
-Each segment contains its own independent set of datastructures.
-
-A segment is identified by a segment id that is in fact a UUID.
-The file of a segment has the format
-
- ```segment-id . ext ```
-
-The extension signals which datastructure (or [`SegmentComponent`](src/core/segment_component.rs)) is stored in the file.
-
-A small `meta.json` file is in charge keeping track of the list of segments, as well as the schema.
-
-On commit, one segment per indexing thread is written to disk, and the `meta.json` is then updated atomically.
-
-For a better idea of how indexing works, you may read the [following blog post](https://fulmicoton.com/posts/behold-tantivy-part2/).
-
-
-### Deletes
-
-Deletes happen by deleting a "term". Tantivy does not offer any notion of primary id, so it is up to the user to use a field in their schema as if it was a primary id, and delete the associated term if they want to delete only one specific document.
-
-On commit, tantivy will find all of the segments with documents matching this existing term and create a [tombstone file](src/fastfield/delete.rs) that represents the bitset of the document that are deleted.
-Like all segment files, this file is immutable. Because it is possible to have more than one tombstone file at a given instant, the tombstone filename has the format ``` segment_id . commit_opstamp . del```.
-
-An opstamp is simply an incremental id that identifies any operation applied to the index. For instance, performing a commit or adding a document.
-
-
-### DocId
-
-Within a segment, all documents are identified by a DocId that ranges within `[0, max_doc)`.
-where max doc is the number of documents in the segment, (deleted or not). Having such a compact `DocId` space is key to the compression of our datastructures.
-
-The DocIds are simply allocated in the order documents are added to the index.
-
-### Merges
-
-In separate threads, tantivy's index writer search for opportunities to merge segments.
-The point of segment merges is to:
-- eventually get rid of tombstoned documents
-- reduce the otherwise evergrowing number of segments.
-
-Indeed, while having several segments instead of one does not hurt search too much, having hundreds can have a measurable impact on the search performance.
-
-### Searcher
-
-The user of the library usually does not need to know about the existence of Segments.
-Searching is done through an object called a [`Searcher`](src/core/searcher.rs), that captures a
-snapshot of the index at one point of time, by holding a list of [SegmentReader](src/core/segment_reader.rs).
-
-In other words, regardless of commits, file garbage collection, or segment merge that might happen, as long as the user holds and reuse the same [Searcher](src/core/searcher.rs), search will happen on an immutable snapshot of the index.
-
-## [directory/](src/directory): Where should the data be stored?
-
-Tantivy, like Lucene, abstracts the place where the data should be stored in a key-trait
-called [`Directory`](src/directory/directory.rs).
-Contrary to Lucene however, "files" are quite different from some kind of `io::Read` object.
-Check out [`src/directory/directory.rs`](src/directory/directory.rs) trait for more details.
-
-Tantivy ships two main directory implementation: the `MMapDirectory` and the `RAMDirectory`,
-but users can extend tantivy with their own implementation.
-
-## [schema/](src/schema): What are documents?
-
-Tantivy's document follow a very strict schema , decided before building any index.
-
-The schema defines all of the fields that the indexes [`Document`](src/schema/document.rs) may and should contain, their types (`text`, `i64`, `u64`, `Date`, ...) as well as how it should be indexed / represented in tantivy.
-
-Depending on the type of the field, you can decide to
-- put it in the docstore
-- store it as a fast field
-- index it
-
-Practically, tantivy will push values associated to this type to up to 3 respective
-datastructures.
-
-*Limitations*
-
-As of today, tantivy's schema impose a 1:1 relationship between a field that is being ingested and a field represented in the search index. In sophisticated search application, it is fairly common to want to index a field twice using different tokenizers, or to index the concatenation of several fields together into one field.
-
-This is not something tantivy supports, and it is up to the user to duplicate field / concatenate fields before feeding them to tantivy.
-
-## General information about these datastructures.
-
-All datastructures in tantivy, have:
-- a writer
-- a serializer
-- a reader
-
-The writer builds a in-memory representation of a batch of documents. This representation is not searchable. It is just meant as intermediary mutable representation, to which we can sequentially add
-the document of a batch. At the end of the batch (or if a memory limit is reached), this representation
-is then converted in an on-disk immutable representation, that is extremely compact.
-This conversion is done by the serializer.
-
-Finally, the reader is in charge of offering an API to read on this on-disk read-only representation.
-In tantivy, readers are designed to require very little anonymous memory. The data is read straight from an mmapped file, and loading an index is as fast as mmapping its files.
-
-## [store/](src/store): Here is my DocId, Gimme my document!
-
-The docstore is a row-oriented storage that, for each documents, stores a subset of the fields
-that are marked as stored in the schema. The docstore is compressed using a general purpose algorithm
-like LZ4.
-
-**Useful for**
-
-In search engines, it is often used to display search results.
-Once the top 10 documents have been identified, we fetch them from the store, and display them or their snippet on the search result page (aka SERP).
-
-**Not useful for**
-
-Fetching a document from the store is typically a "slow" operation. It usually consists in
-- searching into a compact tree-like datastructure to find the position of the right block.
-- decompressing a small block
-- returning the document from this block.
-
-It is NOT meant to be called for every document matching a query.
-
-As a rule of thumb, if you hit the docstore more than 100 times per search query, you are probably misusing tantivy.
-
-
-## [fastfield/](src/fastfield): Here is my DocId, Gimme my value!
-
-Fast fields are stored in a column-oriented storage that allows for random access.
-The only compression applied is bitpacking. The column comes with two meta data.
-The minimum value in the column and the number of bits per doc.
-
-Fetching a value for a `DocId` is then as simple as computing
-
-```
-min_value + fetch_bits(num_bits * doc_id..num_bits * (doc_id+1))
-```
-
-This operation just requires one memory fetch.
-Because, DocSets are scanned through in order (DocId are iterated in a sorted manner) which
-also help locality.
-
-In Lucene's jargon, fast fields are called DocValues.
-
-**Useful for**
-
-They are typically integer values that are useful to either rank or compute aggregate over
-all of the documents matching a query (aka [DocSet](src/docset.rs)).
-
-For instance, one could define a function to combine upvotes with tantivy's internal relevancy score.
-This can be done by fetching a fast field during scoring.
-Once could also compute the mean price of the items matching a query in an e-commerce website.
-This can be done by fetching a fast field in a collector.
-Finally one could decide to post filter a docset to remove docset with a price within a specific range.
-If the ratio of filtered out documents is not too low, an efficient way to do this is to fetch the price, and apply the filter on the collector side.
-
-Aside from integer values, it is also possible to store an actual byte payload.
-For advanced search engine, it is possible to store all of the features required for learning-to-rank in a byte payload, access it during search, and apply the learning-to-rank model.
-
-Finally facets are a specific kind of fast field, and the associated source code is in [`fastfield/facet_reader.rs`](src/fastfield/facet_reader.rs).
-
-# The inverted search index.
-
-The inverted index is the core part of full-text search.
-When presented a new document with the text field "Hello, happy tax payer!", tantivy breaks it into a list of so-called token. In addition to just splitting this strings into tokens, it might also do different kind of operations like dropping the punctuation, converting the character to lowercase, apply stemming etc. Tantivy makes it possible to configure the operations to be applied in the schema
-(tokenizer/ is the place where these operations are implemented).
-
-For instance, the default tokenizer of tantivy would break our text into: `[hello, happy, tax, payer]`.
-The document will therefore be registered in the inverted index as containing the terms
-`[text:hello, text:happy, text:tax, text:payer]`.
-
-The role of the inverted index is, when given a term, supply us with a very fast iterator over
-the sorted doc ids that match the term.
-
-Such an iterator is called a posting list. In addition to giving us `DocId`, they can also give us optionally to the number of occurrence of the term for each document, also called term frequency or TF.
-
-These iterators being sorted by DocId, one can create an iterator over the document containing `text:tax AND text:payer`, `(text:tax AND text:payer) OR (text:contribuable)` or any boolean expression.
-
-In order to represent the function
-```Term ⟶ Posting```
-
-The inverted index actually consists of two datastructures chained together.
-
-- [Term](src/schema/term.rs) ⟶ [TermInfo](src/postings/term_info.rs) is addressed by the term dictionary.
-- [TermInfo](src/postings/term_info.rs) ⟶ [Posting](src/postings/postings.rs) is addressed by the posting lists.
-
-Where [TermInfo](src/postings/term_info.rs) is an object containing some meta data about a term.
-
-
-## [termdict/](src/termdict): Here is a term, give me the [TermInfo](src/postings/term_info.rs)!
-
-Tantivy's term dictionary is mainly in charge of supplying the function
-
-[Term](src/schema/term.rs) ⟶ [TermInfo](src/postings/term_info.rs)
-
-It is itself is broken into two parts.
-- [Term](src/schema/term.rs) ⟶ [TermOrdinal](src/termdict/mod.rs) is addressed by a finite state transducer, implemented by the fst crate.
-- [TermOrdinal](src/termdict/mod.rs) ⟶ [TermInfo](src/postings/term_info.rs) is addressed by the term info store.
-
-
-## [postings/](src/postings): Iterate over documents... very fast!
-
-A posting list makes it possible to store a sorted list of doc ids and for each doc store
-a term frequency as well.
-
-The posting list are stored in a separate file. The [TermInfo](src/postings/term_info.rs) contains an offset into that file and a number of documents for the given posting list. Both are required and sufficient to read the posting list.
-
-The posting list is organized in block of 128 documents.
-One block of doc ids is followed by one block of term frequencies.
-
-The doc ids are delta encoded and bitpacked.
-The term frequencies are bitpacked.
-
-Because the number of docs is rarely a multiple of 128, the last block my contain an arbitrary number of docs between 1 and 127 documents. We then use variable int encoding instead of bitpacking.
-
-## [positions/](src/positions): Where are my terms within the documents?
-
-Phrase queries make it possible to search for documents containing a specific sequence of document.
-For instance, when the phrase query "the art of war" does not match "the war of art".
-To make it possible, it is possible to specify in the schema that a field should store positions in addition to being indexed.
-
-The token positions of all of the terms are then stored in a separate file with the extension `.pos`.
-The [TermInfo](src/postings/term_info.rs) gives an offset (expressed in position this time) in this file. As we iterate throught the docset,
-we advance the position reader by the number of term frequencies of the current document.
-
-## [fieldnorms/](src/fieldnorms): Here is my doc, how many tokens in this field?
-
-The [BM25](https://en.wikipedia.org/wiki/Okapi_BM25) formula also requires to know the number of tokens stored in a specific field for a given document. We store this information on one byte per document in the fieldnorm.
-The fieldnorm is therefore compressed. Values up to 40 are encoded unchanged. There is then a logarithmic mapping that
-
-
-## [tokenizer/](src/tokenizer): How should we process text?
-
-Text processing is key to a good search experience.
-Splits or normalize your text too much, and the search results will have a less precision and a higher recall.
-Do not normalize, or under split your text, you will end up with a higher precision and a lesser recall.
-
-Text processing can be configured by selecting an off-the-shelf [`Tokenizer`](./src/tokenizer/tokenizer.rs) or implementing your own to first split the text into tokens, and then chain different [`TokenFilter`](src/tokenizer/tokenizer.rs)'s to it.
-
-Tantivy's comes with few tokenizers, but external crates are offering advanced tokenizers, such as [Lindera](https://crates.io/crates/lindera) for Japanese.
-
-
-## [query/](src/query): Define and compose queries
-
-The [Query](src/query/query.rs) trait defines what a query is.
-Due to the necessity for some query to compute some statistics over the entire index, and because the
-index is composed of several `SegmentReader`, the path from transforming a `Query` to a iterator over document is slightly convoluted, but fundamentally, this is what a Query is.
-
-The iterator over a document comes with some scoring function. The resulting trait is called a
-[Scorer](src/query/scorer.rs) and is specific to a segment.
-
-Different queries can be combined using the [BooleanQuery](src/query/boolean_query/).
-Tantivy comes with different types of queries, and can be extended by implementing
-the Query`, `Weight` and `Scorer` traits.
-
-## [collector](src/collector): Define what to do with matched documents
-
-Collectors define how to aggregate the documents matching a query, in the broadest sense possible.
-The search will push matched document one by one, calling their
-`fn collect(doc: DocId, score: Score);` method.
-
-Users may implement their own collectors by implementing the [Collector](src/collector/mod.rs) trait.
-
-## [query-grammar](query-grammar): Defines the grammar of the query parser
-
-While the [QueryParser](src/query/query_parser/query_parser.rs) struct is located in the `query/` directory, the actual parser combinator used to convert user queries into an AST is in an external crate called `query-grammar`. This part was externalize to lighten the work of the compiler.

CHANGELOG.md

@@ -1,33 +1,17 @@
-Tantivy 0.15.0
-=========================
-- API Changes. Using Range instead of (start, end) in the API and internals (`FileSlice`, `OwnedBytes`, `Snippets`, ...)
-  This change is breaking but migration is trivial.
-- Added an Histogram collector. (@fulmicoton) #994
-- Added support for Option<TCollector>.  (@fulmicoton)
-- DocAddress is now a struct (@scampi) #987
-- Bugfix consistent tie break handling in facet's topk (@hardikpnsp) #357
-- Date field support for range queries (@rihardsk) #516
-
 Tantivy 0.14.0
 =========================
-- Remove dependency to atomicwrites #833 .Implemented by @fulmicoton upon suggestion and research from @asafigan).
+- Remove dependency to atomicwrites #833 .Implemented by @pmasurel upon suggestion and research from @asafigan). 
 - Migrated tantivy error from the now deprecated `failure` crate to `thiserror` #760. (@hirevo)
-- API Change. Accessing the typed value off a `Schema::Value` now returns an Option instead of panicking if the type does not match.
+- API Change. Accessing the typed value off a `Schema::Value` now returns an Option instead of panicking if the type does not match. 
 - Large API Change in the Directory API. Tantivy used to assume that all files could be somehow memory mapped. After this change, Directory return a `FileSlice` that can be reduced and eventually read into an `OwnedBytes` object. Long and blocking io operation are still required by they do not span over the entire file.
 - Added support for Brotli compression in the DocStore. (@ppodolsky)
 - Added helper for building intersections and unions in BooleanQuery (@guilload)
 - Bugfix in `Query::explain`
-- Removed dependency on `notify` #924. Replaced with `FileWatcher` struct that polls meta file every 500ms in background thread. (@halvorboe @guilload)
-- Added `FilterCollector`, which wraps another collector and filters docs using a predicate over a fast field (@barrotsteindev)
-- Simplified the encoding of the skip reader struct. BlockWAND max tf is now encoded over a single byte. (@fulmicoton)
-- `FilterCollector` now supports all Fast Field value types (@barrotsteindev)
-- FastField are not all loaded when opening the segment reader. (@fulmicoton)
-
-This version breaks compatibility and requires users to reindex everything.
+- Making it possible to opt out the generation of fieldnorms information for indexed fields. This change breaks compatibility as the meta.json file format is slightly changed. (#922, @pmasurel)
 
 Tantivy 0.13.2
 ===================
-Bugfix. Acquiring a facet reader on a segment that does not contain any
+Bugfix. Acquiring a facet reader on a segment that does not contain any 
 doc with this facet returns `None`. (#896)
 
 Tantivy 0.13.1
@@ -38,7 +22,7 @@ Updated misc dependency versions.
 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).
+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
@@ -47,7 +31,7 @@ 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.
-- Change in the DocSet and Scorer API. (@fulmicoton).
+- Change in the DocSet and Scorer API. (@fulmicoton). 
 A freshly created DocSet point directly to their first doc. A sentinel value called TERMINATED marks the end of a DocSet.
 `.advance()` returns the new DocId. `Scorer::skip(target)` has been replaced by `Scorer::seek(target)` and returns the resulting DocId.
 As a result, iterating through DocSet now looks as follows
@@ -61,7 +45,7 @@ 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
+- 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
@@ -69,14 +53,14 @@ Tantivy 0.12.0
 - Removing static dispatch in tokenizers for simplicity. (#762)
 - Added backward iteration for `TermDictionary` stream. (@halvorboe)
 - Fixed a performance issue when searching for the posting lists of a missing term (@audunhalland)
-- Added a configurable maximum number of docs (10M by default) for a segment to be considered for merge (@hntd187, landed by @halvorboe #713)
+- Added a configurable maximum number of docs (10M by default) for a segment to be considered for merge (@hntd187, landed by @halvorboe #713) 
 - Important Bugfix #777, causing tantivy to retain memory mapping. (diagnosed by @poljar)
 - Added support for field boosting. (#547, @fulmicoton)
 
 ## How to update?
 
-Crates relying on custom tokenizer, or registering tokenizer in the manager will require some
-minor changes. Check https://github.com/tantivy-search/tantivy/blob/main/examples/custom_tokenizer.rs
+Crates relying on custom tokenizer, or registering tokenizer in the manager will require some 
+minor changes. Check https://github.com/tantivy-search/tantivy/blob/master/examples/custom_tokenizer.rs
 to check for some code sample.
 
 Tantivy 0.11.3
@@ -112,7 +96,7 @@ Tantivy 0.11.0
 
 ## How to update?
 
-- The index format is changed. You are required to reindex your data to use tantivy 0.11.
+- The index format is changed. You are required to reindex your data to use tantivy 0.11. 
 - `Box<dyn BoxableTokenizer>` has been replaced by a `BoxedTokenizer` struct.
 - Regex are now compiled when the `RegexQuery` instance is built. As a result, it can now return
 an error and handling the `Result` is required.
@@ -136,26 +120,26 @@ Tantivy 0.10.0
 
 *Tantivy 0.10.0 index format is compatible with the index format in 0.9.0.*
 
-- Added an API to easily tweak or entirely replace the
- default score. See `TopDocs::tweak_score`and `TopScore::custom_score` (@fulmicoton)
+- Added an API to easily tweak or entirely replace the 
+ default score. See `TopDocs::tweak_score`and `TopScore::custom_score` (@pmasurel)
 - Added an ASCII folding filter (@drusellers)
-- Bugfix in `query.count` in presence of deletes (@fulmicoton)
-- Added `.explain(...)` in `Query` and `Weight` to (@fulmicoton)
-- Added an efficient way to `delete_all_documents` in `IndexWriter` (@petr-tik).
+- Bugfix in `query.count` in presence of deletes (@pmasurel)
+- Added `.explain(...)` in `Query` and `Weight` to (@pmasurel)
+- Added an efficient way to `delete_all_documents` in `IndexWriter` (@petr-tik). 
   All segments are simply removed.
 
 Minor
 ---------
 - Switched to Rust 2018 (@uvd)
-- Small simplification of the code.
+- Small simplification of the code. 
 Calling .freq() or .doc() when .advance() has never been called
 on segment postings should panic from now on.
 - Tokens exceeding `u16::max_value() - 4` chars are discarded silently instead of panicking.
 - Fast fields are now preloaded when the `SegmentReader` is created.
 - `IndexMeta` is now public.  (@hntd187)
 - `IndexWriter` `add_document`, `delete_term`. `IndexWriter` is `Sync`, making it possible to use it with a `
-Arc<RwLock<IndexWriter>>`. `add_document` and `delete_term` can
-only require a read lock. (@fulmicoton)
+Arc<RwLock<IndexWriter>>`. `add_document` and `delete_term` can 
+only require a read lock. (@pmasurel)
 - Introducing `Opstamp` as an expressive type alias for `u64`. (@petr-tik)
 - Stamper now relies on `AtomicU64` on all platforms (@petr-tik)
 - Bugfix - Files get deleted slightly earlier
@@ -169,7 +153,7 @@ Your program should be usable as is.
 
 Fast fields used to be accessed directly from the `SegmentReader`.
 The API changed, you are now required to acquire your fast field reader via the
-`segment_reader.fast_fields()`, and use one of the typed method:
+`segment_reader.fast_fields()`, and use one of the typed method: 
 - `.u64()`, `.i64()` if your field is single-valued ;
 - `.u64s()`, `.i64s()` if your field is multi-valued ;
 - `.bytes()` if your field is bytes fast field.
@@ -178,16 +162,16 @@ The API changed, you are now required to acquire your fast field reader via the
 
 Tantivy 0.9.0
 =====================
-*0.9.0 index format is not compatible with the
+*0.9.0 index format is not compatible with the 
 previous index format.*
-- MAJOR BUGFIX :
+- MAJOR BUGFIX : 
   Some `Mmap` objects were being leaked, and would never get released. (@fulmicoton)
 - Removed most unsafe (@fulmicoton)
 - Indexer memory footprint improved. (VInt comp, inlining the first block. (@fulmicoton)
 - Stemming in other language possible (@pentlander)
 - Segments with no docs are deleted earlier (@barrotsteindev)
-- Added grouped add and delete operations.
-  They are guaranteed to happen together (i.e. they cannot be split by a commit).
+- Added grouped add and delete operations. 
+  They are guaranteed to happen together (i.e. they cannot be split by a commit). 
   In addition, adds are guaranteed to happen on the same segment. (@elbow-jason)
 - Removed `INT_STORED` and `INT_INDEXED`. It is now possible to use `STORED` and `INDEXED`
   for int fields. (@fulmicoton)
@@ -201,26 +185,26 @@ tantivy 0.9 brought some API breaking change.
 To update from tantivy 0.8, you will need to go through the following steps.
 
 - `schema::INT_INDEXED` and `schema::INT_STORED`  should be replaced by `schema::INDEXED` and `schema::INT_STORED`.
-- The index now does not hold the pool of searcher anymore. You are required to create an intermediary object called
-`IndexReader` for this.
-
+- The index now does not hold the pool of searcher anymore. You are required to create an intermediary object called 
+`IndexReader` for this. 
+    
     ```rust
     // create the reader. You typically need to create 1 reader for the entire
     // lifetime of you program.
     let reader = index.reader()?;
-
+    
     // Acquire a searcher (previously `index.searcher()`) is now written:
     let searcher = reader.searcher();
-
-    // With the default setting of the reader, you are not required to
+    
+    // With the default setting of the reader, you are not required to 
     // call `index.load_searchers()` anymore.
     //
     // The IndexReader will pick up that change automatically, regardless
     // of whether the update was done in a different process or not.
-    // If this behavior is not wanted, you can create your reader with
+    // If this behavior is not wanted, you can create your reader with 
     // the `ReloadPolicy::Manual`, and manually decide when to reload the index
     // by calling `reader.reload()?`.
-
+  
     ```
 
 
@@ -235,7 +219,7 @@ Tantivy 0.8.1
 =====================
 Hotfix of #476.
 
-Merge was reflecting deletes before commit was passed.
+Merge was reflecting deletes before commit was passed. 
 Thanks @barrotsteindev  for reporting the bug.
 
 
@@ -243,7 +227,7 @@ Tantivy 0.8.0
 =====================
 *No change in the index format*
 - API Breaking change in the collector API. (@jwolfe, @fulmicoton)
-- Multithreaded search (@jwolfe, @fulmicoton)
+- Multithreaded search (@jwolfe, @fulmicoton) 
 
 
 Tantivy 0.7.1
@@ -271,7 +255,7 @@ Tantivy 0.6.1
         - Exclusive `field:{startExcl to endExcl}`
         - Mixed `field:[startIncl to endExcl}` and vice versa
         - Unbounded `field:[start to *]`, `field:[* to end]`
-
+ 
 
 Tantivy 0.6
 ==========================
@@ -279,10 +263,10 @@ Tantivy 0.6
 Special thanks to @drusellers and @jason-wolfe for their contributions
 to this release!
 
-- Removed C code. Tantivy is now pure Rust. (@fulmicoton)
-- BM25 (@fulmicoton)
-- Approximate field norms encoded over 1 byte. (@fulmicoton)
-- Compiles on stable rust (@fulmicoton)
+- Removed C code. Tantivy is now pure Rust. (@pmasurel)
+- BM25 (@pmasurel)
+- Approximate field norms encoded over 1 byte. (@pmasurel)
+- Compiles on stable rust (@pmasurel)
 - Add &[u8] fastfield for associating arbitrary bytes to each document (@jason-wolfe) (#270)
     - Completely uncompressed
     - Internally: One u64 fast field for indexes, one fast field for the bytes themselves.
@@ -290,7 +274,7 @@ to this release!
 - Add Stopword Filter support (@drusellers)
 - Add a FuzzyTermQuery (@drusellers)
 - Add a RegexQuery (@drusellers)
-- Various performance improvements (@fulmicoton)_
+- Various performance improvements (@pmasurel)_
 
 
 Tantivy 0.5.2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tantivy"
-version = "0.14.0"
+version = "0.14.0-dev"
 authors = ["Paul Masurel <paul.masurel@gmail.com>"]
 license = "MIT"
 categories = ["database-implementations", "data-structures"]
@@ -30,10 +30,11 @@ serde_json = "1"
 num_cpus = "1"
 fs2={version="0.4", optional=true}
 levenshtein_automata = "0.2"
+notify = {version="4", optional=true}
 uuid = { version = "0.8", features = ["v4", "serde"] }
 crossbeam = "0.8"
 futures = {version = "0.3",  features=["thread-pool"] }
-tantivy-query-grammar = { version="0.14.0", path="./query-grammar" }
+tantivy-query-grammar = { version="0.14.0-dev", path="./query-grammar" }
 stable_deref_trait = "1"
 rust-stemmers = "1"
 downcast-rs = "1"
@@ -47,18 +48,15 @@ murmurhash32 = "0.2"
 chrono = "0.4"
 smallvec = "1"
 rayon = "1"
-lru = "0.6"
-fastdivide = "0.3"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
 
 [dev-dependencies]
-rand = "0.8"
+rand = "0.7"
 maplit = "1"
 matches = "0.1.8"
-proptest = "1.0"
-criterion = "0.3"
+proptest = "0.10"
 
 [dev-dependencies.fail]
 version = "0.4"
@@ -75,7 +73,7 @@ overflow-checks = true
 
 [features]
 default = ["mmap"]
-mmap = ["fs2", "tempfile", "memmap"]
+mmap = ["fs2", "tempfile", "memmap", "notify"]
 brotli-compression = ["brotli"]
 lz4-compression = ["lz4"]
 failpoints = ["fail/failpoints"]
@@ -99,7 +97,3 @@ travis-ci = { repository = "tantivy-search/tantivy" }
 name = "failpoints"
 path = "tests/failpoints/mod.rs"
 required-features = ["fail/failpoints"]
-
-[[bench]]
-name = "analyzer"
-harness = false

README.md

@@ -1,9 +1,9 @@
 
-[![Build Status](https://travis-ci.org/tantivy-search/tantivy.svg?branch=main)](https://travis-ci.org/tantivy-search/tantivy)
-[![codecov](https://codecov.io/gh/tantivy-search/tantivy/branch/main/graph/badge.svg)](https://codecov.io/gh/tantivy-search/tantivy)
+[![Build Status](https://travis-ci.org/tantivy-search/tantivy.svg?branch=master)](https://travis-ci.org/tantivy-search/tantivy)
+[![codecov](https://codecov.io/gh/tantivy-search/tantivy/branch/master/graph/badge.svg)](https://codecov.io/gh/tantivy-search/tantivy)
 [![Join the chat at https://gitter.im/tantivy-search/tantivy](https://badges.gitter.im/tantivy-search/tantivy.svg)](https://gitter.im/tantivy-search/tantivy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Build status](https://ci.appveyor.com/api/projects/status/r7nb13kj23u8m9pj/branch/main?svg=true)](https://ci.appveyor.com/project/fulmicoton/tantivy/branch/main)
+[![Build status](https://ci.appveyor.com/api/projects/status/r7nb13kj23u8m9pj/branch/master?svg=true)](https://ci.appveyor.com/project/fulmicoton/tantivy/branch/master)
 [![Crates.io](https://img.shields.io/crates/v/tantivy.svg)](https://crates.io/crates/tantivy)
 
 ![Tantivy](https://tantivy-search.github.io/logo/tantivy-logo.png)

benches/analyzer.rs

@@ -1,22 +0,0 @@
-use criterion::{criterion_group, criterion_main, Criterion};
-use tantivy::tokenizer::TokenizerManager;
-
-const ALICE_TXT: &'static str = include_str!("alice.txt");
-
-pub fn criterion_benchmark(c: &mut Criterion) {
-    let tokenizer_manager = TokenizerManager::default();
-    let tokenizer = tokenizer_manager.get("default").unwrap();
-    c.bench_function("default-tokenize-alice", |b| {
-        b.iter(|| {
-            let mut word_count = 0;
-            let mut token_stream = tokenizer.token_stream(ALICE_TXT);
-            while token_stream.advance() {
-                word_count += 1;
-            }
-            assert_eq!(word_count, 30_731);
-        })
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

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};
+use tantivy::{doc, Index, Score, SegmentReader, TantivyError};
 
 #[derive(Default)]
 struct Stats {
@@ -72,7 +72,16 @@ impl Collector for StatsCollector {
         _segment_local_id: u32,
         segment_reader: &SegmentReader,
     ) -> tantivy::Result<StatsSegmentCollector> {
-        let fast_field_reader = segment_reader.fast_fields().u64(self.field)?;
+        let fast_field_reader = segment_reader
+            .fast_fields()
+            .u64(self.field)
+            .ok_or_else(|| {
+                let field_name = segment_reader.schema().get_field_name(self.field);
+                TantivyError::SchemaError(format!(
+                    "Field {:?} is not a u64 fast field.",
+                    field_name
+                ))
+            })?;
         Ok(StatsSegmentCollector {
             fast_field_reader,
             stats: Stats::default(),

examples/faceted_search.rs

@@ -23,7 +23,7 @@ fn main() -> tantivy::Result<()> {
 
     let name = schema_builder.add_text_field("felin_name", TEXT | STORED);
     // this is our faceted field: its scientific classification
-    let classification = schema_builder.add_facet_field("classification", INDEXED);
+    let classification = schema_builder.add_facet_field("classification");
 
     let schema = schema_builder.build();
     let index = Index::create_in_ram(schema);

examples/faceted_search_with_tweaked_score.rs

@@ -9,7 +9,7 @@ fn main() -> tantivy::Result<()> {
     let mut schema_builder = Schema::builder();
 
     let title = schema_builder.add_text_field("title", STORED);
-    let ingredient = schema_builder.add_facet_field("ingredient", INDEXED);
+    let ingredient = schema_builder.add_facet_field("ingredient");
 
     let schema = schema_builder.build();
     let index = Index::create_in_ram(schema.clone());
@@ -61,7 +61,7 @@ fn main() -> tantivy::Result<()> {
 
                 let query_ords: HashSet<u64> = facets
                     .iter()
-                    .filter_map(|key| facet_dict.term_ord(key.encoded_str()).unwrap())
+                    .filter_map(|key| facet_dict.term_ord(key.encoded_str()))
                     .collect();
 
                 let mut facet_ords_buffer: Vec<u64> = Vec::with_capacity(20);

examples/iterating_docs_and_positions.rs

@@ -1,4 +1,4 @@
-// # Iterating docs and positions.
+// # Iterating docs and positioms.
 //
 // At its core of tantivy, relies on a data structure
 // called an inverted index.

examples/pre_tokenized_text.rs

@@ -1,6 +1,6 @@
 // # Pre-tokenized text example
 //
-// This example shows how to use pre-tokenized text. Sometimes you might
+// This example shows how to use pre-tokenized text. Sometimes yout might
 // want to index and search through text which is already split into
 // tokens by some external tool.
 //

examples/snippet.rs

@@ -69,12 +69,12 @@ fn highlight(snippet: Snippet) -> String {
     let mut result = String::new();
     let mut start_from = 0;
 
-    for fragment_range in snippet.highlighted() {
-        result.push_str(&snippet.fragments()[start_from..fragment_range.start]);
+    for (start, end) in snippet.highlighted().iter().map(|h| h.bounds()) {
+        result.push_str(&snippet.fragments()[start_from..start]);
         result.push_str(" --> ");
-        result.push_str(&snippet.fragments()[fragment_range.clone()]);
+        result.push_str(&snippet.fragments()[start..end]);
         result.push_str(" <-- ");
-        start_from = fragment_range.end;
+        start_from = end;
     }
 
     result.push_str(&snippet.fragments()[start_from..]);

query-grammar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tantivy-query-grammar"
-version = "0.14.0"
+version = "0.14.0-dev"
 authors = ["Paul Masurel <paul.masurel@gmail.com>"]
 license = "MIT"
 categories = ["database-implementations", "data-structures"]

query-grammar/src/query_grammar.rs

@@ -1,11 +1,11 @@
 use super::user_input_ast::{UserInputAST, UserInputBound, UserInputLeaf, UserInputLiteral};
 use crate::Occur;
+use combine::error::StringStreamError;
 use combine::parser::char::{char, digit, letter, space, spaces, string};
 use combine::parser::Parser;
 use combine::{
     attempt, choice, eof, many, many1, one_of, optional, parser, satisfy, skip_many1, value,
 };
-use combine::{error::StringStreamError, parser::combinator::recognize};
 
 fn field<'a>() -> impl Parser<&'a str, Output = String> {
     (
@@ -35,62 +35,6 @@ fn word<'a>() -> impl Parser<&'a str, Output = String> {
         })
 }
 
-/// Parses a date time according to rfc3339
-/// 2015-08-02T18:54:42+02
-/// 2021-04-13T19:46:26.266051969+00:00
-///
-/// NOTE: also accepts 999999-99-99T99:99:99.266051969+99:99
-/// We delegate rejecting such invalid dates to the logical AST compuation code
-/// which invokes chrono::DateTime::parse_from_rfc3339 on the value to actually parse
-/// it (instead of merely extracting the datetime value as string as done here).
-fn date_time<'a>() -> impl Parser<&'a str, Output = String> {
-    let two_digits = || recognize::<String, _, _>((digit(), digit()));
-
-    // Parses a time zone
-    // -06:30
-    // Z
-    let time_zone = {
-        let utc = recognize::<String, _, _>(char('Z'));
-        let offset = recognize((
-            choice([char('-'), char('+')]),
-            two_digits(),
-            char(':'),
-            two_digits(),
-        ));
-
-        utc.or(offset)
-    };
-
-    // Parses a date
-    // 2010-01-30
-    let date = {
-        recognize::<String, _, _>((
-            many1::<String, _, _>(digit()),
-            char('-'),
-            two_digits(),
-            char('-'),
-            two_digits(),
-        ))
-    };
-
-    // Parses a time
-    // 12:30:02
-    // 19:46:26.266051969
-    let time = {
-        recognize::<String, _, _>((
-            two_digits(),
-            char(':'),
-            two_digits(),
-            char(':'),
-            two_digits(),
-            optional((char('.'), many1::<String, _, _>(digit()))),
-            time_zone,
-        ))
-    };
-
-    recognize((date, char('T'), time))
-}
-
 fn term_val<'a>() -> impl Parser<&'a str, Output = String> {
     let phrase = char('"').with(many1(satisfy(|c| c != '"'))).skip(char('"'));
     phrase.or(word())
@@ -139,8 +83,7 @@ fn spaces1<'a>() -> impl Parser<&'a str, Output = ()> {
 /// [a TO *], [a TO c], [abc TO bcd}
 fn range<'a>() -> impl Parser<&'a str, Output = UserInputLeaf> {
     let range_term_val = || {
-        attempt(date_time())
-            .or(word())
+        word()
             .or(negative_number())
             .or(char('*').with(value("*".to_string())))
     };
@@ -381,22 +324,6 @@ mod test {
         error_parse("-1.");
     }
 
-    #[test]
-    fn test_date_time() {
-        let (val, remaining) = date_time()
-            .parse("2015-08-02T18:54:42+02:30")
-            .expect("cannot parse date");
-        assert_eq!(val, "2015-08-02T18:54:42+02:30");
-        assert_eq!(remaining, "");
-        assert!(date_time().parse("2015-08-02T18:54:42+02").is_err());
-
-        let (val, remaining) = date_time()
-            .parse("2021-04-13T19:46:26.266051969+00:00")
-            .expect("cannot parse fractional date");
-        assert_eq!(val, "2021-04-13T19:46:26.266051969+00:00");
-        assert_eq!(remaining, "");
-    }
-
     fn test_parse_query_to_ast_helper(query: &str, expected: &str) {
         let query = parse_to_ast().parse(query).unwrap().0;
         let query_str = format!("{:?}", query);
@@ -510,60 +437,25 @@ mod test {
     #[test]
     fn test_range_parser() {
         // testing the range() parser separately
-        let res = range()
-            .parse("title: <hello")
-            .expect("Cannot parse felxible bound word")
-            .0;
+        let res = range().parse("title: <hello").unwrap().0;
         let expected = UserInputLeaf::Range {
             field: Some("title".to_string()),
             lower: UserInputBound::Unbounded,
             upper: UserInputBound::Exclusive("hello".to_string()),
         };
-        let res2 = range()
-            .parse("title:{* TO hello}")
-            .expect("Cannot parse ununbounded to word")
-            .0;
+        let res2 = range().parse("title:{* TO hello}").unwrap().0;
         assert_eq!(res, expected);
         assert_eq!(res2, expected);
-
         let expected_weight = UserInputLeaf::Range {
             field: Some("weight".to_string()),
             lower: UserInputBound::Inclusive("71.2".to_string()),
             upper: UserInputBound::Unbounded,
         };
-        let res3 = range()
-            .parse("weight: >=71.2")
-            .expect("Cannot parse flexible bound float")
-            .0;
-        let res4 = range()
-            .parse("weight:[71.2 TO *}")
-            .expect("Cannot parse float to unbounded")
-            .0;
+
+        let res3 = range().parse("weight: >=71.2").unwrap().0;
+        let res4 = range().parse("weight:[71.2 TO *}").unwrap().0;
         assert_eq!(res3, expected_weight);
         assert_eq!(res4, expected_weight);
-
-        let expected_dates = UserInputLeaf::Range {
-            field: Some("date_field".to_string()),
-            lower: UserInputBound::Exclusive("2015-08-02T18:54:42Z".to_string()),
-            upper: UserInputBound::Inclusive("2021-08-02T18:54:42+02:30".to_string()),
-        };
-        let res5 = range()
-            .parse("date_field:{2015-08-02T18:54:42Z TO 2021-08-02T18:54:42+02:30]")
-            .expect("Cannot parse date range")
-            .0;
-        assert_eq!(res5, expected_dates);
-
-        let expected_flexible_dates = UserInputLeaf::Range {
-            field: Some("date_field".to_string()),
-            lower: UserInputBound::Unbounded,
-            upper: UserInputBound::Inclusive("2021-08-02T18:54:42.12345+02:30".to_string()),
-        };
-
-        let res6 = range()
-            .parse("date_field: <=2021-08-02T18:54:42.12345+02:30")
-            .expect("Cannot parse date range")
-            .0;
-        assert_eq!(res6, expected_flexible_dates);
     }
 
     #[test]

src/collector/count_collector.rs

@@ -2,7 +2,7 @@ use super::Collector;
 use crate::collector::SegmentCollector;
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
 
 /// `CountCollector` collector only counts how many
@@ -45,7 +45,7 @@ impl Collector for Count {
 
     fn for_segment(
         &self,
-        _: SegmentOrdinal,
+        _: SegmentLocalId,
         _: &SegmentReader,
     ) -> crate::Result<SegmentCountCollector> {
         Ok(SegmentCountCollector::default())

src/collector/custom_score_top_collector.rs

@@ -58,7 +58,9 @@ where
         segment_local_id: u32,
         segment_reader: &SegmentReader,
     ) -> crate::Result<Self::Child> {
-        let segment_collector = self.collector.for_segment(segment_local_id, segment_reader);
+        let segment_collector = self
+            .collector
+            .for_segment(segment_local_id, segment_reader)?;
         let segment_scorer = self.custom_scorer.segment_scorer(segment_reader)?;
         Ok(CustomScoreTopSegmentCollector {
             segment_collector,

src/collector/docset_collector.rs

@@ -15,7 +15,7 @@ impl Collector for DocSetCollector {
 
     fn for_segment(
         &self,
-        segment_local_id: crate::SegmentOrdinal,
+        segment_local_id: crate::SegmentLocalId,
         _segment: &crate::SegmentReader,
     ) -> crate::Result<Self::Child> {
         Ok(DocSetChildCollector {
@@ -36,7 +36,7 @@ impl Collector for DocSetCollector {
         let mut result = HashSet::with_capacity(len);
         for (segment_local_id, docs) in segment_fruits {
             for doc in docs {
-                result.insert(DocAddress::new(segment_local_id, doc));
+                result.insert(DocAddress(segment_local_id, doc));
             }
         }
         Ok(result)

src/collector/facet_collector.rs

@@ -5,15 +5,15 @@ use crate::schema::Facet;
 use crate::schema::Field;
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
 use std::cmp::Ordering;
 use std::collections::btree_map;
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::collections::BinaryHeap;
+use std::collections::Bound;
 use std::iter::Peekable;
-use std::ops::Bound;
 use std::{u64, usize};
 
 struct Hit<'a> {
@@ -37,10 +37,7 @@ impl<'a> PartialOrd<Hit<'a>> for Hit<'a> {
 
 impl<'a> Ord for Hit<'a> {
     fn cmp(&self, other: &Self) -> Ordering {
-        other
-            .count
-            .cmp(&self.count)
-            .then(self.facet.cmp(other.facet))
+        other.count.cmp(&self.count)
     }
 }
 
@@ -83,7 +80,7 @@ fn facet_depth(facet_bytes: &[u8]) -> usize {
 /// ```rust
 /// use tantivy::collector::FacetCollector;
 /// use tantivy::query::AllQuery;
-/// use tantivy::schema::{Facet, Schema, INDEXED, TEXT};
+/// use tantivy::schema::{Facet, Schema, TEXT};
 /// use tantivy::{doc, Index};
 ///
 /// fn example() -> tantivy::Result<()> {
@@ -92,7 +89,7 @@ fn facet_depth(facet_bytes: &[u8]) -> usize {
 ///     // Facet have their own specific type.
 ///     // It is not a bad practise to put all of your
 ///     // facet information in the same field.
-///     let facet = schema_builder.add_facet_field("facet", INDEXED);
+///     let facet = schema_builder.add_facet_field("facet");
 ///     let title = schema_builder.add_text_field("title", TEXT);
 ///     let schema = schema_builder.build();
 ///     let index = Index::create_in_ram(schema);
@@ -265,7 +262,7 @@ impl Collector for FacetCollector {
 
     fn for_segment(
         &self,
-        _: SegmentOrdinal,
+        _: SegmentLocalId,
         reader: &SegmentReader,
     ) -> crate::Result<FacetSegmentCollector> {
         let facet_reader = reader.facet_reader(self.field)?;
@@ -277,7 +274,7 @@ impl Collector for FacetCollector {
         let mut collapse_facet_it = self.facets.iter().peekable();
         collapse_facet_ords.push(0);
         {
-            let mut facet_streamer = facet_reader.facet_dict().range().into_stream()?;
+            let mut facet_streamer = facet_reader.facet_dict().range().into_stream();
             if facet_streamer.advance() {
                 'outer: loop {
                     // at the begining of this loop, facet_streamer
@@ -371,12 +368,9 @@ impl SegmentCollector for FacetSegmentCollector {
             }
             let mut facet = vec![];
             let facet_ord = self.collapse_facet_ords[collapsed_facet_ord];
-            // TODO handle errors.
-            if facet_dict.ord_to_term(facet_ord as u64, &mut facet).is_ok() {
-                if let Ok(facet) = Facet::from_encoded(facet) {
-                    facet_counts.insert(facet, count);
-                }
-            }
+            facet_dict.ord_to_term(facet_ord as u64, &mut facet);
+            // TODO
+            facet_counts.insert(Facet::from_encoded(facet).unwrap(), count);
         }
         FacetCounts { facet_counts }
     }
@@ -401,8 +395,6 @@ impl<'a> Iterator for FacetChildIterator<'a> {
 }
 
 impl FacetCounts {
-    /// Returns an iterator over all of the facet count pairs inside this result.
-    /// See the documentation for `FacetCollector` for a usage example.
     pub fn get<T>(&self, facet_from: T) -> FacetChildIterator<'_>
     where
         Facet: From<T>,
@@ -422,8 +414,6 @@ impl FacetCounts {
         FacetChildIterator { underlying }
     }
 
-    /// Returns a vector of top `k` facets with their counts, sorted highest-to-lowest by counts.
-    /// See the documentation for `FacetCollector` for a usage example.
     pub fn top_k<T>(&self, facet: T, k: usize) -> Vec<(&Facet, u64)>
     where
         Facet: From<T>,
@@ -464,7 +454,7 @@ mod tests {
     use crate::collector::Count;
     use crate::core::Index;
     use crate::query::{AllQuery, QueryParser, TermQuery};
-    use crate::schema::{Document, Facet, Field, IndexRecordOption, Schema, INDEXED};
+    use crate::schema::{Document, Facet, Field, IndexRecordOption, Schema};
     use crate::Term;
     use rand::distributions::Uniform;
     use rand::prelude::SliceRandom;
@@ -474,7 +464,7 @@ mod tests {
     #[test]
     fn test_facet_collector_drilldown() {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
 
@@ -534,7 +524,7 @@ mod tests {
     #[test]
     fn test_doc_unsorted_multifacet() {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facets", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facets");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index.writer_for_tests().unwrap();
@@ -558,7 +548,7 @@ mod tests {
     #[test]
     fn test_doc_search_by_facet() -> crate::Result<()> {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index.writer_for_tests()?;
@@ -615,7 +605,7 @@ mod tests {
     #[test]
     fn test_facet_collector_topk() {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
 
@@ -660,41 +650,6 @@ mod tests {
             );
         }
     }
-
-    #[test]
-    fn test_facet_collector_topk_tie_break() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-
-        let docs: Vec<Document> = vec![("b", 2), ("a", 2), ("c", 4)]
-            .into_iter()
-            .flat_map(|(c, count)| {
-                let facet = Facet::from(&format!("/facet/{}", c));
-                let doc = doc!(facet_field => facet);
-                iter::repeat(doc).take(count)
-            })
-            .collect();
-
-        let mut index_writer = index.writer_for_tests()?;
-        for doc in docs {
-            index_writer.add_document(doc);
-        }
-        index_writer.commit()?;
-
-        let searcher = index.reader()?.searcher();
-        let mut facet_collector = FacetCollector::for_field(facet_field);
-        facet_collector.add_facet("/facet");
-        let counts: FacetCounts = searcher.search(&AllQuery, &facet_collector)?;
-
-        let facets: Vec<(&Facet, u64)> = counts.top_k("/facet", 2);
-        assert_eq!(
-            facets,
-            vec![(&Facet::from("/facet/c"), 4), (&Facet::from("/facet/a"), 2)]
-        );
-        Ok(())
-    }
 }
 
 #[cfg(all(test, feature = "unstable"))]
@@ -702,7 +657,7 @@ mod bench {
 
     use crate::collector::FacetCollector;
     use crate::query::AllQuery;
-    use crate::schema::{Facet, Schema, INDEXED};
+    use crate::schema::{Facet, Schema};
     use crate::Index;
     use rand::seq::SliceRandom;
     use rand::thread_rng;
@@ -711,7 +666,7 @@ mod bench {
     #[bench]
     fn bench_facet_collector(b: &mut Bencher) {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
 

src/collector/filter_collector_wrapper.rs

@@ -1,183 +0,0 @@
-// # Custom collector example
-//
-// This example shows how you can implement your own
-// collector. As an example, we will compute a collector
-// that computes the standard deviation of a given fast field.
-//
-// Of course, you can have a look at the tantivy's built-in collectors
-// such as the `CountCollector` for more examples.
-
-// ---
-// Importing tantivy...
-use std::marker::PhantomData;
-
-use crate::collector::{Collector, SegmentCollector};
-use crate::fastfield::{FastFieldReader, FastValue};
-use crate::schema::Field;
-use crate::{Score, SegmentReader, TantivyError};
-
-/// The `FilterCollector` collector filters docs using a u64 fast field value and a predicate.
-/// Only the documents for which the predicate returned "true" will be passed on to the next collector.
-///
-/// ```rust
-/// use tantivy::collector::{TopDocs, FilterCollector};
-/// use tantivy::query::QueryParser;
-/// use tantivy::schema::{Schema, TEXT, INDEXED, FAST};
-/// use tantivy::{doc, DocAddress, Index};
-///
-/// let mut schema_builder = Schema::builder();
-/// let title = schema_builder.add_text_field("title", TEXT);
-/// let price = schema_builder.add_u64_field("price", INDEXED | FAST);
-/// let schema = schema_builder.build();
-/// let index = Index::create_in_ram(schema);
-///
-/// let mut index_writer = index.writer_with_num_threads(1, 10_000_000).unwrap();
-/// index_writer.add_document(doc!(title => "The Name of the Wind", price => 30_200u64));
-/// index_writer.add_document(doc!(title => "The Diary of Muadib", price => 29_240u64));
-/// index_writer.add_document(doc!(title => "A Dairy Cow", price => 21_240u64));
-/// index_writer.add_document(doc!(title => "The Diary of a Young Girl", price => 20_120u64));
-/// assert!(index_writer.commit().is_ok());
-///
-/// let reader = index.reader().unwrap();
-/// let searcher = reader.searcher();
-///
-/// let query_parser = QueryParser::for_index(&index, vec![title]);
-/// let query = query_parser.parse_query("diary").unwrap();
-/// let no_filter_collector = FilterCollector::new(price, &|value: u64| value > 20_120u64, TopDocs::with_limit(2));
-/// let top_docs = searcher.search(&query, &no_filter_collector).unwrap();
-///
-/// assert_eq!(top_docs.len(), 1);
-/// assert_eq!(top_docs[0].1, DocAddress::new(0, 1));
-///
-/// let filter_all_collector: FilterCollector<_, _, u64> = FilterCollector::new(price, &|value| value < 5u64, TopDocs::with_limit(2));
-/// let filtered_top_docs = searcher.search(&query, &filter_all_collector).unwrap();
-///
-/// assert_eq!(filtered_top_docs.len(), 0);
-/// ```
-pub struct FilterCollector<TCollector, TPredicate, TPredicateValue: FastValue>
-where
-    TPredicate: 'static + Clone,
-{
-    field: Field,
-    collector: TCollector,
-    predicate: TPredicate,
-    t_predicate_value: PhantomData<TPredicateValue>,
-}
-
-impl<TCollector, TPredicate, TPredicateValue: FastValue>
-    FilterCollector<TCollector, TPredicate, TPredicateValue>
-where
-    TCollector: Collector + Send + Sync,
-    TPredicate: Fn(TPredicateValue) -> bool + Send + Sync + Clone,
-{
-    /// Create a new FilterCollector.
-    pub fn new(
-        field: Field,
-        predicate: TPredicate,
-        collector: TCollector,
-    ) -> FilterCollector<TCollector, TPredicate, TPredicateValue> {
-        FilterCollector {
-            field,
-            predicate,
-            collector,
-            t_predicate_value: PhantomData,
-        }
-    }
-}
-
-impl<TCollector, TPredicate, TPredicateValue: FastValue> Collector
-    for FilterCollector<TCollector, TPredicate, TPredicateValue>
-where
-    TCollector: Collector + Send + Sync,
-    TPredicate: 'static + Fn(TPredicateValue) -> bool + Send + Sync + Clone,
-    TPredicateValue: FastValue,
-{
-    // That's the type of our result.
-    // Our standard deviation will be a float.
-    type Fruit = TCollector::Fruit;
-
-    type Child = FilterSegmentCollector<TCollector::Child, TPredicate, TPredicateValue>;
-
-    fn for_segment(
-        &self,
-        segment_local_id: u32,
-        segment_reader: &SegmentReader,
-    ) -> crate::Result<FilterSegmentCollector<TCollector::Child, TPredicate, TPredicateValue>> {
-        let schema = segment_reader.schema();
-        let field_entry = schema.get_field_entry(self.field);
-        if !field_entry.is_fast() {
-            return Err(TantivyError::SchemaError(format!(
-                "Field {:?} is not a fast field.",
-                field_entry.name()
-            )));
-        }
-        let requested_type = TPredicateValue::to_type();
-        let field_schema_type = field_entry.field_type().value_type();
-        if requested_type != field_schema_type {
-            return Err(TantivyError::SchemaError(format!(
-                "Field {:?} is of type {:?}!={:?}",
-                field_entry.name(),
-                requested_type,
-                field_schema_type
-            )));
-        }
-
-        let fast_field_reader = segment_reader
-            .fast_fields()
-            .typed_fast_field_reader(self.field)?;
-
-        let segment_collector = self
-            .collector
-            .for_segment(segment_local_id, segment_reader)?;
-
-        Ok(FilterSegmentCollector {
-            fast_field_reader,
-            segment_collector,
-            predicate: self.predicate.clone(),
-            t_predicate_value: PhantomData,
-        })
-    }
-
-    fn requires_scoring(&self) -> bool {
-        self.collector.requires_scoring()
-    }
-
-    fn merge_fruits(
-        &self,
-        segment_fruits: Vec<<TCollector::Child as SegmentCollector>::Fruit>,
-    ) -> crate::Result<TCollector::Fruit> {
-        self.collector.merge_fruits(segment_fruits)
-    }
-}
-
-pub struct FilterSegmentCollector<TSegmentCollector, TPredicate, TPredicateValue>
-where
-    TPredicate: 'static,
-    TPredicateValue: FastValue,
-{
-    fast_field_reader: FastFieldReader<TPredicateValue>,
-    segment_collector: TSegmentCollector,
-    predicate: TPredicate,
-    t_predicate_value: PhantomData<TPredicateValue>,
-}
-
-impl<TSegmentCollector, TPredicate, TPredicateValue> SegmentCollector
-    for FilterSegmentCollector<TSegmentCollector, TPredicate, TPredicateValue>
-where
-    TSegmentCollector: SegmentCollector,
-    TPredicate: 'static + Fn(TPredicateValue) -> bool + Send + Sync,
-    TPredicateValue: FastValue,
-{
-    type Fruit = TSegmentCollector::Fruit;
-
-    fn collect(&mut self, doc: u32, score: Score) {
-        let value = self.fast_field_reader.get(doc);
-        if (self.predicate)(value) {
-            self.segment_collector.collect(doc, score)
-        }
-    }
-
-    fn harvest(self) -> <TSegmentCollector as SegmentCollector>::Fruit {
-        self.segment_collector.harvest()
-    }
-}

src/collector/histogram_collector.rs

@@ -1,291 +0,0 @@
-use crate::collector::{Collector, SegmentCollector};
-use crate::fastfield::{FastFieldReader, FastValue};
-use crate::schema::{Field, Type};
-use crate::{DocId, Score};
-use fastdivide::DividerU64;
-
-/// Histogram builds an histogram of the values of a fastfield for the
-/// collected DocSet.
-///
-/// At construction, it is given parameters that define a partition of an interval
-/// [min_val, max_val) into N buckets with the same width.
-/// The ith bucket is then defined by `[min_val + i * bucket_width, min_val + (i+1) * bucket_width)`
-///
-/// An histogram is then defined as a `Vec<u64>` of length `num_buckets`, that contains a count of
-/// documents for each value bucket.
-///
-/// See also [`HistogramCollector::new()`].
-///
-/// # Warning
-///
-/// f64 field. are not supported.
-#[derive(Clone)]
-pub struct HistogramCollector {
-    min_value: u64,
-    num_buckets: usize,
-    divider: DividerU64,
-    field: Field,
-}
-
-impl HistogramCollector {
-    /// Builds a new HistogramCollector.
-    ///
-    /// The scale/range of the histogram is not dynamic. It is required to
-    /// define it by supplying following parameter:
-    ///  - `min_value`: the minimum value that can be recorded in the histogram.
-    ///  - `bucket_width`: the length of the interval that is associated to each buckets.
-    ///  - `num_buckets`: The overall number of buckets.
-    ///
-    /// Together, this parameters define a partition of `[min_value, min_value + num_buckets * bucket_width)`
-    /// into `num_buckets` intervals of width bucket that we call `bucket`.
-    ///
-    /// # Disclaimer
-    /// This function panics if the field given is of type f64.
-    pub fn new<TFastValue: FastValue>(
-        field: Field,
-        min_value: TFastValue,
-        bucket_width: u64,
-        num_buckets: usize,
-    ) -> HistogramCollector {
-        let fast_type = TFastValue::to_type();
-        assert!(fast_type == Type::U64 || fast_type == Type::I64 || fast_type == Type::Date);
-        HistogramCollector {
-            min_value: min_value.to_u64(),
-            num_buckets,
-            field,
-            divider: DividerU64::divide_by(bucket_width),
-        }
-    }
-}
-
-struct HistogramComputer {
-    counts: Vec<u64>,
-    min_value: u64,
-    divider: DividerU64,
-}
-
-impl HistogramComputer {
-    #[inline]
-    pub(crate) fn add_value(&mut self, value: u64) {
-        if value < self.min_value {
-            return;
-        }
-        let delta = value - self.min_value;
-        let delta_u64 = delta.to_u64();
-        let bucket_id: usize = self.divider.divide(delta_u64) as usize;
-        if bucket_id < self.counts.len() {
-            self.counts[bucket_id] += 1;
-        }
-    }
-
-    fn harvest(self) -> Vec<u64> {
-        self.counts
-    }
-}
-pub struct SegmentHistogramCollector {
-    histogram_computer: HistogramComputer,
-    ff_reader: FastFieldReader<u64>,
-}
-
-impl SegmentCollector for SegmentHistogramCollector {
-    type Fruit = Vec<u64>;
-
-    fn collect(&mut self, doc: DocId, _score: Score) {
-        let value = self.ff_reader.get(doc);
-        self.histogram_computer.add_value(value);
-    }
-
-    fn harvest(self) -> Self::Fruit {
-        self.histogram_computer.harvest()
-    }
-}
-
-impl Collector for HistogramCollector {
-    type Fruit = Vec<u64>;
-    type Child = SegmentHistogramCollector;
-
-    fn for_segment(
-        &self,
-        _segment_local_id: crate::SegmentOrdinal,
-        segment: &crate::SegmentReader,
-    ) -> crate::Result<Self::Child> {
-        let ff_reader = segment.fast_fields().u64_lenient(self.field)?;
-        Ok(SegmentHistogramCollector {
-            histogram_computer: HistogramComputer {
-                counts: vec![0; self.num_buckets],
-                min_value: self.min_value,
-                divider: self.divider,
-            },
-            ff_reader,
-        })
-    }
-
-    fn requires_scoring(&self) -> bool {
-        false
-    }
-
-    fn merge_fruits(&self, child_histograms: Vec<Vec<u64>>) -> crate::Result<Vec<u64>> {
-        Ok(add_vecs(child_histograms, self.num_buckets))
-    }
-}
-
-pub fn add_arrays_into(acc: &mut [u64], add: &[u64]) {
-    assert_eq!(acc.len(), add.len());
-    for (dest_bucket, bucket_count) in acc.iter_mut().zip(add) {
-        *dest_bucket += bucket_count;
-    }
-}
-
-fn add_vecs(mut vals_list: Vec<Vec<u64>>, len: usize) -> Vec<u64> {
-    let mut acc = vals_list.pop().unwrap_or_else(|| vec![0u64; len]);
-    assert_eq!(acc.len(), len);
-    for vals in vals_list {
-        add_arrays_into(&mut acc, &vals);
-    }
-    acc
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{add_vecs, HistogramCollector, HistogramComputer};
-    use crate::chrono::{TimeZone, Utc};
-    use crate::schema::{Schema, FAST};
-    use crate::{doc, query, Index};
-    use fastdivide::DividerU64;
-    use query::AllQuery;
-
-    #[test]
-    fn test_add_histograms_simple() {
-        assert_eq!(
-            add_vecs(vec![vec![1, 0, 3], vec![11, 2, 3], vec![0, 0, 1]], 3),
-            vec![12, 2, 7]
-        )
-    }
-
-    #[test]
-    fn test_add_histograms_empty() {
-        assert_eq!(add_vecs(vec![], 3), vec![0, 0, 0])
-    }
-
-    #[test]
-    fn test_histogram_builder_simple() {
-        // [1..3)
-        // [3..5)
-        // ..
-        // [9..11)
-        let mut histogram_computer = HistogramComputer {
-            counts: vec![0; 5],
-            min_value: 1,
-            divider: DividerU64::divide_by(2),
-        };
-        histogram_computer.add_value(1);
-        histogram_computer.add_value(7);
-        assert_eq!(histogram_computer.harvest(), vec![1, 0, 0, 1, 0]);
-    }
-
-    #[test]
-    fn test_histogram_too_low_is_ignored() {
-        let mut histogram_computer = HistogramComputer {
-            counts: vec![0; 5],
-            min_value: 2,
-            divider: DividerU64::divide_by(2),
-        };
-        histogram_computer.add_value(0);
-        assert_eq!(histogram_computer.harvest(), vec![0, 0, 0, 0, 0]);
-    }
-
-    #[test]
-    fn test_histogram_too_high_is_ignored() {
-        let mut histogram_computer = HistogramComputer {
-            counts: vec![0u64; 5],
-            min_value: 0,
-            divider: DividerU64::divide_by(2),
-        };
-        histogram_computer.add_value(10);
-        assert_eq!(histogram_computer.harvest(), vec![0, 0, 0, 0, 0]);
-    }
-    #[test]
-    fn test_no_segments() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let val_field = schema_builder.add_u64_field("val_field", FAST);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let all_query = AllQuery;
-        let histogram_collector = HistogramCollector::new(val_field, 0u64, 2, 5);
-        let histogram = searcher.search(&all_query, &histogram_collector)?;
-        assert_eq!(histogram, vec![0; 5]);
-        Ok(())
-    }
-
-    #[test]
-    fn test_histogram_i64() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let val_field = schema_builder.add_i64_field("val_field", FAST);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut writer = index.writer_with_num_threads(1, 4_000_000)?;
-        writer.add_document(doc!(val_field=>12i64));
-        writer.add_document(doc!(val_field=>-30i64));
-        writer.add_document(doc!(val_field=>-12i64));
-        writer.add_document(doc!(val_field=>-10i64));
-        writer.commit()?;
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let all_query = AllQuery;
-        let histogram_collector = HistogramCollector::new(val_field, -20i64, 10u64, 4);
-        let histogram = searcher.search(&all_query, &histogram_collector)?;
-        assert_eq!(histogram, vec![1, 1, 0, 1]);
-        Ok(())
-    }
-
-    #[test]
-    fn test_histogram_merge() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let val_field = schema_builder.add_i64_field("val_field", FAST);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut writer = index.writer_with_num_threads(1, 4_000_000)?;
-        writer.add_document(doc!(val_field=>12i64));
-        writer.commit()?;
-        writer.add_document(doc!(val_field=>-30i64));
-        writer.commit()?;
-        writer.add_document(doc!(val_field=>-12i64));
-        writer.commit()?;
-        writer.add_document(doc!(val_field=>-10i64));
-        writer.commit()?;
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let all_query = AllQuery;
-        let histogram_collector = HistogramCollector::new(val_field, -20i64, 10u64, 4);
-        let histogram = searcher.search(&all_query, &histogram_collector)?;
-        assert_eq!(histogram, vec![1, 1, 0, 1]);
-        Ok(())
-    }
-
-    #[test]
-    fn test_histogram_dates() -> crate::Result<()> {
-        let mut schema_builder = Schema::builder();
-        let date_field = schema_builder.add_date_field("date_field", FAST);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut writer = index.writer_with_num_threads(1, 4_000_000)?;
-        writer.add_document(doc!(date_field=>Utc.ymd(1982, 9, 17).and_hms(0, 0,0)));
-        writer.add_document(doc!(date_field=>Utc.ymd(1986, 3, 9).and_hms(0, 0, 0)));
-        writer.add_document(doc!(date_field=>Utc.ymd(1983, 9, 27).and_hms(0, 0, 0)));
-        writer.commit()?;
-        let reader = index.reader()?;
-        let searcher = reader.searcher();
-        let all_query = AllQuery;
-        let week_histogram_collector = HistogramCollector::new(
-            date_field,
-            Utc.ymd(1980, 1, 1).and_hms(0, 0, 0),
-            3600 * 24 * 365, // it is just for a unit test... sorry leap years.
-            10,
-        );
-        let week_histogram = searcher.search(&all_query, &week_histogram_collector)?;
-        assert_eq!(week_histogram, vec![0, 0, 1, 1, 0, 0, 1, 0, 0, 0]);
-        Ok(())
-    }
-}

src/collector/mod.rs

@@ -86,16 +86,13 @@ See the `custom_collector` example.
 
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
 use downcast_rs::impl_downcast;
 
 mod count_collector;
 pub use self::count_collector::Count;
 
-mod histogram_collector;
-pub use histogram_collector::HistogramCollector;
-
 mod multi_collector;
 pub use self::multi_collector::MultiCollector;
 
@@ -112,15 +109,11 @@ pub use self::tweak_score_top_collector::{ScoreSegmentTweaker, ScoreTweaker};
 
 mod facet_collector;
 pub use self::facet_collector::FacetCollector;
-pub use self::facet_collector::FacetCounts;
 use crate::query::Weight;
 
 mod docset_collector;
 pub use self::docset_collector::DocSetCollector;
 
-mod filter_collector_wrapper;
-pub use self::filter_collector_wrapper::FilterCollector;
-
 /// `Fruit` is the type for the result of our collection.
 /// e.g. `usize` for the `Count` collector.
 pub trait Fruit: Send + downcast_rs::Downcast {}
@@ -155,7 +148,7 @@ pub trait Collector: Sync + Send {
     /// on this segment.
     fn for_segment(
         &self,
-        segment_local_id: SegmentOrdinal,
+        segment_local_id: SegmentLocalId,
         segment: &SegmentReader,
     ) -> crate::Result<Self::Child>;
 
@@ -193,61 +186,6 @@ pub trait Collector: Sync + Send {
     }
 }
 
-impl<TSegmentCollector: SegmentCollector> SegmentCollector for Option<TSegmentCollector> {
-    type Fruit = Option<TSegmentCollector::Fruit>;
-
-    fn collect(&mut self, doc: DocId, score: Score) {
-        if let Some(segment_collector) = self {
-            segment_collector.collect(doc, score);
-        }
-    }
-
-    fn harvest(self) -> Self::Fruit {
-        self.map(|segment_collector| segment_collector.harvest())
-    }
-}
-
-impl<TCollector: Collector> Collector for Option<TCollector> {
-    type Fruit = Option<TCollector::Fruit>;
-
-    type Child = Option<<TCollector as Collector>::Child>;
-
-    fn for_segment(
-        &self,
-        segment_local_id: SegmentOrdinal,
-        segment: &SegmentReader,
-    ) -> crate::Result<Self::Child> {
-        Ok(if let Some(inner) = self {
-            let inner_segment_collector = inner.for_segment(segment_local_id, segment)?;
-            Some(inner_segment_collector)
-        } else {
-            None
-        })
-    }
-
-    fn requires_scoring(&self) -> bool {
-        self.as_ref()
-            .map(|inner| inner.requires_scoring())
-            .unwrap_or(false)
-    }
-
-    fn merge_fruits(
-        &self,
-        segment_fruits: Vec<<Self::Child as SegmentCollector>::Fruit>,
-    ) -> crate::Result<Self::Fruit> {
-        if let Some(inner) = self.as_ref() {
-            let inner_segment_fruits: Vec<_> = segment_fruits
-                .into_iter()
-                .flat_map(|fruit_opt| fruit_opt.into_iter())
-                .collect();
-            let fruit = inner.merge_fruits(inner_segment_fruits)?;
-            Ok(Some(fruit))
-        } else {
-            Ok(None)
-        }
-    }
-}
-
 /// The `SegmentCollector` is the trait in charge of defining the
 /// collect operation at the scale of the segment.
 ///

src/collector/multi_collector.rs

@@ -3,7 +3,7 @@ use super::SegmentCollector;
 use crate::collector::Fruit;
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
 use crate::TantivyError;
 use std::marker::PhantomData;
@@ -175,7 +175,7 @@ impl<'a> Collector for MultiCollector<'a> {
 
     fn for_segment(
         &self,
-        segment_local_id: SegmentOrdinal,
+        segment_local_id: SegmentLocalId,
         segment: &SegmentReader,
     ) -> crate::Result<MultiCollectorChild> {
         let children = self

src/collector/tests.rs

@@ -3,17 +3,10 @@ use crate::core::SegmentReader;
 use crate::fastfield::BytesFastFieldReader;
 use crate::fastfield::FastFieldReader;
 use crate::schema::Field;
+use crate::DocAddress;
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
-use crate::{DocAddress, Document, Searcher};
-
-use crate::collector::{Count, FilterCollector, TopDocs};
-use crate::query::{AllQuery, QueryParser};
-use crate::schema::{Schema, FAST, TEXT};
-use crate::DateTime;
-use crate::{doc, Index};
-use std::str::FromStr;
+use crate::SegmentLocalId;
 
 pub const TEST_COLLECTOR_WITH_SCORE: TestCollector = TestCollector {
     compute_score: true,
@@ -23,54 +16,6 @@ pub const TEST_COLLECTOR_WITHOUT_SCORE: TestCollector = TestCollector {
     compute_score: true,
 };
 
-#[test]
-pub fn test_filter_collector() {
-    let mut schema_builder = Schema::builder();
-    let title = schema_builder.add_text_field("title", TEXT);
-    let price = schema_builder.add_u64_field("price", FAST);
-    let date = schema_builder.add_date_field("date", FAST);
-    let schema = schema_builder.build();
-    let index = Index::create_in_ram(schema);
-
-    let mut index_writer = index.writer_with_num_threads(1, 10_000_000).unwrap();
-    index_writer.add_document(doc!(title => "The Name of the Wind", price => 30_200u64, date => DateTime::from_str("1898-04-09T00:00:00+00:00").unwrap()));
-    index_writer.add_document(doc!(title => "The Diary of Muadib", price => 29_240u64, date => DateTime::from_str("2020-04-09T00:00:00+00:00").unwrap()));
-    index_writer.add_document(doc!(title => "The Diary of Anne Frank", price => 18_240u64, date => DateTime::from_str("2019-04-20T00:00:00+00:00").unwrap()));
-    index_writer.add_document(doc!(title => "A Dairy Cow", price => 21_240u64, date => DateTime::from_str("2019-04-09T00:00:00+00:00").unwrap()));
-    index_writer.add_document(doc!(title => "The Diary of a Young Girl", price => 20_120u64, date => DateTime::from_str("2018-04-09T00:00:00+00:00").unwrap()));
-    assert!(index_writer.commit().is_ok());
-
-    let reader = index.reader().unwrap();
-    let searcher = reader.searcher();
-
-    let query_parser = QueryParser::for_index(&index, vec![title]);
-    let query = query_parser.parse_query("diary").unwrap();
-    let filter_some_collector = FilterCollector::new(
-        price,
-        &|value: u64| value > 20_120u64,
-        TopDocs::with_limit(2),
-    );
-    let top_docs = searcher.search(&query, &filter_some_collector).unwrap();
-
-    assert_eq!(top_docs.len(), 1);
-    assert_eq!(top_docs[0].1, DocAddress::new(0, 1));
-
-    let filter_all_collector: FilterCollector<_, _, u64> =
-        FilterCollector::new(price, &|value| value < 5u64, TopDocs::with_limit(2));
-    let filtered_top_docs = searcher.search(&query, &filter_all_collector).unwrap();
-
-    assert_eq!(filtered_top_docs.len(), 0);
-
-    fn date_filter(value: DateTime) -> bool {
-        (value - DateTime::from_str("2019-04-09T00:00:00+00:00").unwrap()).num_weeks() > 0
-    }
-
-    let filter_dates_collector = FilterCollector::new(date, &date_filter, TopDocs::with_limit(5));
-    let filtered_date_docs = searcher.search(&query, &filter_dates_collector).unwrap();
-
-    assert_eq!(filtered_date_docs.len(), 2);
-}
-
 /// Stores all of the doc ids.
 /// This collector is only used for tests.
 /// It is unusable in pr
@@ -82,7 +27,7 @@ pub struct TestCollector {
 }
 
 pub struct TestSegmentCollector {
-    segment_id: SegmentOrdinal,
+    segment_id: SegmentLocalId,
     fruit: TestFruit,
 }
 
@@ -108,7 +53,7 @@ impl Collector for TestCollector {
 
     fn for_segment(
         &self,
-        segment_id: SegmentOrdinal,
+        segment_id: SegmentLocalId,
         _reader: &SegmentReader,
     ) -> crate::Result<TestSegmentCollector> {
         Ok(TestSegmentCollector {
@@ -126,7 +71,7 @@ impl Collector for TestCollector {
             if fruit.docs().is_empty() {
                 0
             } else {
-                fruit.docs()[0].segment_ord
+                fruit.docs()[0].segment_ord()
             }
         });
         let mut docs = vec![];
@@ -143,7 +88,7 @@ impl SegmentCollector for TestSegmentCollector {
     type Fruit = TestFruit;
 
     fn collect(&mut self, doc: DocId, score: Score) {
-        self.fruit.docs.push(DocAddress::new(self.segment_id, doc));
+        self.fruit.docs.push(DocAddress(self.segment_id, doc));
         self.fruit.scores.push(score);
     }
 
@@ -177,7 +122,7 @@ impl Collector for FastFieldTestCollector {
 
     fn for_segment(
         &self,
-        _: SegmentOrdinal,
+        _: SegmentLocalId,
         segment_reader: &SegmentReader,
     ) -> crate::Result<FastFieldSegmentCollector> {
         let reader = segment_reader
@@ -240,7 +185,12 @@ impl Collector for BytesFastFieldTestCollector {
         _segment_local_id: u32,
         segment_reader: &SegmentReader,
     ) -> crate::Result<BytesFastFieldSegmentCollector> {
-        let reader = segment_reader.fast_fields().bytes(self.field)?;
+        let reader = segment_reader
+            .fast_fields()
+            .bytes(self.field)
+            .ok_or_else(|| {
+                crate::TantivyError::InvalidArgument("Field is not a bytes fast field.".to_string())
+            })?;
         Ok(BytesFastFieldSegmentCollector {
             vals: Vec::new(),
             reader,
@@ -268,30 +218,3 @@ impl SegmentCollector for BytesFastFieldSegmentCollector {
         self.vals
     }
 }
-
-fn make_test_searcher() -> crate::Result<crate::LeasedItem<Searcher>> {
-    let schema = Schema::builder().build();
-    let index = Index::create_in_ram(schema);
-    let mut index_writer = index.writer_for_tests()?;
-    index_writer.add_document(Document::default());
-    index_writer.add_document(Document::default());
-    index_writer.commit()?;
-    Ok(index.reader()?.searcher())
-}
-
-#[test]
-fn test_option_collector_some() -> crate::Result<()> {
-    let searcher = make_test_searcher()?;
-    let counts = searcher.search(&AllQuery, &Some(Count))?;
-    assert_eq!(counts, Some(2));
-    Ok(())
-}
-
-#[test]
-fn test_option_collector_none() -> crate::Result<()> {
-    let searcher = make_test_searcher()?;
-    let none_collector: Option<Count> = None;
-    let counts = searcher.search(&AllQuery, &none_collector)?;
-    assert_eq!(counts, None);
-    Ok(())
-}

src/collector/top_collector.rs

@@ -1,10 +1,10 @@
 use crate::DocAddress;
 use crate::DocId;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
+use serde::export::PhantomData;
 use std::cmp::Ordering;
 use std::collections::BinaryHeap;
-use std::marker::PhantomData;
 
 /// Contains a feature (field, score, etc.) of a document along with the document address.
 ///
@@ -118,10 +118,13 @@ where
 
     pub(crate) fn for_segment<F: PartialOrd>(
         &self,
-        segment_id: SegmentOrdinal,
+        segment_id: SegmentLocalId,
         _: &SegmentReader,
-    ) -> TopSegmentCollector<F> {
-        TopSegmentCollector::new(segment_id, self.limit + self.offset)
+    ) -> crate::Result<TopSegmentCollector<F>> {
+        Ok(TopSegmentCollector::new(
+            segment_id,
+            self.limit + self.offset,
+        ))
     }
 
     /// Create a new TopCollector with the same limit and offset.
@@ -147,32 +150,29 @@ where
 pub(crate) struct TopSegmentCollector<T> {
     limit: usize,
     heap: BinaryHeap<ComparableDoc<T, DocId>>,
-    segment_ord: u32,
+    segment_id: u32,
 }
 
 impl<T: PartialOrd> TopSegmentCollector<T> {
-    fn new(segment_ord: SegmentOrdinal, limit: usize) -> TopSegmentCollector<T> {
+    fn new(segment_id: SegmentLocalId, limit: usize) -> TopSegmentCollector<T> {
         TopSegmentCollector {
             limit,
             heap: BinaryHeap::with_capacity(limit),
-            segment_ord,
+            segment_id,
         }
     }
 }
 
 impl<T: PartialOrd + Clone> TopSegmentCollector<T> {
     pub fn harvest(self) -> Vec<(T, DocAddress)> {
-        let segment_ord = self.segment_ord;
+        let segment_id = self.segment_id;
         self.heap
             .into_sorted_vec()
             .into_iter()
             .map(|comparable_doc| {
                 (
                     comparable_doc.feature,
-                    DocAddress {
-                        segment_ord,
-                        doc_id: comparable_doc.doc,
-                    },
+                    DocAddress(segment_id, comparable_doc.doc),
                 )
             })
             .collect()
@@ -223,9 +223,9 @@ mod tests {
         assert_eq!(
             top_collector.harvest(),
             vec![
-                (0.8, DocAddress::new(0, 1)),
-                (0.3, DocAddress::new(0, 5)),
-                (0.2, DocAddress::new(0, 3))
+                (0.8, DocAddress(0, 1)),
+                (0.3, DocAddress(0, 5)),
+                (0.2, DocAddress(0, 3))
             ]
         );
     }
@@ -241,10 +241,10 @@ mod tests {
         assert_eq!(
             top_collector.harvest(),
             vec![
-                (0.9, DocAddress::new(0, 7)),
-                (0.8, DocAddress::new(0, 1)),
-                (0.3, DocAddress::new(0, 5)),
-                (0.2, DocAddress::new(0, 3))
+                (0.9, DocAddress(0, 7)),
+                (0.8, DocAddress(0, 1)),
+                (0.3, DocAddress(0, 5)),
+                (0.2, DocAddress(0, 3))
             ]
         );
     }
@@ -279,17 +279,17 @@ mod tests {
 
         let results = collector
             .merge_fruits(vec![vec![
-                (0.9, DocAddress::new(0, 1)),
-                (0.8, DocAddress::new(0, 2)),
-                (0.7, DocAddress::new(0, 3)),
-                (0.6, DocAddress::new(0, 4)),
-                (0.5, DocAddress::new(0, 5)),
+                (0.9, DocAddress(0, 1)),
+                (0.8, DocAddress(0, 2)),
+                (0.7, DocAddress(0, 3)),
+                (0.6, DocAddress(0, 4)),
+                (0.5, DocAddress(0, 5)),
             ]])
             .unwrap();
 
         assert_eq!(
             results,
-            vec![(0.8, DocAddress::new(0, 2)), (0.7, DocAddress::new(0, 3)),]
+            vec![(0.8, DocAddress(0, 2)), (0.7, DocAddress(0, 3)),]
         );
     }
 
@@ -298,13 +298,10 @@ mod tests {
         let collector = TopCollector::with_limit(2).and_offset(1);
 
         let results = collector
-            .merge_fruits(vec![vec![
-                (0.9, DocAddress::new(0, 1)),
-                (0.8, DocAddress::new(0, 2)),
-            ]])
+            .merge_fruits(vec![vec![(0.9, DocAddress(0, 1)), (0.8, DocAddress(0, 2))]])
             .unwrap();
 
-        assert_eq!(results, vec![(0.8, DocAddress::new(0, 2)),]);
+        assert_eq!(results, vec![(0.8, DocAddress(0, 2)),]);
     }
 
     #[test]
@@ -312,10 +309,7 @@ mod tests {
         let collector = TopCollector::with_limit(2).and_offset(20);
 
         let results = collector
-            .merge_fruits(vec![vec![
-                (0.9, DocAddress::new(0, 1)),
-                (0.8, DocAddress::new(0, 2)),
-            ]])
+            .merge_fruits(vec![vec![(0.9, DocAddress(0, 1)), (0.8, DocAddress(0, 2))]])
             .unwrap();
 
         assert_eq!(results, vec![]);

src/collector/top_score_collector.rs

@@ -10,7 +10,7 @@ use crate::schema::Field;
 use crate::DocAddress;
 use crate::DocId;
 use crate::Score;
-use crate::SegmentOrdinal;
+use crate::SegmentLocalId;
 use crate::SegmentReader;
 use crate::{collector::custom_score_top_collector::CustomScoreTopCollector, fastfield::FastValue};
 use crate::{collector::top_collector::TopSegmentCollector, TantivyError};
@@ -29,7 +29,7 @@ struct FastFieldConvertCollector<
 impl<TCollector, TFastValue> Collector for FastFieldConvertCollector<TCollector, TFastValue>
 where
     TCollector: Collector<Fruit = Vec<(u64, DocAddress)>>,
-    TFastValue: FastValue,
+    TFastValue: FastValue + 'static,
 {
     type Fruit = Vec<(TFastValue, DocAddress)>;
 
@@ -37,7 +37,7 @@ where
 
     fn for_segment(
         &self,
-        segment_local_id: crate::SegmentOrdinal,
+        segment_local_id: crate::SegmentLocalId,
         segment: &SegmentReader,
     ) -> crate::Result<Self::Child> {
         let schema = segment.schema();
@@ -113,8 +113,8 @@ where
 /// 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::new(0, 1));
-/// assert_eq!(top_docs[1].1, DocAddress::new(0, 3));
+/// assert_eq!(top_docs[0].1, DocAddress(0, 1));
+/// assert_eq!(top_docs[1].1, DocAddress(0, 3));
 /// ```
 pub struct TopDocs(TopCollector<Score>);
 
@@ -146,14 +146,15 @@ impl CustomScorer<u64> for ScorerByField {
     type Child = ScorerByFastFieldReader;
 
     fn segment_scorer(&self, segment_reader: &SegmentReader) -> crate::Result<Self::Child> {
-        // We interpret this field as u64, regardless of its type, that way,
-        // we avoid needless conversion. Regardless of the fast field type, the
-        // mapping is monotonic, so it is sufficient to compute our top-K docs.
-        //
-        // The conversion will then happen only on the top-K docs.
-        let ff_reader: FastFieldReader<u64> = segment_reader
+        let ff_reader = segment_reader
             .fast_fields()
-            .typed_fast_field_reader(self.field)?;
+            .u64_lenient(self.field)
+            .ok_or_else(|| {
+                crate::TantivyError::SchemaError(format!(
+                    "Field requested ({:?}) is not a fast field.",
+                    self.field
+                ))
+            })?;
         Ok(ScorerByFastFieldReader { ff_reader })
     }
 }
@@ -201,8 +202,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::new(0, 4));
-    /// assert_eq!(top_docs[1].1, DocAddress::new(0, 3));
+    /// assert_eq!(top_docs[0].1, DocAddress(0, 4));
+    /// assert_eq!(top_docs[1].1, DocAddress(0, 3));
     /// ```
     pub fn and_offset(self, offset: usize) -> TopDocs {
         TopDocs(self.0.and_offset(offset))
@@ -231,7 +232,7 @@ impl TopDocs {
     /// #   let title = schema_builder.add_text_field("title", TEXT);
     /// #   let rating = schema_builder.add_u64_field("rating", FAST);
     /// #   let schema = schema_builder.build();
-    /// #
+    /// #  
     /// #   let index = Index::create_in_ram(schema);
     /// #   let mut index_writer = index.writer_with_num_threads(1, 10_000_000)?;
     /// #   index_writer.add_document(doc!(title => "The Name of the Wind", rating => 92u64));
@@ -243,8 +244,8 @@ impl TopDocs {
     /// #   let query = QueryParser::for_index(&index, vec![title]).parse_query("diary")?;
     /// #   let top_docs = docs_sorted_by_rating(&reader.searcher(), &query, rating)?;
     /// #   assert_eq!(top_docs,
-    /// #            vec![(97u64, DocAddress::new(0u32, 1)),
-    /// #                 (80u64, DocAddress::new(0u32, 3))]);
+    /// #            vec![(97u64, DocAddress(0u32, 1)),
+    /// #                 (80u64, DocAddress(0u32, 3))]);
     /// #   Ok(())
     /// # }
     /// /// Searches the document matching the given query, and
@@ -261,7 +262,7 @@ impl TopDocs {
     ///     let top_books_by_rating = TopDocs
     ///                 ::with_limit(10)
     ///                  .order_by_u64_field(rating_field);
-    ///
+    ///     
     ///     // ... and here are our documents. Note this is a simple vec.
     ///     // The `u64` in the pair is the value of our fast field for
     ///     // each documents.
@@ -271,13 +272,13 @@ impl TopDocs {
     ///     // query.
     ///     let resulting_docs: Vec<(u64, DocAddress)> =
     ///          searcher.search(query, &top_books_by_rating)?;
-    ///
+    ///     
     ///     Ok(resulting_docs)
     /// }
     /// ```
     ///
     /// # See also
-    ///
+    ///  
     /// To confortably work with `u64`s, `i64`s, `f64`s, or `date`s, please refer to
     /// [.order_by_fast_field(...)](#method.order_by_fast_field) method.
     pub fn order_by_u64_field(
@@ -289,7 +290,7 @@ impl TopDocs {
 
     /// Set top-K to rank documents by a given fast field.
     ///
-    /// If the field is not a fast field, or its field type does not match the generic type, this method does not panic,
+    /// If the field is not a fast field, or its field type does not match the generic type, this method does not panic,  
     /// but an explicit error will be returned at the moment of collection.
     ///
     /// Note that this method is a generic. The requested fast field type will be often
@@ -313,7 +314,7 @@ impl TopDocs {
     /// #   let title = schema_builder.add_text_field("company", TEXT);
     /// #   let rating = schema_builder.add_i64_field("revenue", FAST);
     /// #   let schema = schema_builder.build();
-    /// #
+    /// #  
     /// #   let index = Index::create_in_ram(schema);
     /// #   let mut index_writer = index.writer_with_num_threads(1, 10_000_000)?;
     /// #   index_writer.add_document(doc!(title => "MadCow Inc.", rating => 92_000_000i64));
@@ -323,8 +324,8 @@ impl TopDocs {
     /// #   let reader = index.reader()?;
     /// #   let top_docs = docs_sorted_by_revenue(&reader.searcher(), &AllQuery, rating)?;
     /// #   assert_eq!(top_docs,
-    /// #            vec![(119_000_000i64, DocAddress::new(0, 1)),
-    /// #                 (92_000_000i64, DocAddress::new(0, 0))]);
+    /// #            vec![(119_000_000i64, DocAddress(0, 1)),
+    /// #                 (92_000_000i64, DocAddress(0, 0))]);
     /// #   Ok(())
     /// # }
     /// /// Searches the document matching the given query, and
@@ -342,7 +343,7 @@ impl TopDocs {
     ///     let top_company_by_revenue = TopDocs
     ///                 ::with_limit(2)
     ///                  .order_by_fast_field(revenue_field);
-    ///
+    ///     
     ///     // ... and here are our documents. Note this is a simple vec.
     ///     // The `i64` in the pair is the value of our fast field for
     ///     // each documents.
@@ -352,7 +353,7 @@ impl TopDocs {
     ///     // query.
     ///     let resulting_docs: Vec<(i64, DocAddress)> =
     ///          searcher.search(query, &top_company_by_revenue)?;
-    ///
+    ///     
     ///     Ok(resulting_docs)
     /// }
     /// ```
@@ -361,7 +362,7 @@ impl TopDocs {
         fast_field: Field,
     ) -> impl Collector<Fruit = Vec<(TFastValue, DocAddress)>>
     where
-        TFastValue: FastValue,
+        TFastValue: FastValue + 'static,
     {
         let u64_collector = self.order_by_u64_field(fast_field);
         FastFieldConvertCollector {
@@ -391,7 +392,7 @@ impl TopDocs {
     ///
     /// In the following example will will tweak our ranking a bit by
     /// boosting popular products a notch.
-    ///
+    ///  
     /// In more serious application, this tweaking could involved running a
     /// learning-to-rank model over various features
     ///
@@ -522,7 +523,7 @@ impl TopDocs {
     /// #   let index = Index::create_in_ram(schema);
     /// #   let mut index_writer = index.writer_with_num_threads(1, 10_000_000)?;
     /// #   let product_name = index.schema().get_field("product_name").unwrap();
-    /// #
+    /// #   
     /// let popularity: Field = index.schema().get_field("popularity").unwrap();
     /// let boosted: Field = index.schema().get_field("boosted").unwrap();
     /// #   index_writer.add_document(doc!(boosted=>1u64, product_name => "The Diary of Muadib", popularity => 1u64));
@@ -556,7 +557,7 @@ impl TopDocs {
     ///                 segment_reader.fast_fields().u64(popularity).unwrap();
     ///             let boosted_reader =
     ///                 segment_reader.fast_fields().u64(boosted).unwrap();
-    ///
+    ///    
     ///             // We can now define our actual scoring function
     ///             move |doc: DocId| {
     ///                 let popularity: u64 = popularity_reader.get(doc);
@@ -600,10 +601,10 @@ impl Collector for TopDocs {
 
     fn for_segment(
         &self,
-        segment_local_id: SegmentOrdinal,
+        segment_local_id: SegmentLocalId,
         reader: &SegmentReader,
     ) -> crate::Result<Self::Child> {
-        let collector = self.0.for_segment(segment_local_id, reader);
+        let collector = self.0.for_segment(segment_local_id, reader)?;
         Ok(TopScoreSegmentCollector(collector))
     }
 
@@ -671,15 +672,7 @@ impl Collector for TopDocs {
         let fruit = heap
             .into_sorted_vec()
             .into_iter()
-            .map(|cid| {
-                (
-                    cid.feature,
-                    DocAddress {
-                        segment_ord,
-                        doc_id: cid.doc,
-                    },
-                )
-            })
+            .map(|cid| (cid.feature, DocAddress(segment_ord, cid.doc)))
             .collect();
         Ok(fruit)
     }
@@ -735,7 +728,7 @@ mod tests {
     }
 
     #[test]
-    fn test_top_collector_not_at_capacity_without_offset() {
+    fn test_top_collector_not_at_capacity() {
         let index = make_index();
         let field = index.schema().get_field("text").unwrap();
         let query_parser = QueryParser::for_index(&index, vec![field]);
@@ -749,9 +742,9 @@ mod tests {
         assert_results_equals(
             &score_docs,
             &[
-                (0.81221175, DocAddress::new(0u32, 1)),
-                (0.5376842, DocAddress::new(0u32, 2)),
-                (0.48527452, DocAddress::new(0, 0)),
+                (0.81221175, DocAddress(0u32, 1)),
+                (0.5376842, DocAddress(0u32, 2)),
+                (0.48527452, DocAddress(0, 0)),
             ],
         );
     }
@@ -768,7 +761,7 @@ mod tests {
             .searcher()
             .search(&text_query, &TopDocs::with_limit(4).and_offset(2))
             .unwrap();
-        assert_results_equals(&score_docs[..], &[(0.48527452, DocAddress::new(0, 0))]);
+        assert_results_equals(&score_docs[..], &[(0.48527452, DocAddress(0, 0))]);
     }
 
     #[test]
@@ -786,8 +779,8 @@ mod tests {
         assert_results_equals(
             &score_docs,
             &[
-                (0.81221175, DocAddress::new(0u32, 1)),
-                (0.5376842, DocAddress::new(0u32, 2)),
+                (0.81221175, DocAddress(0u32, 1)),
+                (0.5376842, DocAddress(0u32, 2)),
             ],
         );
     }
@@ -807,8 +800,8 @@ mod tests {
         assert_results_equals(
             &score_docs[..],
             &[
-                (0.5376842, DocAddress::new(0u32, 2)),
-                (0.48527452, DocAddress::new(0, 0)),
+                (0.5376842, DocAddress(0u32, 2)),
+                (0.48527452, DocAddress(0, 0)),
             ],
         );
     }
@@ -872,9 +865,9 @@ mod tests {
         assert_eq!(
             &top_docs[..],
             &[
-                (64, DocAddress::new(0, 1)),
-                (16, DocAddress::new(0, 2)),
-                (12, DocAddress::new(0, 0))
+                (64, DocAddress(0, 1)),
+                (16, DocAddress(0, 2)),
+                (12, DocAddress(0, 0))
             ]
         );
     }
@@ -906,8 +899,8 @@ mod tests {
         assert_eq!(
             &top_docs[..],
             &[
-                (mr_birthday, DocAddress::new(0, 1)),
-                (pr_birthday, DocAddress::new(0, 0)),
+                (mr_birthday, DocAddress(0, 1)),
+                (pr_birthday, DocAddress(0, 0)),
             ]
         );
         Ok(())
@@ -935,10 +928,7 @@ mod tests {
         let top_docs: Vec<(i64, DocAddress)> = searcher.search(&AllQuery, &top_collector)?;
         assert_eq!(
             &top_docs[..],
-            &[
-                (40i64, DocAddress::new(0, 1)),
-                (-1i64, DocAddress::new(0, 0)),
-            ]
+            &[(40i64, DocAddress(0, 1)), (-1i64, DocAddress(0, 0)),]
         );
         Ok(())
     }
@@ -965,10 +955,7 @@ mod tests {
         let top_docs: Vec<(f64, DocAddress)> = searcher.search(&AllQuery, &top_collector)?;
         assert_eq!(
             &top_docs[..],
-            &[
-                (40f64, DocAddress::new(0, 1)),
-                (-1.0f64, DocAddress::new(0, 0)),
-            ]
+            &[(40f64, DocAddress(0, 1)), (-1.0f64, DocAddress(0, 0)),]
         );
         Ok(())
     }
@@ -1007,7 +994,9 @@ mod tests {
         let segment = searcher.segment_reader(0);
         let top_collector = TopDocs::with_limit(4).order_by_u64_field(size);
         let err = top_collector.for_segment(0, segment).err().unwrap();
-        assert!(matches!(err, crate::TantivyError::SchemaError(_)));
+        assert!(
+            matches!(err, crate::TantivyError::SchemaError(msg) if msg == "Field requested (Field(0)) is not a fast field.")
+        );
         Ok(())
     }
 
@@ -1048,7 +1037,7 @@ mod tests {
 
         assert_eq!(
             score_docs,
-            vec![(1, DocAddress::new(0, 1)), (0, DocAddress::new(0, 0)),]
+            vec![(1, DocAddress(0, 1)), (0, DocAddress(0, 0)),]
         );
     }
 
@@ -1070,7 +1059,7 @@ mod tests {
 
         assert_eq!(
             score_docs,
-            vec![(1, DocAddress::new(0, 1)), (0, DocAddress::new(0, 0)),]
+            vec![(1, DocAddress(0, 1)), (0, DocAddress(0, 0)),]
         );
     }
 

src/collector/tweak_score_top_collector.rs

@@ -62,7 +62,9 @@ where
         segment_reader: &SegmentReader,
     ) -> Result<Self::Child> {
         let segment_scorer = self.score_tweaker.segment_tweaker(segment_reader)?;
-        let segment_collector = self.collector.for_segment(segment_local_id, segment_reader);
+        let segment_collector = self
+            .collector
+            .for_segment(segment_local_id, segment_reader)?;
         Ok(TopTweakedScoreSegmentCollector {
             segment_collector,
             segment_scorer,

src/common/composite_file.rs

@@ -8,8 +8,6 @@ use crate::space_usage::FieldUsage;
 use crate::space_usage::PerFieldSpaceUsage;
 use std::collections::HashMap;
 use std::io::{self, Read, Write};
-use std::iter::ExactSizeIterator;
-use std::ops::Range;
 
 use super::HasLen;
 
@@ -107,7 +105,7 @@ impl<W: TerminatingWrite + Write> CompositeWrite<W> {
 #[derive(Clone)]
 pub struct CompositeFile {
     data: FileSlice,
-    offsets_index: HashMap<FileAddr, Range<usize>>,
+    offsets_index: HashMap<FileAddr, (usize, usize)>,
 }
 
 impl CompositeFile {
@@ -119,7 +117,7 @@ impl CompositeFile {
         let footer_len = u32::deserialize(&mut footer_len_data.as_slice())? as usize;
         let footer_start = end - 4 - footer_len;
         let footer_data = data
-            .slice(footer_start..footer_start + footer_len)
+            .slice(footer_start, footer_start + footer_len)
             .read_bytes()?;
         let mut footer_buffer = footer_data.as_slice();
         let num_fields = VInt::deserialize(&mut footer_buffer)?.0 as usize;
@@ -140,7 +138,7 @@ impl CompositeFile {
             let file_addr = file_addrs[i];
             let start_offset = offsets[i];
             let end_offset = offsets[i + 1];
-            field_index.insert(file_addr, start_offset..end_offset);
+            field_index.insert(file_addr, (start_offset, end_offset));
         }
 
         Ok(CompositeFile {
@@ -169,16 +167,16 @@ impl CompositeFile {
     pub fn open_read_with_idx(&self, field: Field, idx: usize) -> Option<FileSlice> {
         self.offsets_index
             .get(&FileAddr { field, idx })
-            .map(|byte_range| self.data.slice(byte_range.clone()))
+            .map(|&(from, to)| self.data.slice(from, to))
     }
 
     pub fn space_usage(&self) -> PerFieldSpaceUsage {
         let mut fields = HashMap::new();
-        for (&field_addr, byte_range) in &self.offsets_index {
+        for (&field_addr, &(start, end)) in self.offsets_index.iter() {
             fields
                 .entry(field_addr.field)
                 .or_insert_with(|| FieldUsage::empty(field_addr.field))
-                .add_field_idx(field_addr.idx, byte_range.len());
+                .add_field_idx(field_addr.idx, end - start);
         }
         PerFieldSpaceUsage::new(fields)
     }

src/common/counting_writer.rs

@@ -20,10 +20,9 @@ impl<W: Write> CountingWriter<W> {
         self.written_bytes
     }
 
-    /// Returns the underlying write object.
-    /// Note that this method does not trigger any flushing.
-    pub fn finish(self) -> W {
-        self.underlying
+    pub fn finish(mut self) -> io::Result<(W, u64)> {
+        self.flush()?;
+        Ok((self.underlying, self.written_bytes))
     }
 }
 
@@ -47,6 +46,7 @@ impl<W: Write> Write for CountingWriter<W> {
 
 impl<W: TerminatingWrite> TerminatingWrite for CountingWriter<W> {
     fn terminate_ref(&mut self, token: AntiCallToken) -> io::Result<()> {
+        self.flush()?;
         self.underlying.terminate_ref(token)
     }
 }
@@ -63,9 +63,8 @@ mod test {
         let mut counting_writer = CountingWriter::wrap(buffer);
         let bytes = (0u8..10u8).collect::<Vec<u8>>();
         counting_writer.write_all(&bytes).unwrap();
-        let len = counting_writer.written_bytes();
-        let buffer_restituted: Vec<u8> = counting_writer.finish();
+        let (w, len): (Vec<u8>, u64) = counting_writer.finish().unwrap();
         assert_eq!(len, 10u64);
-        assert_eq!(buffer_restituted.len(), 10);
+        assert_eq!(w.len(), 10);
     }
 }

src/common/mod.rs

@@ -66,6 +66,10 @@ pub(crate) fn compute_num_bits(n: u64) -> u8 {
     }
 }
 
+pub(crate) fn is_power_of_2(n: usize) -> bool {
+    (n > 0) && (n & (n - 1) == 0)
+}
+
 /// Has length trait
 pub trait HasLen {
     /// Return length
@@ -115,16 +119,11 @@ pub fn u64_to_i64(val: u64) -> i64 {
 /// For simplicity, tantivy internally handles `f64` as `u64`.
 /// The mapping is defined by this function.
 ///
-/// Maps `f64` to `u64` in a monotonic manner, so that bytes lexical order is preserved.
+/// Maps `f64` to `u64` so that lexical order is preserved.
 ///
 /// This is more suited than simply casting (`val as u64`)
 /// which would truncate the result
 ///
-/// # Reference
-///
-/// Daniel Lemire's [blog post](https://lemire.me/blog/2020/12/14/converting-floating-point-numbers-to-integers-while-preserving-order/)
-/// explains the mapping in a clear manner.
-///
 /// # See also
 /// The [reverse mapping is `u64_to_f64`](./fn.u64_to_f64.html).
 #[inline(always)]
@@ -153,7 +152,6 @@ pub(crate) mod test {
     pub use super::minmax;
     pub use super::serialize::test::fixed_size_test;
     use super::{compute_num_bits, f64_to_u64, i64_to_u64, u64_to_f64, u64_to_i64};
-    use proptest::prelude::*;
     use std::f64;
 
     fn test_i64_converter_helper(val: i64) {
@@ -164,15 +162,6 @@ pub(crate) mod test {
         assert_eq!(u64_to_f64(f64_to_u64(val)), val);
     }
 
-    proptest! {
-        #[test]
-        fn test_f64_converter_monotonicity_proptest((left, right) in (proptest::num::f64::NORMAL, proptest::num::f64::NORMAL)) {
-            let left_u64 = f64_to_u64(left);
-            let right_u64 = f64_to_u64(right);
-            assert_eq!(left_u64 < right_u64,  left < right);
-        }
-    }
-
     #[test]
     fn test_i64_converter() {
         assert_eq!(i64_to_u64(i64::min_value()), u64::min_value());

src/core/index.rs

@@ -5,7 +5,6 @@ use crate::core::SegmentId;
 use crate::core::SegmentMeta;
 use crate::core::SegmentMetaInventory;
 use crate::core::META_FILEPATH;
-use crate::directory::error::OpenReadError;
 use crate::directory::ManagedDirectory;
 #[cfg(feature = "mmap")]
 use crate::directory::MmapDirectory;
@@ -35,21 +34,12 @@ fn load_metas(
     inventory: &SegmentMetaInventory,
 ) -> crate::Result<IndexMeta> {
     let meta_data = directory.atomic_read(&META_FILEPATH)?;
-    let meta_string = String::from_utf8(meta_data).map_err(|_utf8_err| {
-        error!("Meta data is not valid utf8.");
-        DataCorruption::new(
-            META_FILEPATH.to_path_buf(),
-            "Meta file does not contain valid utf8 file.".to_string(),
-        )
-    })?;
+    let meta_string = String::from_utf8_lossy(&meta_data);
     IndexMeta::deserialize(&meta_string, &inventory)
         .map_err(|e| {
             DataCorruption::new(
                 META_FILEPATH.to_path_buf(),
-                format!(
-                    "Meta file cannot be deserialized. {:?}. Content: {:?}",
-                    e, meta_string
-                ),
+                format!("Meta file cannot be deserialized. {:?}.", e),
             )
         })
         .map_err(From::from)
@@ -69,7 +59,7 @@ impl Index {
     /// Examines the directory to see if it contains an index.
     ///
     /// Effectively, it only checks for the presence of the `meta.json` file.
-    pub fn exists<Dir: Directory>(dir: &Dir) -> Result<bool, OpenReadError> {
+    pub fn exists<Dir: Directory>(dir: &Dir) -> bool {
         dir.exists(&META_FILEPATH)
     }
 
@@ -116,7 +106,7 @@ impl Index {
         schema: Schema,
     ) -> crate::Result<Index> {
         let mmap_directory = MmapDirectory::open(directory_path)?;
-        if Index::exists(&mmap_directory)? {
+        if Index::exists(&mmap_directory) {
             return Err(TantivyError::IndexAlreadyExists);
         }
         Index::create(mmap_directory, schema)
@@ -124,7 +114,7 @@ impl Index {
 
     /// Opens or creates a new index in the provided directory
     pub fn open_or_create<Dir: Directory>(dir: Dir, schema: Schema) -> crate::Result<Index> {
-        if !Index::exists(&dir)? {
+        if !Index::exists(&dir) {
             return Index::create(dir, schema);
         }
         let index = Index::open(dir)?;
@@ -165,8 +155,7 @@ impl Index {
     fn from_directory(directory: ManagedDirectory, schema: Schema) -> crate::Result<Index> {
         save_new_metas(schema.clone(), &directory)?;
         let metas = IndexMeta::with_schema(schema);
-        let index = Index::create_from_metas(directory, &metas, SegmentMetaInventory::default());
-        Ok(index)
+        Index::create_from_metas(directory, &metas, SegmentMetaInventory::default())
     }
 
     /// Creates a new index given a directory and an `IndexMeta`.
@@ -174,15 +163,15 @@ impl Index {
         directory: ManagedDirectory,
         metas: &IndexMeta,
         inventory: SegmentMetaInventory,
-    ) -> Index {
+    ) -> crate::Result<Index> {
         let schema = metas.schema.clone();
-        Index {
+        Ok(Index {
             directory,
             schema,
             tokenizers: TokenizerManager::default(),
             executor: Arc::new(Executor::single_thread()),
             inventory,
-        }
+        })
     }
 
     /// Accessor for the tokenizer manager.
@@ -239,7 +228,7 @@ impl Index {
     /// Such segments can of course be part of the index,
     /// but also they could be segments being currently built or in the middle of a merge
     /// operation.
-    pub(crate) fn list_all_segment_metas(&self) -> Vec<SegmentMeta> {
+    pub fn list_all_segment_metas(&self) -> Vec<SegmentMeta> {
         self.inventory.all()
     }
 
@@ -257,8 +246,7 @@ impl Index {
         let directory = ManagedDirectory::wrap(directory)?;
         let inventory = SegmentMetaInventory::default();
         let metas = load_metas(&directory, &inventory)?;
-        let index = Index::create_from_metas(directory, &metas, inventory);
-        Ok(index)
+        Index::create_from_metas(directory, &metas, inventory)
     }
 
     /// Reads the index meta file from the directory.
@@ -411,7 +399,7 @@ impl fmt::Debug for Index {
 
 #[cfg(test)]
 mod tests {
-    use crate::directory::{RAMDirectory, WatchCallback};
+    use crate::directory::RAMDirectory;
     use crate::schema::Field;
     use crate::schema::{Schema, INDEXED, TEXT};
     use crate::IndexReader;
@@ -435,24 +423,24 @@ mod tests {
     #[test]
     fn test_index_exists() {
         let directory = RAMDirectory::create();
-        assert!(!Index::exists(&directory).unwrap());
+        assert!(!Index::exists(&directory));
         assert!(Index::create(directory.clone(), throw_away_schema()).is_ok());
-        assert!(Index::exists(&directory).unwrap());
+        assert!(Index::exists(&directory));
     }
 
     #[test]
     fn open_or_create_should_create() {
         let directory = RAMDirectory::create();
-        assert!(!Index::exists(&directory).unwrap());
+        assert!(!Index::exists(&directory));
         assert!(Index::open_or_create(directory.clone(), throw_away_schema()).is_ok());
-        assert!(Index::exists(&directory).unwrap());
+        assert!(Index::exists(&directory));
     }
 
     #[test]
     fn open_or_create_should_open() {
         let directory = RAMDirectory::create();
         assert!(Index::create(directory.clone(), throw_away_schema()).is_ok());
-        assert!(Index::exists(&directory).unwrap());
+        assert!(Index::exists(&directory));
         assert!(Index::open_or_create(directory, throw_away_schema()).is_ok());
     }
 
@@ -460,7 +448,7 @@ mod tests {
     fn create_should_wipeoff_existing() {
         let directory = RAMDirectory::create();
         assert!(Index::create(directory.clone(), throw_away_schema()).is_ok());
-        assert!(Index::exists(&directory).unwrap());
+        assert!(Index::exists(&directory));
         assert!(Index::create(directory.clone(), Schema::builder().build()).is_ok());
     }
 
@@ -468,7 +456,7 @@ mod tests {
     fn open_or_create_exists_but_schema_does_not_match() {
         let directory = RAMDirectory::create();
         assert!(Index::create(directory.clone(), throw_away_schema()).is_ok());
-        assert!(Index::exists(&directory).unwrap());
+        assert!(Index::exists(&directory));
         assert!(Index::open_or_create(directory.clone(), throw_away_schema()).is_ok());
         let err = Index::open_or_create(directory, Schema::builder().build());
         assert_eq!(
@@ -522,28 +510,28 @@ mod tests {
         }
 
         #[test]
-        fn test_index_manual_policy_mmap() -> crate::Result<()> {
+        fn test_index_manual_policy_mmap() {
             let schema = throw_away_schema();
             let field = schema.get_field("num_likes").unwrap();
-            let mut index = Index::create_from_tempdir(schema)?;
-            let mut writer = index.writer_for_tests()?;
-            writer.commit()?;
+            let mut index = Index::create_from_tempdir(schema).unwrap();
+            let mut writer = index.writer_for_tests().unwrap();
+            writer.commit().unwrap();
             let reader = index
                 .reader_builder()
                 .reload_policy(ReloadPolicy::Manual)
-                .try_into()?;
+                .try_into()
+                .unwrap();
             assert_eq!(reader.searcher().num_docs(), 0);
             writer.add_document(doc!(field=>1u64));
             let (sender, receiver) = crossbeam::channel::unbounded();
-            let _handle = index.directory_mut().watch(WatchCallback::new(move || {
+            let _handle = index.directory_mut().watch(Box::new(move || {
                 let _ = sender.send(());
             }));
-            writer.commit()?;
+            writer.commit().unwrap();
             assert!(receiver.recv().is_ok());
             assert_eq!(reader.searcher().num_docs(), 0);
-            reader.reload()?;
+            reader.reload().unwrap();
             assert_eq!(reader.searcher().num_docs(), 1);
-            Ok(())
         }
 
         #[test]
@@ -566,11 +554,9 @@ mod tests {
     fn test_index_on_commit_reload_policy_aux(field: Field, index: &Index, reader: &IndexReader) {
         let mut reader_index = reader.index();
         let (sender, receiver) = crossbeam::channel::unbounded();
-        let _watch_handle = reader_index
-            .directory_mut()
-            .watch(WatchCallback::new(move || {
-                let _ = sender.send(());
-            }));
+        let _watch_handle = reader_index.directory_mut().watch(Box::new(move || {
+            let _ = sender.send(());
+        }));
         let mut writer = index.writer_for_tests().unwrap();
         assert_eq!(reader.searcher().num_docs(), 0);
         writer.add_document(doc!(field=>1u64));
@@ -609,7 +595,7 @@ mod tests {
             writer.add_document(doc!(field => i));
         }
         let (sender, receiver) = crossbeam::channel::unbounded();
-        let _handle = directory.watch(WatchCallback::new(move || {
+        let _handle = directory.watch(Box::new(move || {
             let _ = sender.send(());
         }));
         writer.commit().unwrap();

src/core/index_meta.rs

@@ -301,7 +301,7 @@ mod tests {
         let json = serde_json::ser::to_string(&index_metas).expect("serialization failed");
         assert_eq!(
             json,
-            r#"{"segments":[],"schema":[{"name":"text","type":"text","options":{"indexing":{"record":"position","tokenizer":"default"},"stored":false}}],"opstamp":0}"#
+            r#"{"segments":[],"schema":[{"name":"text","type":"text","options":{"indexing":{"record":"position","tokenizer":"default","fieldnorms":true},"stored":false}}],"opstamp":0}"#
         );
     }
 }

src/core/inverted_index_reader.rs

@@ -66,7 +66,7 @@ impl InvertedIndexReader {
     }
 
     /// Returns the term info associated with the term.
-    pub fn get_term_info(&self, term: &Term) -> io::Result<Option<TermInfo>> {
+    pub fn get_term_info(&self, term: &Term) -> Option<TermInfo> {
         self.termdict.get(term.value_bytes())
     }
 
@@ -92,7 +92,7 @@ impl InvertedIndexReader {
     ) -> io::Result<()> {
         let postings_slice = self
             .postings_file_slice
-            .slice(term_info.postings_range.clone());
+            .slice_from(term_info.postings_offset as usize);
         block_postings.reset(term_info.doc_freq, postings_slice.read_bytes()?);
         Ok(())
     }
@@ -106,9 +106,10 @@ impl InvertedIndexReader {
         term: &Term,
         option: IndexRecordOption,
     ) -> io::Result<Option<BlockSegmentPostings>> {
-        self.get_term_info(term)?
+        Ok(self
+            .get_term_info(term)
             .map(move |term_info| self.read_block_postings_from_terminfo(&term_info, option))
-            .transpose()
+            .transpose()?)
     }
 
     /// Returns a block postings given a `term_info`.
@@ -120,9 +121,8 @@ impl InvertedIndexReader {
         term_info: &TermInfo,
         requested_option: IndexRecordOption,
     ) -> io::Result<BlockSegmentPostings> {
-        let postings_data = self
-            .postings_file_slice
-            .slice(term_info.postings_range.clone());
+        let offset = term_info.postings_offset as usize;
+        let postings_data = self.postings_file_slice.slice_from(offset);
         BlockSegmentPostings::open(
             term_info.doc_freq,
             postings_data,
@@ -179,7 +179,7 @@ impl InvertedIndexReader {
         term: &Term,
         option: IndexRecordOption,
     ) -> io::Result<Option<SegmentPostings>> {
-        self.get_term_info(term)?
+        self.get_term_info(term)
             .map(move |term_info| self.read_postings_from_terminfo(&term_info, option))
             .transpose()
     }
@@ -189,7 +189,7 @@ impl InvertedIndexReader {
         term: &Term,
         option: IndexRecordOption,
     ) -> io::Result<Option<SegmentPostings>> {
-        self.get_term_info(term)?
+        self.get_term_info(term)
             .map(|term_info| self.read_postings_from_terminfo(&term_info, option))
             .transpose()
     }
@@ -197,7 +197,7 @@ impl InvertedIndexReader {
     /// Returns the number of documents containing the term.
     pub fn doc_freq(&self, term: &Term) -> io::Result<u32> {
         Ok(self
-            .get_term_info(term)?
+            .get_term_info(term)
             .map(|term_info| term_info.doc_freq)
             .unwrap_or(0u32))
     }

src/core/searcher.rs

@@ -1,16 +1,17 @@
 use crate::collector::Collector;
 use crate::core::Executor;
-
+use crate::core::InvertedIndexReader;
 use crate::core::SegmentReader;
 use crate::query::Query;
 use crate::schema::Document;
 use crate::schema::Schema;
-use crate::schema::Term;
+use crate::schema::{Field, Term};
 use crate::space_usage::SearcherSpaceUsage;
 use crate::store::StoreReader;
+use crate::termdict::TermMerger;
 use crate::DocAddress;
 use crate::Index;
-
+use std::sync::Arc;
 use std::{fmt, io};
 
 /// Holds a list of `SegmentReader`s ready for search.
@@ -54,8 +55,9 @@ impl Searcher {
     /// The searcher uses the segment ordinal to route the
     /// the request to the right `Segment`.
     pub fn doc(&self, doc_address: DocAddress) -> crate::Result<Document> {
-        let store_reader = &self.store_readers[doc_address.segment_ord as usize];
-        store_reader.get(doc_address.doc_id)
+        let DocAddress(segment_local_id, doc_id) = doc_address;
+        let store_reader = &self.store_readers[segment_local_id as usize];
+        store_reader.get(doc_id)
     }
 
     /// Access the schema associated to the index of this searcher.
@@ -146,6 +148,16 @@ impl Searcher {
         collector.merge_fruits(fruits)
     }
 
+    /// Return the field searcher associated to a `Field`.
+    pub fn field(&self, field: Field) -> crate::Result<FieldSearcher> {
+        let inv_index_readers: Vec<Arc<InvertedIndexReader>> = self
+            .segment_readers
+            .iter()
+            .map(|segment_reader| segment_reader.inverted_index(field))
+            .collect::<crate::Result<Vec<_>>>()?;
+        Ok(FieldSearcher::new(inv_index_readers))
+    }
+
     /// Summarize total space usage of this searcher.
     pub fn space_usage(&self) -> io::Result<SearcherSpaceUsage> {
         let mut space_usage = SearcherSpaceUsage::new();
@@ -156,6 +168,27 @@ impl Searcher {
     }
 }
 
+pub struct FieldSearcher {
+    inv_index_readers: Vec<Arc<InvertedIndexReader>>,
+}
+
+impl FieldSearcher {
+    fn new(inv_index_readers: Vec<Arc<InvertedIndexReader>>) -> FieldSearcher {
+        FieldSearcher { inv_index_readers }
+    }
+
+    /// Returns a Stream over all of the sorted unique terms of
+    /// for the given field.
+    pub fn terms(&self) -> TermMerger<'_> {
+        let term_streamers: Vec<_> = self
+            .inv_index_readers
+            .iter()
+            .map(|inverted_index| inverted_index.terms().stream())
+            .collect();
+        TermMerger::new(term_streamers)
+    }
+}
+
 impl fmt::Debug for Searcher {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let segment_ids = self

src/core/segment_reader.rs

@@ -108,22 +108,24 @@ impl SegmentReader {
     /// Accessor to the `FacetReader` associated to a given `Field`.
     pub fn facet_reader(&self, field: Field) -> crate::Result<FacetReader> {
         let field_entry = self.schema.get_field_entry(field);
-
-        match field_entry.field_type() {
-            FieldType::HierarchicalFacet(_) => {
-                let term_ords_reader = self.fast_fields().u64s(field)?;
-                let termdict = self
-                    .termdict_composite
-                    .open_read(field)
-                    .map(TermDictionary::open)
-                    .unwrap_or_else(|| Ok(TermDictionary::empty()))?;
-                Ok(FacetReader::new(term_ords_reader, termdict))
-            }
-            _ => Err(crate::TantivyError::InvalidArgument(format!(
+        if field_entry.field_type() != &FieldType::HierarchicalFacet {
+            return Err(crate::TantivyError::InvalidArgument(format!(
                 "Field {:?} is not a facet field.",
                 field_entry.name()
-            ))),
+            )));
         }
+        let term_ords_reader = self.fast_fields().u64s(field).ok_or_else(|| {
+            DataCorruption::comment_only(format!(
+                "Cannot find data for hierarchical facet {:?}",
+                field_entry.name()
+            ))
+        })?;
+        let termdict = self
+            .termdict_composite
+            .open_read(field)
+            .map(TermDictionary::open)
+            .unwrap_or_else(|| Ok(TermDictionary::empty()))?;
+        Ok(FacetReader::new(term_ords_reader, termdict))
     }
 
     /// Accessor to the segment's `Field norms`'s reader.
@@ -182,7 +184,7 @@ impl SegmentReader {
         let fast_fields_data = segment.open_read(SegmentComponent::FASTFIELDS)?;
         let fast_fields_composite = CompositeFile::open(&fast_fields_data)?;
         let fast_field_readers =
-            Arc::new(FastFieldReaders::new(schema.clone(), fast_fields_composite));
+            Arc::new(FastFieldReaders::load_all(&schema, &fast_fields_composite)?);
 
         let fieldnorm_data = segment.open_read(SegmentComponent::FIELDNORMS)?;
         let fieldnorm_readers = FieldNormReaders::open(fieldnorm_data)?;
@@ -308,7 +310,7 @@ impl SegmentReader {
     }
 
     /// Returns an iterator that will iterate over the alive document ids
-    pub fn doc_ids_alive(&self) -> impl Iterator<Item = DocId> + '_ {
+    pub fn doc_ids_alive<'a>(&'a self) -> impl Iterator<Item = DocId> + 'a {
         (0u32..self.max_doc).filter(move |doc| !self.is_deleted(*doc))
     }
 

src/directory/directory.rs

@@ -1,8 +1,8 @@
 use crate::directory::directory_lock::Lock;
 use crate::directory::error::LockError;
 use crate::directory::error::{DeleteError, OpenReadError, OpenWriteError};
+use crate::directory::WatchCallback;
 use crate::directory::WatchHandle;
-use crate::directory::{FileHandle, WatchCallback};
 use crate::directory::{FileSlice, WritePtr};
 use std::fmt;
 use std::io;
@@ -108,13 +108,10 @@ fn retry_policy(is_blocking: bool) -> RetryPolicy {
 /// should be your default choice.
 /// - The [`RAMDirectory`](struct.RAMDirectory.html), which
 /// should be used mostly for tests.
+///
 pub trait Directory: DirectoryClone + fmt::Debug + Send + Sync + 'static {
-    /// Opens a file and returns a boxed `FileHandle`.
+    /// Opens a virtual file for read.
     ///
-    /// Users of `Directory` should typically call `Directory::open_read(...)`,
-    /// while `Directory` implementor should implement `get_file_handle()`.
-    fn get_file_handle(&self, path: &Path) -> Result<Box<dyn FileHandle>, OpenReadError>;
-
     /// Once a virtual file is open, its data may not
     /// change.
     ///
@@ -122,10 +119,7 @@ pub trait Directory: DirectoryClone + fmt::Debug + Send + Sync + 'static {
     /// have no effect on the returned `FileSlice` object.
     ///
     /// You should only use this to read files create with [Directory::open_write].
-    fn open_read(&self, path: &Path) -> Result<FileSlice, OpenReadError> {
-        let file_handle = self.get_file_handle(path)?;
-        Ok(FileSlice::new(file_handle))
-    }
+    fn open_read(&self, path: &Path) -> Result<FileSlice, OpenReadError>;
 
     /// Removes a file
     ///
@@ -137,7 +131,7 @@ pub trait Directory: DirectoryClone + fmt::Debug + Send + Sync + 'static {
     fn delete(&self, path: &Path) -> Result<(), DeleteError>;
 
     /// Returns true iff the file exists
-    fn exists(&self, path: &Path) -> Result<bool, OpenReadError>;
+    fn exists(&self, path: &Path) -> bool;
 
     /// Opens a writer for the *virtual file* associated with
     /// a Path.

src/directory/error.rs

@@ -58,8 +58,7 @@ pub enum OpenWriteError {
 }
 
 impl OpenWriteError {
-    /// Wraps an io error.
-    pub fn wrap_io_error(io_error: io::Error, filepath: PathBuf) -> Self {
+    pub(crate) fn wrap_io_error(io_error: io::Error, filepath: PathBuf) -> Self {
         Self::IOError { io_error, filepath }
     }
 }
@@ -144,8 +143,7 @@ pub enum OpenReadError {
 }
 
 impl OpenReadError {
-    /// Wraps an io error.
-    pub fn wrap_io_error(io_error: io::Error, filepath: PathBuf) -> Self {
+    pub(crate) fn wrap_io_error(io_error: io::Error, filepath: PathBuf) -> Self {
         Self::IOError { io_error, filepath }
     }
 }

src/directory/file_slice.rs

@@ -2,13 +2,10 @@ use stable_deref_trait::StableDeref;
 
 use crate::common::HasLen;
 use crate::directory::OwnedBytes;
-use std::fmt;
-use std::ops::Range;
-use std::sync::{Arc, Weak};
+use std::sync::Arc;
 use std::{io, ops::Deref};
 
-pub type ArcBytes = Arc<dyn Deref<Target = [u8]> + Send + Sync + 'static>;
-pub type WeakArcBytes = Weak<dyn Deref<Target = [u8]> + Send + Sync + 'static>;
+pub type BoxedData = Box<dyn Deref<Target = [u8]> + Send + Sync + 'static>;
 
 /// Objects that represents files sections in tantivy.
 ///
@@ -18,23 +15,23 @@ pub type WeakArcBytes = Weak<dyn Deref<Target = [u8]> + Send + Sync + 'static>;
 /// The underlying behavior is therefore specific to the `Directory` that created it.
 /// Despite its name, a `FileSlice` may or may not directly map to an actual file
 /// on the filesystem.
-pub trait FileHandle: 'static + Send + Sync + HasLen + fmt::Debug {
+pub trait FileHandle: 'static + Send + Sync + HasLen {
     /// Reads a slice of bytes.
     ///
     /// This method may panic if the range requested is invalid.
-    fn read_bytes(&self, range: Range<usize>) -> io::Result<OwnedBytes>;
+    fn read_bytes(&self, from: usize, to: usize) -> io::Result<OwnedBytes>;
 }
 
 impl FileHandle for &'static [u8] {
-    fn read_bytes(&self, range: Range<usize>) -> io::Result<OwnedBytes> {
-        let bytes = &self[range];
+    fn read_bytes(&self, from: usize, to: usize) -> io::Result<OwnedBytes> {
+        let bytes = &self[from..to];
         Ok(OwnedBytes::new(bytes))
     }
 }
 
 impl<T: Deref<Target = [u8]>> HasLen for T {
     fn len(&self) -> usize {
-        self.deref().len()
+        self.as_ref().len()
     }
 }
 
@@ -43,39 +40,32 @@ where
     B: StableDeref + Deref<Target = [u8]> + 'static + Send + Sync,
 {
     fn from(bytes: B) -> FileSlice {
-        FileSlice::new(Box::new(OwnedBytes::new(bytes)))
+        FileSlice::new(OwnedBytes::new(bytes))
     }
 }
 
 /// Logical slice of read only file in tantivy.
-///
+//
 /// It can be cloned and sliced cheaply.
 ///
 #[derive(Clone)]
 pub struct FileSlice {
-    data: Arc<dyn FileHandle>,
-    range: Range<usize>,
-}
-
-impl fmt::Debug for FileSlice {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "FileSlice({:?}, {:?})", &self.data, self.range)
-    }
+    data: Arc<Box<dyn FileHandle>>,
+    start: usize,
+    stop: usize,
 }
 
 impl FileSlice {
     /// Wraps a FileHandle.
-    pub fn new(file_handle: Box<dyn FileHandle>) -> Self {
-        let num_bytes = file_handle.len();
-        FileSlice::new_with_num_bytes(file_handle, num_bytes)
-    }
-
-    /// Wraps a FileHandle.
-    #[doc(hidden)]
-    pub fn new_with_num_bytes(file_handle: Box<dyn FileHandle>, num_bytes: usize) -> Self {
+    pub fn new<D>(data: D) -> Self
+    where
+        D: FileHandle,
+    {
+        let len = data.len();
         FileSlice {
-            data: Arc::from(file_handle),
-            range: 0..num_bytes,
+            data: Arc::new(Box::new(data)),
+            start: 0,
+            stop: len,
         }
     }
 
@@ -83,12 +73,14 @@ impl FileSlice {
     ///
     /// # Panics
     ///
-    /// Panics if `byte_range.end` exceeds the filesize.
-    pub fn slice(&self, byte_range: Range<usize>) -> FileSlice {
-        assert!(byte_range.end <= self.len());
+    /// Panics if `to < from` or if `to` exceeds the filesize.
+    pub fn slice(&self, from: usize, to: usize) -> FileSlice {
+        assert!(to <= self.len());
+        assert!(to >= from);
         FileSlice {
             data: self.data.clone(),
-            range: self.range.start + byte_range.start..self.range.start + byte_range.end,
+            start: self.start + from,
+            stop: self.start + to,
         }
     }
 
@@ -105,21 +97,19 @@ impl FileSlice {
     /// In particular, it is  up to the `Directory` implementation
     /// to handle caching if needed.
     pub fn read_bytes(&self) -> io::Result<OwnedBytes> {
-        self.data.read_bytes(self.range.clone())
+        self.data.read_bytes(self.start, self.stop)
     }
 
     /// Reads a specific slice of data.
     ///
     /// This is equivalent to running `file_slice.slice(from, to).read_bytes()`.
-    pub fn read_bytes_slice(&self, range: Range<usize>) -> io::Result<OwnedBytes> {
+    pub fn read_bytes_slice(&self, from: usize, to: usize) -> io::Result<OwnedBytes> {
+        assert!(from <= to);
         assert!(
-            range.end <= self.len(),
-            "end of requested range exceeds the fileslice length ({} > {})",
-            range.end,
-            self.len()
+            self.start + to <= self.stop,
+            "`to` exceeds the fileslice length"
         );
-        self.data
-            .read_bytes(self.range.start + range.start..self.range.start + range.end)
+        self.data.read_bytes(self.start + from, self.start + to)
     }
 
     /// Splits the FileSlice at the given offset and return two file slices.
@@ -144,7 +134,7 @@ impl FileSlice {
     ///
     /// Equivalent to `.slice(from_offset, self.len())`
     pub fn slice_from(&self, from_offset: usize) -> FileSlice {
-        self.slice(from_offset..self.len())
+        self.slice(from_offset, self.len())
     }
 
     /// Like `.slice(...)` but enforcing only the `to`
@@ -152,19 +142,13 @@ impl FileSlice {
     ///
     /// Equivalent to `.slice(0, to_offset)`
     pub fn slice_to(&self, to_offset: usize) -> FileSlice {
-        self.slice(0..to_offset)
-    }
-}
-
-impl FileHandle for FileSlice {
-    fn read_bytes(&self, range: Range<usize>) -> io::Result<OwnedBytes> {
-        self.read_bytes_slice(range)
+        self.slice(0, to_offset)
     }
 }
 
 impl HasLen for FileSlice {
     fn len(&self) -> usize {
-        self.range.len()
+        self.stop - self.start
     }
 }
 
@@ -176,7 +160,7 @@ mod tests {
 
     #[test]
     fn test_file_slice() -> io::Result<()> {
-        let file_slice = FileSlice::new(Box::new(b"abcdef".as_ref()));
+        let file_slice = FileSlice::new(b"abcdef".as_ref());
         assert_eq!(file_slice.len(), 6);
         assert_eq!(file_slice.slice_from(2).read_bytes()?.as_slice(), b"cdef");
         assert_eq!(file_slice.slice_to(2).read_bytes()?.as_slice(), b"ab");
@@ -220,26 +204,33 @@ mod tests {
 
     #[test]
     fn test_slice_simple_read() -> io::Result<()> {
-        let slice = FileSlice::new(Box::new(&b"abcdef"[..]));
+        let slice = FileSlice::new(&b"abcdef"[..]);
         assert_eq!(slice.len(), 6);
         assert_eq!(slice.read_bytes()?.as_ref(), b"abcdef");
-        assert_eq!(slice.slice(1..4).read_bytes()?.as_ref(), b"bcd");
+        assert_eq!(slice.slice(1, 4).read_bytes()?.as_ref(), b"bcd");
         Ok(())
     }
 
     #[test]
     fn test_slice_read_slice() -> io::Result<()> {
-        let slice_deref = FileSlice::new(Box::new(&b"abcdef"[..]));
-        assert_eq!(slice_deref.read_bytes_slice(1..4)?.as_ref(), b"bcd");
+        let slice_deref = FileSlice::new(&b"abcdef"[..]);
+        assert_eq!(slice_deref.read_bytes_slice(1, 4)?.as_ref(), b"bcd");
         Ok(())
     }
 
     #[test]
-    #[should_panic(expected = "end of requested range exceeds the fileslice length (10 > 6)")]
+    #[should_panic(expected = "assertion failed: from <= to")]
+    fn test_slice_read_slice_invalid_range() {
+        let slice_deref = FileSlice::new(&b"abcdef"[..]);
+        assert_eq!(slice_deref.read_bytes_slice(1, 0).unwrap().as_ref(), b"bcd");
+    }
+
+    #[test]
+    #[should_panic(expected = "`to` exceeds the fileslice length")]
     fn test_slice_read_slice_invalid_range_exceeds() {
-        let slice_deref = FileSlice::new(Box::new(&b"abcdef"[..]));
+        let slice_deref = FileSlice::new(&b"abcdef"[..]);
         assert_eq!(
-            slice_deref.read_bytes_slice(0..10).unwrap().as_ref(),
+            slice_deref.read_bytes_slice(0, 10).unwrap().as_ref(),
             b"bcd"
         );
     }

src/directory/file_watcher.rs

@@ -1,182 +0,0 @@
-use crate::directory::{WatchCallback, WatchCallbackList, WatchHandle};
-use crc32fast::Hasher;
-use std::fs;
-use std::io;
-use std::io::BufRead;
-use std::path::Path;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
-
-pub const POLLING_INTERVAL: Duration = Duration::from_millis(if cfg!(test) { 1 } else { 500 });
-
-// Watches a file and executes registered callbacks when the file is modified.
-pub struct FileWatcher {
-    path: Arc<Path>,
-    callbacks: Arc<WatchCallbackList>,
-    state: Arc<AtomicUsize>, // 0: new, 1: runnable, 2: terminated
-}
-
-impl FileWatcher {
-    pub fn new(path: &Path) -> FileWatcher {
-        FileWatcher {
-            path: Arc::from(path),
-            callbacks: Default::default(),
-            state: Default::default(),
-        }
-    }
-
-    pub fn spawn(&self) {
-        if self
-            .state
-            .compare_exchange(0, 1, Ordering::SeqCst, Ordering::SeqCst)
-            .is_err()
-        {
-            return;
-        }
-
-        let path = self.path.clone();
-        let callbacks = self.callbacks.clone();
-        let state = self.state.clone();
-
-        thread::Builder::new()
-            .name("thread-tantivy-meta-file-watcher".to_string())
-            .spawn(move || {
-                let mut current_checksum = None;
-
-                while state.load(Ordering::SeqCst) == 1 {
-                    if let Ok(checksum) = FileWatcher::compute_checksum(&path) {
-                        // `None.unwrap_or_else(|| !checksum) != checksum` evaluates to `true`
-                        if current_checksum.unwrap_or_else(|| !checksum) != checksum {
-                            info!("Meta file {:?} was modified", path);
-                            current_checksum = Some(checksum);
-                            futures::executor::block_on(callbacks.broadcast());
-                        }
-                    }
-
-                    thread::sleep(POLLING_INTERVAL);
-                }
-            })
-            .expect("Failed to spawn meta file watcher thread");
-    }
-
-    pub fn watch(&self, callback: WatchCallback) -> WatchHandle {
-        let handle = self.callbacks.subscribe(callback);
-        self.spawn();
-        handle
-    }
-
-    fn compute_checksum(path: &Path) -> Result<u32, io::Error> {
-        let reader = match fs::File::open(path) {
-            Ok(f) => io::BufReader::new(f),
-            Err(e) => {
-                warn!("Failed to open meta file {:?}: {:?}", path, e);
-                return Err(e);
-            }
-        };
-
-        let mut hasher = Hasher::new();
-
-        for line in reader.lines() {
-            hasher.update(line?.as_bytes())
-        }
-
-        Ok(hasher.finalize())
-    }
-}
-
-impl Drop for FileWatcher {
-    fn drop(&mut self) {
-        self.state.store(2, Ordering::SeqCst);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use std::mem;
-
-    use crate::directory::mmap_directory::atomic_write;
-
-    use super::*;
-
-    #[test]
-    fn test_file_watcher_drop_watcher() -> crate::Result<()> {
-        let tmp_dir = tempfile::TempDir::new()?;
-        let tmp_file = tmp_dir.path().join("watched.txt");
-
-        let counter: Arc<AtomicUsize> = Default::default();
-        let (tx, rx) = crossbeam::channel::unbounded();
-        let timeout = Duration::from_millis(100);
-
-        let watcher = FileWatcher::new(&tmp_file);
-
-        let state = watcher.state.clone();
-        assert_eq!(state.load(Ordering::SeqCst), 0);
-
-        let counter_clone = counter.clone();
-
-        let _handle = watcher.watch(WatchCallback::new(move || {
-            let val = counter_clone.fetch_add(1, Ordering::SeqCst);
-            tx.send(val + 1).unwrap();
-        }));
-
-        assert_eq!(counter.load(Ordering::SeqCst), 0);
-        assert_eq!(state.load(Ordering::SeqCst), 1);
-
-        atomic_write(&tmp_file, b"foo")?;
-        assert_eq!(rx.recv_timeout(timeout), Ok(1));
-
-        atomic_write(&tmp_file, b"foo")?;
-        assert!(rx.recv_timeout(timeout).is_err());
-
-        atomic_write(&tmp_file, b"bar")?;
-        assert_eq!(rx.recv_timeout(timeout), Ok(2));
-
-        mem::drop(watcher);
-
-        atomic_write(&tmp_file, b"qux")?;
-        thread::sleep(Duration::from_millis(10));
-        assert_eq!(counter.load(Ordering::SeqCst), 2);
-        assert_eq!(state.load(Ordering::SeqCst), 2);
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_file_watcher_drop_handle() -> crate::Result<()> {
-        let tmp_dir = tempfile::TempDir::new()?;
-        let tmp_file = tmp_dir.path().join("watched.txt");
-
-        let counter: Arc<AtomicUsize> = Default::default();
-        let (tx, rx) = crossbeam::channel::unbounded();
-        let timeout = Duration::from_millis(100);
-
-        let watcher = FileWatcher::new(&tmp_file);
-
-        let state = watcher.state.clone();
-        assert_eq!(state.load(Ordering::SeqCst), 0);
-
-        let counter_clone = counter.clone();
-
-        let handle = watcher.watch(WatchCallback::new(move || {
-            let val = counter_clone.fetch_add(1, Ordering::SeqCst);
-            tx.send(val + 1).unwrap();
-        }));
-
-        assert_eq!(counter.load(Ordering::SeqCst), 0);
-        assert_eq!(state.load(Ordering::SeqCst), 1);
-
-        atomic_write(&tmp_file, b"foo")?;
-        assert_eq!(rx.recv_timeout(timeout), Ok(1));
-
-        mem::drop(handle);
-
-        atomic_write(&tmp_file, b"qux")?;
-        assert_eq!(counter.load(Ordering::SeqCst), 1);
-        assert_eq!(state.load(Ordering::SeqCst), 1);
-
-        Ok(())
-    }
-}

src/directory/footer.rs

@@ -115,18 +115,6 @@ impl Footer {
                 }
                 Ok(())
             }
-            VersionedFooter::V3 {
-                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(())
-            }
             VersionedFooter::UnknownVersion => Err(Incompatibility::IndexMismatch {
                 library_version: library_version.clone(),
                 index_version: self.version.clone(),
@@ -148,31 +136,24 @@ pub enum VersionedFooter {
         crc32: CrcHashU32,
         store_compression: String,
     },
-    // Block wand max termfred on 1 byte
-    V3 {
-        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::V3 {
+            VersionedFooter::V2 {
                 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(&3u32, &mut buf)?;
+                BinarySerializable::serialize(&2u32, &mut buf)?;
                 BinarySerializable::serialize(crc32, &mut buf)?;
                 BinarySerializable::serialize(compression, &mut buf)?;
             }
-            VersionedFooter::V2 { .. }
-            | VersionedFooter::V1 { .. }
-            | VersionedFooter::UnknownVersion => {
+            VersionedFooter::V1 { .. } | VersionedFooter::UnknownVersion => {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
                     "Cannot serialize an unknown versioned footer ",
@@ -201,7 +182,7 @@ impl BinarySerializable for VersionedFooter {
         reader.read_exact(&mut buf[..])?;
         let mut cursor = &buf[..];
         let version = u32::deserialize(&mut cursor)?;
-        if version > 3 {
+        if version != 1 && version != 2 {
             return Ok(VersionedFooter::UnknownVersion);
         }
         let crc32 = u32::deserialize(&mut cursor)?;
@@ -211,14 +192,9 @@ impl BinarySerializable for VersionedFooter {
                 crc32,
                 store_compression,
             }
-        } else if version == 2 {
-            VersionedFooter::V2 {
-                crc32,
-                store_compression,
-            }
         } else {
-            assert_eq!(version, 3);
-            VersionedFooter::V3 {
+            assert_eq!(version, 2);
+            VersionedFooter::V2 {
                 crc32,
                 store_compression,
             }
@@ -229,7 +205,6 @@ impl BinarySerializable for VersionedFooter {
 impl VersionedFooter {
     pub fn crc(&self) -> Option<CrcHashU32> {
         match self {
-            VersionedFooter::V3 { crc32, .. } => Some(*crc32),
             VersionedFooter::V2 { crc32, .. } => Some(*crc32),
             VersionedFooter::V1 { crc32, .. } => Some(*crc32),
             VersionedFooter::UnknownVersion { .. } => None,
@@ -268,7 +243,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::V3 {
+        let footer = Footer::new(VersionedFooter::V2 {
             crc32,
             store_compression: crate::store::COMPRESSION.to_string(),
         });
@@ -303,7 +278,7 @@ mod tests {
         let footer = Footer::deserialize(&mut &vec[..]).unwrap();
         assert!(matches!(
            footer.versioned_footer,
-           VersionedFooter::V3 { store_compression, .. }
+           VersionedFooter::V2 { store_compression, .. }
            if store_compression == crate::store::COMPRESSION
         ));
         assert_eq!(&footer.version, crate::version());
@@ -313,7 +288,7 @@ mod tests {
     fn test_serialize_deserialize_footer() {
         let mut buffer = Vec::new();
         let crc32 = 123456u32;
-        let footer: Footer = Footer::new(VersionedFooter::V3 {
+        let footer: Footer = Footer::new(VersionedFooter::V2 {
             crc32,
             store_compression: "lz4".to_string(),
         });
@@ -325,7 +300,7 @@ mod tests {
     #[test]
     fn footer_length() {
         let crc32 = 1111111u32;
-        let versioned_footer = VersionedFooter::V3 {
+        let versioned_footer = VersionedFooter::V2 {
             crc32,
             store_compression: "lz4".to_string(),
         };
@@ -346,7 +321,7 @@ mod tests {
             // versionned footer length
             12 | 128,
             // index format version
-            3,
+            2,
             0,
             0,
             0,
@@ -365,7 +340,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::V3 {
+        let expected_versioned_footer: VersionedFooter = VersionedFooter::V2 {
             crc32: expected_crc,
             store_compression: "lz4".to_string(),
         };

src/directory/managed_directory.rs

@@ -1,10 +1,10 @@
 use crate::core::{MANAGED_FILEPATH, META_FILEPATH};
 use crate::directory::error::{DeleteError, LockError, OpenReadError, OpenWriteError};
 use crate::directory::footer::{Footer, FooterProxy};
+use crate::directory::DirectoryLock;
 use crate::directory::GarbageCollectionResult;
 use crate::directory::Lock;
 use crate::directory::META_LOCK;
-use crate::directory::{DirectoryLock, FileHandle};
 use crate::directory::{FileSlice, WritePtr};
 use crate::directory::{WatchCallback, WatchHandle};
 use crate::error::DataCorruption;
@@ -274,11 +274,6 @@ impl ManagedDirectory {
 }
 
 impl Directory for ManagedDirectory {
-    fn get_file_handle(&self, path: &Path) -> Result<Box<dyn FileHandle>, OpenReadError> {
-        let file_slice = self.open_read(path)?;
-        Ok(Box::new(file_slice))
-    }
-
     fn open_read(&self, path: &Path) -> result::Result<FileSlice, OpenReadError> {
         let file_slice = self.directory.open_read(path)?;
         let (footer, reader) = Footer::extract_footer(file_slice)
@@ -312,7 +307,7 @@ impl Directory for ManagedDirectory {
         self.directory.delete(path)
     }
 
-    fn exists(&self, path: &Path) -> Result<bool, OpenReadError> {
+    fn exists(&self, path: &Path) -> bool {
         self.directory.exists(path)
     }
 
@@ -360,22 +355,22 @@ mod tests_mmap_specific {
             managed_directory
                 .atomic_write(test_path2, &[0u8, 1u8])
                 .unwrap();
-            assert!(managed_directory.exists(test_path1).unwrap());
-            assert!(managed_directory.exists(test_path2).unwrap());
+            assert!(managed_directory.exists(test_path1));
+            assert!(managed_directory.exists(test_path2));
             let living_files: HashSet<PathBuf> = [test_path1.to_owned()].iter().cloned().collect();
             assert!(managed_directory.garbage_collect(|| living_files).is_ok());
-            assert!(managed_directory.exists(test_path1).unwrap());
-            assert!(!managed_directory.exists(test_path2).unwrap());
+            assert!(managed_directory.exists(test_path1));
+            assert!(!managed_directory.exists(test_path2));
         }
         {
             let mmap_directory = MmapDirectory::open(&tempdir_path).unwrap();
             let mut managed_directory = ManagedDirectory::wrap(mmap_directory).unwrap();
-            assert!(managed_directory.exists(test_path1).unwrap());
-            assert!(!managed_directory.exists(test_path2).unwrap());
+            assert!(managed_directory.exists(test_path1));
+            assert!(!managed_directory.exists(test_path2));
             let living_files: HashSet<PathBuf> = HashSet::new();
             assert!(managed_directory.garbage_collect(|| living_files).is_ok());
-            assert!(!managed_directory.exists(test_path1).unwrap());
-            assert!(!managed_directory.exists(test_path2).unwrap());
+            assert!(!managed_directory.exists(test_path1));
+            assert!(!managed_directory.exists(test_path2));
         }
     }
 
@@ -392,7 +387,7 @@ mod tests_mmap_specific {
         let mut write = managed_directory.open_write(test_path1).unwrap();
         write.write_all(&[0u8, 1u8]).unwrap();
         write.terminate().unwrap();
-        assert!(managed_directory.exists(test_path1).unwrap());
+        assert!(managed_directory.exists(test_path1));
 
         let _mmap_read = managed_directory.open_read(test_path1).unwrap();
         assert!(managed_directory
@@ -400,15 +395,15 @@ mod tests_mmap_specific {
             .is_ok());
         if cfg!(target_os = "windows") {
             // On Windows, gc should try and fail the file as it is mmapped.
-            assert!(managed_directory.exists(test_path1).unwrap());
+            assert!(managed_directory.exists(test_path1));
             // unmap should happen here.
             drop(_mmap_read);
             // The file should still be in the list of managed file and
             // eventually be deleted once mmap is released.
             assert!(managed_directory.garbage_collect(|| living_files).is_ok());
-            assert!(!managed_directory.exists(test_path1).unwrap());
+            assert!(!managed_directory.exists(test_path1));
         } else {
-            assert!(!managed_directory.exists(test_path1).unwrap());
+            assert!(!managed_directory.exists(test_path1));
         }
     }
 

src/directory/mmap_directory.rs

@@ -1,17 +1,21 @@
 use crate::core::META_FILEPATH;
 use crate::directory::error::LockError;
 use crate::directory::error::{DeleteError, OpenDirectoryError, OpenReadError, OpenWriteError};
-use crate::directory::file_watcher::FileWatcher;
+use crate::directory::AntiCallToken;
+use crate::directory::BoxedData;
 use crate::directory::Directory;
 use crate::directory::DirectoryLock;
+use crate::directory::FileSlice;
 use crate::directory::Lock;
 use crate::directory::WatchCallback;
+use crate::directory::WatchCallbackList;
 use crate::directory::WatchHandle;
-use crate::directory::{AntiCallToken, FileHandle, OwnedBytes};
-use crate::directory::{ArcBytes, WeakArcBytes};
 use crate::directory::{TerminatingWrite, WritePtr};
 use fs2::FileExt;
 use memmap::Mmap;
+use notify::RawEvent;
+use notify::RecursiveMode;
+use notify::Watcher;
 use serde::{Deserialize, Serialize};
 use stable_deref_trait::StableDeref;
 use std::convert::From;
@@ -22,8 +26,12 @@ use std::io::{self, Seek, SeekFrom};
 use std::io::{BufWriter, Read, Write};
 use std::path::{Path, PathBuf};
 use std::result;
+use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::sync::RwLock;
+use std::sync::Weak;
+use std::thread;
 use std::{collections::HashMap, ops::Deref};
 use tempfile::TempDir;
 
@@ -76,7 +84,7 @@ pub struct CacheInfo {
 
 struct MmapCache {
     counters: CacheCounters,
-    cache: HashMap<PathBuf, WeakArcBytes>,
+    cache: HashMap<PathBuf, Weak<BoxedData>>,
 }
 
 impl Default for MmapCache {
@@ -110,7 +118,7 @@ impl MmapCache {
     }
 
     // Returns None if the file exists but as a len of 0 (and hence is not mmappable).
-    fn get_mmap(&mut self, full_path: &Path) -> Result<Option<ArcBytes>, OpenReadError> {
+    fn get_mmap(&mut self, full_path: &Path) -> Result<Option<Arc<BoxedData>>, OpenReadError> {
         if let Some(mmap_weak) = self.cache.get(full_path) {
             if let Some(mmap_arc) = mmap_weak.upgrade() {
                 self.counters.hit += 1;
@@ -121,7 +129,7 @@ impl MmapCache {
         self.counters.miss += 1;
         let mmap_opt = open_mmap(full_path)?;
         Ok(mmap_opt.map(|mmap| {
-            let mmap_arc: ArcBytes = Arc::new(mmap);
+            let mmap_arc: Arc<BoxedData> = Arc::new(Box::new(mmap));
             let mmap_weak = Arc::downgrade(&mmap_arc);
             self.cache.insert(full_path.to_owned(), mmap_weak);
             mmap_arc
@@ -129,6 +137,67 @@ impl MmapCache {
     }
 }
 
+struct WatcherWrapper {
+    _watcher: Mutex<notify::RecommendedWatcher>,
+    watcher_router: Arc<WatchCallbackList>,
+}
+
+impl WatcherWrapper {
+    pub fn new(path: &Path) -> Result<Self, OpenDirectoryError> {
+        let (tx, watcher_recv): (Sender<RawEvent>, Receiver<RawEvent>) = channel();
+        // We need to initialize the
+        let watcher = notify::raw_watcher(tx)
+            .and_then(|mut watcher| {
+                watcher.watch(path, RecursiveMode::Recursive)?;
+                Ok(watcher)
+            })
+            .map_err(|err| match err {
+                notify::Error::PathNotFound => OpenDirectoryError::DoesNotExist(path.to_owned()),
+                _ => {
+                    panic!("Unknown error while starting watching directory {:?}", path);
+                }
+            })?;
+        let watcher_router: Arc<WatchCallbackList> = Default::default();
+        let watcher_router_clone = watcher_router.clone();
+        thread::Builder::new()
+            .name("meta-file-watch-thread".to_string())
+            .spawn(move || {
+                loop {
+                    match watcher_recv.recv().map(|evt| evt.path) {
+                        Ok(Some(changed_path)) => {
+                            // ... Actually subject to false positive.
+                            // We might want to be more accurate than this at one point.
+                            if let Some(filename) = changed_path.file_name() {
+                                if filename == *META_FILEPATH {
+                                    let _ = watcher_router_clone.broadcast();
+                                }
+                            }
+                        }
+                        Ok(None) => {
+                            // not an event we are interested in.
+                        }
+                        Err(_e) => {
+                            // the watch send channel was dropped
+                            break;
+                        }
+                    }
+                }
+            })
+            .map_err(|io_error| OpenDirectoryError::IoError {
+                io_error,
+                directory_path: path.to_path_buf(),
+            })?;
+        Ok(WatcherWrapper {
+            _watcher: Mutex::new(watcher),
+            watcher_router,
+        })
+    }
+
+    pub fn watch(&mut self, watch_callback: WatchCallback) -> WatchHandle {
+        self.watcher_router.subscribe(watch_callback)
+    }
+}
+
 /// Directory storing data in files, read via mmap.
 ///
 /// The Mmap object are cached to limit the
@@ -150,21 +219,40 @@ struct MmapDirectoryInner {
     root_path: PathBuf,
     mmap_cache: RwLock<MmapCache>,
     _temp_directory: Option<TempDir>,
-    watcher: FileWatcher,
+    watcher: RwLock<Option<WatcherWrapper>>,
 }
 
 impl MmapDirectoryInner {
     fn new(root_path: PathBuf, temp_directory: Option<TempDir>) -> MmapDirectoryInner {
         MmapDirectoryInner {
+            root_path,
             mmap_cache: Default::default(),
             _temp_directory: temp_directory,
-            watcher: FileWatcher::new(&root_path.join(*META_FILEPATH)),
-            root_path,
+            watcher: RwLock::new(None),
         }
     }
 
-    fn watch(&self, callback: WatchCallback) -> WatchHandle {
-        self.watcher.watch(callback)
+    fn watch(&self, watch_callback: WatchCallback) -> crate::Result<WatchHandle> {
+        // a lot of juggling here, to ensure we don't do anything that panics
+        // while the rwlock is held. That way we ensure that the rwlock cannot
+        // be poisoned.
+        //
+        // The downside is that we might create a watch wrapper that is not useful.
+        let need_initialization = self.watcher.read().unwrap().is_none();
+        if need_initialization {
+            let watch_wrapper = WatcherWrapper::new(&self.root_path)?;
+            let mut watch_wlock = self.watcher.write().unwrap();
+            // the watcher could have been initialized when we released the lock, and
+            // we do not want to lose the watched files that were set.
+            if watch_wlock.is_none() {
+                *watch_wlock = Some(watch_wrapper);
+            }
+        }
+        if let Some(watch_wrapper) = self.watcher.write().unwrap().as_mut() {
+            Ok(watch_wrapper.watch(watch_callback))
+        } else {
+            unreachable!("At this point, watch wrapper is supposed to be initialized");
+        }
     }
 }
 
@@ -314,7 +402,7 @@ impl TerminatingWrite for SafeFileWriter {
 }
 
 #[derive(Clone)]
-struct MmapArc(Arc<dyn Deref<Target = [u8]> + Send + Sync>);
+struct MmapArc(Arc<Box<dyn Deref<Target = [u8]> + Send + Sync>>);
 
 impl Deref for MmapArc {
     type Target = [u8];
@@ -325,26 +413,8 @@ impl Deref for MmapArc {
 }
 unsafe impl StableDeref for MmapArc {}
 
-/// Writes a file in an atomic manner.
-pub(crate) fn atomic_write(path: &Path, content: &[u8]) -> io::Result<()> {
-    // We create the temporary file in the same directory as the target file.
-    // Indeed the canonical temp directory and the target file might sit in different
-    // filesystem, in which case the atomic write may actually not work.
-    let parent_path = path.parent().ok_or_else(|| {
-        io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "Path {:?} does not have parent directory.",
-        )
-    })?;
-    let mut tempfile = tempfile::Builder::new().tempfile_in(&parent_path)?;
-    tempfile.write_all(content)?;
-    tempfile.flush()?;
-    tempfile.into_temp_path().persist(path)?;
-    Ok(())
-}
-
 impl Directory for MmapDirectory {
-    fn get_file_handle(&self, path: &Path) -> result::Result<Box<dyn FileHandle>, OpenReadError> {
+    fn open_read(&self, path: &Path) -> result::Result<FileSlice, OpenReadError> {
         debug!("Open Read {:?}", path);
         let full_path = self.resolve_path(path);
 
@@ -357,16 +427,11 @@ impl Directory for MmapDirectory {
             let io_err = make_io_err(msg);
             OpenReadError::wrap_io_error(io_err, path.to_path_buf())
         })?;
-
-        let owned_bytes = mmap_cache
-            .get_mmap(&full_path)?
-            .map(|mmap_arc| {
-                let mmap_arc_obj = MmapArc(mmap_arc);
-                OwnedBytes::new(mmap_arc_obj)
-            })
-            .unwrap_or_else(OwnedBytes::empty);
-
-        Ok(Box::new(owned_bytes))
+        if let Some(mmap_arc) = mmap_cache.get_mmap(&full_path)? {
+            Ok(FileSlice::from(MmapArc(mmap_arc)))
+        } else {
+            Ok(FileSlice::empty())
+        }
     }
 
     /// Any entry associated to the path in the mmap will be
@@ -391,9 +456,9 @@ impl Directory for MmapDirectory {
         }
     }
 
-    fn exists(&self, path: &Path) -> Result<bool, OpenReadError> {
+    fn exists(&self, path: &Path) -> bool {
         let full_path = self.resolve_path(path);
-        Ok(full_path.exists())
+        full_path.exists()
     }
 
     fn open_write(&self, path: &Path) -> Result<WritePtr, OpenWriteError> {
@@ -448,9 +513,12 @@ impl Directory for MmapDirectory {
 
     fn atomic_write(&self, path: &Path, content: &[u8]) -> io::Result<()> {
         debug!("Atomic Write {:?}", path);
+        let mut tempfile = tempfile::Builder::new().tempfile_in(&self.inner.root_path)?;
+        tempfile.write_all(content)?;
+        tempfile.flush()?;
         let full_path = self.resolve_path(path);
-        atomic_write(&full_path, content)?;
-        self.sync_directory()
+        tempfile.into_temp_path().persist(full_path)?;
+        Ok(())
     }
 
     fn acquire_lock(&self, lock: &Lock) -> Result<DirectoryLock, LockError> {
@@ -474,7 +542,7 @@ impl Directory for MmapDirectory {
     }
 
     fn watch(&self, watch_callback: WatchCallback) -> crate::Result<WatchHandle> {
-        Ok(self.inner.watch(watch_callback))
+        self.inner.watch(watch_callback)
     }
 }
 
@@ -489,6 +557,8 @@ mod tests {
     use crate::Index;
     use crate::ReloadPolicy;
     use crate::{common::HasLen, indexer::LogMergePolicy};
+    use std::fs;
+    use std::sync::atomic::{AtomicUsize, Ordering};
 
     #[test]
     fn test_open_non_existent_path() {
@@ -577,6 +647,27 @@ mod tests {
         assert_eq!(mmap_directory.get_cache_info().mmapped.len(), 0);
     }
 
+    #[test]
+    fn test_watch_wrapper() {
+        let counter: Arc<AtomicUsize> = Default::default();
+        let counter_clone = counter.clone();
+        let tmp_dir = tempfile::TempDir::new().unwrap();
+        let tmp_dirpath = tmp_dir.path().to_owned();
+        let mut watch_wrapper = WatcherWrapper::new(&tmp_dirpath).unwrap();
+        let tmp_file = tmp_dirpath.join(*META_FILEPATH);
+        let _handle = watch_wrapper.watch(Box::new(move || {
+            counter_clone.fetch_add(1, Ordering::SeqCst);
+        }));
+        let (sender, receiver) = crossbeam::channel::unbounded();
+        let _handle2 = watch_wrapper.watch(Box::new(move || {
+            let _ = sender.send(());
+        }));
+        assert_eq!(counter.load(Ordering::SeqCst), 0);
+        fs::write(&tmp_file, b"whateverwilldo").unwrap();
+        assert!(receiver.recv().is_ok());
+        assert!(counter.load(Ordering::SeqCst) >= 1);
+    }
+
     #[test]
     fn test_mmap_released() {
         let mmap_directory = MmapDirectory::create_from_tempdir().unwrap();

src/directory/mod.rs

@@ -10,7 +10,6 @@ mod mmap_directory;
 mod directory;
 mod directory_lock;
 mod file_slice;
-mod file_watcher;
 mod footer;
 mod managed_directory;
 mod owned_bytes;
@@ -23,7 +22,7 @@ pub mod error;
 pub use self::directory::DirectoryLock;
 pub use self::directory::{Directory, DirectoryClone};
 pub use self::directory_lock::{Lock, INDEX_WRITER_LOCK, META_LOCK};
-pub(crate) use self::file_slice::{ArcBytes, WeakArcBytes};
+pub(crate) use self::file_slice::BoxedData;
 pub use self::file_slice::{FileHandle, FileSlice};
 pub use self::owned_bytes::OwnedBytes;
 pub use self::ram_directory::RAMDirectory;

src/directory/owned_bytes.rs

@@ -1,8 +1,7 @@
 use crate::directory::FileHandle;
 use stable_deref_trait::StableDeref;
-use std::convert::TryInto;
 use std::mem;
-use std::ops::{Deref, Range};
+use std::ops::Deref;
 use std::sync::Arc;
 use std::{fmt, io};
 
@@ -17,8 +16,8 @@ pub struct OwnedBytes {
 }
 
 impl FileHandle for OwnedBytes {
-    fn read_bytes(&self, range: Range<usize>) -> io::Result<OwnedBytes> {
-        Ok(self.slice(range))
+    fn read_bytes(&self, from: usize, to: usize) -> io::Result<OwnedBytes> {
+        Ok(self.slice(from, to))
     }
 }
 
@@ -42,9 +41,9 @@ impl OwnedBytes {
     }
 
     /// creates a fileslice that is just a view over a slice of the data.
-    pub fn slice(&self, range: Range<usize>) -> Self {
+    pub fn slice(&self, from: usize, to: usize) -> Self {
         OwnedBytes {
-            data: &self.data[range],
+            data: &self.data[from..to],
             box_stable_deref: self.box_stable_deref.clone(),
         }
     }
@@ -96,24 +95,6 @@ impl OwnedBytes {
     pub fn advance(&mut self, advance_len: usize) {
         self.data = &self.data[advance_len..]
     }
-
-    /// Reads an `u8` from the `OwnedBytes` and advance by one byte.
-    pub fn read_u8(&mut self) -> u8 {
-        assert!(!self.is_empty());
-
-        let byte = self.as_slice()[0];
-        self.advance(1);
-        byte
-    }
-
-    /// Reads an `u64` encoded as little-endian from the `OwnedBytes` and advance by 8 bytes.
-    pub fn read_u64(&mut self) -> u64 {
-        assert!(self.len() > 7);
-
-        let octlet: [u8; 8] = self.as_slice()[..8].try_into().unwrap();
-        self.advance(8);
-        u64::from_le_bytes(octlet)
-    }
 }
 
 impl fmt::Debug for OwnedBytes {
@@ -249,22 +230,6 @@ mod tests {
         Ok(())
     }
 
-    #[test]
-    fn test_owned_bytes_read_u8() -> io::Result<()> {
-        let mut bytes = OwnedBytes::new(b"\xFF".as_ref());
-        assert_eq!(bytes.read_u8(), 255);
-        assert_eq!(bytes.len(), 0);
-        Ok(())
-    }
-
-    #[test]
-    fn test_owned_bytes_read_u64() -> io::Result<()> {
-        let mut bytes = OwnedBytes::new(b"\0\xFF\xFF\xFF\xFF\xFF\xFF\xFF".as_ref());
-        assert_eq!(bytes.read_u64(), u64::MAX - 255);
-        assert_eq!(bytes.len(), 0);
-        Ok(())
-    }
-
     #[test]
     fn test_owned_bytes_split() {
         let bytes = OwnedBytes::new(b"abcdefghi".as_ref());

src/directory/ram_directory.rs

@@ -12,8 +12,6 @@ use std::path::{Path, PathBuf};
 use std::result;
 use std::sync::{Arc, RwLock};
 
-use super::FileHandle;
-
 /// Writer associated with the `RAMDirectory`
 ///
 /// The Writer just writes a buffer.
@@ -165,11 +163,6 @@ impl RAMDirectory {
 }
 
 impl Directory for RAMDirectory {
-    fn get_file_handle(&self, path: &Path) -> Result<Box<dyn FileHandle>, OpenReadError> {
-        let file_slice = self.open_read(path)?;
-        Ok(Box::new(file_slice))
-    }
-
     fn open_read(&self, path: &Path) -> result::Result<FileSlice, OpenReadError> {
         self.fs.read().unwrap().open_read(path)
     }
@@ -184,15 +177,8 @@ impl Directory for RAMDirectory {
         self.fs.write().unwrap().delete(path)
     }
 
-    fn exists(&self, path: &Path) -> Result<bool, OpenReadError> {
-        Ok(self
-            .fs
-            .read()
-            .map_err(|e| OpenReadError::IOError {
-                io_error: io::Error::new(io::ErrorKind::Other, e.to_string()),
-                filepath: path.to_path_buf(),
-            })?
-            .exists(path))
+    fn exists(&self, path: &Path) -> bool {
+        self.fs.read().unwrap().exists(path)
     }
 
     fn open_write(&self, path: &Path) -> Result<WritePtr, OpenWriteError> {
@@ -226,9 +212,13 @@ impl Directory for RAMDirectory {
         )));
         let path_buf = PathBuf::from(path);
 
-        self.fs.write().unwrap().write(path_buf, data);
+        // Reserve the path to prevent calls to .write() to succeed.
+        self.fs.write().unwrap().write(path_buf.clone(), &[]);
 
-        if path == *META_FILEPATH {
+        let mut vec_writer = VecWriter::new(path_buf, self.clone());
+        vec_writer.write_all(data)?;
+        vec_writer.flush()?;
+        if path == Path::new(&*META_FILEPATH) {
             let _ = self.fs.write().unwrap().watch_router.broadcast();
         }
         Ok(())

src/directory/tests.rs

@@ -130,7 +130,7 @@ fn ram_directory_panics_if_flush_forgotten() {
 fn test_simple(directory: &dyn Directory) -> crate::Result<()> {
     let test_path: &'static Path = Path::new("some_path_for_test");
     let mut write_file = directory.open_write(test_path)?;
-    assert!(directory.exists(test_path).unwrap());
+    assert!(directory.exists(test_path));
     write_file.write_all(&[4])?;
     write_file.write_all(&[3])?;
     write_file.write_all(&[7, 3, 5])?;
@@ -139,14 +139,14 @@ fn test_simple(directory: &dyn Directory) -> crate::Result<()> {
     assert_eq!(read_file.as_slice(), &[4u8, 3u8, 7u8, 3u8, 5u8]);
     mem::drop(read_file);
     assert!(directory.delete(test_path).is_ok());
-    assert!(!directory.exists(test_path).unwrap());
+    assert!(!directory.exists(test_path));
     Ok(())
 }
 
 fn test_rewrite_forbidden(directory: &dyn Directory) -> crate::Result<()> {
     let test_path: &'static Path = Path::new("some_path_for_test");
     directory.open_write(test_path)?;
-    assert!(directory.exists(test_path).unwrap());
+    assert!(directory.exists(test_path));
     assert!(directory.open_write(test_path).is_err());
     assert!(directory.delete(test_path).is_ok());
     Ok(())
@@ -157,7 +157,7 @@ fn test_write_create_the_file(directory: &dyn Directory) {
     {
         assert!(directory.open_read(test_path).is_err());
         let _w = directory.open_write(test_path).unwrap();
-        assert!(directory.exists(test_path).unwrap());
+        assert!(directory.exists(test_path));
         assert!(directory.open_read(test_path).is_ok());
         assert!(directory.delete(test_path).is_ok());
     }
@@ -190,33 +190,38 @@ fn test_directory_delete(directory: &dyn Directory) -> crate::Result<()> {
 }
 
 fn test_watch(directory: &dyn Directory) {
+    let num_progress: Arc<AtomicUsize> = Default::default();
     let counter: Arc<AtomicUsize> = Default::default();
-    let (tx, rx) = crossbeam::channel::unbounded();
-    let timeout = Duration::from_millis(500);
-
-    let handle = directory
-        .watch(WatchCallback::new(move || {
-            let val = counter.fetch_add(1, SeqCst);
-            tx.send(val + 1).unwrap();
+    let counter_clone = counter.clone();
+    let (sender, receiver) = crossbeam::channel::unbounded();
+    let watch_callback = Box::new(move || {
+        counter_clone.fetch_add(1, SeqCst);
+    });
+    // This callback is used to synchronize watching in our unit test.
+    // We bind it to a variable because the callback is removed when that
+    // handle is dropped.
+    let watch_handle = directory.watch(watch_callback).unwrap();
+    let _progress_listener = directory
+        .watch(Box::new(move || {
+            let val = num_progress.fetch_add(1, SeqCst);
+            let _ = sender.send(val);
         }))
         .unwrap();
 
+    for i in 0..10 {
+        assert!(i <= counter.load(SeqCst));
+        assert!(directory
+            .atomic_write(Path::new("meta.json"), b"random_test_data_2")
+            .is_ok());
+        assert_eq!(receiver.recv_timeout(Duration::from_millis(500)), Ok(i));
+        assert!(i + 1 <= counter.load(SeqCst)); // notify can trigger more than once.
+    }
+    mem::drop(watch_handle);
     assert!(directory
-        .atomic_write(Path::new("meta.json"), b"foo")
+        .atomic_write(Path::new("meta.json"), b"random_test_data")
         .is_ok());
-    assert_eq!(rx.recv_timeout(timeout), Ok(1));
-
-    assert!(directory
-        .atomic_write(Path::new("meta.json"), b"bar")
-        .is_ok());
-    assert_eq!(rx.recv_timeout(timeout), Ok(2));
-
-    mem::drop(handle);
-
-    assert!(directory
-        .atomic_write(Path::new("meta.json"), b"qux")
-        .is_ok());
-    assert!(rx.recv_timeout(timeout).is_err());
+    assert!(receiver.recv_timeout(Duration::from_millis(500)).is_ok());
+    assert!(10 <= counter.load(SeqCst));
 }
 
 fn test_lock_non_blocking(directory: &dyn Directory) {

src/directory/watch_event_router.rs

@@ -4,20 +4,8 @@ use std::sync::Arc;
 use std::sync::RwLock;
 use std::sync::Weak;
 
-/// Cloneable wrapper for callbacks registered when watching files of a `Directory`.
-#[derive(Clone)]
-pub struct WatchCallback(Arc<dyn Fn() + Sync + Send>);
-
-impl WatchCallback {
-    /// Wraps a `Fn()` to create a WatchCallback.
-    pub fn new<F: Fn() + Sync + Send + 'static>(op: F) -> Self {
-        WatchCallback(Arc::new(op))
-    }
-
-    fn call(&self) {
-        self.0()
-    }
-}
+/// Type alias for callbacks registered when watching files of a `Directory`.
+pub type WatchCallback = Box<dyn Fn() + Sync + Send>;
 
 /// Helper struct to implement the watch method in `Directory` implementations.
 ///
@@ -46,7 +34,7 @@ impl WatchHandle {
     ///
     /// This function is only useful when implementing a readonly directory.
     pub fn empty() -> WatchHandle {
-        WatchHandle::new(Arc::new(WatchCallback::new(|| {})))
+        WatchHandle::new(Arc::new(Box::new(|| {})))
     }
 }
 
@@ -59,13 +47,13 @@ impl WatchCallbackList {
         WatchHandle::new(watch_callback_arc)
     }
 
-    fn list_callback(&self) -> Vec<WatchCallback> {
-        let mut callbacks: Vec<WatchCallback> = vec![];
+    fn list_callback(&self) -> Vec<Arc<WatchCallback>> {
+        let mut callbacks = vec![];
         let mut router_wlock = self.router.write().unwrap();
         let mut i = 0;
         while i < router_wlock.len() {
             if let Some(watch) = router_wlock[i].upgrade() {
-                callbacks.push(watch.as_ref().clone());
+                callbacks.push(watch);
                 i += 1;
             } else {
                 router_wlock.swap_remove(i);
@@ -87,7 +75,7 @@ impl WatchCallbackList {
             .name("watch-callbacks".to_string())
             .spawn(move || {
                 for callback in callbacks {
-                    callback.call();
+                    callback();
                 }
                 let _ = sender.send(());
             });
@@ -103,7 +91,7 @@ impl WatchCallbackList {
 
 #[cfg(test)]
 mod tests {
-    use crate::directory::{WatchCallback, WatchCallbackList};
+    use crate::directory::WatchCallbackList;
     use futures::executor::block_on;
     use std::mem;
     use std::sync::atomic::{AtomicUsize, Ordering};
@@ -114,7 +102,7 @@ mod tests {
         let watch_event_router = WatchCallbackList::default();
         let counter: Arc<AtomicUsize> = Default::default();
         let counter_clone = counter.clone();
-        let inc_callback = WatchCallback::new(move || {
+        let inc_callback = Box::new(move || {
             counter_clone.fetch_add(1, Ordering::SeqCst);
         });
         block_on(watch_event_router.broadcast());
@@ -142,7 +130,7 @@ mod tests {
         let counter: Arc<AtomicUsize> = Default::default();
         let inc_callback = |inc: usize| {
             let counter_clone = counter.clone();
-            WatchCallback::new(move || {
+            Box::new(move || {
                 counter_clone.fetch_add(inc, Ordering::SeqCst);
             })
         };
@@ -170,7 +158,7 @@ mod tests {
         let watch_event_router = WatchCallbackList::default();
         let counter: Arc<AtomicUsize> = Default::default();
         let counter_clone = counter.clone();
-        let inc_callback = WatchCallback::new(move || {
+        let inc_callback = Box::new(move || {
             counter_clone.fetch_add(1, Ordering::SeqCst);
         });
         let handle_a = watch_event_router.subscribe(inc_callback);

src/docset.rs

@@ -10,7 +10,7 @@ use std::borrow::BorrowMut;
 pub const TERMINATED: DocId = std::i32::MAX as u32;
 
 /// Represents an iterable set of sorted doc ids.
-pub trait DocSet: Send {
+pub trait DocSet {
     /// Goes to the next element.
     ///
     /// The DocId of the next element is returned.
@@ -129,14 +129,6 @@ impl<'a> DocSet for &'a mut dyn DocSet {
     fn size_hint(&self) -> u32 {
         (**self).size_hint()
     }
-
-    fn count(&mut self, delete_bitset: &DeleteBitSet) -> u32 {
-        (**self).count(delete_bitset)
-    }
-
-    fn count_including_deleted(&mut self) -> u32 {
-        (**self).count_including_deleted()
-    }
 }
 
 impl<TDocSet: DocSet + ?Sized> DocSet for Box<TDocSet> {

src/fastfield/bytes/mod.rs

@@ -56,7 +56,7 @@ mod tests {
     fn test_stored_bytes() -> crate::Result<()> {
         let searcher = create_index_for_test(STORED)?;
         assert_eq!(searcher.num_docs(), 1);
-        let retrieved_doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
+        let retrieved_doc = searcher.doc(DocAddress(0u32, 0u32))?;
         let field = searcher.schema().get_field("string_bytes").unwrap();
         let values: Vec<&Value> = retrieved_doc.get_all(field).collect();
         assert_eq!(values.len(), 2);
@@ -72,7 +72,7 @@ mod tests {
     fn test_non_stored_bytes() -> crate::Result<()> {
         let searcher = create_index_for_test(INDEXED)?;
         assert_eq!(searcher.num_docs(), 1);
-        let retrieved_doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
+        let retrieved_doc = searcher.doc(DocAddress(0u32, 0u32))?;
         let field = searcher.schema().get_field("string_bytes").unwrap();
         assert!(retrieved_doc.get_first(field).is_none());
         Ok(())
@@ -86,7 +86,7 @@ mod tests {
         let term = Term::from_field_bytes(field, b"lucene".as_ref());
         let term_query = TermQuery::new(term, IndexRecordOption::Basic);
         let term_weight = term_query.specialized_weight(&searcher, true)?;
-        let term_scorer = term_weight.specialized_scorer(searcher.segment_reader(0), 1.0)?;
+        let term_scorer = term_weight.specialized_scorer(searcher.segment_reader(0), 1.0f32)?;
         assert_eq!(term_scorer.doc(), 0u32);
         Ok(())
     }
@@ -98,9 +98,9 @@ mod tests {
         let field = searcher.schema().get_field("string_bytes").unwrap();
         let term = Term::from_field_bytes(field, b"lucene".as_ref());
         let term_query = TermQuery::new(term, IndexRecordOption::Basic);
-        let term_weight_err = term_query.specialized_weight(&searcher, false);
+        let term_weight_res = term_query.specialized_weight(&searcher, false);
         assert!(matches!(
-            term_weight_err,
+            term_weight_res,
             Err(crate::TantivyError::SchemaError(_))
         ));
         Ok(())

src/fastfield/bytes/writer.rs

@@ -80,7 +80,7 @@ impl BytesFastFieldWriter {
         doc_index_serializer.close_field()?;
         // writing the values themselves
         serializer
-            .new_bytes_fast_field_with_idx(self.field, 1)
+            .new_bytes_fast_field_with_idx(self.field, 1)?
             .write_all(&self.vals)?;
         Ok(())
     }

src/fastfield/facet_reader.rs

@@ -1,5 +1,4 @@
-use super::MultiValuedFastFieldReader;
-use crate::error::DataCorruption;
+use super::MultiValueIntFastFieldReader;
 use crate::schema::Facet;
 use crate::termdict::TermDictionary;
 use crate::termdict::TermOrdinal;
@@ -20,7 +19,7 @@ use std::str;
 /// list of facets. This ordinal is segment local and
 /// only makes sense for a given segment.
 pub struct FacetReader {
-    term_ords: MultiValuedFastFieldReader<u64>,
+    term_ords: MultiValueIntFastFieldReader<u64>,
     term_dict: TermDictionary,
     buffer: Vec<u8>,
 }
@@ -29,12 +28,12 @@ impl FacetReader {
     /// Creates a new `FacetReader`.
     ///
     /// A facet reader just wraps :
-    /// - a `MultiValuedFastFieldReader` that makes it possible to
+    /// - a `MultiValueIntFastFieldReader` that makes it possible to
     /// access the list of facet ords for a given document.
     /// - a `TermDictionary` that helps associating a facet to
     /// an ordinal and vice versa.
     pub fn new(
-        term_ords: MultiValuedFastFieldReader<u64>,
+        term_ords: MultiValueIntFastFieldReader<u64>,
         term_dict: TermDictionary,
     ) -> FacetReader {
         FacetReader {
@@ -63,13 +62,12 @@ impl FacetReader {
         &mut self,
         facet_ord: TermOrdinal,
         output: &mut Facet,
-    ) -> crate::Result<()> {
+    ) -> Result<(), str::Utf8Error> {
         let found_term = self
             .term_dict
-            .ord_to_term(facet_ord as u64, &mut self.buffer)?;
+            .ord_to_term(facet_ord as u64, &mut self.buffer);
         assert!(found_term, "Term ordinal {} no found.", facet_ord);
-        let facet_str = str::from_utf8(&self.buffer[..])
-            .map_err(|utf8_err| DataCorruption::comment_only(utf8_err.to_string()))?;
+        let facet_str = str::from_utf8(&self.buffer[..])?;
         output.set_facet_str(facet_str);
         Ok(())
     }
@@ -84,106 +82,14 @@ impl FacetReader {
 mod tests {
     use crate::Index;
     use crate::{
-        schema::{Facet, FacetOptions, SchemaBuilder, Value, INDEXED, STORED},
-        DocAddress, Document,
+        schema::{Facet, SchemaBuilder},
+        Document,
     };
 
-    #[test]
-    fn test_facet_only_indexed() -> crate::Result<()> {
-        let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.add_document(doc!(facet_field=>Facet::from_text("/a/b")));
-        index_writer.commit()?;
-        let searcher = index.reader()?.searcher();
-        let facet_reader = searcher
-            .segment_reader(0u32)
-            .facet_reader(facet_field)
-            .unwrap();
-        let mut facet_ords = Vec::new();
-        facet_reader.facet_ords(0u32, &mut facet_ords);
-        assert_eq!(&facet_ords, &[2u64]);
-        let doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
-        let value = doc.get_first(facet_field).and_then(Value::path);
-        assert_eq!(value, None);
-        Ok(())
-    }
-
-    #[test]
-    fn test_facet_only_stored() -> crate::Result<()> {
-        let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", STORED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.add_document(doc!(facet_field=>Facet::from_text("/a/b")));
-        index_writer.commit()?;
-        let searcher = index.reader()?.searcher();
-        let facet_reader = searcher
-            .segment_reader(0u32)
-            .facet_reader(facet_field)
-            .unwrap();
-        let mut facet_ords = Vec::new();
-        facet_reader.facet_ords(0u32, &mut facet_ords);
-        assert!(facet_ords.is_empty());
-        let doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
-        let value = doc.get_first(facet_field).and_then(Value::path);
-        assert_eq!(value, Some("/a/b".to_string()));
-        Ok(())
-    }
-
-    #[test]
-    fn test_facet_stored_and_indexed() -> crate::Result<()> {
-        let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", STORED | INDEXED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.add_document(doc!(facet_field=>Facet::from_text("/a/b")));
-        index_writer.commit()?;
-        let searcher = index.reader()?.searcher();
-        let facet_reader = searcher
-            .segment_reader(0u32)
-            .facet_reader(facet_field)
-            .unwrap();
-        let mut facet_ords = Vec::new();
-        facet_reader.facet_ords(0u32, &mut facet_ords);
-        assert_eq!(&facet_ords, &[2u64]);
-        let doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
-        let value = doc.get_first(facet_field).and_then(Value::path);
-        assert_eq!(value, Some("/a/b".to_string()));
-        Ok(())
-    }
-
-    #[test]
-    fn test_facet_neither_stored_and_indexed() -> crate::Result<()> {
-        let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", FacetOptions::default());
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.add_document(doc!(facet_field=>Facet::from_text("/a/b")));
-        index_writer.commit()?;
-        let searcher = index.reader()?.searcher();
-        let facet_reader = searcher
-            .segment_reader(0u32)
-            .facet_reader(facet_field)
-            .unwrap();
-        let mut facet_ords = Vec::new();
-        facet_reader.facet_ords(0u32, &mut facet_ords);
-        assert!(facet_ords.is_empty());
-        let doc = searcher.doc(DocAddress::new(0u32, 0u32))?;
-        let value = doc.get_first(facet_field).and_then(Value::path);
-        assert_eq!(value, None);
-        Ok(())
-    }
-
     #[test]
     fn test_facet_not_populated_for_all_docs() -> crate::Result<()> {
         let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index.writer_for_tests()?;
@@ -202,11 +108,10 @@ mod tests {
         assert!(facet_ords.is_empty());
         Ok(())
     }
-
     #[test]
     fn test_facet_not_populated_for_any_docs() -> crate::Result<()> {
         let mut schema_builder = SchemaBuilder::default();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index.writer_for_tests()?;

src/fastfield/mod.rs

@@ -28,7 +28,7 @@ pub use self::delete::write_delete_bitset;
 pub use self::delete::DeleteBitSet;
 pub use self::error::{FastFieldNotAvailableError, Result};
 pub use self::facet_reader::FacetReader;
-pub use self::multivalued::{MultiValuedFastFieldReader, MultiValuedFastFieldWriter};
+pub use self::multivalued::{MultiValueIntFastFieldReader, MultiValueIntFastFieldWriter};
 pub use self::reader::FastFieldReader;
 pub use self::readers::FastFieldReaders;
 pub use self::serializer::FastFieldSerializer;
@@ -53,7 +53,7 @@ mod serializer;
 mod writer;
 
 /// Trait for types that are allowed for fast fields: (u64, i64 and f64).
-pub trait FastValue: Clone + Copy + Send + Sync + PartialOrd + 'static {
+pub trait FastValue: Clone + Copy + Send + Sync + PartialOrd {
     /// Converts a value from u64
     ///
     /// Internally all fast field values are encoded as u64.
@@ -96,7 +96,7 @@ impl FastValue for u64 {
     fn fast_field_cardinality(field_type: &FieldType) -> Option<Cardinality> {
         match *field_type {
             FieldType::U64(ref integer_options) => integer_options.get_fastfield_cardinality(),
-            FieldType::HierarchicalFacet(_) => Some(Cardinality::MultiValues),
+            FieldType::HierarchicalFacet => Some(Cardinality::MultiValues),
             _ => None,
         }
     }
@@ -629,7 +629,7 @@ mod bench {
         {
             let fast_fields_composite = CompositeFile::open(&file).unwrap();
             let data = fast_fields_composite.open_read(*FIELD).unwrap();
-            let fast_field_reader = FastFieldReader::<u64>::open(data).unwrap();
+            let fast_field_reader = FastFieldReader::<u64>::open(data);
 
             b.iter(|| {
                 let n = test::black_box(7000u32);
@@ -663,7 +663,7 @@ mod bench {
         {
             let fast_fields_composite = CompositeFile::open(&file).unwrap();
             let data = fast_fields_composite.open_read(*FIELD).unwrap();
-            let fast_field_reader = FastFieldReader::<u64>::open(data).unwrap();
+            let fast_field_reader = FastFieldReader::<u64>::open(data);
 
             b.iter(|| {
                 let n = test::black_box(1000u32);

src/fastfield/multivalued/mod.rs

@@ -1,8 +1,8 @@
 mod reader;
 mod writer;
 
-pub use self::reader::MultiValuedFastFieldReader;
-pub use self::writer::MultiValuedFastFieldWriter;
+pub use self::reader::MultiValueIntFastFieldReader;
+pub use self::writer::MultiValueIntFastFieldWriter;
 
 #[cfg(test)]
 mod tests {
@@ -13,7 +13,6 @@ mod tests {
     use crate::schema::Facet;
     use crate::schema::IntOptions;
     use crate::schema::Schema;
-    use crate::schema::INDEXED;
     use crate::Index;
     use chrono::Duration;
 
@@ -147,50 +146,37 @@ mod tests {
             }
         }
 
-        {
-            let parser = QueryParser::for_index(&index, vec![date_field]);
-            let range_q = format!(
-                "[{} TO {}]",
-                (first_time_stamp + Duration::seconds(1)).to_rfc3339(),
-                (first_time_stamp + Duration::seconds(3)).to_rfc3339()
-            );
-            let query = parser.parse_query(&range_q).expect("could not parse query");
-            let results = searcher
-                .search(&query, &TopDocs::with_limit(5))
-                .expect("could not query index");
-
-            assert_eq!(results.len(), 2);
-            for (i, doc_pair) in results.iter().enumerate() {
-                let retrieved_doc = searcher.doc(doc_pair.1).expect("cannot fetch doc");
-                let offset_sec = match i {
-                    0 => 1,
-                    1 => 2,
-                    _ => panic!("should not have more than 2 docs"),
-                };
-                let time_i_val = match i {
-                    0 => 2,
-                    1 => 3,
-                    _ => panic!("should not have more than 2 docs"),
-                };
-                assert_eq!(
-                    retrieved_doc
-                        .get_first(date_field)
-                        .expect("cannot find value")
-                        .date_value()
-                        .expect("value not of Date type")
-                        .timestamp(),
-                    (first_time_stamp + Duration::seconds(offset_sec)).timestamp()
-                );
-                assert_eq!(
-                    retrieved_doc
-                        .get_first(time_i)
-                        .expect("cannot find value")
-                        .i64_value()
-                        .expect("value not of i64 type"),
-                    time_i_val
-                );
-            }
-        }
+        // TODO: support Date range queries
+        //        {
+        //            let parser = QueryParser::for_index(&index, vec![date_field]);
+        //            let range_q = format!("\"{}\"..\"{}\"",
+        //                                  (first_time_stamp + Duration::seconds(1)).to_rfc3339(),
+        //                                  (first_time_stamp + Duration::seconds(3)).to_rfc3339()
+        //            );
+        //            let query = parser.parse_query(&range_q)
+        //                .expect("could not parse query");
+        //            let results = searcher.search(&query, &TopDocs::with_limit(5))
+        //                .expect("could not query index");
+        //
+        //
+        //            assert_eq!(results.len(), 2);
+        //            for (i, doc_pair) in results.iter().enumerate() {
+        //                let retrieved_doc = searcher.doc(doc_pair.1).expect("cannot fetch doc");
+        //                let offset_sec = match i {
+        //                    0 => 1,
+        //                    1 => 3,
+        //                    _ => panic!("should not have more than 2 docs")
+        //                };
+        //                let time_i_val = match i {
+        //                    0 => 2,
+        //                    1 => 3,
+        //                    _ => panic!("should not have more than 2 docs")
+        //                };
+        //                assert_eq!(retrieved_doc.get_first(date_field).expect("cannot find value").date_value().timestamp(),
+        //                           (first_time_stamp + Duration::seconds(offset_sec)).timestamp());
+        //                assert_eq!(retrieved_doc.get_first(time_i).expect("cannot find value").i64_value(), time_i_val);
+        //            }
+        //        }
     }
 
     #[test]
@@ -226,7 +212,7 @@ mod tests {
     #[ignore]
     fn test_many_facets() {
         let mut schema_builder = Schema::builder();
-        let field = schema_builder.add_facet_field("facetfield", INDEXED);
+        let field = schema_builder.add_facet_field("facetfield");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index.writer_for_tests().unwrap();

src/fastfield/multivalued/reader.rs

@@ -1,5 +1,3 @@
-use std::ops::Range;
-
 use crate::fastfield::{FastFieldReader, FastValue};
 use crate::DocId;
 
@@ -12,42 +10,49 @@ use crate::DocId;
 /// The `idx_reader` associated, for each document, the index of its first value.
 ///
 #[derive(Clone)]
-pub struct MultiValuedFastFieldReader<Item: FastValue> {
+pub struct MultiValueIntFastFieldReader<Item: FastValue> {
     idx_reader: FastFieldReader<u64>,
     vals_reader: FastFieldReader<Item>,
 }
 
-impl<Item: FastValue> MultiValuedFastFieldReader<Item> {
+impl<Item: FastValue> MultiValueIntFastFieldReader<Item> {
     pub(crate) fn open(
         idx_reader: FastFieldReader<u64>,
         vals_reader: FastFieldReader<Item>,
-    ) -> MultiValuedFastFieldReader<Item> {
-        MultiValuedFastFieldReader {
+    ) -> MultiValueIntFastFieldReader<Item> {
+        MultiValueIntFastFieldReader {
             idx_reader,
             vals_reader,
         }
     }
 
+    pub(crate) fn into_u64s_reader(self) -> MultiValueIntFastFieldReader<u64> {
+        MultiValueIntFastFieldReader {
+            idx_reader: self.idx_reader,
+            vals_reader: self.vals_reader.into_u64_reader(),
+        }
+    }
+
     /// Returns `(start, stop)`, such that the values associated
     /// to the given document are `start..stop`.
-    fn range(&self, doc: DocId) -> Range<u64> {
+    fn range(&self, doc: DocId) -> (u64, u64) {
         let start = self.idx_reader.get(doc);
         let stop = self.idx_reader.get(doc + 1);
-        start..stop
+        (start, stop)
     }
 
     /// Returns the array of values associated to the given `doc`.
     pub fn get_vals(&self, doc: DocId, vals: &mut Vec<Item>) {
-        let range = self.range(doc);
-        let len = (range.end - range.start) as usize;
+        let (start, stop) = self.range(doc);
+        let len = (stop - start) as usize;
         vals.resize(len, Item::make_zero());
-        self.vals_reader.get_range_u64(range.start, &mut vals[..]);
+        self.vals_reader.get_range_u64(start, &mut vals[..]);
     }
 
     /// Returns the number of values associated with the document `DocId`.
     pub fn num_vals(&self, doc: DocId) -> usize {
-        let range = self.range(doc);
-        (range.end - range.start) as usize
+        let (start, stop) = self.range(doc);
+        (stop - start) as usize
     }
 
     /// Returns the overall number of values in this field  .
@@ -60,12 +65,12 @@ impl<Item: FastValue> MultiValuedFastFieldReader<Item> {
 mod tests {
 
     use crate::core::Index;
-    use crate::schema::{Facet, Schema, INDEXED};
+    use crate::schema::{Facet, Schema};
 
     #[test]
     fn test_multifastfield_reader() {
         let mut schema_builder = Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facets", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facets");
         let schema = schema_builder.build();
         let index = Index::create_in_ram(schema);
         let mut index_writer = index

src/fastfield/multivalued/writer.rs

@@ -7,7 +7,6 @@ use crate::termdict::TermOrdinal;
 use crate::DocId;
 use fnv::FnvHashMap;
 use std::io;
-use std::iter::once;
 
 /// Writer for multi-valued (as in, more than one value per document)
 /// int fast field.
@@ -19,7 +18,7 @@ use std::iter::once;
 /// in your schema
 /// - add your document simply by calling `.add_document(...)`.
 ///
-/// The `MultiValuedFastFieldWriter` can be acquired from the
+/// The `MultiValueIntFastFieldWriter` can be acquired from the
 /// fastfield writer, by calling [`.get_multivalue_writer(...)`](./struct.FastFieldsWriter.html#method.get_multivalue_writer).
 ///
 /// Once acquired, writing is done by calling calls to
@@ -30,17 +29,17 @@ use std::iter::once;
 /// This makes it possible to push unordered term ids,
 /// during indexing and remap them to their respective
 /// term ids when the segment is getting serialized.
-pub struct MultiValuedFastFieldWriter {
+pub struct MultiValueIntFastFieldWriter {
     field: Field,
     vals: Vec<UnorderedTermId>,
     doc_index: Vec<u64>,
     is_facet: bool,
 }
 
-impl MultiValuedFastFieldWriter {
+impl MultiValueIntFastFieldWriter {
     /// Creates a new `IntFastFieldWriter`
     pub(crate) fn new(field: Field, is_facet: bool) -> Self {
-        MultiValuedFastFieldWriter {
+        MultiValueIntFastFieldWriter {
             field,
             vals: Vec::new(),
             doc_index: Vec::new(),
@@ -48,7 +47,7 @@ impl MultiValuedFastFieldWriter {
         }
     }
 
-    /// Access the field associated to the `MultiValuedFastFieldWriter`
+    /// Access the field associated to the `MultiValueIntFastFieldWriter`
     pub fn field(&self) -> Field {
         self.field
     }
@@ -126,18 +125,21 @@ impl MultiValuedFastFieldWriter {
                         1,
                     )?;
 
-                    let last_interval =
-                        self.doc_index.last().cloned().unwrap() as usize..self.vals.len();
+                    let last_interval = (
+                        self.doc_index.last().cloned().unwrap(),
+                        self.vals.len() as u64,
+                    );
 
                     let mut doc_vals: Vec<u64> = Vec::with_capacity(100);
-                    for range in self
+                    for (start, stop) in self
                         .doc_index
                         .windows(2)
-                        .map(|interval| interval[0] as usize..interval[1] as usize)
-                        .chain(once(last_interval))
+                        .map(|interval| (interval[0], interval[1]))
+                        .chain(Some(last_interval).into_iter())
+                        .map(|(start, stop)| (start as usize, stop as usize))
                     {
                         doc_vals.clear();
-                        let remapped_vals = self.vals[range]
+                        let remapped_vals = self.vals[start..stop]
                             .iter()
                             .map(|val| *mapping.get(val).expect("Missing term ordinal"));
                         doc_vals.extend(remapped_vals);

src/fastfield/reader.rs

@@ -42,6 +42,15 @@ impl<Item: FastValue> FastFieldReader<Item> {
         })
     }
 
+    pub(crate) fn into_u64_reader(self) -> FastFieldReader<u64> {
+        FastFieldReader {
+            bit_unpacker: self.bit_unpacker,
+            min_value_u64: self.min_value_u64,
+            max_value_u64: self.max_value_u64,
+            _phantom: PhantomData,
+        }
+    }
+
     /// Return the value associated to the given document.
     ///
     /// This accessor should return as fast as possible.

src/fastfield/readers.rs

@@ -1,22 +1,28 @@
 use crate::common::CompositeFile;
-use crate::directory::FileSlice;
-use crate::fastfield::MultiValuedFastFieldReader;
-use crate::fastfield::{BytesFastFieldReader, FastValue};
+use crate::fastfield::BytesFastFieldReader;
+use crate::fastfield::MultiValueIntFastFieldReader;
 use crate::fastfield::{FastFieldNotAvailableError, FastFieldReader};
 use crate::schema::{Cardinality, Field, FieldType, Schema};
 use crate::space_usage::PerFieldSpaceUsage;
-use crate::TantivyError;
+use std::collections::HashMap;
 
 /// Provides access to all of the FastFieldReader.
 ///
 /// Internally, `FastFieldReaders` have preloaded fast field readers,
 /// and just wraps several `HashMap`.
-#[derive(Clone)]
 pub struct FastFieldReaders {
-    schema: Schema,
+    fast_field_i64: HashMap<Field, FastFieldReader<i64>>,
+    fast_field_u64: HashMap<Field, FastFieldReader<u64>>,
+    fast_field_f64: HashMap<Field, FastFieldReader<f64>>,
+    fast_field_date: HashMap<Field, FastFieldReader<crate::DateTime>>,
+    fast_field_i64s: HashMap<Field, MultiValueIntFastFieldReader<i64>>,
+    fast_field_u64s: HashMap<Field, MultiValueIntFastFieldReader<u64>>,
+    fast_field_f64s: HashMap<Field, MultiValueIntFastFieldReader<f64>>,
+    fast_field_dates: HashMap<Field, MultiValueIntFastFieldReader<crate::DateTime>>,
+    fast_bytes: HashMap<Field, BytesFastFieldReader>,
     fast_fields_composite: CompositeFile,
 }
-#[derive(Eq, PartialEq, Debug)]
+
 enum FastType {
     I64,
     U64,
@@ -38,178 +44,234 @@ fn type_and_cardinality(field_type: &FieldType) -> Option<(FastType, Cardinality
         FieldType::Date(options) => options
             .get_fastfield_cardinality()
             .map(|cardinality| (FastType::Date, cardinality)),
-        FieldType::HierarchicalFacet(_) => Some((FastType::U64, Cardinality::MultiValues)),
+        FieldType::HierarchicalFacet => Some((FastType::U64, Cardinality::MultiValues)),
         _ => None,
     }
 }
 
 impl FastFieldReaders {
-    pub(crate) fn new(schema: Schema, fast_fields_composite: CompositeFile) -> FastFieldReaders {
-        FastFieldReaders {
-            fast_fields_composite,
-            schema,
+    pub(crate) fn load_all(
+        schema: &Schema,
+        fast_fields_composite: &CompositeFile,
+    ) -> crate::Result<FastFieldReaders> {
+        let mut fast_field_readers = FastFieldReaders {
+            fast_field_i64: Default::default(),
+            fast_field_u64: Default::default(),
+            fast_field_f64: Default::default(),
+            fast_field_date: Default::default(),
+            fast_field_i64s: Default::default(),
+            fast_field_u64s: Default::default(),
+            fast_field_f64s: Default::default(),
+            fast_field_dates: Default::default(),
+            fast_bytes: Default::default(),
+            fast_fields_composite: fast_fields_composite.clone(),
+        };
+        for (field, field_entry) in schema.fields() {
+            let field_type = field_entry.field_type();
+            if let FieldType::Bytes(bytes_option) = field_type {
+                if !bytes_option.is_fast() {
+                    continue;
+                }
+                let fast_field_idx_file = fast_fields_composite
+                    .open_read_with_idx(field, 0)
+                    .ok_or_else(|| FastFieldNotAvailableError::new(field_entry))?;
+                let idx_reader = FastFieldReader::open(fast_field_idx_file)?;
+                let data = fast_fields_composite
+                    .open_read_with_idx(field, 1)
+                    .ok_or_else(|| FastFieldNotAvailableError::new(field_entry))?;
+                let bytes_fast_field_reader = BytesFastFieldReader::open(idx_reader, data)?;
+                fast_field_readers
+                    .fast_bytes
+                    .insert(field, bytes_fast_field_reader);
+            } else if let Some((fast_type, cardinality)) = type_and_cardinality(field_type) {
+                match cardinality {
+                    Cardinality::SingleValue => {
+                        if let Some(fast_field_data) = fast_fields_composite.open_read(field) {
+                            match fast_type {
+                                FastType::U64 => {
+                                    let fast_field_reader = FastFieldReader::open(fast_field_data)?;
+                                    fast_field_readers
+                                        .fast_field_u64
+                                        .insert(field, fast_field_reader);
+                                }
+                                FastType::I64 => {
+                                    let fast_field_reader =
+                                        FastFieldReader::open(fast_field_data.clone())?;
+                                    fast_field_readers
+                                        .fast_field_i64
+                                        .insert(field, fast_field_reader);
+                                }
+                                FastType::F64 => {
+                                    let fast_field_reader =
+                                        FastFieldReader::open(fast_field_data.clone())?;
+                                    fast_field_readers
+                                        .fast_field_f64
+                                        .insert(field, fast_field_reader);
+                                }
+                                FastType::Date => {
+                                    let fast_field_reader =
+                                        FastFieldReader::open(fast_field_data.clone())?;
+                                    fast_field_readers
+                                        .fast_field_date
+                                        .insert(field, fast_field_reader);
+                                }
+                            }
+                        } else {
+                            return Err(From::from(FastFieldNotAvailableError::new(field_entry)));
+                        }
+                    }
+                    Cardinality::MultiValues => {
+                        let idx_opt = fast_fields_composite.open_read_with_idx(field, 0);
+                        let data_opt = fast_fields_composite.open_read_with_idx(field, 1);
+                        if let (Some(fast_field_idx), Some(fast_field_data)) = (idx_opt, data_opt) {
+                            let idx_reader = FastFieldReader::open(fast_field_idx)?;
+                            match fast_type {
+                                FastType::I64 => {
+                                    let vals_reader = FastFieldReader::open(fast_field_data)?;
+                                    let multivalued_int_fast_field =
+                                        MultiValueIntFastFieldReader::open(idx_reader, vals_reader);
+                                    fast_field_readers
+                                        .fast_field_i64s
+                                        .insert(field, multivalued_int_fast_field);
+                                }
+                                FastType::U64 => {
+                                    let vals_reader = FastFieldReader::open(fast_field_data)?;
+                                    let multivalued_int_fast_field =
+                                        MultiValueIntFastFieldReader::open(idx_reader, vals_reader);
+                                    fast_field_readers
+                                        .fast_field_u64s
+                                        .insert(field, multivalued_int_fast_field);
+                                }
+                                FastType::F64 => {
+                                    let vals_reader = FastFieldReader::open(fast_field_data)?;
+                                    let multivalued_int_fast_field =
+                                        MultiValueIntFastFieldReader::open(idx_reader, vals_reader);
+                                    fast_field_readers
+                                        .fast_field_f64s
+                                        .insert(field, multivalued_int_fast_field);
+                                }
+                                FastType::Date => {
+                                    let vals_reader = FastFieldReader::open(fast_field_data)?;
+                                    let multivalued_int_fast_field =
+                                        MultiValueIntFastFieldReader::open(idx_reader, vals_reader);
+                                    fast_field_readers
+                                        .fast_field_dates
+                                        .insert(field, multivalued_int_fast_field);
+                                }
+                            }
+                        } else {
+                            return Err(From::from(FastFieldNotAvailableError::new(field_entry)));
+                        }
+                    }
+                }
+            }
         }
+        Ok(fast_field_readers)
     }
 
     pub(crate) fn space_usage(&self) -> PerFieldSpaceUsage {
         self.fast_fields_composite.space_usage()
     }
 
-    fn fast_field_data(&self, field: Field, idx: usize) -> crate::Result<FileSlice> {
-        self.fast_fields_composite
-            .open_read_with_idx(field, idx)
-            .ok_or_else(|| {
-                let field_name = self.schema.get_field_entry(field).name();
-                TantivyError::SchemaError(format!("Field({}) data was not found", field_name))
-            })
-    }
-
-    fn check_type(
-        &self,
-        field: Field,
-        expected_fast_type: FastType,
-        expected_cardinality: Cardinality,
-    ) -> crate::Result<()> {
-        let field_entry = self.schema.get_field_entry(field);
-        let (fast_type, cardinality) =
-            type_and_cardinality(field_entry.field_type()).ok_or_else(|| {
-                crate::TantivyError::SchemaError(format!(
-                    "Field {:?} is not a fast field.",
-                    field_entry.name()
-                ))
-            })?;
-        if fast_type != expected_fast_type {
-            return Err(crate::TantivyError::SchemaError(format!(
-                "Field {:?} is of type {:?}, expected {:?}.",
-                field_entry.name(),
-                fast_type,
-                expected_fast_type
-            )));
-        }
-        if cardinality != expected_cardinality {
-            return Err(crate::TantivyError::SchemaError(format!(
-                "Field {:?} is of cardinality {:?}, expected {:?}.",
-                field_entry.name(),
-                cardinality,
-                expected_cardinality
-            )));
-        }
-        Ok(())
-    }
-
-    pub(crate) fn typed_fast_field_reader<TFastValue: FastValue>(
-        &self,
-        field: Field,
-    ) -> crate::Result<FastFieldReader<TFastValue>> {
-        let fast_field_slice = self.fast_field_data(field, 0)?;
-        FastFieldReader::open(fast_field_slice)
-    }
-
-    pub(crate) fn typed_fast_field_multi_reader<TFastValue: FastValue>(
-        &self,
-        field: Field,
-    ) -> crate::Result<MultiValuedFastFieldReader<TFastValue>> {
-        let fast_field_slice_idx = self.fast_field_data(field, 0)?;
-        let fast_field_slice_vals = self.fast_field_data(field, 1)?;
-        let idx_reader = FastFieldReader::open(fast_field_slice_idx)?;
-        let vals_reader: FastFieldReader<TFastValue> =
-            FastFieldReader::open(fast_field_slice_vals)?;
-        Ok(MultiValuedFastFieldReader::open(idx_reader, vals_reader))
-    }
-
     /// Returns the `u64` fast field reader reader associated to `field`.
     ///
     /// If `field` is not a u64 fast field, this method returns `None`.
-    pub fn u64(&self, field: Field) -> crate::Result<FastFieldReader<u64>> {
-        self.check_type(field, FastType::U64, Cardinality::SingleValue)?;
-        self.typed_fast_field_reader(field)
+    pub fn u64(&self, field: Field) -> Option<FastFieldReader<u64>> {
+        self.fast_field_u64.get(&field).cloned()
     }
 
-    /// Returns the `u64` fast field reader reader associated to `field`, regardless of whether the given
-    /// field is effectively of type `u64` or not.
+    /// If the field is a u64-fast field return the associated reader.
+    /// If the field is a i64-fast field, return the associated u64 reader. Values are
+    /// mapped from i64 to u64 using a (well the, it is unique) monotonic mapping.    ///
     ///
-    /// If not, the fastfield reader will returns the u64-value associated to the original FastValue.
-    pub fn u64_lenient(&self, field: Field) -> crate::Result<FastFieldReader<u64>> {
-        self.typed_fast_field_reader(field)
+    /// This method is useful when merging segment reader.
+    pub(crate) fn u64_lenient(&self, field: Field) -> Option<FastFieldReader<u64>> {
+        if let Some(u64_ff_reader) = self.u64(field) {
+            return Some(u64_ff_reader);
+        }
+        if let Some(i64_ff_reader) = self.i64(field) {
+            return Some(i64_ff_reader.into_u64_reader());
+        }
+        if let Some(f64_ff_reader) = self.f64(field) {
+            return Some(f64_ff_reader.into_u64_reader());
+        }
+        if let Some(date_ff_reader) = self.date(field) {
+            return Some(date_ff_reader.into_u64_reader());
+        }
+        None
     }
 
     /// Returns the `i64` fast field reader reader associated to `field`.
     ///
     /// If `field` is not a i64 fast field, this method returns `None`.
-    pub fn i64(&self, field: Field) -> crate::Result<FastFieldReader<i64>> {
-        self.check_type(field, FastType::I64, Cardinality::SingleValue)?;
-        self.typed_fast_field_reader(field)
+    pub fn i64(&self, field: Field) -> Option<FastFieldReader<i64>> {
+        self.fast_field_i64.get(&field).cloned()
     }
 
     /// Returns the `i64` fast field reader reader associated to `field`.
     ///
     /// If `field` is not a i64 fast field, this method returns `None`.
-    pub fn date(&self, field: Field) -> crate::Result<FastFieldReader<crate::DateTime>> {
-        self.check_type(field, FastType::Date, Cardinality::SingleValue)?;
-        self.typed_fast_field_reader(field)
+    pub fn date(&self, field: Field) -> Option<FastFieldReader<crate::DateTime>> {
+        self.fast_field_date.get(&field).cloned()
     }
 
     /// Returns the `f64` fast field reader reader associated to `field`.
     ///
     /// If `field` is not a f64 fast field, this method returns `None`.
-    pub fn f64(&self, field: Field) -> crate::Result<FastFieldReader<f64>> {
-        self.check_type(field, FastType::F64, Cardinality::SingleValue)?;
-        self.typed_fast_field_reader(field)
+    pub fn f64(&self, field: Field) -> Option<FastFieldReader<f64>> {
+        self.fast_field_f64.get(&field).cloned()
     }
 
     /// Returns a `u64s` multi-valued fast field reader reader associated to `field`.
     ///
     /// If `field` is not a u64 multi-valued fast field, this method returns `None`.
-    pub fn u64s(&self, field: Field) -> crate::Result<MultiValuedFastFieldReader<u64>> {
-        self.check_type(field, FastType::U64, Cardinality::MultiValues)?;
-        self.typed_fast_field_multi_reader(field)
+    pub fn u64s(&self, field: Field) -> Option<MultiValueIntFastFieldReader<u64>> {
+        self.fast_field_u64s.get(&field).cloned()
+    }
+
+    /// If the field is a u64s-fast field return the associated reader.
+    /// If the field is a i64s-fast field, return the associated u64s reader. Values are
+    /// mapped from i64 to u64 using a (well the, it is unique) monotonic mapping.
+    ///
+    /// This method is useful when merging segment reader.
+    pub(crate) fn u64s_lenient(&self, field: Field) -> Option<MultiValueIntFastFieldReader<u64>> {
+        if let Some(u64s_ff_reader) = self.u64s(field) {
+            return Some(u64s_ff_reader);
+        }
+        if let Some(i64s_ff_reader) = self.i64s(field) {
+            return Some(i64s_ff_reader.into_u64s_reader());
+        }
+        if let Some(f64s_ff_reader) = self.f64s(field) {
+            return Some(f64s_ff_reader.into_u64s_reader());
+        }
+        None
     }
 
     /// Returns a `i64s` multi-valued fast field reader reader associated to `field`.
     ///
     /// If `field` is not a i64 multi-valued fast field, this method returns `None`.
-    pub fn i64s(&self, field: Field) -> crate::Result<MultiValuedFastFieldReader<i64>> {
-        self.check_type(field, FastType::I64, Cardinality::MultiValues)?;
-        self.typed_fast_field_multi_reader(field)
+    pub fn i64s(&self, field: Field) -> Option<MultiValueIntFastFieldReader<i64>> {
+        self.fast_field_i64s.get(&field).cloned()
     }
 
     /// Returns a `f64s` multi-valued fast field reader reader associated to `field`.
     ///
     /// If `field` is not a f64 multi-valued fast field, this method returns `None`.
-    pub fn f64s(&self, field: Field) -> crate::Result<MultiValuedFastFieldReader<f64>> {
-        self.check_type(field, FastType::F64, Cardinality::MultiValues)?;
-        self.typed_fast_field_multi_reader(field)
+    pub fn f64s(&self, field: Field) -> Option<MultiValueIntFastFieldReader<f64>> {
+        self.fast_field_f64s.get(&field).cloned()
     }
 
     /// Returns a `crate::DateTime` multi-valued fast field reader reader associated to `field`.
     ///
     /// If `field` is not a `crate::DateTime` multi-valued fast field, this method returns `None`.
-    pub fn dates(
-        &self,
-        field: Field,
-    ) -> crate::Result<MultiValuedFastFieldReader<crate::DateTime>> {
-        self.check_type(field, FastType::Date, Cardinality::MultiValues)?;
-        self.typed_fast_field_multi_reader(field)
+    pub fn dates(&self, field: Field) -> Option<MultiValueIntFastFieldReader<crate::DateTime>> {
+        self.fast_field_dates.get(&field).cloned()
     }
 
     /// Returns the `bytes` fast field reader associated to `field`.
     ///
     /// If `field` is not a bytes fast field, returns `None`.
-    pub fn bytes(&self, field: Field) -> crate::Result<BytesFastFieldReader> {
-        let field_entry = self.schema.get_field_entry(field);
-        if let FieldType::Bytes(bytes_option) = field_entry.field_type() {
-            if !bytes_option.is_fast() {
-                return Err(crate::TantivyError::SchemaError(format!(
-                    "Field {:?} is not a fast field.",
-                    field_entry.name()
-                )));
-            }
-            let fast_field_idx_file = self.fast_field_data(field, 0)?;
-            let idx_reader = FastFieldReader::open(fast_field_idx_file)?;
-            let data = self.fast_field_data(field, 1)?;
-            BytesFastFieldReader::open(idx_reader, data)
-        } else {
-            Err(FastFieldNotAvailableError::new(field_entry).into())
-        }
+    pub fn bytes(&self, field: Field) -> Option<BytesFastFieldReader> {
+        self.fast_bytes.get(&field).cloned()
     }
 }

src/fastfield/serializer.rs

@@ -66,9 +66,9 @@ impl FastFieldSerializer {
         &mut self,
         field: Field,
         idx: usize,
-    ) -> FastBytesFieldSerializer<'_, CountingWriter<WritePtr>> {
+    ) -> io::Result<FastBytesFieldSerializer<'_, CountingWriter<WritePtr>>> {
         let field_write = self.composite_write.for_field_with_idx(field, idx);
-        FastBytesFieldSerializer { write: field_write }
+        FastBytesFieldSerializer::open(field_write)
     }
 
     /// Closes the serializer
@@ -132,6 +132,10 @@ pub struct FastBytesFieldSerializer<'a, W: Write> {
 }
 
 impl<'a, W: Write> FastBytesFieldSerializer<'a, W> {
+    fn open(write: &'a mut W) -> io::Result<FastBytesFieldSerializer<'a, W>> {
+        Ok(FastBytesFieldSerializer { write })
+    }
+
     pub fn write_all(&mut self, vals: &[u8]) -> io::Result<()> {
         self.write.write_all(vals)
     }

src/fastfield/writer.rs

@@ -1,4 +1,4 @@
-use super::multivalued::MultiValuedFastFieldWriter;
+use super::multivalued::MultiValueIntFastFieldWriter;
 use crate::common;
 use crate::common::BinarySerializable;
 use crate::common::VInt;
@@ -13,7 +13,7 @@ use std::io;
 /// The fastfieldswriter regroup all of the fast field writers.
 pub struct FastFieldsWriter {
     single_value_writers: Vec<IntFastFieldWriter>,
-    multi_values_writers: Vec<MultiValuedFastFieldWriter>,
+    multi_values_writers: Vec<MultiValueIntFastFieldWriter>,
     bytes_value_writers: Vec<BytesFastFieldWriter>,
 }
 
@@ -46,14 +46,14 @@ impl FastFieldsWriter {
                             single_value_writers.push(fast_field_writer);
                         }
                         Some(Cardinality::MultiValues) => {
-                            let fast_field_writer = MultiValuedFastFieldWriter::new(field, false);
+                            let fast_field_writer = MultiValueIntFastFieldWriter::new(field, false);
                             multi_values_writers.push(fast_field_writer);
                         }
                         None => {}
                     }
                 }
-                FieldType::HierarchicalFacet(_) => {
-                    let fast_field_writer = MultiValuedFastFieldWriter::new(field, true);
+                FieldType::HierarchicalFacet => {
+                    let fast_field_writer = MultiValueIntFastFieldWriter::new(field, true);
                     multi_values_writers.push(fast_field_writer);
                 }
                 FieldType::Bytes(bytes_option) => {
@@ -87,7 +87,7 @@ impl FastFieldsWriter {
     pub fn get_multivalue_writer(
         &mut self,
         field: Field,
-    ) -> Option<&mut MultiValuedFastFieldWriter> {
+    ) -> Option<&mut MultiValueIntFastFieldWriter> {
         // TODO optimize
         self.multi_values_writers
             .iter_mut()

src/fieldnorm/reader.rs

@@ -49,7 +49,7 @@ impl FieldNormReaders {
 ///
 /// This metric is important to compute the score of a
 /// document : a document having a query word in one its short fields
-/// (e.g. title)  is likely to be more relevant than in one of its longer field
+/// (e.g. title)is likely to be more relevant than in one of its longer field
 /// (e.g. body).
 ///
 /// tantivy encodes `fieldnorm` on one byte with some precision loss,
@@ -61,55 +61,30 @@ impl FieldNormReaders {
 /// precompute computationally expensive functions of the fieldnorm
 /// in a very short array.
 #[derive(Clone)]
-pub struct FieldNormReader(ReaderImplEnum);
-
-impl From<ReaderImplEnum> for FieldNormReader {
-    fn from(reader_enum: ReaderImplEnum) -> FieldNormReader {
-        FieldNormReader(reader_enum)
-    }
-}
-
-#[derive(Clone)]
-enum ReaderImplEnum {
-    FromData(OwnedBytes),
-    Const {
-        num_docs: u32,
-        fieldnorm_id: u8,
-        fieldnorm: u32,
-    },
+pub enum FieldNormReader {
+    ConstFieldNorm { fieldnorm_id: u8, num_docs: u32 },
+    OneByte(OwnedBytes),
 }
 
 impl FieldNormReader {
-    /// Creates a `FieldNormReader` with a constant fieldnorm.
-    ///
-    /// The fieldnorm will be subjected to compression as if it was coming
-    /// from an array-backed fieldnorm reader.
-    pub fn constant(num_docs: u32, fieldnorm: u32) -> FieldNormReader {
-        let fieldnorm_id = fieldnorm_to_id(fieldnorm);
-        let fieldnorm = id_to_fieldnorm(fieldnorm_id);
-        ReaderImplEnum::Const {
-            num_docs,
+    pub fn const_fieldnorm_id(fieldnorm_id: u8, num_docs: u32) -> FieldNormReader {
+        FieldNormReader::ConstFieldNorm {
             fieldnorm_id,
-            fieldnorm,
+            num_docs,
         }
-        .into()
     }
 
     /// Opens a field norm reader given its file.
     pub fn open(fieldnorm_file: FileSlice) -> crate::Result<Self> {
         let data = fieldnorm_file.read_bytes()?;
-        Ok(FieldNormReader::new(data))
-    }
-
-    fn new(data: OwnedBytes) -> Self {
-        ReaderImplEnum::FromData(data).into()
+        Ok(FieldNormReader::OneByte(data))
     }
 
     /// Returns the number of documents in this segment.
     pub fn num_docs(&self) -> u32 {
-        match &self.0 {
-            ReaderImplEnum::FromData(data) => data.len() as u32,
-            ReaderImplEnum::Const { num_docs, .. } => *num_docs,
+        match self {
+            Self::ConstFieldNorm { num_docs, .. } => *num_docs,
+            FieldNormReader::OneByte(vals) => vals.len() as u32,
         }
     }
 
@@ -122,25 +97,19 @@ impl FieldNormReader {
     ///
     /// The fieldnorm is effectively decoded from the
     /// `fieldnorm_id` by doing a simple table lookup.
+    #[inline(always)]
     pub fn fieldnorm(&self, doc_id: DocId) -> u32 {
-        match &self.0 {
-            ReaderImplEnum::FromData(data) => {
-                let fieldnorm_id = data.as_slice()[doc_id as usize];
-                id_to_fieldnorm(fieldnorm_id)
-            }
-            ReaderImplEnum::Const { fieldnorm, .. } => *fieldnorm,
-        }
+        let fieldnorm_id = self.fieldnorm_id(doc_id);
+        id_to_fieldnorm(fieldnorm_id)
     }
 
     /// Returns the `fieldnorm_id` associated to a document.
     #[inline(always)]
     pub fn fieldnorm_id(&self, doc_id: DocId) -> u8 {
-        match &self.0 {
-            ReaderImplEnum::FromData(data) => {
-                let fieldnorm_id = data.as_slice()[doc_id as usize];
-                fieldnorm_id
-            }
-            ReaderImplEnum::Const { fieldnorm_id, .. } => *fieldnorm_id,
+        match self {
+            FieldNormReader::ConstFieldNorm { fieldnorm_id, .. } => *fieldnorm_id,
+
+            FieldNormReader::OneByte(data) => data.as_slice()[doc_id as usize],
         }
     }
 
@@ -165,7 +134,7 @@ impl FieldNormReader {
             .map(FieldNormReader::fieldnorm_to_id)
             .collect::<Vec<u8>>();
         let field_norms_data = OwnedBytes::new(field_norms_id);
-        FieldNormReader::new(field_norms_data)
+        FieldNormReader::OneByte(field_norms_data)
     }
 }
 
@@ -184,20 +153,4 @@ mod tests {
         assert_eq!(fieldnorm_reader.fieldnorm(3), 4);
         assert_eq!(fieldnorm_reader.fieldnorm(4), 983_064);
     }
-
-    #[test]
-    fn test_const_fieldnorm_reader_small_fieldnorm_id() {
-        let fieldnorm_reader = FieldNormReader::constant(1_000_000u32, 10u32);
-        assert_eq!(fieldnorm_reader.num_docs(), 1_000_000u32);
-        assert_eq!(fieldnorm_reader.fieldnorm(0u32), 10u32);
-        assert_eq!(fieldnorm_reader.fieldnorm_id(0u32), 10u8);
-    }
-
-    #[test]
-    fn test_const_fieldnorm_reader_large_fieldnorm_id() {
-        let fieldnorm_reader = FieldNormReader::constant(1_000_000u32, 300u32);
-        assert_eq!(fieldnorm_reader.num_docs(), 1_000_000u32);
-        assert_eq!(fieldnorm_reader.fieldnorm(0u32), 280u32);
-        assert_eq!(fieldnorm_reader.fieldnorm_id(0u32), 72u8);
-    }
 }

src/fieldnorm/writer.rs

@@ -4,7 +4,7 @@ use super::fieldnorm_to_id;
 use super::FieldNormsSerializer;
 use crate::schema::Field;
 use crate::schema::Schema;
-use std::{io, iter};
+use std::io;
 
 /// The `FieldNormsWriter` is in charge of tracking the fieldnorm byte
 /// of each document for each field with field norms.
@@ -13,7 +13,7 @@ use std::{io, iter};
 /// byte per document per field.
 pub struct FieldNormsWriter {
     fields: Vec<Field>,
-    fieldnorms_buffer: Vec<Vec<u8>>,
+    fieldnorms_buffer: Vec<Option<Vec<u8>>>,
 }
 
 impl FieldNormsWriter {
@@ -23,7 +23,7 @@ impl FieldNormsWriter {
         schema
             .fields()
             .filter_map(|(field, field_entry)| {
-                if field_entry.is_indexed() {
+                if field_entry.has_fieldnorms() {
                     Some(field)
                 } else {
                     None
@@ -36,17 +36,14 @@ impl FieldNormsWriter {
     /// specified in the schema.
     pub fn for_schema(schema: &Schema) -> FieldNormsWriter {
         let fields = FieldNormsWriter::fields_with_fieldnorm(schema);
-        let max_field = fields
-            .iter()
-            .map(Field::field_id)
-            .max()
-            .map(|max_field_id| max_field_id as usize + 1)
-            .unwrap_or(0);
+        let num_fields = schema.num_fields();
+        let mut fieldnorms_buffer: Vec<Option<Vec<u8>>> = vec![None; num_fields];
+        for field in &fields {
+            fieldnorms_buffer[field.field_id() as usize] = Some(Vec::new());
+        }
         FieldNormsWriter {
             fields,
-            fieldnorms_buffer: iter::repeat_with(Vec::new)
-                .take(max_field)
-                .collect::<Vec<_>>(),
+            fieldnorms_buffer,
         }
     }
 
@@ -55,8 +52,10 @@ impl FieldNormsWriter {
     ///
     /// Will extend with 0-bytes for documents that have not been seen.
     pub fn fill_up_to_max_doc(&mut self, max_doc: DocId) {
-        for field in self.fields.iter() {
-            self.fieldnorms_buffer[field.field_id() as usize].resize(max_doc as usize, 0u8);
+        for buffer_opt in self.fieldnorms_buffer.iter_mut() {
+            if let Some(buffer) = buffer_opt {
+                buffer.resize(max_doc as usize, 0u8);
+            }
         }
     }
 
@@ -69,21 +68,22 @@ impl FieldNormsWriter {
     /// * field     - the field being set
     /// * fieldnorm - the number of terms present in document `doc` in field `field`
     pub fn record(&mut self, doc: DocId, field: Field, fieldnorm: u32) {
-        let fieldnorm_buffer: &mut Vec<u8> = &mut self.fieldnorms_buffer[field.field_id() as usize];
-        assert!(
-            fieldnorm_buffer.len() <= doc as usize,
-            "Cannot register a given fieldnorm twice"
-        );
-        // we fill intermediary `DocId` as  having a fieldnorm of 0.
-        fieldnorm_buffer.resize(doc as usize + 1, 0u8);
-        fieldnorm_buffer[doc as usize] = fieldnorm_to_id(fieldnorm);
+        if let Some(fieldnorm_buffer) = self.fieldnorms_buffer[field.field_id() as usize].as_mut() {
+            assert!(
+                fieldnorm_buffer.len() <= doc as usize,
+                "Cannot register a given fieldnorm twice" // we fill intermediary `DocId` as  having a fieldnorm of 0.
+            );
+            fieldnorm_buffer.resize(doc as usize + 1, 0u8);
+            fieldnorm_buffer[doc as usize] = fieldnorm_to_id(fieldnorm);
+        }
     }
 
     /// Serialize the seen fieldnorm values to the serializer for all fields.
     pub fn serialize(&self, mut fieldnorms_serializer: 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)?;
+            if let Some(buffer) = self.fieldnorms_buffer[field.field_id() as usize].as_ref() {
+                fieldnorms_serializer.serialize_field(field, &buffer[..])?;
+            }
         }
         fieldnorms_serializer.close()?;
         Ok(())

src/functional_test.rs

@@ -1,93 +1,45 @@
-use crate::Index;
-use crate::Searcher;
-use crate::{doc, schema::*};
 use rand::thread_rng;
-use rand::Rng;
 use std::collections::HashSet;
 
-fn check_index_content(searcher: &Searcher, vals: &[u64]) -> crate::Result<()> {
+use crate::schema::*;
+use crate::Index;
+use crate::Searcher;
+use rand::Rng;
+
+fn check_index_content(searcher: &Searcher, vals: &HashSet<u64>) {
     assert!(searcher.segment_readers().len() < 20);
     assert_eq!(searcher.num_docs() as usize, vals.len());
-    for segment_reader in searcher.segment_readers() {
-        let store_reader = segment_reader.get_store_reader()?;
-        for doc_id in 0..segment_reader.max_doc() {
-            let _doc = store_reader.get(doc_id)?;
-        }
-    }
-    Ok(())
 }
 
 #[test]
 #[ignore]
-fn test_functional_store() -> crate::Result<()> {
-    let mut schema_builder = Schema::builder();
-
-    let id_field = schema_builder.add_u64_field("id", INDEXED | STORED);
-    let schema = schema_builder.build();
-
-    let index = Index::create_in_ram(schema);
-    let reader = index.reader()?;
-
-    let mut rng = thread_rng();
-
-    let mut index_writer = index.writer_with_num_threads(3, 12_000_000)?;
-
-    let mut doc_set: Vec<u64> = Vec::new();
-
-    let mut doc_id = 0u64;
-    for iteration in 0..500 {
-        dbg!(iteration);
-        let num_docs: usize = rng.gen_range(0..4);
-        if doc_set.len() >= 1 {
-            let doc_to_remove_id = rng.gen_range(0..doc_set.len());
-            let removed_doc_id = doc_set.swap_remove(doc_to_remove_id);
-            index_writer.delete_term(Term::from_field_u64(id_field, removed_doc_id));
-        }
-        for _ in 0..num_docs {
-            doc_set.push(doc_id);
-            index_writer.add_document(doc!(id_field=>doc_id));
-            doc_id += 1;
-        }
-        index_writer.commit()?;
-        reader.reload()?;
-        let searcher = reader.searcher();
-        check_index_content(&searcher, &doc_set)?;
-    }
-    Ok(())
-}
-
-#[test]
-#[ignore]
-fn test_functional_indexing() -> crate::Result<()> {
+fn test_indexing() {
     let mut schema_builder = Schema::builder();
 
     let id_field = schema_builder.add_u64_field("id", INDEXED);
     let multiples_field = schema_builder.add_u64_field("multiples", INDEXED);
     let schema = schema_builder.build();
 
-    let index = Index::create_from_tempdir(schema)?;
-    let reader = index.reader()?;
+    let index = Index::create_from_tempdir(schema).unwrap();
+    let reader = index.reader().unwrap();
 
     let mut rng = thread_rng();
 
-    let mut index_writer = index.writer_with_num_threads(3, 120_000_000)?;
+    let mut index_writer = index.writer_with_num_threads(3, 120_000_000).unwrap();
 
     let mut committed_docs: HashSet<u64> = HashSet::new();
     let mut uncommitted_docs: HashSet<u64> = HashSet::new();
 
     for _ in 0..200 {
-        let random_val = rng.gen_range(0..20);
+        let random_val = rng.gen_range(0, 20);
         if random_val == 0 {
-            index_writer.commit()?;
+            index_writer.commit().expect("Commit failed");
             committed_docs.extend(&uncommitted_docs);
             uncommitted_docs.clear();
-            reader.reload()?;
+            reader.reload().unwrap();
             let searcher = reader.searcher();
             // check that everything is correct.
-            check_index_content(
-                &searcher,
-                &committed_docs.iter().cloned().collect::<Vec<u64>>(),
-            )?;
+            check_index_content(&searcher, &committed_docs);
         } else {
             if committed_docs.remove(&random_val) || uncommitted_docs.remove(&random_val) {
                 let doc_id_term = Term::from_field_u64(id_field, random_val);
@@ -103,5 +55,4 @@ fn test_functional_indexing() -> crate::Result<()> {
             }
         }
     }
-    Ok(())
 }

src/indexer/delete_queue.rs

@@ -53,7 +53,7 @@ impl DeleteQueue {
             return block;
         }
         let block = Arc::new(Block {
-            operations: Arc::new([]),
+            operations: Arc::default(),
             next: NextBlock::from(self.clone()),
         });
         wlock.last_block = Arc::downgrade(&block);
@@ -108,7 +108,7 @@ impl DeleteQueue {
         let delete_operations = mem::replace(&mut self_wlock.writer, vec![]);
 
         let new_block = Arc::new(Block {
-            operations: Arc::from(delete_operations.into_boxed_slice()),
+            operations: Arc::new(delete_operations.into_boxed_slice()),
             next: NextBlock::from(self.clone()),
         });
 
@@ -167,7 +167,7 @@ impl NextBlock {
 }
 
 struct Block {
-    operations: Arc<[DeleteOperation]>,
+    operations: Arc<Box<[DeleteOperation]>>,
     next: NextBlock,
 }
 

src/indexer/index_writer.rs

@@ -449,7 +449,7 @@ impl IndexWriter {
     }
 
     /// Accessor to the merge policy.
-    pub fn get_merge_policy(&self) -> Arc<dyn MergePolicy> {
+    pub fn get_merge_policy(&self) -> Arc<Box<dyn MergePolicy>> {
         self.segment_updater.get_merge_policy()
     }
 

src/indexer/log_merge_policy.rs

@@ -8,7 +8,7 @@ const DEFAULT_MIN_LAYER_SIZE: u32 = 10_000;
 const DEFAULT_MIN_MERGE_SIZE: usize = 8;
 const DEFAULT_MAX_MERGE_SIZE: usize = 10_000_000;
 
-/// `LogMergePolicy` tries to merge segments that have a similar number of
+/// `LogMergePolicy` tries tries to merge segments that have a similar number of
 /// documents.
 #[derive(Debug, Clone)]
 pub struct LogMergePolicy {

src/indexer/merger.rs

@@ -7,7 +7,7 @@ use crate::fastfield::BytesFastFieldReader;
 use crate::fastfield::DeleteBitSet;
 use crate::fastfield::FastFieldReader;
 use crate::fastfield::FastFieldSerializer;
-use crate::fastfield::MultiValuedFastFieldReader;
+use crate::fastfield::MultiValueIntFastFieldReader;
 use crate::fieldnorm::FieldNormsSerializer;
 use crate::fieldnorm::FieldNormsWriter;
 use crate::fieldnorm::{FieldNormReader, FieldNormReaders};
@@ -195,7 +195,7 @@ impl IndexMerger {
         for (field, field_entry) in self.schema.fields() {
             let field_type = field_entry.field_type();
             match field_type {
-                FieldType::HierarchicalFacet(_) => {
+                FieldType::HierarchicalFacet => {
                     let term_ordinal_mapping = term_ord_mappings
                         .remove(&field)
                         .expect("Logic Error in Tantivy (Please report). HierarchicalFact field should have required a\
@@ -246,7 +246,7 @@ impl IndexMerger {
         for reader in &self.readers {
             let u64_reader: FastFieldReader<u64> = reader
                 .fast_fields()
-                .typed_fast_field_reader(field)
+                .u64_lenient(field)
                 .expect("Failed to find a reader for single fast field. This is a tantivy bug and it should never happen.");
             if let Some((seg_min_val, seg_max_val)) =
                 compute_min_max_val(&u64_reader, reader.max_doc(), reader.delete_bitset())
@@ -290,7 +290,7 @@ impl IndexMerger {
         fast_field_serializer: &mut FastFieldSerializer,
     ) -> crate::Result<()> {
         let mut total_num_vals = 0u64;
-        let mut u64s_readers: Vec<MultiValuedFastFieldReader<u64>> = Vec::new();
+        let mut u64s_readers: Vec<MultiValueIntFastFieldReader<u64>> = Vec::new();
 
         // In the first pass, we compute the total number of vals.
         //
@@ -298,8 +298,9 @@ impl IndexMerger {
         // what should be the bit length use for bitpacking.
         for reader in &self.readers {
             let u64s_reader = reader.fast_fields()
-                .typed_fast_field_multi_reader(field)
+                .u64s_lenient(field)
                 .expect("Failed to find index for multivalued field. This is a bug in tantivy, please report.");
+
             if let Some(delete_bitset) = reader.delete_bitset() {
                 for doc in 0u32..reader.max_doc() {
                     if delete_bitset.is_alive(doc) {
@@ -352,7 +353,7 @@ impl IndexMerger {
             for (segment_ord, segment_reader) in self.readers.iter().enumerate() {
                 let term_ordinal_mapping: &[TermOrdinal] =
                     term_ordinal_mappings.get_segment(segment_ord);
-                let ff_reader: MultiValuedFastFieldReader<u64> = segment_reader
+                let ff_reader: MultiValueIntFastFieldReader<u64> = segment_reader
                     .fast_fields()
                     .u64s(field)
                     .expect("Could not find multivalued u64 fast value reader.");
@@ -396,10 +397,8 @@ impl IndexMerger {
         // We go through a complete first pass to compute the minimum and the
         // maximum value and initialize our Serializer.
         for reader in &self.readers {
-            let ff_reader: MultiValuedFastFieldReader<u64> = reader
-                .fast_fields()
-                .typed_fast_field_multi_reader(field)
-                .expect(
+            let ff_reader: MultiValueIntFastFieldReader<u64> =
+                reader.fast_fields().u64s_lenient(field).expect(
                     "Failed to find multivalued fast field reader. This is a bug in \
                      tantivy. Please report.",
                 );
@@ -446,7 +445,11 @@ impl IndexMerger {
         let mut bytes_readers: Vec<BytesFastFieldReader> = Vec::new();
 
         for reader in &self.readers {
-            let bytes_reader = reader.fast_fields().bytes(field)?;
+            let bytes_reader = reader.fast_fields().bytes(field).ok_or_else(|| {
+                crate::TantivyError::InvalidArgument(
+                    "Bytes fast field {:?} not found in segment.".to_string(),
+                )
+            })?;
             if let Some(delete_bitset) = reader.delete_bitset() {
                 for doc in 0u32..reader.max_doc() {
                     if delete_bitset.is_alive(doc) {
@@ -476,7 +479,7 @@ impl IndexMerger {
             serialize_idx.close_field()?;
         }
 
-        let mut serialize_vals = fast_field_serializer.new_bytes_fast_field_with_idx(field, 1);
+        let mut serialize_vals = fast_field_serializer.new_bytes_fast_field_with_idx(field, 1)?;
         for segment_reader in &self.readers {
             let bytes_reader = segment_reader.fast_fields().bytes(field)
                 .expect("Failed to find bytes field in fast field reader. This is a bug in tantivy. Please report.");
@@ -500,6 +503,7 @@ impl IndexMerger {
         let mut positions_buffer: Vec<u32> = Vec::with_capacity(1_000);
         let mut delta_computer = DeltaComputer::new();
 
+        let mut field_term_streams = Vec::new();
         let mut max_term_ords: Vec<TermOrdinal> = Vec::new();
 
         let field_readers: Vec<Arc<InvertedIndexReader>> = self
@@ -508,16 +512,16 @@ impl IndexMerger {
             .map(|reader| reader.inverted_index(indexed_field))
             .collect::<crate::Result<Vec<_>>>()?;
 
-        let mut field_term_streams = Vec::new();
         for field_reader in &field_readers {
             let terms = field_reader.terms();
-            field_term_streams.push(terms.stream()?);
+            field_term_streams.push(terms.stream());
             max_term_ords.push(terms.num_terms() as u64);
         }
 
-        let mut term_ord_mapping_opt = match field_type {
-            FieldType::HierarchicalFacet(_) => Some(TermOrdinalMapping::new(max_term_ords)),
-            _ => None,
+        let mut term_ord_mapping_opt = if *field_type == FieldType::HierarchicalFacet {
+            Some(TermOrdinalMapping::new(max_term_ords))
+        } else {
+            None
         };
 
         let mut merged_terms = TermMerger::new(field_term_streams);
@@ -798,53 +802,49 @@ mod tests {
             {
                 assert_eq!(
                     get_doc_ids(vec![Term::from_field_text(text_field, "a")])?,
-                    vec![
-                        DocAddress::new(0, 1),
-                        DocAddress::new(0, 2),
-                        DocAddress::new(0, 4)
-                    ]
+                    vec![DocAddress(0, 1), DocAddress(0, 2), DocAddress(0, 4)]
                 );
                 assert_eq!(
                     get_doc_ids(vec![Term::from_field_text(text_field, "af")])?,
-                    vec![DocAddress::new(0, 0), DocAddress::new(0, 3)]
+                    vec![DocAddress(0, 0), DocAddress(0, 3)]
                 );
                 assert_eq!(
                     get_doc_ids(vec![Term::from_field_text(text_field, "g")])?,
-                    vec![DocAddress::new(0, 4)]
+                    vec![DocAddress(0, 4)]
                 );
                 assert_eq!(
                     get_doc_ids(vec![Term::from_field_text(text_field, "b")])?,
                     vec![
-                        DocAddress::new(0, 0),
-                        DocAddress::new(0, 1),
-                        DocAddress::new(0, 2),
-                        DocAddress::new(0, 3),
-                        DocAddress::new(0, 4)
+                        DocAddress(0, 0),
+                        DocAddress(0, 1),
+                        DocAddress(0, 2),
+                        DocAddress(0, 3),
+                        DocAddress(0, 4)
                     ]
                 );
                 assert_eq!(
                     get_doc_ids(vec![Term::from_field_date(date_field, &curr_time)])?,
-                    vec![DocAddress::new(0, 0), DocAddress::new(0, 3)]
+                    vec![DocAddress(0, 0), DocAddress(0, 3)]
                 );
             }
             {
-                let doc = searcher.doc(DocAddress::new(0, 0))?;
+                let doc = searcher.doc(DocAddress(0, 0))?;
                 assert_eq!(doc.get_first(text_field).unwrap().text(), Some("af b"));
             }
             {
-                let doc = searcher.doc(DocAddress::new(0, 1))?;
+                let doc = searcher.doc(DocAddress(0, 1))?;
                 assert_eq!(doc.get_first(text_field).unwrap().text(), Some("a b c"));
             }
             {
-                let doc = searcher.doc(DocAddress::new(0, 2))?;
+                let doc = searcher.doc(DocAddress(0, 2))?;
                 assert_eq!(doc.get_first(text_field).unwrap().text(), Some("a b c d"));
             }
             {
-                let doc = searcher.doc(DocAddress::new(0, 3))?;
+                let doc = searcher.doc(DocAddress(0, 3))?;
                 assert_eq!(doc.get_first(text_field).unwrap().text(), Some("af b"));
             }
             {
-                let doc = searcher.doc(DocAddress::new(0, 4))?;
+                let doc = searcher.doc(DocAddress(0, 4))?;
                 assert_eq!(doc.get_first(text_field).unwrap().text(), Some("a b c g"));
             }
             {
@@ -1182,7 +1182,7 @@ mod tests {
     #[test]
     fn test_merge_facets() {
         let mut schema_builder = schema::Schema::builder();
-        let facet_field = schema_builder.add_facet_field("facet", INDEXED);
+        let facet_field = schema_builder.add_facet_field("facet");
         let index = Index::create_in_ram(schema_builder.build());
         let reader = index.reader().unwrap();
         {

src/indexer/mod.rs

@@ -24,7 +24,6 @@ pub use self::prepared_commit::PreparedCommit;
 pub use self::segment_entry::SegmentEntry;
 pub use self::segment_manager::SegmentManager;
 pub use self::segment_serializer::SegmentSerializer;
-pub use self::segment_updater::merge_segments;
 pub use self::segment_writer::SegmentWriter;
 
 /// Alias for the default merge policy, which is the `LogMergePolicy`.

src/indexer/operation.rs

@@ -9,15 +9,6 @@ pub struct DeleteOperation {
     pub term: Term,
 }
 
-impl Default for DeleteOperation {
-    fn default() -> Self {
-        DeleteOperation {
-            opstamp: 0u64,
-            term: Term::new(),
-        }
-    }
-}
-
 /// Timestamped Add operation.
 #[derive(Eq, PartialEq, Debug)]
 pub struct AddOperation {

src/indexer/segment_updater.rs

@@ -114,7 +114,7 @@ fn merge(
     // first we need to apply deletes to our segment.
     let merged_segment = index.new_segment();
 
-    // First we apply all of the delete to the merged segment, up to the target opstamp.
+    // First we apply all of the delet to the merged segment, up to the target opstamp.
     for segment_entry in &mut segment_entries {
         let segment = index.segment(segment_entry.meta().clone());
         advance_deletes(segment, segment_entry, target_opstamp)?;
@@ -141,81 +141,6 @@ fn merge(
     Ok(SegmentEntry::new(segment_meta, delete_cursor, None))
 }
 
-/// Advanced: Merges a list of segments from different indices in a new index.
-///
-/// Returns `TantivyError` if the the indices list is empty or their
-/// schemas don't match.
-///
-/// `output_directory`: is assumed to be empty.
-///
-/// # Warning
-/// This function does NOT check or take the `IndexWriter` is running. It is not
-/// meant to work if you have an IndexWriter running for the origin indices, or
-/// the destination Index.
-#[doc(hidden)]
-pub fn merge_segments<Dir: Directory>(
-    indices: &[Index],
-    output_directory: Dir,
-) -> crate::Result<Index> {
-    if indices.is_empty() {
-        // If there are no indices to merge, there is no need to do anything.
-        return Err(crate::TantivyError::InvalidArgument(
-            "No indices given to marge".to_string(),
-        ));
-    }
-
-    let target_schema = indices[0].schema();
-
-    // let's check that all of the indices have the same schema
-    if indices
-        .iter()
-        .skip(1)
-        .any(|index| index.schema() != target_schema)
-    {
-        return Err(crate::TantivyError::InvalidArgument(
-            "Attempt to merge different schema indices".to_string(),
-        ));
-    }
-
-    let mut segments: Vec<Segment> = Vec::new();
-    for index in indices {
-        segments.extend(index.searchable_segments()?);
-    }
-
-    let mut merged_index = Index::create(output_directory, target_schema.clone())?;
-    let merged_segment = merged_index.new_segment();
-    let merged_segment_id = merged_segment.id();
-    let merger: IndexMerger = IndexMerger::open(merged_index.schema(), &segments[..])?;
-    let segment_serializer = SegmentSerializer::for_segment(merged_segment)?;
-    let num_docs = merger.write(segment_serializer)?;
-
-    let segment_meta = merged_index.new_segment_meta(merged_segment_id, num_docs);
-
-    let stats = format!(
-        "Segments Merge: [{}]",
-        segments
-            .iter()
-            .fold(String::new(), |sum, current| format!(
-                "{}{} ",
-                sum,
-                current.meta().id().uuid_string()
-            ))
-            .trim_end()
-    );
-
-    let index_meta = IndexMeta {
-        segments: vec![segment_meta],
-        schema: target_schema,
-        opstamp: 0u64,
-        payload: Some(stats),
-    };
-
-    // save the meta.json
-    save_metas(&index_meta, merged_index.directory_mut())?;
-
-    Ok(merged_index)
-}
-
 pub(crate) struct InnerSegmentUpdater {
     // we keep a copy of the current active IndexMeta to
     // avoid loading the file everytime we need it in the
@@ -229,7 +154,7 @@ pub(crate) struct InnerSegmentUpdater {
 
     index: Index,
     segment_manager: SegmentManager,
-    merge_policy: RwLock<Arc<dyn MergePolicy>>,
+    merge_policy: RwLock<Arc<Box<dyn MergePolicy>>>,
     killed: AtomicBool,
     stamper: Stamper,
     merge_operations: MergeOperationInventory,
@@ -268,19 +193,19 @@ impl SegmentUpdater {
             merge_thread_pool,
             index,
             segment_manager,
-            merge_policy: RwLock::new(Arc::new(DefaultMergePolicy::default())),
+            merge_policy: RwLock::new(Arc::new(Box::new(DefaultMergePolicy::default()))),
             killed: AtomicBool::new(false),
             stamper,
             merge_operations: Default::default(),
         })))
     }
 
-    pub fn get_merge_policy(&self) -> Arc<dyn MergePolicy> {
+    pub fn get_merge_policy(&self) -> Arc<Box<dyn MergePolicy>> {
         self.merge_policy.read().unwrap().clone()
     }
 
     pub fn set_merge_policy(&self, merge_policy: Box<dyn MergePolicy>) {
-        let arc_merge_policy = Arc::from(merge_policy);
+        let arc_merge_policy = Arc::new(merge_policy);
         *self.merge_policy.write().unwrap() = arc_merge_policy;
     }
 
@@ -554,7 +479,7 @@ impl SegmentUpdater {
                     if delete_operation.opstamp < committed_opstamp {
                         let index = &segment_updater.index;
                         let segment = index.segment(after_merge_segment_entry.meta().clone());
-                        if let Err(advance_deletes_err) = advance_deletes(
+                        if let Err(e) = advance_deletes(
                             segment,
                             &mut after_merge_segment_entry,
                             committed_opstamp,
@@ -562,7 +487,7 @@ impl SegmentUpdater {
                             error!(
                                 "Merge of {:?} was cancelled (advancing deletes failed): {:?}",
                                 merge_operation.segment_ids(),
-                                advance_deletes_err
+                                e
                             );
                             if cfg!(test) {
                                 panic!("Merge failed.");
@@ -570,7 +495,7 @@ impl SegmentUpdater {
                             // ... cancel merge
                             // `merge_operations` are tracked. As it is dropped, the
                             // the segment_ids will be available again for merge.
-                            return Err(advance_deletes_err);
+                            return Err(e);
                         }
                     }
                 }
@@ -615,201 +540,158 @@ impl SegmentUpdater {
 
 #[cfg(test)]
 mod tests {
-    use super::merge_segments;
-    use crate::directory::RAMDirectory;
+
     use crate::indexer::merge_policy::tests::MergeWheneverPossible;
     use crate::schema::*;
     use crate::Index;
 
     #[test]
-    fn test_delete_during_merge() -> crate::Result<()> {
+    fn test_delete_during_merge() {
         let mut schema_builder = Schema::builder();
         let text_field = schema_builder.add_text_field("text", TEXT);
-        let index = Index::create_in_ram(schema_builder.build());
+        let schema = schema_builder.build();
+
+        let index = Index::create_in_ram(schema);
 
         // writing the segment
-        let mut index_writer = index.writer_for_tests()?;
+        let mut index_writer = index.writer_for_tests().unwrap();
         index_writer.set_merge_policy(Box::new(MergeWheneverPossible));
 
-        for _ in 0..100 {
-            index_writer.add_document(doc!(text_field=>"a"));
-            index_writer.add_document(doc!(text_field=>"b"));
+        {
+            for _ in 0..100 {
+                index_writer.add_document(doc!(text_field=>"a"));
+                index_writer.add_document(doc!(text_field=>"b"));
+            }
+            assert!(index_writer.commit().is_ok());
         }
-        index_writer.commit()?;
 
-        for _ in 0..100 {
-            index_writer.add_document(doc!(text_field=>"c"));
-            index_writer.add_document(doc!(text_field=>"d"));
+        {
+            for _ in 0..100 {
+                index_writer.add_document(doc!(text_field=>"c"));
+                index_writer.add_document(doc!(text_field=>"d"));
+            }
+            assert!(index_writer.commit().is_ok());
         }
-        index_writer.commit()?;
 
-        index_writer.add_document(doc!(text_field=>"e"));
-        index_writer.add_document(doc!(text_field=>"f"));
-        index_writer.commit()?;
+        {
+            index_writer.add_document(doc!(text_field=>"e"));
+            index_writer.add_document(doc!(text_field=>"f"));
+            assert!(index_writer.commit().is_ok());
+        }
 
-        let term = Term::from_field_text(text_field, "a");
-        index_writer.delete_term(term);
-        index_writer.commit()?;
-
-        let reader = index.reader()?;
+        {
+            let term = Term::from_field_text(text_field, "a");
+            index_writer.delete_term(term);
+            assert!(index_writer.commit().is_ok());
+        }
+        let reader = index.reader().unwrap();
         assert_eq!(reader.searcher().num_docs(), 302);
 
-        index_writer.wait_merging_threads()?;
+        {
+            index_writer
+                .wait_merging_threads()
+                .expect("waiting for merging threads");
+        }
 
-        reader.reload()?;
+        reader.reload().unwrap();
         assert_eq!(reader.searcher().segment_readers().len(), 1);
         assert_eq!(reader.searcher().num_docs(), 302);
-        Ok(())
     }
 
     #[test]
-    fn delete_all_docs() -> crate::Result<()> {
+    fn delete_all_docs() {
         let mut schema_builder = Schema::builder();
         let text_field = schema_builder.add_text_field("text", TEXT);
-        let index = Index::create_in_ram(schema_builder.build());
+        let schema = schema_builder.build();
+
+        let index = Index::create_in_ram(schema);
 
         // writing the segment
-        let mut index_writer = index.writer_for_tests()?;
+        let mut index_writer = index.writer_for_tests().unwrap();
 
-        for _ in 0..100 {
-            index_writer.add_document(doc!(text_field=>"a"));
-            index_writer.add_document(doc!(text_field=>"b"));
-        }
-        index_writer.commit()?;
-
-        for _ in 0..100 {
-            index_writer.add_document(doc!(text_field=>"c"));
-            index_writer.add_document(doc!(text_field=>"d"));
-        }
-        index_writer.commit()?;
-
-        index_writer.add_document(doc!(text_field=>"e"));
-        index_writer.add_document(doc!(text_field=>"f"));
-        index_writer.commit()?;
-
-        let seg_ids = index.searchable_segment_ids()?;
-        // docs exist, should have at least 1 segment
-        assert!(seg_ids.len() > 0);
-
-        let term_vals = vec!["a", "b", "c", "d", "e", "f"];
-        for term_val in term_vals {
-            let term = Term::from_field_text(text_field, term_val);
-            index_writer.delete_term(term);
-            index_writer.commit()?;
+        {
+            for _ in 0..100 {
+                index_writer.add_document(doc!(text_field=>"a"));
+                index_writer.add_document(doc!(text_field=>"b"));
+            }
+            assert!(index_writer.commit().is_ok());
         }
 
-        index_writer.wait_merging_threads()?;
+        {
+            for _ in 0..100 {
+                index_writer.add_document(doc!(text_field=>"c"));
+                index_writer.add_document(doc!(text_field=>"d"));
+            }
+            assert!(index_writer.commit().is_ok());
+        }
 
-        let reader = index.reader()?;
+        {
+            index_writer.add_document(doc!(text_field=>"e"));
+            index_writer.add_document(doc!(text_field=>"f"));
+            assert!(index_writer.commit().is_ok());
+        }
+
+        {
+            let seg_ids = index
+                .searchable_segment_ids()
+                .expect("Searchable segments failed.");
+            // docs exist, should have at least 1 segment
+            assert!(seg_ids.len() > 0);
+        }
+
+        {
+            let term_vals = vec!["a", "b", "c", "d", "e", "f"];
+            for term_val in term_vals {
+                let term = Term::from_field_text(text_field, term_val);
+                index_writer.delete_term(term);
+                assert!(index_writer.commit().is_ok());
+            }
+        }
+
+        {
+            index_writer
+                .wait_merging_threads()
+                .expect("waiting for merging threads");
+        }
+
+        let reader = index.reader().unwrap();
         assert_eq!(reader.searcher().num_docs(), 0);
 
-        let seg_ids = index.searchable_segment_ids()?;
+        let seg_ids = index
+            .searchable_segment_ids()
+            .expect("Searchable segments failed.");
         assert!(seg_ids.is_empty());
 
-        reader.reload()?;
+        reader.reload().unwrap();
         assert_eq!(reader.searcher().num_docs(), 0);
         // empty segments should be erased
-        assert!(index.searchable_segment_metas()?.is_empty());
+        assert!(index.searchable_segment_metas().unwrap().is_empty());
         assert!(reader.searcher().segment_readers().is_empty());
-
-        Ok(())
     }
 
     #[test]
-    fn test_remove_all_segments() -> crate::Result<()> {
+    fn test_remove_all_segments() {
         let mut schema_builder = Schema::builder();
         let text_field = schema_builder.add_text_field("text", TEXT);
-        let index = Index::create_in_ram(schema_builder.build());
+        let schema = schema_builder.build();
+
+        let index = Index::create_in_ram(schema);
 
         // writing the segment
-        let mut index_writer = index.writer_for_tests()?;
-        for _ in 0..100 {
-            index_writer.add_document(doc!(text_field=>"a"));
-            index_writer.add_document(doc!(text_field=>"b"));
-        }
-        index_writer.commit()?;
+        let mut index_writer = index.writer_for_tests().unwrap();
 
+        {
+            for _ in 0..100 {
+                index_writer.add_document(doc!(text_field=>"a"));
+                index_writer.add_document(doc!(text_field=>"b"));
+            }
+            assert!(index_writer.commit().is_ok());
+        }
         index_writer.segment_updater().remove_all_segments();
         let seg_vec = index_writer
             .segment_updater()
             .segment_manager
             .segment_entries();
         assert!(seg_vec.is_empty());
-        Ok(())
-    }
-
-    #[test]
-    fn test_merge_segments() -> crate::Result<()> {
-        let mut indices = vec![];
-        let mut schema_builder = Schema::builder();
-        let text_field = schema_builder.add_text_field("text", TEXT);
-        let schema = schema_builder.build();
-
-        for _ in 0..3 {
-            let index = Index::create_in_ram(schema.clone());
-
-            // writing two segments
-            let mut index_writer = index.writer_for_tests()?;
-            for _ in 0..100 {
-                index_writer.add_document(doc!(text_field=>"fizz"));
-                index_writer.add_document(doc!(text_field=>"buzz"));
-            }
-            index_writer.commit()?;
-
-            for _ in 0..1000 {
-                index_writer.add_document(doc!(text_field=>"foo"));
-                index_writer.add_document(doc!(text_field=>"bar"));
-            }
-            index_writer.commit()?;
-            indices.push(index);
-        }
-
-        assert_eq!(indices.len(), 3);
-        let output_directory = RAMDirectory::default();
-        let index = merge_segments(&indices, output_directory)?;
-        assert_eq!(index.schema(), schema);
-
-        let segments = index.searchable_segments()?;
-        assert_eq!(segments.len(), 1);
-
-        let segment_metas = segments[0].meta();
-        assert_eq!(segment_metas.num_deleted_docs(), 0);
-        assert_eq!(segment_metas.num_docs(), 6600);
-        Ok(())
-    }
-
-    #[test]
-    fn test_merge_empty_indices_array() {
-        let merge_result = merge_segments(&[], RAMDirectory::default());
-        assert!(merge_result.is_err());
-    }
-
-    #[test]
-    fn test_merge_mismatched_schema() -> crate::Result<()> {
-        let first_index = {
-            let mut schema_builder = Schema::builder();
-            let text_field = schema_builder.add_text_field("text", TEXT);
-            let index = Index::create_in_ram(schema_builder.build());
-            let mut index_writer = index.writer_for_tests()?;
-            index_writer.add_document(doc!(text_field=>"some text"));
-            index_writer.commit()?;
-            index
-        };
-
-        let second_index = {
-            let mut schema_builder = Schema::builder();
-            let body_field = schema_builder.add_text_field("body", TEXT);
-            let index = Index::create_in_ram(schema_builder.build());
-            let mut index_writer = index.writer_for_tests()?;
-            index_writer.add_document(doc!(body_field=>"some body"));
-            index_writer.commit()?;
-            index
-        };
-
-        // mismatched schema index list
-        let result = merge_segments(&[first_index, second_index], RAMDirectory::default());
-        assert!(result.is_err());
-
-        Ok(())
     }
 }

src/indexer/segment_writer.rs

@@ -142,7 +142,7 @@ impl SegmentWriter {
             let (term_buffer, multifield_postings) =
                 (&mut self.term_buffer, &mut self.multifield_postings);
             match *field_entry.field_type() {
-                FieldType::HierarchicalFacet(_) => {
+                FieldType::HierarchicalFacet => {
                     term_buffer.set_field(field);
                     let facets =
                         field_values
@@ -213,59 +213,69 @@ impl SegmentWriter {
 
                     self.fieldnorms_writer.record(doc_id, field, num_tokens);
                 }
-                FieldType::U64(_) => {
-                    for field_value in field_values {
-                        term_buffer.set_field(field_value.field());
-                        let u64_val = field_value
-                            .value()
-                            .u64_value()
-                            .ok_or_else(make_schema_error)?;
-                        term_buffer.set_u64(u64_val);
-                        multifield_postings.subscribe(doc_id, &term_buffer);
+                FieldType::U64(ref int_option) => {
+                    if int_option.is_indexed() {
+                        for field_value in field_values {
+                            term_buffer.set_field(field_value.field());
+                            let u64_val = field_value
+                                .value()
+                                .u64_value()
+                                .ok_or_else(make_schema_error)?;
+                            term_buffer.set_u64(u64_val);
+                            multifield_postings.subscribe(doc_id, &term_buffer);
+                        }
                     }
                 }
-                FieldType::Date(_) => {
-                    for field_value in field_values {
-                        term_buffer.set_field(field_value.field());
-                        let date_val = field_value
-                            .value()
-                            .date_value()
-                            .ok_or_else(make_schema_error)?;
-                        term_buffer.set_i64(date_val.timestamp());
-                        multifield_postings.subscribe(doc_id, &term_buffer);
+                FieldType::Date(ref int_option) => {
+                    if int_option.is_indexed() {
+                        for field_value in field_values {
+                            term_buffer.set_field(field_value.field());
+                            let date_val = field_value
+                                .value()
+                                .date_value()
+                                .ok_or_else(make_schema_error)?;
+                            term_buffer.set_i64(date_val.timestamp());
+                            multifield_postings.subscribe(doc_id, &term_buffer);
+                        }
                     }
                 }
-                FieldType::I64(_) => {
-                    for field_value in field_values {
-                        term_buffer.set_field(field_value.field());
-                        let i64_val = field_value
-                            .value()
-                            .i64_value()
-                            .ok_or_else(make_schema_error)?;
-                        term_buffer.set_i64(i64_val);
-                        multifield_postings.subscribe(doc_id, &term_buffer);
+                FieldType::I64(ref int_option) => {
+                    if int_option.is_indexed() {
+                        for field_value in field_values {
+                            term_buffer.set_field(field_value.field());
+                            let i64_val = field_value
+                                .value()
+                                .i64_value()
+                                .ok_or_else(make_schema_error)?;
+                            term_buffer.set_i64(i64_val);
+                            multifield_postings.subscribe(doc_id, &term_buffer);
+                        }
                     }
                 }
-                FieldType::F64(_) => {
-                    for field_value in field_values {
-                        term_buffer.set_field(field_value.field());
-                        let f64_val = field_value
-                            .value()
-                            .f64_value()
-                            .ok_or_else(make_schema_error)?;
-                        term_buffer.set_f64(f64_val);
-                        multifield_postings.subscribe(doc_id, &term_buffer);
+                FieldType::F64(ref int_option) => {
+                    if int_option.is_indexed() {
+                        for field_value in field_values {
+                            term_buffer.set_field(field_value.field());
+                            let f64_val = field_value
+                                .value()
+                                .f64_value()
+                                .ok_or_else(make_schema_error)?;
+                            term_buffer.set_f64(f64_val);
+                            multifield_postings.subscribe(doc_id, &term_buffer);
+                        }
                     }
                 }
-                FieldType::Bytes(_) => {
-                    for field_value in field_values {
-                        term_buffer.set_field(field_value.field());
-                        let bytes = field_value
-                            .value()
-                            .bytes_value()
-                            .ok_or_else(make_schema_error)?;
-                        term_buffer.set_bytes(bytes);
-                        self.multifield_postings.subscribe(doc_id, &term_buffer);
+                FieldType::Bytes(ref option) => {
+                    if option.is_indexed() {
+                        for field_value in field_values {
+                            term_buffer.set_field(field_value.field());
+                            let bytes = field_value
+                                .value()
+                                .bytes_value()
+                                .ok_or_else(make_schema_error)?;
+                            term_buffer.set_bytes(bytes);
+                            self.multifield_postings.subscribe(doc_id, &term_buffer);
+                        }
                     }
                 }
             }

src/lib.rs

@@ -96,7 +96,7 @@
 //! A good place for you to get started is to check out
 //! the example code (
 //! [literate programming](https://tantivy-search.github.io/examples/basic_search.html) /
-//! [source code](https://github.com/tantivy-search/tantivy/blob/main/examples/basic_search.rs))
+//! [source code](https://github.com/tantivy-search/tantivy/blob/master/examples/basic_search.rs))
 
 #[cfg_attr(test, macro_use)]
 extern crate serde_json;
@@ -163,7 +163,6 @@ pub use crate::core::{Executor, SegmentComponent};
 pub use crate::core::{Index, IndexMeta, Searcher, Segment, SegmentId, SegmentMeta};
 pub use crate::core::{InvertedIndexReader, SegmentReader};
 pub use crate::directory::Directory;
-pub use crate::indexer::merge_segments;
 pub use crate::indexer::operation::UserOperation;
 pub use crate::indexer::IndexWriter;
 pub use crate::postings::Postings;
@@ -175,7 +174,7 @@ use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
 /// Index format version.
-const INDEX_FORMAT_VERSION: u32 = 3;
+const INDEX_FORMAT_VERSION: u32 = 2;
 
 /// Structure version for the index.
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -235,8 +234,6 @@ pub mod merge_policy {
 /// A `u32` identifying a document within a segment.
 /// Documents have their `DocId` assigned incrementally,
 /// as they are added in the segment.
-///
-/// At most, a segment can contain 2^31 documents.
 pub type DocId = u32;
 
 /// A u64 assigned to every operation incrementally
@@ -255,16 +252,20 @@ pub type Opstamp = u64;
 /// the document to the search query.
 pub type Score = f32;
 
-/// A `SegmentOrdinal` identifies a segment, within a `Searcher`.
-pub type SegmentOrdinal = u32;
+/// A `SegmentLocalId` identifies a segment.
+/// It only makes sense for a given searcher.
+pub type SegmentLocalId = u32;
 
 impl DocAddress {
-    /// Creates a new DocAddress from the segment/docId pair.
-    pub fn new(segment_ord: SegmentOrdinal, doc_id: DocId) -> DocAddress {
-        DocAddress {
-            segment_ord,
-            doc_id,
-        }
+    /// Return the segment ordinal id that identifies the segment
+    /// hosting the document in the `Searcher` it is called from.
+    pub fn segment_ord(self) -> SegmentLocalId {
+        self.0
+    }
+
+    /// Return the segment-local `DocId`
+    pub fn doc(self) -> DocId {
+        self.1
     }
 }
 
@@ -277,13 +278,7 @@ impl DocAddress {
 /// The id used for the segment is actually an ordinal
 /// in the list of `Segment`s held by a `Searcher`.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DocAddress {
-    /// The segment ordinal id that identifies the segment
-    /// hosting the document in the `Searcher` it is called from.
-    pub segment_ord: SegmentOrdinal,
-    /// The segment-local `DocId`.
-    pub doc_id: DocId,
-}
+pub struct DocAddress(pub SegmentLocalId, pub DocId);
 
 #[cfg(test)]
 mod tests {
@@ -781,38 +776,30 @@ mod tests {
         };
         assert_eq!(
             get_doc_ids(vec![Term::from_field_text(text_field, "a")])?,
-            vec![DocAddress::new(0, 1), DocAddress::new(0, 2)]
+            vec![DocAddress(0, 1), DocAddress(0, 2)]
         );
         assert_eq!(
             get_doc_ids(vec![Term::from_field_text(text_field, "af")])?,
-            vec![DocAddress::new(0, 0)]
+            vec![DocAddress(0, 0)]
         );
         assert_eq!(
             get_doc_ids(vec![Term::from_field_text(text_field, "b")])?,
-            vec![
-                DocAddress::new(0, 0),
-                DocAddress::new(0, 1),
-                DocAddress::new(0, 2)
-            ]
+            vec![DocAddress(0, 0), DocAddress(0, 1), DocAddress(0, 2)]
         );
         assert_eq!(
             get_doc_ids(vec![Term::from_field_text(text_field, "c")])?,
-            vec![DocAddress::new(0, 1), DocAddress::new(0, 2)]
+            vec![DocAddress(0, 1), DocAddress(0, 2)]
         );
         assert_eq!(
             get_doc_ids(vec![Term::from_field_text(text_field, "d")])?,
-            vec![DocAddress::new(0, 2)]
+            vec![DocAddress(0, 2)]
         );
         assert_eq!(
             get_doc_ids(vec![
                 Term::from_field_text(text_field, "b"),
                 Term::from_field_text(text_field, "a"),
             ])?,
-            vec![
-                DocAddress::new(0, 0),
-                DocAddress::new(0, 1),
-                DocAddress::new(0, 2)
-            ]
+            vec![DocAddress(0, 0), DocAddress(0, 1), DocAddress(0, 2)]
         );
         Ok(())
     }
@@ -879,39 +866,39 @@ mod tests {
         let searcher = reader.searcher();
         let segment_reader: &SegmentReader = searcher.segment_reader(0);
         {
-            let fast_field_reader_res = segment_reader.fast_fields().u64(text_field);
-            assert!(fast_field_reader_res.is_err());
+            let fast_field_reader_opt = segment_reader.fast_fields().u64(text_field);
+            assert!(fast_field_reader_opt.is_none());
         }
         {
             let fast_field_reader_opt = segment_reader.fast_fields().u64(stored_int_field);
-            assert!(fast_field_reader_opt.is_err());
+            assert!(fast_field_reader_opt.is_none());
         }
         {
             let fast_field_reader_opt = segment_reader.fast_fields().u64(fast_field_signed);
-            assert!(fast_field_reader_opt.is_err());
+            assert!(fast_field_reader_opt.is_none());
         }
         {
             let fast_field_reader_opt = segment_reader.fast_fields().u64(fast_field_float);
-            assert!(fast_field_reader_opt.is_err());
+            assert!(fast_field_reader_opt.is_none());
         }
         {
             let fast_field_reader_opt = segment_reader.fast_fields().u64(fast_field_unsigned);
-            assert!(fast_field_reader_opt.is_ok());
+            assert!(fast_field_reader_opt.is_some());
             let fast_field_reader = fast_field_reader_opt.unwrap();
             assert_eq!(fast_field_reader.get(0), 4u64)
         }
 
         {
-            let fast_field_reader_res = segment_reader.fast_fields().i64(fast_field_signed);
-            assert!(fast_field_reader_res.is_ok());
-            let fast_field_reader = fast_field_reader_res.unwrap();
+            let fast_field_reader_opt = segment_reader.fast_fields().i64(fast_field_signed);
+            assert!(fast_field_reader_opt.is_some());
+            let fast_field_reader = fast_field_reader_opt.unwrap();
             assert_eq!(fast_field_reader.get(0), 4i64)
         }
 
         {
-            let fast_field_reader_res = segment_reader.fast_fields().f64(fast_field_float);
-            assert!(fast_field_reader_res.is_ok());
-            let fast_field_reader = fast_field_reader_res.unwrap();
+            let fast_field_reader_opt = segment_reader.fast_fields().f64(fast_field_float);
+            assert!(fast_field_reader_opt.is_some());
+            let fast_field_reader = fast_field_reader_opt.unwrap();
             assert_eq!(fast_field_reader.get(0), 4f64)
         }
         Ok(())

src/positions/reader.rs

@@ -132,7 +132,7 @@ impl PositionReader {
             "offset arguments should be increasing."
         );
         let delta_to_block_offset = offset as i64 - self.block_offset as i64;
-        if !(0..128).contains(&delta_to_block_offset) {
+        if delta_to_block_offset < 0 || delta_to_block_offset >= 128 {
             // The first position is not within the first block.
             // We need to decompress the first block.
             let delta_to_anchor_offset = offset - self.anchor_offset;

src/positions/serializer.rs

@@ -8,7 +8,7 @@ use std::io::{self, Write};
 pub struct PositionSerializer<W: io::Write> {
     bit_packer: BitPacker4x,
     write_stream: CountingWriter<W>,
-    write_skip_index: W,
+    write_skiplist: W,
     block: Vec<u32>,
     buffer: Vec<u8>,
     num_ints: u64,
@@ -16,11 +16,11 @@ pub struct PositionSerializer<W: io::Write> {
 }
 
 impl<W: io::Write> PositionSerializer<W> {
-    pub fn new(write_stream: W, write_skip_index: W) -> PositionSerializer<W> {
+    pub fn new(write_stream: W, write_skiplist: W) -> PositionSerializer<W> {
         PositionSerializer {
             bit_packer: BitPacker4x::new(),
             write_stream: CountingWriter::wrap(write_stream),
-            write_skip_index,
+            write_skiplist,
             block: Vec::with_capacity(128),
             buffer: vec![0u8; 128 * 4],
             num_ints: 0u64,
@@ -52,7 +52,7 @@ impl<W: io::Write> PositionSerializer<W> {
 
     fn flush_block(&mut self) -> io::Result<()> {
         let num_bits = self.bit_packer.num_bits(&self.block[..]);
-        self.write_skip_index.write_all(&[num_bits])?;
+        self.write_skiplist.write_all(&[num_bits])?;
         let written_len = self
             .bit_packer
             .compress(&self.block[..], &mut self.buffer, num_bits);
@@ -70,10 +70,10 @@ impl<W: io::Write> PositionSerializer<W> {
             self.flush_block()?;
         }
         for &long_skip in &self.long_skips {
-            long_skip.serialize(&mut self.write_skip_index)?;
+            long_skip.serialize(&mut self.write_skiplist)?;
         }
-        (self.long_skips.len() as u32).serialize(&mut self.write_skip_index)?;
-        self.write_skip_index.flush()?;
+        (self.long_skips.len() as u32).serialize(&mut self.write_skiplist)?;
+        self.write_skiplist.flush()?;
         self.write_stream.flush()?;
         Ok(())
     }

src/postings/block_search.rs

@@ -1,5 +1,3 @@
-use std::ops::Range;
-
 use crate::postings::compression::AlignedBuffer;
 
 /// This modules define the logic used to search for a doc in a given
@@ -74,7 +72,7 @@ fn linear_search(arr: &[u32], target: u32) -> usize {
     arr.iter().map(|&el| if el < target { 1 } else { 0 }).sum()
 }
 
-fn exponential_search(arr: &[u32], target: u32) -> Range<usize> {
+fn exponential_search(arr: &[u32], target: u32) -> (usize, usize) {
     let end = arr.len();
     let mut begin = 0;
     for &pivot in &[1, 3, 7, 15, 31, 63] {
@@ -82,17 +80,17 @@ fn exponential_search(arr: &[u32], target: u32) -> Range<usize> {
             break;
         }
         if arr[pivot] > target {
-            return begin..pivot;
+            return (begin, pivot);
         }
         begin = pivot;
     }
-    begin..end
+    (begin, end)
 }
 
 #[inline(never)]
 fn galloping(block_docs: &[u32], target: u32) -> usize {
-    let range = exponential_search(&block_docs, target);
-    range.start + linear_search(&block_docs[range], target)
+    let (start, end) = exponential_search(&block_docs, target);
+    start + linear_search(&block_docs[start..end], target)
 }
 
 /// Tantivy may rely on SIMD instructions to search for a specific document within
@@ -184,11 +182,11 @@ mod tests {
 
     #[test]
     fn test_exponentiel_search() {
-        assert_eq!(exponential_search(&[1, 2], 0), 0..1);
-        assert_eq!(exponential_search(&[1, 2], 1), 0..1);
+        assert_eq!(exponential_search(&[1, 2], 0), (0, 1));
+        assert_eq!(exponential_search(&[1, 2], 1), (0, 1));
         assert_eq!(
             exponential_search(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], 7),
-            3..7
+            (3, 7)
         );
     }
 

src/postings/block_segment_postings.rs

@@ -469,7 +469,7 @@ mod tests {
         let segment_reader = searcher.segment_reader(0);
         let inverted_index = segment_reader.inverted_index(int_field).unwrap();
         let term = Term::from_field_u64(int_field, 0u64);
-        let term_info = inverted_index.get_term_info(&term).unwrap().unwrap();
+        let term_info = inverted_index.get_term_info(&term).unwrap();
         inverted_index
             .read_block_postings_from_terminfo(&term_info, IndexRecordOption::Basic)
             .unwrap()
@@ -513,7 +513,7 @@ mod tests {
         {
             let term = Term::from_field_u64(int_field, 0u64);
             let inverted_index = segment_reader.inverted_index(int_field)?;
-            let term_info = inverted_index.get_term_info(&term)?.unwrap();
+            let term_info = inverted_index.get_term_info(&term).unwrap();
             block_segments = inverted_index
                 .read_block_postings_from_terminfo(&term_info, IndexRecordOption::Basic)?;
         }
@@ -521,7 +521,7 @@ mod tests {
         {
             let term = Term::from_field_u64(int_field, 1u64);
             let inverted_index = segment_reader.inverted_index(int_field)?;
-            let term_info = inverted_index.get_term_info(&term)?.unwrap();
+            let term_info = inverted_index.get_term_info(&term).unwrap();
             inverted_index.reset_block_postings_from_terminfo(&term_info, &mut block_segments)?;
         }
         assert_eq!(block_segments.docs(), &[1, 3, 5]);

src/postings/mod.rs

@@ -15,15 +15,19 @@ mod stacker;
 mod term_info;
 
 pub(crate) use self::block_search::BlockSearcher;
-pub use self::block_segment_postings::BlockSegmentPostings;
-pub use self::postings::Postings;
+
 pub(crate) use self::postings_writer::MultiFieldPostingsWriter;
-pub use self::segment_postings::SegmentPostings;
 pub use self::serializer::{FieldSerializer, InvertedIndexSerializer};
+
+pub use self::postings::Postings;
 pub(crate) use self::skip::{BlockInfo, SkipReader};
-pub(crate) use self::stacker::compute_table_size;
 pub use self::term_info::TermInfo;
 
+pub use self::block_segment_postings::BlockSegmentPostings;
+pub use self::segment_postings::SegmentPostings;
+
+pub(crate) use self::stacker::compute_table_size;
+
 pub(crate) type UnorderedTermId = u64;
 
 #[cfg_attr(feature = "cargo-clippy", allow(clippy::enum_variant_names))]
@@ -47,14 +51,17 @@ pub mod tests {
     use crate::indexer::SegmentWriter;
     use crate::merge_policy::NoMergePolicy;
     use crate::query::Scorer;
+    use crate::schema::{Document, Schema, Term, INDEXED, STRING, TEXT};
     use crate::schema::{Field, TextOptions};
     use crate::schema::{IndexRecordOption, TextFieldIndexing};
-    use crate::schema::{Schema, Term, INDEXED, TEXT};
     use crate::tokenizer::{SimpleTokenizer, MAX_TOKEN_LEN};
     use crate::DocId;
     use crate::HasLen;
     use crate::Score;
-    use std::{iter, mem};
+    use once_cell::sync::Lazy;
+    use rand::rngs::StdRng;
+    use rand::{Rng, SeedableRng};
+    use std::iter;
 
     #[test]
     pub fn test_position_write() -> crate::Result<()> {
@@ -71,7 +78,6 @@ pub mod tests {
             field_serializer.write_doc(doc_id, 4, &delta_positions)?;
         }
         field_serializer.close_term()?;
-        mem::drop(field_serializer);
         posting_serializer.close()?;
         let read = segment.open_read(SegmentComponent::POSITIONS)?;
         assert!(read.len() <= 140);
@@ -180,7 +186,7 @@ pub mod tests {
             let inverted_index = segment_reader.inverted_index(text_field)?;
             assert_eq!(inverted_index.terms().num_terms(), 1);
             let mut bytes = vec![];
-            assert!(inverted_index.terms().ord_to_term(0, &mut bytes)?);
+            assert!(inverted_index.terms().ord_to_term(0, &mut bytes));
             assert_eq!(&bytes, b"hello");
         }
         {
@@ -192,7 +198,7 @@ pub mod tests {
             let inverted_index = segment_reader.inverted_index(text_field)?;
             assert_eq!(inverted_index.terms().num_terms(), 1);
             let mut bytes = vec![];
-            assert!(inverted_index.terms().ord_to_term(0, &mut bytes)?);
+            assert!(inverted_index.terms().ord_to_term(0, &mut bytes));
             assert_eq!(&bytes[..], ok_token_text.as_bytes());
         }
         Ok(())
@@ -485,6 +491,53 @@ pub mod tests {
         Ok(())
     }
 
+    pub static TERM_A: Lazy<Term> = Lazy::new(|| {
+        let field = Field::from_field_id(0);
+        Term::from_field_text(field, "a")
+    });
+    pub static TERM_B: Lazy<Term> = Lazy::new(|| {
+        let field = Field::from_field_id(0);
+        Term::from_field_text(field, "b")
+    });
+    pub static TERM_C: Lazy<Term> = Lazy::new(|| {
+        let field = Field::from_field_id(0);
+        Term::from_field_text(field, "c")
+    });
+    pub static TERM_D: Lazy<Term> = Lazy::new(|| {
+        let field = Field::from_field_id(0);
+        Term::from_field_text(field, "d")
+    });
+
+    pub static INDEX: Lazy<Index> = Lazy::new(|| {
+        let mut schema_builder = Schema::builder();
+        let text_field = schema_builder.add_text_field("text", STRING);
+        let schema = schema_builder.build();
+
+        let mut rng: StdRng = StdRng::from_seed([1u8; 32]);
+
+        let index = Index::create_in_ram(schema);
+        let posting_list_size = 1_000_000;
+        {
+            let mut index_writer = index.writer_for_tests().unwrap();
+            for _ in 0..posting_list_size {
+                let mut doc = Document::default();
+                if rng.gen_bool(1f64 / 15f64) {
+                    doc.add_text(text_field, "a");
+                }
+                if rng.gen_bool(1f64 / 10f64) {
+                    doc.add_text(text_field, "b");
+                }
+                if rng.gen_bool(1f64 / 5f64) {
+                    doc.add_text(text_field, "c");
+                }
+                doc.add_text(text_field, "d");
+                index_writer.add_document(doc);
+            }
+            assert!(index_writer.commit().is_ok());
+        }
+        index
+    });
+
     /// Wraps a given docset, and forward alls call but the
     /// `.skip_next(...)`. This is useful to test that a specialized
     /// implementation of `.skip_next(...)` is consistent
@@ -549,65 +602,15 @@ pub mod tests {
 
 #[cfg(all(test, feature = "unstable"))]
 mod bench {
+
+    use super::tests::*;
     use crate::docset::TERMINATED;
     use crate::query::Intersection;
     use crate::schema::IndexRecordOption;
-    use crate::schema::{Document, Field, Schema, Term, STRING};
     use crate::tests;
     use crate::DocSet;
-    use crate::Index;
-    use once_cell::sync::Lazy;
-    use rand::rngs::StdRng;
-    use rand::{Rng, SeedableRng};
     use test::{self, Bencher};
 
-    pub static TERM_A: Lazy<Term> = Lazy::new(|| {
-        let field = Field::from_field_id(0);
-        Term::from_field_text(field, "a")
-    });
-    pub static TERM_B: Lazy<Term> = Lazy::new(|| {
-        let field = Field::from_field_id(0);
-        Term::from_field_text(field, "b")
-    });
-    pub static TERM_C: Lazy<Term> = Lazy::new(|| {
-        let field = Field::from_field_id(0);
-        Term::from_field_text(field, "c")
-    });
-    pub static TERM_D: Lazy<Term> = Lazy::new(|| {
-        let field = Field::from_field_id(0);
-        Term::from_field_text(field, "d")
-    });
-
-    pub static INDEX: Lazy<Index> = Lazy::new(|| {
-        let mut schema_builder = Schema::builder();
-        let text_field = schema_builder.add_text_field("text", STRING);
-        let schema = schema_builder.build();
-
-        let mut rng: StdRng = StdRng::from_seed([1u8; 32]);
-
-        let index = Index::create_in_ram(schema);
-        let posting_list_size = 1_000_000;
-        {
-            let mut index_writer = index.writer_for_tests().unwrap();
-            for _ in 0..posting_list_size {
-                let mut doc = Document::default();
-                if rng.gen_bool(1f64 / 15f64) {
-                    doc.add_text(text_field, "a");
-                }
-                if rng.gen_bool(1f64 / 10f64) {
-                    doc.add_text(text_field, "b");
-                }
-                if rng.gen_bool(1f64 / 5f64) {
-                    doc.add_text(text_field, "c");
-                }
-                doc.add_text(text_field, "d");
-                index_writer.add_document(doc);
-            }
-            assert!(index_writer.commit().is_ok());
-        }
-        index
-    });
-
     #[bench]
     fn bench_segment_postings(b: &mut Bencher) {
         let reader = INDEX.reader().unwrap();
@@ -617,9 +620,7 @@ mod bench {
         b.iter(|| {
             let mut segment_postings = segment_reader
                 .inverted_index(TERM_A.field())
-                .unwrap()
-                .read_postings(&*TERM_A, IndexRecordOption::Basic)
-                .unwrap()
+                .read_postings(&*TERM_A, IndexRecordOption::Basic)?
                 .unwrap();
             while segment_postings.advance() != TERMINATED {}
         });
@@ -633,25 +634,21 @@ mod bench {
         b.iter(|| {
             let segment_postings_a = segment_reader
                 .inverted_index(TERM_A.field())
-                .unwrap()
                 .read_postings(&*TERM_A, IndexRecordOption::Basic)
                 .unwrap()
                 .unwrap();
             let segment_postings_b = segment_reader
                 .inverted_index(TERM_B.field())
-                .unwrap()
                 .read_postings(&*TERM_B, IndexRecordOption::Basic)
                 .unwrap()
                 .unwrap();
             let segment_postings_c = segment_reader
                 .inverted_index(TERM_C.field())
-                .unwrap()
                 .read_postings(&*TERM_C, IndexRecordOption::Basic)
                 .unwrap()
                 .unwrap();
             let segment_postings_d = segment_reader
                 .inverted_index(TERM_D.field())
-                .unwrap()
                 .read_postings(&*TERM_D, IndexRecordOption::Basic)
                 .unwrap()
                 .unwrap();
@@ -673,7 +670,6 @@ mod bench {
 
         let mut segment_postings = segment_reader
             .inverted_index(TERM_A.field())
-            .unwrap()
             .read_postings(&*TERM_A, IndexRecordOption::Basic)
             .unwrap()
             .unwrap();
@@ -691,9 +687,7 @@ mod bench {
         b.iter(|| {
             let mut segment_postings = segment_reader
                 .inverted_index(TERM_A.field())
-                .unwrap()
                 .read_postings(&*TERM_A, IndexRecordOption::Basic)
-                .unwrap()
                 .unwrap();
             for doc in &existing_docs {
                 if segment_postings.seek(*doc) == TERMINATED {
@@ -732,9 +726,7 @@ mod bench {
             let n: u32 = test::black_box(17);
             let mut segment_postings = segment_reader
                 .inverted_index(TERM_A.field())
-                .unwrap()
                 .read_postings(&*TERM_A, IndexRecordOption::Basic)
-                .unwrap()
                 .unwrap();
             let mut s = 0u32;
             while segment_postings.doc() != TERMINATED {

src/postings/postings_writer.rs

@@ -16,7 +16,7 @@ use fnv::FnvHashMap;
 use std::collections::HashMap;
 use std::io;
 use std::marker::PhantomData;
-use std::ops::{DerefMut, Range};
+use std::ops::DerefMut;
 
 fn posting_from_field_entry(field_entry: &FieldEntry) -> Box<dyn PostingsWriter> {
     match *field_entry.field_type() {
@@ -39,9 +39,7 @@ fn posting_from_field_entry(field_entry: &FieldEntry) -> Box<dyn PostingsWriter>
         | FieldType::F64(_)
         | FieldType::Date(_)
         | FieldType::Bytes(_)
-        | FieldType::HierarchicalFacet(_) => {
-            SpecializedPostingsWriter::<NothingRecorder>::new_boxed()
-        }
+        | FieldType::HierarchicalFacet => SpecializedPostingsWriter::<NothingRecorder>::new_boxed(),
     }
 }
 
@@ -54,7 +52,7 @@ pub struct MultiFieldPostingsWriter {
 
 fn make_field_partition(
     term_offsets: &[(&[u8], Addr, UnorderedTermId)],
-) -> Vec<(Field, Range<usize>)> {
+) -> Vec<(Field, usize, usize)> {
     let term_offsets_it = term_offsets
         .iter()
         .map(|(key, _, _)| Term::wrap(key).field())
@@ -72,7 +70,7 @@ fn make_field_partition(
     offsets.push(term_offsets.len());
     let mut field_offsets = vec![];
     for i in 0..fields.len() {
-        field_offsets.push((fields[i], offsets[i]..offsets[i + 1]));
+        field_offsets.push((fields[i], offsets[i], offsets[i + 1]));
     }
     field_offsets
 }
@@ -140,14 +138,14 @@ impl MultiFieldPostingsWriter {
 
         let field_offsets = make_field_partition(&term_offsets);
 
-        for (field, byte_offsets) in field_offsets {
+        for (field, start, stop) in field_offsets {
             let field_entry = self.schema.get_field_entry(field);
 
             match *field_entry.field_type() {
-                FieldType::Str(_) | FieldType::HierarchicalFacet(_) => {
+                FieldType::Str(_) | FieldType::HierarchicalFacet => {
                     // populating the (unordered term ord) -> (ordered term ord) mapping
                     // for the field.
-                    let unordered_term_ids = term_offsets[byte_offsets.clone()]
+                    let unordered_term_ids = term_offsets[start..stop]
                         .iter()
                         .map(|&(_, _, bucket)| bucket);
                     let mapping: FnvHashMap<UnorderedTermId, TermOrdinal> = unordered_term_ids
@@ -171,7 +169,7 @@ impl MultiFieldPostingsWriter {
                 fieldnorm_reader,
             )?;
             postings_writer.serialize(
-                &term_offsets[byte_offsets],
+                &term_offsets[start..stop],
                 &mut field_serializer,
                 &self.term_index.heap,
                 &self.heap,

src/postings/segment_postings.rs

@@ -1,11 +1,14 @@
 use crate::common::HasLen;
+use crate::directory::FileSlice;
 use crate::docset::DocSet;
 use crate::fastfield::DeleteBitSet;
 use crate::positions::PositionReader;
 use crate::postings::compression::COMPRESSION_BLOCK_SIZE;
+use crate::postings::serializer::PostingsSerializer;
 use crate::postings::BlockSearcher;
 use crate::postings::BlockSegmentPostings;
 use crate::postings::Postings;
+use crate::schema::IndexRecordOption;
 use crate::{DocId, TERMINATED};
 
 /// `SegmentPostings` represents the inverted list or postings associated to
@@ -65,11 +68,7 @@ impl SegmentPostings {
     /// It serializes the doc ids using tantivy's codec
     /// and returns a `SegmentPostings` object that embeds a
     /// buffer with the serialized data.
-    #[cfg(test)]
     pub fn create_from_docs(docs: &[u32]) -> SegmentPostings {
-        use crate::directory::FileSlice;
-        use crate::postings::serializer::PostingsSerializer;
-        use crate::schema::IndexRecordOption;
         let mut buffer = Vec::new();
         {
             let mut postings_serializer =
@@ -98,10 +97,7 @@ impl SegmentPostings {
         doc_and_tfs: &[(u32, u32)],
         fieldnorms: Option<&[u32]>,
     ) -> SegmentPostings {
-        use crate::directory::FileSlice;
         use crate::fieldnorm::FieldNormReader;
-        use crate::postings::serializer::PostingsSerializer;
-        use crate::schema::IndexRecordOption;
         use crate::Score;
         let mut buffer: Vec<u8> = Vec::new();
         let fieldnorm_reader = fieldnorms.map(FieldNormReader::for_test);

src/postings/serializer.rs

@@ -55,17 +55,33 @@ pub struct InvertedIndexSerializer {
 }
 
 impl InvertedIndexSerializer {
+    /// Open a new `InvertedIndexSerializer` for the given segment
+    fn create(
+        terms_write: CompositeWrite<WritePtr>,
+        postings_write: CompositeWrite<WritePtr>,
+        positions_write: CompositeWrite<WritePtr>,
+        positionsidx_write: CompositeWrite<WritePtr>,
+        schema: Schema,
+    ) -> crate::Result<InvertedIndexSerializer> {
+        Ok(InvertedIndexSerializer {
+            terms_write,
+            postings_write,
+            positions_write,
+            positionsidx_write,
+            schema,
+        })
+    }
+
     /// Open a new `PostingsSerializer` for the given segment
     pub fn open(segment: &mut Segment) -> crate::Result<InvertedIndexSerializer> {
         use crate::SegmentComponent::{POSITIONS, POSITIONSSKIP, POSTINGS, TERMS};
-        let inv_index_serializer = InvertedIndexSerializer {
-            terms_write: CompositeWrite::wrap(segment.open_write(TERMS)?),
-            postings_write: CompositeWrite::wrap(segment.open_write(POSTINGS)?),
-            positions_write: CompositeWrite::wrap(segment.open_write(POSITIONS)?),
-            positionsidx_write: CompositeWrite::wrap(segment.open_write(POSITIONSSKIP)?),
-            schema: segment.schema(),
-        };
-        Ok(inv_index_serializer)
+        InvertedIndexSerializer::create(
+            CompositeWrite::wrap(segment.open_write(TERMS)?),
+            CompositeWrite::wrap(segment.open_write(POSTINGS)?),
+            CompositeWrite::wrap(segment.open_write(POSITIONS)?),
+            CompositeWrite::wrap(segment.open_write(POSITIONSSKIP)?),
+            segment.schema(),
+        )
     }
 
     /// Must be called before starting pushing terms of
@@ -161,16 +177,14 @@ impl<'a> FieldSerializer<'a> {
     }
 
     fn current_term_info(&self) -> TermInfo {
-        let positions_idx =
-            if let Some(positions_serializer) = self.positions_serializer_opt.as_ref() {
-                positions_serializer.positions_idx()
-            } else {
-                0u64
-            };
-        let addr = self.postings_serializer.addr() as usize;
+        let positions_idx = self
+            .positions_serializer_opt
+            .as_ref()
+            .map(PositionSerializer::positions_idx)
+            .unwrap_or(0u64);
         TermInfo {
             doc_freq: 0,
-            postings_range: addr..addr,
+            postings_offset: self.postings_serializer.addr(),
             positions_idx,
         }
     }
@@ -224,11 +238,10 @@ impl<'a> FieldSerializer<'a> {
     /// using `VInt` encoding.
     pub fn close_term(&mut self) -> io::Result<()> {
         if self.term_open {
-            self.postings_serializer
-                .close_term(self.current_term_info.doc_freq)?;
-            self.current_term_info.postings_range.end = self.postings_serializer.addr() as usize;
             self.term_dictionary_builder
                 .insert_value(&self.current_term_info)?;
+            self.postings_serializer
+                .close_term(self.current_term_info.doc_freq)?;
             self.term_open = false;
         }
         Ok(())
@@ -309,9 +322,8 @@ pub struct PostingsSerializer<W: Write> {
 
     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.
+                          // this value is used to compute the block wand information.
 }
 
 impl<W: Write> PostingsSerializer<W> {
@@ -321,10 +333,6 @@ impl<W: Write> PostingsSerializer<W> {
         mode: IndexRecordOption,
         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),
 
@@ -340,20 +348,25 @@ impl<W: Write> PostingsSerializer<W> {
             fieldnorm_reader,
             bm25_weight: None,
 
-            num_docs,
             avg_fieldnorm,
         }
     }
 
+    /// Returns the number of documents in the segment currently being serialized.
+    /// This function may return `None` if there are no fieldnorm for that field.
+    fn num_docs_in_segment(&self) -> Option<u32> {
+        self.fieldnorm_reader
+            .as_ref()
+            .map(|reader| reader.num_docs())
+    }
+
     pub fn new_term(&mut self, term_doc_freq: u32) {
-        if self.mode.has_freq() && 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);
+        if self.mode.has_freq() {
+            return;
         }
+        self.bm25_weight = self.num_docs_in_segment().map(|num_docs| {
+            BM25Weight::for_one_term(term_doc_freq as u64, num_docs as u64, self.avg_fieldnorm)
+        });
     }
 
     fn write_block(&mut self) {

src/postings/skip.rs

@@ -1,46 +1,32 @@
-use std::convert::TryInto;
-
+use crate::common::{read_u32_vint_no_advance, serialize_vint_u32, BinarySerializable};
 use crate::directory::OwnedBytes;
 use crate::postings::compression::{compressed_block_size, COMPRESSION_BLOCK_SIZE};
 use crate::query::BM25Weight;
 use crate::schema::IndexRecordOption;
 use crate::{DocId, Score, TERMINATED};
 
-#[inline(always)]
-fn encode_block_wand_max_tf(max_tf: u32) -> u8 {
-    max_tf.min(u8::MAX as u32) as u8
-}
-
-#[inline(always)]
-fn decode_block_wand_max_tf(max_tf_code: u8) -> u32 {
-    if max_tf_code == u8::MAX {
-        u32::MAX
-    } else {
-        max_tf_code as u32
-    }
-}
-
-#[inline(always)]
-fn read_u32(data: &[u8]) -> u32 {
-    u32::from_le_bytes(data[..4].try_into().unwrap())
-}
-
-#[inline(always)]
-fn write_u32(val: u32, buf: &mut Vec<u8>) {
-    buf.extend_from_slice(&val.to_le_bytes());
-}
-
 pub struct SkipSerializer {
     buffer: Vec<u8>,
+    prev_doc: DocId,
 }
 
 impl SkipSerializer {
     pub fn new() -> SkipSerializer {
-        SkipSerializer { buffer: Vec::new() }
+        SkipSerializer {
+            buffer: Vec::new(),
+            prev_doc: 0u32,
+        }
     }
 
     pub fn write_doc(&mut self, last_doc: DocId, doc_num_bits: u8) {
-        write_u32(last_doc, &mut self.buffer);
+        assert!(
+            last_doc > self.prev_doc,
+            "write_doc(...) called with non-increasing doc ids. \
+             Did you forget to call clear maybe?"
+        );
+        let delta_doc = last_doc - self.prev_doc;
+        self.prev_doc = last_doc;
+        delta_doc.serialize(&mut self.buffer).unwrap();
         self.buffer.push(doc_num_bits);
     }
 
@@ -49,13 +35,16 @@ impl SkipSerializer {
     }
 
     pub fn write_total_term_freq(&mut self, tf_sum: u32) {
-        write_u32(tf_sum, &mut self.buffer);
+        tf_sum
+            .serialize(&mut self.buffer)
+            .expect("Should never fail");
     }
 
     pub fn write_blockwand_max(&mut self, fieldnorm_id: u8, term_freq: u32) {
-        let block_wand_tf = encode_block_wand_max_tf(term_freq);
-        self.buffer
-            .extend_from_slice(&[fieldnorm_id, block_wand_tf]);
+        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] {
@@ -63,6 +52,7 @@ impl SkipSerializer {
     }
 
     pub fn clear(&mut self) {
+        self.prev_doc = 0u32;
         self.buffer.clear();
     }
 }
@@ -169,13 +159,18 @@ impl SkipReader {
     }
 
     fn read_block_info(&mut self) {
-        let bytes = self.owned_read.as_slice();
-        let advance_len: usize;
-        self.last_doc_in_block = read_u32(bytes);
-        let doc_num_bits = bytes[4];
+        let doc_delta = {
+            let bytes = self.owned_read.as_slice();
+            let mut buf = [0; 4];
+            buf.copy_from_slice(&bytes[..4]);
+            u32::from_le_bytes(buf)
+        };
+        self.last_doc_in_block += doc_delta as DocId;
+        let doc_num_bits = self.owned_read.as_slice()[4];
+
         match self.skip_info {
             IndexRecordOption::Basic => {
-                advance_len = 5;
+                self.owned_read.advance(5);
                 self.block_info = BlockInfo::BitPacked {
                     doc_num_bits,
                     tf_num_bits: 0,
@@ -185,10 +180,11 @@ impl SkipReader {
                 };
             }
             IndexRecordOption::WithFreqs => {
+                let bytes = self.owned_read.as_slice();
                 let tf_num_bits = bytes[5];
                 let block_wand_fieldnorm_id = bytes[6];
-                let block_wand_term_freq = decode_block_wand_max_tf(bytes[7]);
-                advance_len = 8;
+                let (block_wand_term_freq, num_bytes) = read_u32_vint_no_advance(&bytes[7..]);
+                self.owned_read.advance(7 + num_bytes);
                 self.block_info = BlockInfo::BitPacked {
                     doc_num_bits,
                     tf_num_bits,
@@ -198,11 +194,16 @@ impl SkipReader {
                 };
             }
             IndexRecordOption::WithFreqsAndPositions => {
+                let bytes = self.owned_read.as_slice();
                 let tf_num_bits = bytes[5];
-                let tf_sum = read_u32(&bytes[6..10]);
+                let tf_sum = {
+                    let mut buf = [0; 4];
+                    buf.copy_from_slice(&bytes[6..10]);
+                    u32::from_le_bytes(buf)
+                };
                 let block_wand_fieldnorm_id = bytes[10];
-                let block_wand_term_freq = decode_block_wand_max_tf(bytes[11]);
-                advance_len = 12;
+                let (block_wand_term_freq, num_bytes) = read_u32_vint_no_advance(&bytes[11..]);
+                self.owned_read.advance(11 + num_bytes);
                 self.block_info = BlockInfo::BitPacked {
                     doc_num_bits,
                     tf_num_bits,
@@ -212,7 +213,6 @@ impl SkipReader {
                 };
             }
         }
-        self.owned_read.advance(advance_len);
     }
 
     pub fn block_info(&self) -> BlockInfo {
@@ -274,24 +274,6 @@ mod tests {
     use crate::directory::OwnedBytes;
     use crate::postings::compression::COMPRESSION_BLOCK_SIZE;
 
-    #[test]
-    fn test_encode_block_wand_max_tf() {
-        for tf in 0..255 {
-            assert_eq!(super::encode_block_wand_max_tf(tf), tf as u8);
-        }
-        for &tf in &[255, 256, 1_000_000, u32::MAX] {
-            assert_eq!(super::encode_block_wand_max_tf(tf), 255);
-        }
-    }
-
-    #[test]
-    fn test_decode_block_wand_max_tf() {
-        for tf in 0..255 {
-            assert_eq!(super::decode_block_wand_max_tf(tf), tf as u32);
-        }
-        assert_eq!(super::decode_block_wand_max_tf(255), u32::MAX);
-    }
-
     #[test]
     fn test_skip_with_freq() {
         let buf = {

src/postings/stacker/term_hashmap.rs

@@ -17,6 +17,10 @@ pub fn compute_table_size(num_bits: usize) -> usize {
 /// `KeyValue` is the item stored in the hash table.
 /// The key is actually a `BytesRef` object stored in an external heap.
 /// The `value_addr` also points to an address in the heap.
+///
+/// The key and the value are actually stored contiguously.
+/// For this reason, the (start, stop) information is actually redundant
+/// and can be simplified in the future
 #[derive(Copy, Clone)]
 struct KeyValue {
     key_value_addr: Addr,

src/postings/term_info.rs

@@ -1,54 +1,41 @@
 use crate::common::{BinarySerializable, FixedSize};
 use std::io;
-use std::iter::ExactSizeIterator;
-use std::ops::Range;
 
 /// `TermInfo` wraps the metadata associated to a Term.
 /// It is segment-local.
-#[derive(Debug, Default, Eq, PartialEq, Clone)]
+#[derive(Debug, Default, Ord, PartialOrd, Eq, PartialEq, Clone)]
 pub struct TermInfo {
     /// Number of documents in the segment containing the term
     pub doc_freq: u32,
-    /// Byte range of the posting list within the postings (`.idx`) file.
-    pub postings_range: Range<usize>,
+    /// Start offset within the postings (`.idx`) file.
+    pub postings_offset: u64,
     /// Start offset of the first block within the position (`.pos`) file.
     pub positions_idx: u64,
 }
 
-impl TermInfo {
-    pub(crate) fn posting_num_bytes(&self) -> u32 {
-        let num_bytes = self.postings_range.len();
-        assert!(num_bytes <= std::u32::MAX as usize);
-        num_bytes as u32
-    }
-}
-
 impl FixedSize for TermInfo {
     /// Size required for the binary serialization of a `TermInfo` object.
     /// This is large, but in practise, `TermInfo` are encoded in blocks and
     /// only the first `TermInfo` of a block is serialized uncompressed.
     /// The subsequent `TermInfo` are delta encoded and bitpacked.
-    const SIZE_IN_BYTES: usize = 2 * u32::SIZE_IN_BYTES + 2 * u64::SIZE_IN_BYTES;
+    const SIZE_IN_BYTES: usize = u32::SIZE_IN_BYTES + 2 * u64::SIZE_IN_BYTES;
 }
 
 impl BinarySerializable for TermInfo {
     fn serialize<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
         self.doc_freq.serialize(writer)?;
-        (self.postings_range.start as u64).serialize(writer)?;
-        self.posting_num_bytes().serialize(writer)?;
+        self.postings_offset.serialize(writer)?;
         self.positions_idx.serialize(writer)?;
         Ok(())
     }
 
     fn deserialize<R: io::Read>(reader: &mut R) -> io::Result<Self> {
         let doc_freq = u32::deserialize(reader)?;
-        let postings_start_offset = u64::deserialize(reader)? as usize;
-        let postings_num_bytes = u32::deserialize(reader)?;
-        let postings_end_offset = postings_start_offset + u64::from(postings_num_bytes) as usize;
+        let postings_offset = u64::deserialize(reader)?;
         let positions_idx = u64::deserialize(reader)?;
         Ok(TermInfo {
             doc_freq,
-            postings_range: postings_start_offset..postings_end_offset,
+            postings_offset,
             positions_idx,
         })
     }

src/query/automaton_weight.rs

@@ -7,7 +7,6 @@ use crate::schema::{Field, IndexRecordOption};
 use crate::termdict::{TermDictionary, TermStreamer};
 use crate::TantivyError;
 use crate::{DocId, Score};
-use std::io;
 use std::sync::Arc;
 use tantivy_fst::Automaton;
 
@@ -20,7 +19,6 @@ pub struct AutomatonWeight<A> {
 impl<A> AutomatonWeight<A>
 where
     A: Automaton + Send + Sync + 'static,
-    A::State: Clone,
 {
     /// Create a new AutomationWeight
     pub fn new<IntoArcA: Into<Arc<A>>>(field: Field, automaton: IntoArcA) -> AutomatonWeight<A> {
@@ -30,10 +28,7 @@ where
         }
     }
 
-    fn automaton_stream<'a>(
-        &'a self,
-        term_dict: &'a TermDictionary,
-    ) -> io::Result<TermStreamer<'a, &'a A>> {
+    fn automaton_stream<'a>(&'a self, term_dict: &'a TermDictionary) -> TermStreamer<'a, &'a A> {
         let automaton: &A = &*self.automaton;
         let term_stream_builder = term_dict.search(automaton);
         term_stream_builder.into_stream()
@@ -43,14 +38,13 @@ where
 impl<A> Weight for AutomatonWeight<A>
 where
     A: Automaton + Send + Sync + 'static,
-    A::State: Clone,
 {
     fn scorer(&self, reader: &SegmentReader, boost: Score) -> crate::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)?;
+        let mut term_stream = self.automaton_stream(term_dict);
         while term_stream.advance() {
             let term_info = term_stream.value();
             let mut block_segment_postings = inverted_index
@@ -104,7 +98,6 @@ mod tests {
         index
     }
 
-    #[derive(Clone, Copy)]
     enum State {
         Start,
         NotMatching,

src/query/bm25.rs

@@ -106,7 +106,7 @@ impl BM25Weight {
         BM25Weight::new(idf_explain, avg_fieldnorm)
     }
 
-    pub(crate) fn new(idf_explain: Explanation, average_fieldnorm: Score) -> BM25Weight {
+    fn new(idf_explain: Explanation, average_fieldnorm: Score) -> BM25Weight {
         let weight = idf_explain.value() * (1.0 + K1);
         BM25Weight {
             idf_explain,

src/query/boolean_query/block_wand.rs

@@ -268,7 +268,7 @@ mod tests {
     }
 
     fn nearly_equals(left: Score, right: Score) -> bool {
-        (left - right).abs() < 0.0001 * (left + right).abs()
+        (left - right).abs() < 0.000001 * (left + right).abs()
     }
 
     fn compute_checkpoints_for_each_pruning(
@@ -424,116 +424,9 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_fn_reproduce_proptest() {
-        let postings_lists = &[
-            vec![
-                (0, 1),
-                (1, 1),
-                (2, 1),
-                (3, 1),
-                (4, 1),
-                (6, 1),
-                (7, 7),
-                (8, 1),
-                (10, 1),
-                (12, 1),
-                (13, 1),
-                (14, 1),
-                (15, 1),
-                (16, 1),
-                (19, 1),
-                (20, 1),
-                (21, 1),
-                (22, 1),
-                (24, 1),
-                (25, 1),
-                (26, 1),
-                (28, 1),
-                (30, 1),
-                (31, 1),
-                (33, 1),
-                (34, 1),
-                (35, 1),
-                (36, 95),
-                (37, 1),
-                (39, 1),
-                (41, 1),
-                (44, 1),
-                (46, 1),
-            ],
-            vec![
-                (0, 5),
-                (2, 1),
-                (4, 1),
-                (5, 84),
-                (6, 47),
-                (7, 26),
-                (8, 50),
-                (9, 34),
-                (11, 73),
-                (12, 11),
-                (13, 51),
-                (14, 45),
-                (15, 18),
-                (18, 60),
-                (19, 80),
-                (20, 63),
-                (23, 79),
-                (24, 69),
-                (26, 35),
-                (28, 82),
-                (29, 19),
-                (30, 2),
-                (31, 7),
-                (33, 40),
-                (34, 1),
-                (35, 33),
-                (36, 27),
-                (37, 24),
-                (38, 65),
-                (39, 32),
-                (40, 85),
-                (41, 1),
-                (42, 69),
-                (43, 11),
-                (45, 45),
-                (47, 97),
-            ],
-            vec![
-                (2, 1),
-                (4, 1),
-                (7, 94),
-                (8, 1),
-                (9, 1),
-                (10, 1),
-                (12, 1),
-                (15, 1),
-                (22, 1),
-                (23, 1),
-                (26, 1),
-                (27, 1),
-                (32, 1),
-                (33, 1),
-                (34, 1),
-                (36, 96),
-                (39, 1),
-                (41, 1),
-            ],
-        ];
-        let fieldnorms = &[
-            685, 239, 780, 564, 664, 827, 5, 56, 930, 887, 263, 665, 167, 127, 120, 919, 292, 92,
-            489, 734, 814, 724, 700, 304, 128, 779, 311, 877, 774, 15, 866, 368, 894, 371, 982,
-            502, 507, 669, 680, 76, 594, 626, 578, 331, 170, 639, 665, 186,
-        ][..];
-        test_block_wand_aux(postings_lists, fieldnorms);
-    }
-
     proptest! {
         #![proptest_config(ProptestConfig::with_cases(500))]
-        #[ignore]
         #[test]
-        #[ignore]
         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_query.rs

@@ -238,9 +238,9 @@ mod tests {
         assert_eq!(
             docs,
             vec![
-                DocAddress::new(0u32, 1u32),
-                DocAddress::new(0u32, 2u32),
-                DocAddress::new(0u32, 3u32)
+                DocAddress(0u32, 1u32),
+                DocAddress(0u32, 2u32),
+                DocAddress(0u32, 3u32)
             ]
             .into_iter()
             .collect()
@@ -264,24 +264,15 @@ mod tests {
             BooleanQuery::intersection(vec![term_b.box_clone(), term_c.box_clone()]);
         {
             let docs = searcher.search(&intersection_ab, &DocSetCollector)?;
-            assert_eq!(
-                docs,
-                vec![DocAddress::new(0u32, 2u32)].into_iter().collect()
-            );
+            assert_eq!(docs, vec![DocAddress(0u32, 2u32)].into_iter().collect());
         }
         {
             let docs = searcher.search(&intersection_ac, &DocSetCollector)?;
-            assert_eq!(
-                docs,
-                vec![DocAddress::new(0u32, 1u32)].into_iter().collect()
-            );
+            assert_eq!(docs, vec![DocAddress(0u32, 1u32)].into_iter().collect());
         }
         {
             let docs = searcher.search(&intersection_bc, &DocSetCollector)?;
-            assert_eq!(
-                docs,
-                vec![DocAddress::new(0u32, 0u32)].into_iter().collect()
-            );
+            assert_eq!(docs, vec![DocAddress(0u32, 0u32)].into_iter().collect());
         }
         Ok(())
     }

src/query/boolean_query/mod.rs

@@ -128,7 +128,7 @@ mod tests {
                 .docs()
                 .iter()
                 .cloned()
-                .map(|doc| doc.doc_id)
+                .map(|doc| doc.1)
                 .collect::<Vec<DocId>>()
         };
         {
@@ -196,8 +196,8 @@ mod tests {
             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::new(0, 4));
-            assert_eq!(topdocs_no_excluded[1].1, DocAddress::new(0, 3)); // ignore score of doc 3.
+            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;
         }
 
@@ -210,7 +210,7 @@ mod tests {
             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::new(0, 4));
+            assert_eq!(top_doc, DocAddress(0, 4));
             assert_eq!(top_score, score_doc_4);
         }
     }
@@ -309,8 +309,8 @@ mod tests {
             IndexRecordOption::Basic,
         ));
         let query = BooleanQuery::from(vec![(Occur::Should, term_a), (Occur::Should, term_b)]);
-        let explanation = query.explain(&searcher, DocAddress::new(0, 0u32))?;
-        assert_nearly_equals!(explanation.value(), 0.6931472);
+        let explanation = query.explain(&searcher, DocAddress(0, 0u32))?;
+        assert_nearly_equals!(explanation.value(), 0.6931472f32);
         Ok(())
     }
 }

src/query/boost_query.rs

@@ -150,7 +150,7 @@ mod tests {
         let reader = index.reader().unwrap();
         let searcher = reader.searcher();
         let query = BoostQuery::new(Box::new(AllQuery), 0.2);
-        let explanation = query.explain(&searcher, DocAddress::new(0, 0u32)).unwrap();
+        let explanation = query.explain(&searcher, DocAddress(0, 0u32)).unwrap();
         assert_eq!(
             explanation.to_pretty_json(),
             "{\n  \"value\": 0.2,\n  \"description\": \"Boost x0.2 of ...\",\n  \"details\": [\n    {\n      \"value\": 1.0,\n      \"description\": \"AllQuery\",\n      \"context\": []\n    }\n  ],\n  \"context\": []\n}"

src/query/phrase_query/mod.rs

@@ -58,7 +58,7 @@ pub mod tests {
             test_fruits
                 .docs()
                 .iter()
-                .map(|docaddr| docaddr.doc_id)
+                .map(|docaddr| docaddr.1)
                 .collect::<Vec<_>>()
         };
         assert_eq!(test_query(vec!["a", "b"]), vec![1, 2, 3, 4]);
@@ -109,7 +109,7 @@ pub mod tests {
             test_fruits
                 .docs()
                 .iter()
-                .map(|docaddr| docaddr.doc_id)
+                .map(|docaddr| docaddr.1)
                 .collect::<Vec<_>>()
         };
         assert_eq!(test_query(vec!["a", "b", "c"]), vec![2, 4]);
@@ -206,8 +206,8 @@ pub mod tests {
                 .docs()
                 .to_vec()
         };
-        assert_eq!(test_query(vec!["a", "b"]), vec![DocAddress::new(0, 1)]);
-        assert_eq!(test_query(vec!["b", "a"]), vec![DocAddress::new(0, 2)]);
+        assert_eq!(test_query(vec!["a", "b"]), vec![DocAddress(0, 1)]);
+        assert_eq!(test_query(vec!["b", "a"]), vec![DocAddress(0, 2)]);
     }
 
     #[test] // motivated by #234
@@ -233,7 +233,7 @@ pub mod tests {
                 .expect("search should succeed")
                 .docs()
                 .iter()
-                .map(|doc_address| doc_address.doc_id)
+                .map(|doc_address| doc_address.1)
                 .collect::<Vec<DocId>>()
         };
         assert_eq!(test_query(vec![(0, "a"), (1, "b")]), vec![0]);

src/query/query.rs

@@ -51,9 +51,9 @@ pub trait Query: QueryClone + Send + Sync + downcast_rs::Downcast + fmt::Debug {
 
     /// Returns an `Explanation` for the score of the document.
     fn explain(&self, searcher: &Searcher, doc_address: DocAddress) -> crate::Result<Explanation> {
-        let reader = searcher.segment_reader(doc_address.segment_ord);
+        let reader = searcher.segment_reader(doc_address.segment_ord());
         let weight = self.weight(searcher, true)?;
-        weight.explain(reader, doc_address.doc_id)
+        weight.explain(reader, doc_address.doc())
     }
 
     /// Returns the number of documents matching the query.

src/query/query_parser/query_parser.rs

@@ -157,8 +157,7 @@ fn trim_ast(logical_ast: LogicalAST) -> Option<LogicalAST> {
 ///   a word lexicographically between `a` and `c` (inclusive lower bound, exclusive upper bound).
 ///   Inclusive bounds are `[]`, exclusive are `{}`.
 ///
-/// * date values: The query parser supports rfc3339 formatted dates. For example `"2002-10-02T15:00:00.05Z"`
-///   or `some_date_field:[2002-10-02T15:00:00Z TO 2002-10-02T18:00:00Z}`
+/// * date values: The query parser supports rfc3339 formatted dates. For example "2002-10-02T15:00:00.05Z"
 ///
 /// *  all docs query: A plain `*` will match all documents in the index.
 ///
@@ -358,7 +357,7 @@ impl QueryParser {
                     ))
                 }
             }
-            FieldType::HierarchicalFacet(_) => {
+            FieldType::HierarchicalFacet => {
                 let facet = Facet::from_text(phrase);
                 Ok(vec![(0, Term::from_field_text(field, facet.encoded_str()))])
             }
@@ -606,8 +605,7 @@ mod test {
         schema_builder.add_text_field("with_stop_words", text_options);
         schema_builder.add_date_field("date", INDEXED);
         schema_builder.add_f64_field("float", INDEXED);
-        schema_builder.add_facet_field("facet", INDEXED);
-        schema_builder.add_facet_field("facet_not_indexed", STORED);
+        schema_builder.add_facet_field("facet");
         schema_builder.add_bytes_field("bytes", INDEXED);
         schema_builder.add_bytes_field("bytes_not_indexed", STORED);
         schema_builder.build()
@@ -660,13 +658,6 @@ mod test {
         );
     }
 
-    #[test]
-    fn test_parse_query_facet_not_indexed() {
-        let error =
-            parse_query_to_logical_ast("facet_not_indexed:/root/branch/leaf", false).unwrap_err();
-        assert!(matches!(error, QueryParserError::FieldNotIndexed(_)));
-    }
-
     #[test]
     pub fn test_parse_query_with_boost() {
         let mut query_parser = make_query_parser();
@@ -808,7 +799,7 @@ mod test {
     fn test_parse_bytes() {
         test_parse_query_to_logical_ast_helper(
             "bytes:YnVidQ==",
-            "Term(field=13,bytes=[98, 117, 98, 117])",
+            "Term(field=12,bytes=[98, 117, 98, 117])",
             false,
         );
     }
@@ -823,7 +814,7 @@ mod test {
     fn test_parse_bytes_phrase() {
         test_parse_query_to_logical_ast_helper(
             "bytes:\"YnVidQ==\"",
-            "Term(field=13,bytes=[98, 117, 98, 117])",
+            "Term(field=12,bytes=[98, 117, 98, 117])",
             false,
         );
     }

src/query/range_query.rs

@@ -10,8 +10,8 @@ use crate::schema::Type;
 use crate::schema::{Field, IndexRecordOption, Term};
 use crate::termdict::{TermDictionary, TermStreamer};
 use crate::{DocId, Score};
-use std::io;
-use std::ops::{Bound, Range};
+use std::collections::Bound;
+use std::ops::Range;
 
 fn map_bound<TFrom, TTo, Transform: Fn(&TFrom) -> TTo>(
     bound: &Bound<TFrom>,
@@ -274,8 +274,8 @@ pub struct RangeWeight {
 }
 
 impl RangeWeight {
-    fn term_range<'a>(&self, term_dict: &'a TermDictionary) -> io::Result<TermStreamer<'a>> {
-        use std::ops::Bound::*;
+    fn term_range<'a>(&self, term_dict: &'a TermDictionary) -> TermStreamer<'a> {
+        use std::collections::Bound::*;
         let mut term_stream_builder = term_dict.range();
         term_stream_builder = match self.left_bound {
             Included(ref term_val) => term_stream_builder.ge(term_val),
@@ -298,7 +298,7 @@ impl Weight for RangeWeight {
 
         let inverted_index = reader.inverted_index(self.field)?;
         let term_dict = inverted_index.terms();
-        let mut term_range = self.term_range(term_dict)?;
+        let mut term_range = self.term_range(term_dict);
         while term_range.advance() {
             let term_info = term_range.value();
             let mut block_segment_postings = inverted_index
@@ -335,7 +335,7 @@ mod tests {
     use crate::query::QueryParser;
     use crate::schema::{Document, Field, Schema, INDEXED, TEXT};
     use crate::Index;
-    use std::ops::Bound;
+    use std::collections::Bound;
 
     #[test]
     fn test_range_query_simple() {

src/query/reqopt_scorer.rs

@@ -12,7 +12,7 @@ use std::marker::PhantomData;
 /// This is useful for queries like `+somethingrequired somethingoptional`.
 ///
 /// Note that `somethingoptional` has no impact on the `DocSet`.
-pub struct RequiredOptionalScorer<TReqScorer, TOptScorer, TScoreCombiner: ScoreCombiner> {
+pub struct RequiredOptionalScorer<TReqScorer, TOptScorer, TScoreCombiner> {
     req_scorer: TReqScorer,
     opt_scorer: TOptScorer,
     score_cache: Option<Score>,
@@ -23,7 +23,6 @@ impl<TReqScorer, TOptScorer, TScoreCombiner>
     RequiredOptionalScorer<TReqScorer, TOptScorer, TScoreCombiner>
 where
     TOptScorer: DocSet,
-    TScoreCombiner: ScoreCombiner,
 {
     /// Creates a new `RequiredOptionalScorer`.
     pub fn new(
@@ -44,7 +43,6 @@ impl<TReqScorer, TOptScorer, TScoreCombiner> DocSet
 where
     TReqScorer: DocSet,
     TOptScorer: DocSet,
-    TScoreCombiner: ScoreCombiner,
 {
     fn advance(&mut self) -> DocId {
         self.score_cache = None;

src/query/score_combiner.rs

@@ -3,7 +3,7 @@ use crate::Score;
 
 /// The `ScoreCombiner` trait defines how to compute
 /// an overall score given a list of scores.
-pub trait ScoreCombiner: Default + Clone + Send + Copy + 'static {
+pub trait ScoreCombiner: Default + Clone + Copy + 'static {
     /// Aggregates the score combiner with the given scorer.
     ///
     /// The `ScoreCombiner` may decide to call `.scorer.score()`

src/query/term_query/mod.rs

@@ -196,18 +196,18 @@ mod tests {
         let term_query = TermQuery::new(term_a, IndexRecordOption::Basic);
         let searcher = index.reader()?.searcher();
         {
-            let explanation = term_query.explain(&searcher, DocAddress::new(0u32, 1u32))?;
-            assert_nearly_equals!(explanation.value(), 0.6931472);
+            let explanation = term_query.explain(&searcher, DocAddress(0u32, 1u32))?;
+            assert_nearly_equals!(explanation.value(), 0.6931472f32);
         }
         {
-            let explanation_err = term_query.explain(&searcher, DocAddress::new(0u32, 0u32));
+            let explanation_err = term_query.explain(&searcher, DocAddress(0u32, 0u32));
             assert!(matches!(
                 explanation_err,
                 Err(crate::TantivyError::InvalidArgument(_msg))
             ));
         }
         {
-            let explanation_err = term_query.explain(&searcher, DocAddress::new(0u32, 3u32));
+            let explanation_err = term_query.explain(&searcher, DocAddress(0u32, 3u32));
             assert!(matches!(
                 explanation_err,
                 Err(crate::TantivyError::InvalidArgument(_msg))

src/query/term_query/term_query.rs

@@ -1,7 +1,7 @@
 use super::term_weight::TermWeight;
 use crate::query::bm25::BM25Weight;
+use crate::query::Query;
 use crate::query::Weight;
-use crate::query::{Explanation, Query};
 use crate::schema::IndexRecordOption;
 use crate::Searcher;
 use crate::Term;
@@ -92,21 +92,19 @@ impl TermQuery {
         searcher: &Searcher,
         scoring_enabled: bool,
     ) -> crate::Result<TermWeight> {
-        let term = self.term.clone();
-        let field_entry = searcher.schema().get_field_entry(term.field());
+        let field_entry = searcher
+            .schema()
+            .get_field_entry(self.term.field());
         if !field_entry.is_indexed() {
-            return Err(crate::TantivyError::SchemaError(format!(
-                "Field {:?} is not indexed",
-                field_entry.name()
-            )));
-        }
-        let bm25_weight;
-        if scoring_enabled {
-            bm25_weight = BM25Weight::for_terms(searcher, &[term])?;
-        } else {
-            bm25_weight =
-                BM25Weight::new(Explanation::new("<no score>".to_string(), 1.0f32), 1.0f32);
+            let error_msg = format!("Field {:?} is not indexed.", field_entry.name());
+            return Err(crate::TantivyError::SchemaError(error_msg));
         }
+        let has_fieldnorms = searcher
+            .schema()
+            .get_field_entry(self.term.field())
+            .has_fieldnorms();
+        let term = self.term.clone();
+        let bm25_weight = BM25Weight::for_terms(searcher, &[term])?;
         let index_record_option = if scoring_enabled {
             self.index_record_option
         } else {
@@ -116,7 +114,7 @@ impl TermQuery {
             self.term.clone(),
             index_record_option,
             bm25_weight,
-            scoring_enabled,
+            has_fieldnorms,
         ))
     }
 }

src/query/term_query/term_scorer.rs

@@ -302,7 +302,7 @@ mod tests {
         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 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));

src/query/term_query/term_weight.rs

@@ -16,7 +16,7 @@ pub struct TermWeight {
     term: Term,
     index_record_option: IndexRecordOption,
     similarity_weight: BM25Weight,
-    scoring_enabled: bool,
+    has_fieldnorms: bool,
 }
 
 impl Weight for TermWeight {
@@ -45,7 +45,7 @@ impl Weight for TermWeight {
         } else {
             let field = self.term.field();
             let inv_index = reader.inverted_index(field)?;
-            let term_info = inv_index.get_term_info(&self.term)?;
+            let term_info = inv_index.get_term_info(&self.term);
             Ok(term_info.map(|term_info| term_info.doc_freq).unwrap_or(0))
         }
     }
@@ -89,13 +89,13 @@ impl TermWeight {
         term: Term,
         index_record_option: IndexRecordOption,
         similarity_weight: BM25Weight,
-        scoring_enabled: bool,
+        has_fieldnorms: bool,
     ) -> TermWeight {
         TermWeight {
             term,
             index_record_option,
             similarity_weight,
-            scoring_enabled,
+            has_fieldnorms,
         }
     }
 
@@ -106,10 +106,10 @@ impl TermWeight {
     ) -> crate::Result<TermScorer> {
         let field = self.term.field();
         let inverted_index = reader.inverted_index(field)?;
-        let fieldnorm_reader = if self.scoring_enabled {
+        let fieldnorm_reader = if self.has_fieldnorms {
             reader.get_fieldnorms_reader(field)?
         } else {
-            FieldNormReader::constant(reader.max_doc(), 1)
+            FieldNormReader::const_fieldnorm_id(1u8, reader.num_docs())
         };
         let similarity_weight = self.similarity_weight.boost_by(boost);
         let postings_opt: Option<SegmentPostings> =

src/reader/mod.rs

@@ -3,9 +3,9 @@ mod pool;
 pub use self::pool::LeasedItem;
 use self::pool::Pool;
 use crate::core::Segment;
+use crate::directory::Directory;
 use crate::directory::WatchHandle;
 use crate::directory::META_LOCK;
-use crate::directory::{Directory, WatchCallback};
 use crate::Index;
 use crate::Searcher;
 use crate::SegmentReader;
@@ -88,7 +88,7 @@ impl IndexReaderBuilder {
                 let watch_handle = inner_reader_arc
                     .index
                     .directory()
-                    .watch(WatchCallback::new(callback))?;
+                    .watch(Box::new(callback))?;
                 watch_handle_opt = Some(watch_handle);
             }
         }

src/reader/pool.rs

@@ -100,32 +100,20 @@ impl<T> Pool<T> {
 
     /// At the exit of this method,
     /// - freshest_generation has a value greater or equal than generation
-    /// - freshest_generation has the last value that has been advertised
+    /// - freshest_generation has a value that has been advertised
+    /// - freshest_generation has)
     fn advertise_generation(&self, generation: usize) {
         // not optimal at all but the easiest to read proof.
-        let mut former_generation = self.freshest_generation.load(Ordering::Acquire);
         loop {
-            match self.freshest_generation.compare_exchange(
+            let former_generation = self.freshest_generation.load(Ordering::Acquire);
+            if former_generation >= generation {
+                break;
+            }
+            self.freshest_generation.compare_and_swap(
                 former_generation,
                 generation,
                 Ordering::SeqCst,
-                Ordering::SeqCst,
-            ) {
-                Ok(_) => {
-                    // We successfuly updated the value.
-                    return;
-                }
-                Err(current_generation) => {
-                    // The value was updated after we did our load apparently.
-                    // In theory, it is always a value greater than ours, but just to
-                    // simplify the logic, we keep looping until we reach a
-                    // value >= to our target value.
-                    if current_generation >= generation {
-                        return;
-                    }
-                    former_generation = current_generation;
-                }
-            }
+            );
         }
     }