xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: rust binding search avoid read binary index every check

This commit is contained in:
gongzhengyang 2025-10-11 11:32:55 +08:00
parent a930a17e39
commit 7f757eafbf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binding/rust/ip2region/src/searcher.rs
View File

@ -55,8 +55,14 @@ impl Searcher {
let ip = ip.to_ipaddr()?; let ip = ip.to_ipaddr()?;
let (il0, il1) = match (ip, self.header.ip_version()) { let (il0, il1) = match (ip, self.header.ip_version()) {
(IpAddr::V6(ip), IpVersion::V6) => (ip.octets()[0], ip.octets()[1]), (IpAddr::V6(ip), IpVersion::V6) => {
(IpAddr::V4(ip), IpVersion::V4) => (ip.octets()[0], ip.octets()[1]), let octets = ip.octets();
(octets[0], octets[1])
},
(IpAddr::V4(ip), IpVersion::V4) => {
let octets = ip.octets();
(octets[0], octets[1])
},
(_, IpVersion::V4) => return Err(Ip2RegionError::OnlyIPv4Version), (_, IpVersion::V4) => return Err(Ip2RegionError::OnlyIPv4Version),
(_, IpVersion::V6) => return Err(Ip2RegionError::OnlyIPv6Version), (_, IpVersion::V6) => return Err(Ip2RegionError::OnlyIPv6Version),
}; };
@ -76,10 +82,13 @@ impl Searcher {
let mut left: usize = 0; let mut left: usize = 0;
let mut right: usize = (end_ptr - start_ptr) / segment_index_size; let mut right: usize = (end_ptr - start_ptr) / segment_index_size;
let binary_index = self.read_buf(start_ptr, end_ptr - start_ptr)?;
while left <= right { while left <= right {
let mid = (left + right) >> 1; let mid = (left + right) >> 1;
let offset = start_ptr + mid * segment_index_size; let offset = mid * segment_index_size;
let buffer_ip_value = self.read_buf(offset, segment_index_size)?; let buffer_ip_value = &binary_index[offset..offset + segment_index_size];
if ip.ip_lt(Cow::Borrowed(&buffer_ip_value[0..ip_bytes_len])) { if ip.ip_lt(Cow::Borrowed(&buffer_ip_value[0..ip_bytes_len])) {
right = mid - 1; right = mid - 1;
} else if ip.ip_gt(Cow::Borrowed(&buffer_ip_value[ip_bytes_len..ip_end_offset])) { } else if ip.ip_gt(Cow::Borrowed(&buffer_ip_value[ip_bytes_len..ip_end_offset])) {