From 76a4f86e0c07568b9f7575c737934beeaa58ffc7 Mon Sep 17 00:00:00 2001
From: Tamo <tamo@meilisearch.com>
Date: Tue, 26 Oct 2021 13:57:41 +0200
Subject: [PATCH] rename user-id to instance-uid

---
 meilisearch-http/src/analytics.rs           | 15 ++++++++++-----
 meilisearch-lib/src/analytics.rs            |  6 +++---
 meilisearch-lib/src/index_controller/mod.rs |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/meilisearch-http/src/analytics.rs b/meilisearch-http/src/analytics.rs
index a042a5e92..ddbd842e4 100644
--- a/meilisearch-http/src/analytics.rs
+++ b/meilisearch-http/src/analytics.rs
@@ -20,22 +20,27 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
     db_path
         .canonicalize()
         .ok()
-        .map(|path| path.join("user-id").display().to_string().replace("/", "-"))
+        .map(|path| {
+            path.join("instance-uid")
+                .display()
+                .to_string()
+                .replace("/", "-")
+        })
         .zip(MEILISEARCH_CONFIG_PATH.as_ref())
         .map(|(filename, config_path)| config_path.join(filename))
 }
 
-/// Look for the user-id in the `data.ms` or in `~/.config/MeiliSearch/path-to-db-user-id`
+/// Look for the instance-uid in the `data.ms` or in `~/.config/MeiliSearch/path-to-db-instance-uid`
 fn find_user_id(db_path: &Path) -> Option<String> {
-    fs::read_to_string(db_path.join("user-id"))
+    fs::read_to_string(db_path.join("instance-uid"))
         .ok()
         .or_else(|| fs::read_to_string(&config_user_id_path(db_path)?).ok())
 }
 
 #[cfg(all(not(debug_assertions), feature = "analytics"))]
-/// Write the user-id in the `data.ms` and in `~/.config/MeiliSearch/path-to-db-user-id`. Ignore the errors.
+/// Write the instance-uid in the `data.ms` and in `~/.config/MeiliSearch/path-to-db-instance-uid`. Ignore the errors.
 fn write_user_id(db_path: &Path, user_id: &str) {
-    let _ = fs::write(db_path.join("user-id"), user_id.as_bytes());
+    let _ = fs::write(db_path.join("instance-uid"), user_id.as_bytes());
     if let Some((meilisearch_config_path, user_id_path)) = MEILISEARCH_CONFIG_PATH
         .as_ref()
         .zip(config_user_id_path(db_path))
diff --git a/meilisearch-lib/src/analytics.rs b/meilisearch-lib/src/analytics.rs
index 9dd8d3219..adfddf998 100644
--- a/meilisearch-lib/src/analytics.rs
+++ b/meilisearch-lib/src/analytics.rs
@@ -1,8 +1,8 @@
 use std::{fs, path::Path};
 
-/// Copy the `user-id` contained in one db to another. Ignore all errors.
+/// Copy the `instance-uid` contained in one db to another. Ignore all errors.
 pub fn copy_user_id(src: &Path, dst: &Path) {
-    if let Ok(user_id) = fs::read_to_string(src.join("user-id")) {
-        let _ = fs::write(dst.join("user-id"), &user_id);
+    if let Ok(user_id) = fs::read_to_string(src.join("instance-uid")) {
+        let _ = fs::write(dst.join("instance-uid"), &user_id);
     }
 }
diff --git a/meilisearch-lib/src/index_controller/mod.rs b/meilisearch-lib/src/index_controller/mod.rs
index 631bab9e9..f2571de77 100644
--- a/meilisearch-lib/src/index_controller/mod.rs
+++ b/meilisearch-lib/src/index_controller/mod.rs
@@ -169,7 +169,7 @@ impl IndexControllerBuilder {
         let dump_path = self
             .dump_dst
             .ok_or_else(|| anyhow::anyhow!("Missing dump directory path"))?;
-        let analytics_path = db_path.as_ref().join("user-id");
+        let analytics_path = db_path.as_ref().join("instance-uid");
         let dump_handle = dump_actor::DumpActorHandleImpl::new(
             dump_path,
             analytics_path,