From 3313fd39fcfe829ecb33012daaf76bd3cdc0dedc Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul@quickwit.io>
Date: Mon, 12 Apr 2021 12:02:25 +0900
Subject: [PATCH] Edited CHANGELOG

---
 CHANGELOG.md                     |  3 ++-
 src/collector/facet_collector.rs | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91c149f2c..4516598a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@ 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
 
 
 Tantivy 0.14.0
diff --git a/src/collector/facet_collector.rs b/src/collector/facet_collector.rs
index db5618442..b2b35b69a 100644
--- a/src/collector/facet_collector.rs
+++ b/src/collector/facet_collector.rs
@@ -662,7 +662,7 @@ mod tests {
     }
 
     #[test]
-    fn test_facet_collector_topk_tie_break() {
+    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();
@@ -677,24 +677,23 @@ mod tests {
             })
             .collect();
 
-        let mut index_writer = index.writer_for_tests().unwrap();
+        let mut index_writer = index.writer_for_tests()?;
         for doc in docs {
             index_writer.add_document(doc);
         }
-        index_writer.commit().unwrap();
-        let searcher = index.reader().unwrap().searcher();
+        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).unwrap();
+        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)]
-            );
-        }
+        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(())
     }
 }