From 66bb7c96da841b5d4a8d7a7328de8cb207b29f26 Mon Sep 17 00:00:00 2001
From: wangboo <5417808+wangboa@user.noreply.gitee.com>
Date: Thu, 16 Mar 2023 18:42:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dslice=20partial=5Fcmp=20b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/comparator_test.rs |  7 ++-----
 src/util/slice.rs           | 32 ++++++++++++++------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/util/comparator_test.rs b/src/util/comparator_test.rs
index e1ad1b6..d6d311b 100644
--- a/src/util/comparator_test.rs
+++ b/src/util/comparator_test.rs
@@ -20,12 +20,9 @@ mod test {
         let option_val = comp.compare(&Slice::from("a"), &Slice::from("ab"));
         assert_eq!(option_val.unwrap(), Ordering::Less);
 
-        // // todo  Slice 存在 bug 未修复
-        // let comp = BytewiseComparatorImpl::default();
-        // let option_val = comp.compare(&Slice::from("b"), &Slice::from("abcd"));
-        // assert_eq!(option_val.unwrap(), Ordering::Greater);
+        let option_val = comp.compare(&Slice::from("b"), &Slice::from("abcd"));
+        assert_eq!(option_val.unwrap(), Ordering::Greater);
 
-        let comp = BytewiseComparatorImpl::default();
         let option_val = comp.compare(&Slice::from("abcd"), &Slice::from("abcd"));
         assert_eq!(option_val.unwrap(), Ordering::Equal);
     }
diff --git a/src/util/slice.rs b/src/util/slice.rs
index 26ea8b1..6416db3 100644
--- a/src/util/slice.rs
+++ b/src/util/slice.rs
@@ -152,24 +152,20 @@ impl PartialEq for Slice {
 impl PartialOrd for Slice {
     /// 判断两个 slice 的大小关系
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        match self.size().partial_cmp(&other.size()) {
-            Some(Ordering::Equal) => {
-                let cmp = unsafe {
-                    memcmp(
-                        self.data.as_ptr() as *const i8,
-                        other.data.as_ptr() as *const i8,
-                        self.size(),
-                    )
-                };
-                if cmp == 0 {
-                    Some(Ordering::Equal)
-                } else if cmp > 0 {
-                    Some(Ordering::Greater)
-                } else {
-                    Some(Ordering::Less)
-                }
-            }
-            op => op
+        let min = self.size().min(other.size());
+        let cmp = unsafe {
+            memcmp(
+                self.data.as_ptr() as *const i8,
+                other.data.as_ptr() as *const i8,
+                min,
+            )
+        };
+        if cmp == 0 {
+            self.size().partial_cmp(&other.size())
+        } else if cmp > 0 {
+            Some(Ordering::Greater)
+        } else {
+            Some(Ordering::Less)
         }
     }
 }
-- 
Gitee


From 1e9ca27319f8207f12ee3ef02b837721cf9de4f8 Mon Sep 17 00:00:00 2001
From: wangboo <5417808+wangboa@user.noreply.gitee.com>
Date: Thu, 16 Mar 2023 18:43:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/slice_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/slice_test.rs b/src/util/slice_test.rs
index a2e0ec5..9baf1d1 100644
--- a/src/util/slice_test.rs
+++ b/src/util/slice_test.rs
@@ -88,7 +88,7 @@ mod test {
     #[test]
     fn test_merge2() {
         let mut a0 = Slice::from("123");
-        let mut a2 = Slice::from("456");
+        let a2 = Slice::from("456");
         a0.merge(a2, None);
         assert_eq!(String::from("123456"), String::from(a0));
     }
-- 
Gitee