From 75975adcb6a03dc68fa81e2cfe36f30a0a202538 Mon Sep 17 00:00:00 2001
From: Weny Xu <wenymedia@gmail.com>
Date: Fri, 12 Jan 2024 18:12:11 +0900
Subject: [PATCH] fix: fix tests failed on windows (#3155)

* fix: fix tests failed on windows

* feat: add comments

* Update src/object-store/src/util.rs

Co-authored-by: Yingwen <realevenyag@gmail.com>

---------

Co-authored-by: Yingwen <realevenyag@gmail.com>
---
 src/metric-engine/src/engine/create.rs |  2 +-
 src/object-store/src/util.rs           | 50 +++++++++++++++++++-------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/metric-engine/src/engine/create.rs b/src/metric-engine/src/engine/create.rs
index bc04eeb82a63..48a70835fd4a 100644
--- a/src/metric-engine/src/engine/create.rs
+++ b/src/metric-engine/src/engine/create.rs
@@ -534,7 +534,7 @@ mod test {
             ],
             primary_key: vec![0],
             options: HashMap::new(),
-            region_dir: "test_dir".to_string(),
+            region_dir: "/test_dir".to_string(),
         };
 
         let env = TestEnv::new().await;
diff --git a/src/object-store/src/util.rs b/src/object-store/src/util.rs
index a357fb4fa279..febc8413e281 100644
--- a/src/object-store/src/util.rs
+++ b/src/object-store/src/util.rs
@@ -24,16 +24,6 @@ pub async fn collect(stream: Lister) -> Result<Vec<Entry>, opendal::Error> {
     stream.try_collect::<Vec<_>>().await
 }
 
-/// Normalize a directory path, ensure it is ends with '/'
-pub fn normalize_dir(dir: &str) -> String {
-    let mut dir = dir.to_string();
-    if !dir.ends_with('/') {
-        dir.push('/')
-    }
-
-    dir
-}
-
 /// Join two paths and normalize the output dir.
 ///
 /// The output dir is always ends with `/`. e.g.
@@ -44,8 +34,42 @@ pub fn normalize_dir(dir: &str) -> String {
 pub fn join_dir(parent: &str, child: &str) -> String {
     // Always adds a `/` to the output path.
     let output = format!("{parent}/{child}/");
-    // We call opendal's normalize_root which keep the last `/`.
-    opendal::raw::normalize_root(&output)
+    normalize_dir(&output)
+}
+
+/// Modified from the `opendal::raw::normalize_root`
+///
+/// # The different
+///
+/// It doesn't always append `/` ahead of the path,
+/// It only keeps `/` ahead if the original path starts with `/`.
+///
+/// Make sure the directory is normalized to style like `abc/def/`.
+///
+/// # Normalize Rules
+///
+/// - All whitespace will be trimmed: ` abc/def ` => `abc/def`
+/// - All leading / will be trimmed: `///abc` => `abc`
+/// - Internal // will be replaced by /: `abc///def` => `abc/def`
+/// - Empty path will be `/`: `` => `/`
+/// - **(Removed❗️)** ~~Add leading `/` if not starts with: `abc/` => `/abc/`~~
+/// - Add trailing `/` if not ends with: `/abc` => `/abc/`
+///
+/// Finally, we will got path like `/path/to/root/`.
+pub fn normalize_dir(v: &str) -> String {
+    let has_root = v.starts_with('/');
+    let mut v = v
+        .split('/')
+        .filter(|v| !v.is_empty())
+        .collect::<Vec<&str>>()
+        .join("/");
+    if has_root {
+        v.insert(0, '/');
+    }
+    if !v.ends_with('/') {
+        v.push('/')
+    }
+    v
 }
 
 /// Push `child` to `parent` dir and normalize the output path.
@@ -89,7 +113,7 @@ mod tests {
         assert_eq!("/", join_dir("", "/"));
         assert_eq!("/", join_dir("/", "/"));
         assert_eq!("/a/", join_dir("/a", ""));
-        assert_eq!("/a/b/c/", join_dir("a/b", "c"));
+        assert_eq!("a/b/c/", join_dir("a/b", "c"));
         assert_eq!("/a/b/c/", join_dir("/a/b", "c"));
         assert_eq!("/a/b/c/", join_dir("/a/b", "c/"));
         assert_eq!("/a/b/c/", join_dir("/a/b", "/c/"));