fix delta overflow (#56)

* fix delta overflow

* newline

* i32 test

* fmt

* i16 test

* address i32 consistency

Author: cxzl25

.github/workflows/ci.yml

@@ -142,7 +142,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: EmbarkStudios/cargo-deny-action@v1
+    - uses: EmbarkStudios/cargo-deny-action@v2
       with:
         command: check license
 

.gitignore

@@ -29,3 +29,4 @@ private/
 /perf.*
 /flamegraph.svg
 
+.DS_Store

src/encoding/integer/mod.rs

@@ -234,12 +234,12 @@ impl NInt for i16 {
 
     #[inline]
     fn add_i64(self, i: i64) -> Option<Self> {
-        i.try_into().ok().and_then(|i| self.checked_add(i))
+        self.as_i64().checked_add(i).and_then(|v| v.try_into().ok())
     }
 
     #[inline]
     fn sub_i64(self, i: i64) -> Option<Self> {
-        i.try_into().ok().and_then(|i| self.checked_sub(i))
+        self.as_i64().checked_sub(i).and_then(|v| v.try_into().ok())
     }
 
     #[inline]
@@ -268,12 +268,12 @@ impl NInt for i32 {
 
     #[inline]
     fn add_i64(self, i: i64) -> Option<Self> {
-        i.try_into().ok().and_then(|i| self.checked_add(i))
+        self.as_i64().checked_add(i).and_then(|v| v.try_into().ok())
     }
 
     #[inline]
     fn sub_i64(self, i: i64) -> Option<Self> {
-        i.try_into().ok().and_then(|i| self.checked_sub(i))
+        self.as_i64().checked_sub(i).and_then(|v| v.try_into().ok())
     }
 
     #[inline]

src/encoding/integer/rle_v2/delta.rs

@@ -286,4 +286,30 @@ mod tests {
         }
         assert_eq!(expected, out);
     }
+
+    #[test]
+    fn test_i32_add_sub_i64() {
+        let v = i32::MIN;
+        let i = (i32::MAX as i64) * 2;
+        let add_result = v.add_i64(i);
+        assert_eq!(add_result, Some(2147483646));
+
+        let v = i32::MIN;
+        let i = -(i32::MAX as i64) * 2;
+        let sub_result = v.sub_i64(i);
+        assert_eq!(sub_result, Some(2147483646));
+    }
+
+    #[test]
+    fn test_i16_add_sub_i64() {
+        let v = i16::MIN;
+        let i = (i16::MAX as i64) * 2;
+        let add_result = v.add_i64(i);
+        assert_eq!(add_result, Some(32766i16));
+
+        let v = i16::MIN;
+        let i = -(i16::MAX as i64) * 2;
+        let sub_result = v.sub_i64(i);
+        assert_eq!(sub_result, Some(32766i16));
+    }
 }