Fixing build (#4478)

quickwit-oss · Jan 30, 2024 · c7f0414 · c7f0414
1 parent 0912b9f
commit c7f0414
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/quickwit/quickwit-indexing/failpoints/mod.rs b/quickwit/quickwit-indexing/failpoints/mod.rs
@@ -46,7 +46,7 @@ use quickwit_common::rand::append_random_suffix;
 use quickwit_common::split_file;
 use quickwit_common::temp_dir::TempDirectory;
 use quickwit_indexing::actors::MergeExecutor;
-use quickwit_indexing::merge_policy::MergeOperation;
+use quickwit_indexing::merge_policy::{MergeOperation, MergeTask};
 use quickwit_indexing::models::MergeScratch;
 use quickwit_indexing::{get_tantivy_directory_from_split_bundle, TestSandbox};
 use quickwit_metastore::{
@@ -57,7 +57,7 @@ use quickwit_proto::indexing::IndexingPipelineId;
 use quickwit_proto::metastore::{ListSplitsRequest, MetastoreService};
 use quickwit_proto::types::{IndexUid, PipelineUid};
 use serde_json::Value as JsonValue;
-use tantivy::{Directory, Inventory};
+use tantivy::Directory;
 
 #[tokio::test]
 async fn test_failpoint_no_failure() -> anyhow::Result<()> {
@@ -290,11 +290,10 @@ async fn test_merge_executor_controlled_directory_kill_switch() -> anyhow::Resul
 
         tantivy_dirs.push(get_tantivy_directory_from_split_bundle(&dest_filepath).unwrap());
     }
-    let merge_ops_inventory = Inventory::new();
-    let merge_operation =
-        merge_ops_inventory.track(MergeOperation::new_merge_operation(split_metadatas));
+    let merge_operation = MergeOperation::new_merge_operation(split_metadatas);
+    let merge_task = MergeTask::from_merge_operation_for_test(merge_operation);
     let merge_scratch = MergeScratch {
-        merge_operation,
+        merge_task,
         merge_scratch_directory,
         downloaded_splits_directory,
         tantivy_dirs,

diff --git a/quickwit/quickwit-indexing/src/actors/merge_scheduler_service.rs b/quickwit/quickwit-indexing/src/actors/merge_scheduler_service.rs
@@ -38,7 +38,7 @@ pub struct MergePermit {
 }
 
 impl MergePermit {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testsuite"))]
     pub fn for_test() -> MergePermit {
         MergePermit {
             _semaphore_permit: None,

diff --git a/quickwit/quickwit-indexing/src/merge_policy/mod.rs b/quickwit/quickwit-indexing/src/merge_policy/mod.rs
@@ -57,7 +57,7 @@ pub struct MergeTask {
 }
 
 impl MergeTask {
-    #[cfg(test)]
+    #[cfg(any(test, feature = "testsuite"))]
     pub fn from_merge_operation_for_test(merge_operation: MergeOperation) -> MergeTask {
         let inventory = tantivy::Inventory::default();
         let tracked_merge_operation = inventory.track(merge_operation);