Merge pull request #1416 from jqnatividad/stats-atoi

`stats`: use atoi to skip utf8 validation to directly convert &[u8] to integer validation
dathere · Nov 14, 2023 · 43c73ee · 43c73ee
2 parents fbd0726 + 69bfbe3
commit 43c73ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,6 +69,7 @@ panic    = "abort"
 [dependencies]
 ahash = "0.8"
 anyhow = { version = "1.0", optional = true }
+atoi = "2"
 bincode = "1.3"
 byteorder = "1.5"
 bytes = "1"

diff --git a/src/cmd/stats.rs b/src/cmd/stats.rs
@@ -1046,6 +1046,8 @@ impl Stats {
                     };
                 }
             },
+            // do nothing for String type
+            TString => {},
             TFloat | TInteger => {
                 if sample_type == TNull {
                     if self.which.include_nulls {
@@ -1069,8 +1071,6 @@ impl Stats {
                     }
                 }
             },
-            // do nothing for String type
-            TString => {},
             TDateTime | TDate => {
                 if sample_type == TNull {
                     if self.which.include_nulls {
@@ -1612,7 +1612,7 @@ impl TypedSum {
                     // so we don't panic on overflow/underflow, use saturating_add
                     self.integer = self
                         .integer
-                        .saturating_add(from_bytes::<i64>(sample).unwrap());
+                        .saturating_add(atoi::atoi::<i64>(sample).unwrap());
                 }
             },
             _ => {},
@@ -1685,13 +1685,13 @@ impl TypedMinMax {
                 self.integers.add(n as i64);
             },
             TInteger => {
-                let n = from_utf8(sample).unwrap().parse::<i64>().unwrap();
+                let n = atoi::atoi::<i64>(sample).unwrap();
                 self.integers.add(n);
                 #[allow(clippy::cast_precision_loss)]
                 self.floats.add(n as f64);
             },
             TDate | TDateTime => {
-                let n = from_utf8(sample).unwrap().parse::<i64>().unwrap();
+                let n = atoi::atoi::<i64>(sample).unwrap();
                 self.dates.add(n);
             },
         }