Update CHANGELOG with date range queries

Closing #933

CHANGELOG.md

@@ -3,9 +3,10 @@ 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) 
+- 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
 =========================

src/collector/facet_collector.rs

@@ -37,7 +37,10 @@ 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)
+        other
+            .count
+            .cmp(&self.count)
+            .then(self.facet.cmp(other.facet))
     }
 }
 
@@ -657,6 +660,41 @@ 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"))]

src/indexer/segment_updater.rs

@@ -170,7 +170,7 @@ pub fn merge_segments<Dir: Directory>(
     if indices
         .iter()
         .skip(1)
-        .any(|index| &index.schema() != &target_schema)
+        .any(|index| index.schema() != target_schema)
     {
         return Err(crate::TantivyError::InvalidArgument(
             "Attempt to merge different schema indices".to_string(),

src/termdict/merger.rs

@@ -1,4 +1,3 @@
-use crate::schema::Term;
 use crate::termdict::TermOrdinal;
 use crate::termdict::TermStreamer;
 use std::cmp::Ordering;
@@ -114,14 +113,4 @@ impl<'a> TermMerger<'a> {
     pub fn current_kvs(&self) -> &[HeapItem<'a>] {
         &self.current_streamers[..]
     }
-
-    /// Iterates through terms
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::should_implement_trait))]
-    pub fn next(&mut self) -> Option<Term<&[u8]>> {
-        if self.advance() {
-            Some(Term::wrap(self.current_streamers[0].streamer.key()))
-        } else {
-            None
-        }
-    }
 }