From 17401cfbe917bb51aae7498853d729d625d0be3a Mon Sep 17 00:00:00 2001 From: Jan Emmens Date: Wed, 29 Apr 2020 09:19:11 +0200 Subject: [PATCH] Fix compilation error in unit tests --- meilisearch-core/src/database.rs | 16 ++++++++-------- meilisearch-http/tests/common.rs | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/meilisearch-core/src/database.rs b/meilisearch-core/src/database.rs index 62a756db5..eab085fc5 100644 --- a/meilisearch-core/src/database.rs +++ b/meilisearch-core/src/database.rs @@ -382,7 +382,7 @@ mod tests { fn valid_updates() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -447,7 +447,7 @@ mod tests { fn invalid_updates() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -509,7 +509,7 @@ mod tests { fn ignored_words_too_long() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -564,7 +564,7 @@ mod tests { fn add_schema_attributes_at_end() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -708,7 +708,7 @@ mod tests { fn deserialize_documents() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -788,7 +788,7 @@ mod tests { fn partial_document_update() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -922,7 +922,7 @@ mod tests { fn delete_index() { let dir = tempfile::tempdir().unwrap(); - let database = Arc::new(Database::open_or_create(dir.path()).unwrap()); + let database = Arc::new(Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap()); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); @@ -994,7 +994,7 @@ mod tests { fn check_number_ordering() { let dir = tempfile::tempdir().unwrap(); - let database = Database::open_or_create(dir.path()).unwrap(); + let database = Database::open_or_create(dir.path(), DatabaseOptions::default()).unwrap(); let db = &database; let (sender, receiver) = mpsc::sync_channel(100); diff --git a/meilisearch-http/tests/common.rs b/meilisearch-http/tests/common.rs index 8c4e5d147..2b1edcc5c 100644 --- a/meilisearch-http/tests/common.rs +++ b/meilisearch-http/tests/common.rs @@ -18,12 +18,16 @@ impl Server { pub fn with_uid(uid: &str) -> Server { let tmp_dir = TempDir::new("meilisearch").unwrap(); + let default_db_options = meilisearch_core::DatabaseOptions::default(); + let opt = Opt { db_path: tmp_dir.path().to_str().unwrap().to_string(), http_addr: "127.0.0.1:7700".to_owned(), master_key: None, env: "development".to_owned(), no_analytics: true, + main_map_size: default_db_options.main_map_size, + update_map_size: default_db_options.update_map_size }; let data = Data::new(opt.clone());