fix: restore CancelSentinel in sorted-merge bench

The bundle stripped DummyCancelSentinel + the cancel/ignore_store args
from this #[cfg(feature="unstable")] bench. After replaying #31/#40 the
merge API is 5-arg again, so restore the bench to match (fixes the
unstable build; matches origin/main).

Author: rebasedming

benches/merge_segments.rs

@@ -17,7 +17,6 @@ use rand::SeedableRng;
 use tantivy::directory::error::{DeleteError, OpenReadError, OpenWriteError};
 use tantivy::directory::{
     AntiCallToken, Directory, FileHandle, OwnedBytes, TerminatingWrite, WatchCallback, WatchHandle,
-    WritePtr,
 };
 use tantivy::indexer::{merge_filtered_segments, NoMergePolicy};
 use tantivy::schema::{Schema, TEXT};
@@ -216,9 +215,14 @@ fn main() {
         group.register("merge", move |_| {
             let output_dir = NullDirectory::default();
             let filter_doc_ids = vec![None; segments.len()];
-            let merged_index =
-                merge_filtered_segments(&segments, settings.clone(), filter_doc_ids, output_dir)
-                    .unwrap();
+            let merged_index = merge_filtered_segments(
+                &segments,
+                settings.clone(),
+                filter_doc_ids,
+                output_dir,
+                Box::new(|| false),
+            )
+            .unwrap();
             black_box(merged_index);
         });
 

src/indexer/merger_sorted_index_test.rs

@@ -1053,6 +1053,7 @@ mod bench_sorted_index_merge {
 
     use crate::index::Index;
     use crate::indexer::merger::IndexMerger;
+    use crate::indexer::segment_updater::CancelSentinel;
     use crate::schema::{NumericOptions, Schema};
     use crate::{IndexSettings, IndexSortByField, IndexWriter, Order};
     fn create_index(sort_by_field: Option<IndexSortByField>) -> Index {
@@ -1121,6 +1122,19 @@ mod bench_sorted_index_merge {
     // Ok(())
     //}
 
+    #[derive(Clone)]
+    struct DummyCancelSentinel;
+
+    impl CancelSentinel for DummyCancelSentinel {
+        fn box_clone(&self) -> Box<dyn CancelSentinel> {
+            Box::new(DummyCancelSentinel)
+        }
+
+        fn wants_cancel(&self) -> bool {
+            false
+        }
+    }
+
     #[bench]
     fn create_sorted_index_create_doc_id_mapping(b: &mut Bencher) -> crate::Result<()> {
         let sort_by_field = IndexSortByField {
@@ -1130,8 +1144,13 @@ mod bench_sorted_index_merge {
         let index = create_index(Some(sort_by_field.clone()));
         // let field = index.schema().get_field("intval").unwrap();
         let segments = index.searchable_segments().unwrap();
-        let merger: IndexMerger =
-            IndexMerger::open(index.schema(), index.settings().clone(), &segments[..])?;
+        let merger: IndexMerger = IndexMerger::open(
+            index.schema(),
+            index.settings().clone(),
+            &segments[..],
+            Box::new(DummyCancelSentinel),
+            true,
+        )?;
         b.iter(|| {
             merger
                 .generate_doc_id_mapping_with_sort_by_field(&sort_by_field)