- remove useless heap usage & few tiny optimizations

- update bench info

Author: IncSW

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "geoip2"
-version = "0.1.7"
+version = "0.1.8"
 authors = ["IncSW <dev@incsw.in>"]
 description = "Library for reading MaxMind DB format used by GeoIP2 and GeoLite2"
 readme = "README.md"

README.md

@@ -9,8 +9,8 @@
 [![Downloads](https://img.shields.io/crates/d/geoip2.svg)](https://crates.io/crates/geoip2)
 
 [![crates.io](https://img.shields.io/crates/v/geoip2?label=latest)](https://crates.io/crates/geoip2)
-[![Documentation](https://docs.rs/geoip2/badge.svg?version=0.1.7)](https://docs.rs/geoip2/0.1.7)
-[![Dependency Status](https://deps.rs/crate/geoip2/0.1.7/status.svg)](https://deps.rs/crate/geoip2/0.1.7)
+[![Documentation](https://docs.rs/geoip2/badge.svg?version=0.1.8)](https://docs.rs/geoip2/0.1.8)
+[![Dependency Status](https://deps.rs/crate/geoip2/0.1.8/status.svg)](https://deps.rs/crate/geoip2/0.1.8)
 
 
 </div>
@@ -19,7 +19,7 @@
 
 ```toml
 [dependencies]
-geoip2 = "0.1.7"
+geoip2 = "0.1.8"
 ```
 
 See [examples/lookup.rs](examples/lookup.rs) for a basic example.
@@ -33,30 +33,35 @@ Place `GeoIP2-Country.mmdb` and `GeoIP2-City.mmdb` in the `testdata` folder, the
 cargo bench
 ```
 
-Tested on paid DB on cargo 1.56.0-nightly, Intel i7-7700, Debian 9.1.
+Tested on paid DB on cargo 1.95.0-nightly, Ryzen 5 3600, Ubuntu 20.04.3 LTS.
 
 ### [IncSW/geoip2-rs](https://github.com/IncSW/geoip2-rs)
 `default`
 ```
-city      2,175 ns/iter (+/- 124)
-country   1,123 ns/iter (+/- 111)
+city      1,782.38 ns/iter (+/- 28.49)
+country     908.45 ns/iter (+/- 7.62)
 ```
 `unsafe-str`
 ```
-city      1,113 ns/iter (+/- 76)
-country     524 ns/iter (+/- 31)
+city        999.06 ns/iter (+/- 8.87)
+country     467.06 ns/iter (+/- 5.79)
 ```
 
-### [oschwald/maxminddb-rust](https://github.com/oschwald/maxminddb-rust).
+### [oschwald/maxminddb-rust](https://github.com/oschwald/maxminddb-rust) 0.27.2.
 `default`
 ```
-city      4,224 ns/iter (+/- 153)
-country   2,270 ns/iter (+/- 158)
+city      1,915.71 ns/iter (+/- 29.17)
+country     993.89 ns/iter (+/- 47.24)
+```
+`simdutf8`
+```
+city      1,870.60 ns/iter (+/- 32.75)
+country     960.99 ns/iter (+/- 22.91)
 ```
 `unsafe-str-decode`
 ```
-city      3,266 ns/iter (+/- 191)
-country   1,802 ns/iter (+/- 75)
+city      1,708.32 ns/iter (+/- 27.23)
+country     875.96 ns/iter (+/- 44.86)
 ```
 
 ## License

src/decoder.rs

@@ -31,7 +31,6 @@ pub(crate) fn read_bytes<'a>(
     Ok(bytes)
 }
 
-#[inline]
 pub(crate) fn read_control(buffer: &[u8], offset: &mut usize) -> Result<(u8, usize), Error> {
     let control_byte = buffer[*offset];
     *offset += 1;
@@ -236,116 +235,14 @@ pub(crate) fn read_array<'a>(buffer: &'a [u8], offset: &mut usize) -> Result<Vec
 }
 
 pub(crate) fn bytes_to_usize(buffer: &[u8]) -> usize {
-    match buffer.len() {
-        1 => buffer[0] as usize,
-        2 => (buffer[0] as usize) << 8 | (buffer[1] as usize),
-        3 => ((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize),
-        4 => {
-            (((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize)) << 8
-                | (buffer[3] as usize)
-        }
-        5 => {
-            ((((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize)) << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize)
-        }
-        6 => {
-            (((((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize)
-        }
-        7 => {
-            ((((((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize))
-                << 8
-                | (buffer[6] as usize)
-        }
-        8 => {
-            (((((((buffer[0] as usize) << 8 | (buffer[1] as usize)) << 8 | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize))
-                << 8
-                | (buffer[6] as usize))
-                << 8
-                | (buffer[7] as usize)
-        }
-        _ => 0,
+    if buffer.len() > 8 {
+        return 0;
     }
+    buffer
+        .iter()
+        .fold(0usize, |acc, &b| (acc << 8) | (b as usize))
 }
 
 fn bytes_to_usize_with_prefix(prefix: usize, buffer: &[u8]) -> usize {
-    match buffer.len() {
-        0 => prefix,
-        1 => prefix << 8 | (buffer[0] as usize),
-        2 => (prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize),
-        3 => {
-            ((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize)
-        }
-        4 => {
-            (((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize)
-        }
-        5 => {
-            ((((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize)
-        }
-        6 => {
-            (((((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize)
-        }
-        7 => {
-            ((((((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize))
-                << 8
-                | (buffer[6] as usize)
-        }
-        8 => {
-            (((((((prefix << 8 | (buffer[0] as usize)) << 8 | (buffer[1] as usize)) << 8
-                | (buffer[2] as usize))
-                << 8
-                | (buffer[3] as usize))
-                << 8
-                | (buffer[4] as usize))
-                << 8
-                | (buffer[5] as usize))
-                << 8
-                | (buffer[6] as usize))
-                << 8
-                | (buffer[7] as usize)
-        }
-        _ => 0,
-    }
+    (prefix << (buffer.len() * 8)) | bytes_to_usize(buffer)
 }

src/reader.rs

@@ -61,15 +61,13 @@ impl<'a, T> Reader<'a, T> {
         Ok(reader)
     }
 
-    fn find_address_in_tree(&self, ip: &[u8]) -> Result<usize, Error> {
-        let bit_count = ip.len() * 8;
-        let mut node: usize = if bit_count == 128 {
-            0
-        } else {
-            self.ip_v4_start
-        };
+    fn find_address_in_tree<const N: usize>(
+        &self,
+        ip: &[u8; N],
+        mut node: usize,
+    ) -> Result<usize, Error> {
         let node_count = self.metadata.node_count as usize;
-        for i in 0..bit_count {
+        for i in 0..(N * 8) {
             if node >= node_count {
                 break;
             }
@@ -135,16 +133,19 @@ impl<'a, T> Reader<'a, T> {
     }
 
     fn lookup_pointer(&self, address: IpAddr) -> Result<usize, Error> {
-        let ip_bytes = match address {
-            IpAddr::V4(ip) => ip.octets().to_vec(),
+        let pointer = match address {
+            IpAddr::V4(ip) => {
+                let octets = ip.octets();
+                self.find_address_in_tree(&octets, self.ip_v4_start)?
+            }
             IpAddr::V6(ip) => {
                 if self.metadata.ip_version == 4 {
                     return Err(Error::IPv4Only);
                 }
-                ip.octets().to_vec()
+                let octets = ip.octets();
+                self.find_address_in_tree(&octets, 0)?
             }
         };
-        let pointer = self.find_address_in_tree(&ip_bytes)?;
         if pointer == 0 {
             return Err(Error::NotFound);
         }

tests/dbip.rs

@@ -60,7 +60,7 @@ mod tests {
         let result = reader
             .lookup(IpAddr::from_str("66.30.184.198").unwrap())
             .unwrap();
-        assert_eq!(result.autonomous_system_number, Some(7015));
+        assert_eq!(result.autonomous_system_number, Some(7922));
         assert_eq!(
             result.autonomous_system_organization,
             Some("Comcast Cable Communications, LLC")