From 0c1a3d59eb2d55d0d86e50361fe527e4f818cd3b Mon Sep 17 00:00:00 2001 From: mpostma Date: Wed, 12 Jan 2022 15:57:31 +0100 Subject: [PATCH] fix no-analytics --- meilisearch-http/src/main.rs | 4 +- meilisearch-http/src/option.rs | 10 ---- meilisearch-http/tests/common/index.rs | 74 +++++++------------------ meilisearch-http/tests/common/server.rs | 2 +- meilisearch-lib/src/index/dump.rs | 4 +- 5 files changed, 23 insertions(+), 71 deletions(-) diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs index 1c11ed1a1..9ca1fecfe 100644 --- a/meilisearch-http/src/main.rs +++ b/meilisearch-http/src/main.rs @@ -50,7 +50,7 @@ async fn main() -> anyhow::Result<()> { let auth_controller = AuthController::new(&opt.db_path, &opt.master_key)?; #[cfg(all(not(debug_assertions), feature = "analytics"))] - let (analytics, user) = if opt.analytics() { + let (analytics, user) = if !opt.no_analytics { analytics::SegmentAnalytics::new(&opt, &meilisearch).await } else { analytics::MockAnalytics::new(&opt) @@ -125,7 +125,7 @@ pub fn print_launch_resume(opt: &Opt, user: &str) { #[cfg(all(not(debug_assertions), feature = "analytics"))] { - if opt.analytics() { + if !opt.no_analytics { eprintln!( " Thank you for using MeiliSearch! diff --git a/meilisearch-http/src/option.rs b/meilisearch-http/src/option.rs index 18d110513..7abe9be55 100644 --- a/meilisearch-http/src/option.rs +++ b/meilisearch-http/src/option.rs @@ -129,16 +129,6 @@ pub struct Opt { } impl Opt { - /// Wether analytics should be enabled or not. - #[cfg(all(not(debug_assertions), feature = "analytics"))] - pub fn analytics(&self) -> bool { - match self.no_analytics { - None => true, - Some(None) => false, - Some(Some(disabled)) => !disabled, - } - } - pub fn get_ssl_config(&self) -> anyhow::Result> { if let (Some(cert_path), Some(key_path)) = (&self.ssl_cert_path, &self.ssl_key_path) { let client_auth = match &self.ssl_auth_path { diff --git a/meilisearch-http/tests/common/index.rs b/meilisearch-http/tests/common/index.rs index 81bdd2f9d..6c44ea369 100644 --- a/meilisearch-http/tests/common/index.rs +++ b/meilisearch-http/tests/common/index.rs @@ -35,15 +35,12 @@ pub struct Index<'a> { #[allow(dead_code)] impl Index<'_> { pub async fn get(&self) -> (Value, StatusCode) { - let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); + let url = format!("/indexes/{}", encode(self.uid.as_ref())); self.service.get(url).await } pub async fn load_test_set(&self) -> u64 { - let url = format!( - "/indexes/{}/documents", - encode(self.uid.as_ref()).to_string() - ); + let url = format!("/indexes/{}/documents", encode(self.uid.as_ref())); let (response, code) = self .service .post_str(url, include_str!("../assets/test_set.json")) @@ -66,13 +63,13 @@ impl Index<'_> { let body = json!({ "primaryKey": primary_key, }); - let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); + let url = format!("/indexes/{}", encode(self.uid.as_ref())); self.service.put(url, body).await } pub async fn delete(&self) -> (Value, StatusCode) { - let url = format!("/indexes/{}", encode(self.uid.as_ref()).to_string()); + let url = format!("/indexes/{}", encode(self.uid.as_ref())); self.service.delete(url).await } @@ -84,13 +81,10 @@ impl Index<'_> { let url = match primary_key { Some(key) => format!( "/indexes/{}/documents?primaryKey={}", - encode(self.uid.as_ref()).to_string(), + encode(self.uid.as_ref()), key ), - None => format!( - "/indexes/{}/documents", - encode(self.uid.as_ref()).to_string() - ), + None => format!("/indexes/{}/documents", encode(self.uid.as_ref())), }; self.service.post(url, documents).await } @@ -103,13 +97,10 @@ impl Index<'_> { let url = match primary_key { Some(key) => format!( "/indexes/{}/documents?primaryKey={}", - encode(self.uid.as_ref()).to_string(), + encode(self.uid.as_ref()), key ), - None => format!( - "/indexes/{}/documents", - encode(self.uid.as_ref()).to_string() - ), + None => format!("/indexes/{}/documents", encode(self.uid.as_ref())), }; self.service.put(url, documents).await } @@ -145,19 +136,12 @@ impl Index<'_> { id: u64, _options: Option, ) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/documents/{}", - encode(self.uid.as_ref()).to_string(), - id - ); + let url = format!("/indexes/{}/documents/{}", encode(self.uid.as_ref()), id); self.service.get(url).await } pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) { - let mut url = format!( - "/indexes/{}/documents?", - encode(self.uid.as_ref()).to_string() - ); + let mut url = format!("/indexes/{}/documents?", encode(self.uid.as_ref())); if let Some(limit) = options.limit { url.push_str(&format!("limit={}&", limit)); } @@ -177,26 +161,19 @@ impl Index<'_> { } pub async fn delete_document(&self, id: u64) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/documents/{}", - encode(self.uid.as_ref()).to_string(), - id - ); + let url = format!("/indexes/{}/documents/{}", encode(self.uid.as_ref()), id); self.service.delete(url).await } pub async fn clear_all_documents(&self) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/documents", - encode(self.uid.as_ref()).to_string() - ); + let url = format!("/indexes/{}/documents", encode(self.uid.as_ref())); self.service.delete(url).await } pub async fn delete_batch(&self, ids: Vec) -> (Value, StatusCode) { let url = format!( "/indexes/{}/documents/delete-batch", - encode(self.uid.as_ref()).to_string() + encode(self.uid.as_ref()) ); self.service .post(url, serde_json::to_value(&ids).unwrap()) @@ -204,31 +181,22 @@ impl Index<'_> { } pub async fn settings(&self) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/settings", - encode(self.uid.as_ref()).to_string() - ); + let url = format!("/indexes/{}/settings", encode(self.uid.as_ref())); self.service.get(url).await } pub async fn update_settings(&self, settings: Value) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/settings", - encode(self.uid.as_ref()).to_string() - ); + let url = format!("/indexes/{}/settings", encode(self.uid.as_ref())); self.service.post(url, settings).await } pub async fn delete_settings(&self) -> (Value, StatusCode) { - let url = format!( - "/indexes/{}/settings", - encode(self.uid.as_ref()).to_string() - ); + let url = format!("/indexes/{}/settings", encode(self.uid.as_ref())); self.service.delete(url).await } pub async fn stats(&self) -> (Value, StatusCode) { - let url = format!("/indexes/{}/stats", encode(self.uid.as_ref()).to_string()); + let url = format!("/indexes/{}/stats", encode(self.uid.as_ref())); self.service.get(url).await } @@ -253,17 +221,13 @@ impl Index<'_> { } pub async fn search_post(&self, query: Value) -> (Value, StatusCode) { - let url = format!("/indexes/{}/search", encode(self.uid.as_ref()).to_string()); + let url = format!("/indexes/{}/search", encode(self.uid.as_ref())); self.service.post(url, query).await } pub async fn search_get(&self, query: Value) -> (Value, StatusCode) { let params = serde_url_params::to_string(&query).unwrap(); - let url = format!( - "/indexes/{}/search?{}", - encode(self.uid.as_ref()).to_string(), - params - ); + let url = format!("/indexes/{}/search?{}", encode(self.uid.as_ref()), params); self.service.get(url).await } diff --git a/meilisearch-http/tests/common/server.rs b/meilisearch-http/tests/common/server.rs index 0fb5eacfb..409cacd66 100644 --- a/meilisearch-http/tests/common/server.rs +++ b/meilisearch-http/tests/common/server.rs @@ -130,7 +130,7 @@ pub fn default_settings(dir: impl AsRef) -> Opt { master_key: None, env: "development".to_owned(), #[cfg(all(not(debug_assertions), feature = "analytics"))] - no_analytics: Some(Some(true)), + no_analytics: true, max_index_size: Byte::from_unit(4.0, ByteUnit::GiB).unwrap(), max_task_db_size: Byte::from_unit(4.0, ByteUnit::GiB).unwrap(), http_payload_size_limit: Byte::from_unit(10.0, ByteUnit::MiB).unwrap(), diff --git a/meilisearch-lib/src/index/dump.rs b/meilisearch-lib/src/index/dump.rs index ace589529..2c20adda2 100644 --- a/meilisearch-lib/src/index/dump.rs +++ b/meilisearch-lib/src/index/dump.rs @@ -28,9 +28,7 @@ impl Index { pub fn dump(&self, path: impl AsRef) -> Result<()> { // acquire write txn make sure any ongoing write is finished before we start. let txn = self.env.write_txn()?; - let path = path - .as_ref() - .join(format!("indexes/{}", self.uuid.to_string())); + let path = path.as_ref().join(format!("indexes/{}", self.uuid)); create_dir_all(&path)?;