Eytzinger layout

Author: marselester

benchmarks/inspect.zig

@@ -36,7 +36,8 @@ pub fn main() !void {
 
     var open_timer = try std.time.Timer.start();
     var db = try maxminddb.Reader.mmap(allocator, db_path);
-    defer db.unmap();
+    defer db.close();
+
     const open_time_ms = @as(f64, @floatFromInt(open_timer.read())) /
         @as(f64, @floatFromInt(std.time.ns_per_ms));
     std.debug.print("Database opened successfully in {d} ms. Type: {s}\n", .{

benchmarks/lookup.zig

@@ -36,7 +36,8 @@ pub fn main() !void {
 
     var open_timer = try std.time.Timer.start();
     var db = try maxminddb.Reader.mmap(allocator, db_path);
-    defer db.unmap();
+    defer db.close();
+
     const open_time_ms = @as(f64, @floatFromInt(open_timer.read())) /
         @as(f64, @floatFromInt(std.time.ns_per_ms));
     std.debug.print("Database opened successfully in {d} ms. Type: {s}\n", .{

examples/inspect.zig

@@ -12,7 +12,7 @@ pub fn main() !void {
     const ip = if (args.len > 2) args[2] else "89.160.20.128";
 
     var db = try maxminddb.Reader.mmap(allocator, db_path);
-    defer db.unmap();
+    defer db.close();
 
     const result = try db.lookup(
         allocator,

examples/lookup.zig

@@ -11,7 +11,9 @@ pub fn main() !void {
     defer _ = gpa.detectLeaks();
 
     var db = try maxminddb.Reader.open(allocator, db_path, max_db_size);
-    defer db.close(allocator);
+    defer db.close();
+
+    try db.buildIPv4Index(16);
 
     // Note, for better performance use arena allocator and reset it after calling lookup().
     // You won't need to call city.deinit() in that case.

examples/within.zig

@@ -9,7 +9,7 @@ pub fn main() !void {
     defer _ = gpa.detectLeaks();
 
     var db = try maxminddb.Reader.mmap(allocator, db_path);
-    defer db.unmap();
+    defer db.close();
 
     const network = if (db.metadata.ip_version == 4)
         maxminddb.Network.all_ipv4
@@ -22,7 +22,6 @@ pub fn main() !void {
     // The iterator owns the values; each next() call invalidates the previous item.
     var n: usize = 0;
     while (try it.next()) |item| {
-
         const continent = item.value.continent.code;
         const country = item.value.country.iso_code;
         var city: []const u8 = "";

src/maxminddb.zig

@@ -139,7 +139,7 @@ test "GeoLite2 Country" {
         allocator,
         "test-data/test-data/GeoLite2-Country-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geolite_country, DatabaseType.new(db.metadata.database_type));
 
@@ -192,7 +192,7 @@ test "GeoLite2 City" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geolite_city, DatabaseType.new(db.metadata.database_type));
 
@@ -263,7 +263,7 @@ test "GeoLite2 ASN" {
         allocator,
         "test-data/test-data/GeoLite2-ASN-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geolite_asn, DatabaseType.new(db.metadata.database_type));
 
@@ -287,7 +287,7 @@ test "GeoIP2 Country" {
         allocator,
         "test-data/test-data/GeoIP2-Country-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_country, DatabaseType.new(db.metadata.database_type));
 
@@ -342,7 +342,7 @@ test "GeoIP2 Country RepresentedCountry" {
         allocator,
         "test-data/test-data/GeoIP2-Country-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const ip = try std.net.Address.parseIp("202.196.224.0", 0);
     const got = (try db.lookup(allocator, geoip2.Country, ip, .{})).?;
@@ -367,7 +367,7 @@ test "GeoIP2 City" {
         allocator,
         "test-data/test-data/GeoIP2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_city, DatabaseType.new(db.metadata.database_type));
 
@@ -451,7 +451,7 @@ test "GeoIP2 Enterprise" {
         allocator,
         "test-data/test-data/GeoIP2-Enterprise-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_enterprise, DatabaseType.new(db.metadata.database_type));
 
@@ -550,7 +550,7 @@ test "GeoIP2 ISP" {
         allocator,
         "test-data/test-data/GeoIP2-ISP-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_isp, DatabaseType.new(db.metadata.database_type));
 
@@ -574,7 +574,7 @@ test "GeoIP2 Connection-Type" {
         allocator,
         "test-data/test-data/GeoIP2-Connection-Type-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_connection_type, DatabaseType.new(db.metadata.database_type));
 
@@ -593,7 +593,7 @@ test "GeoIP2 Anonymous-IP" {
         allocator,
         "test-data/test-data/GeoIP2-Anonymous-IP-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_anonymous_ip, DatabaseType.new(db.metadata.database_type));
 
@@ -617,7 +617,7 @@ test "GeoIP Anonymous-Plus" {
         allocator,
         "test-data/test-data/GeoIP-Anonymous-Plus-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_anonymous_plus, DatabaseType.new(db.metadata.database_type));
 
@@ -640,7 +640,7 @@ test "GeoIP2 DensityIncome" {
         allocator,
         "test-data/test-data/GeoIP2-DensityIncome-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_densityincome, DatabaseType.new(db.metadata.database_type));
 
@@ -660,7 +660,7 @@ test "GeoIP2 Domain" {
         allocator,
         "test-data/test-data/GeoIP2-Domain-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_domain, DatabaseType.new(db.metadata.database_type));
 
@@ -679,7 +679,7 @@ test "GeoIP2 IP-Risk" {
         allocator,
         "test-data/test-data/GeoIP2-IP-Risk-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_ip_risk, DatabaseType.new(db.metadata.database_type));
 
@@ -716,7 +716,7 @@ test "GeoIP2 Static-IP-Score" {
         allocator,
         "test-data/test-data/GeoIP2-Static-IP-Score-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_static_ip_score, DatabaseType.new(db.metadata.database_type));
 
@@ -735,7 +735,7 @@ test "GeoIP2 User-Count" {
         allocator,
         "test-data/test-data/GeoIP2-User-Count-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     try expectEqual(DatabaseType.geoip_user_count, DatabaseType.new(db.metadata.database_type));
 
@@ -755,7 +755,7 @@ test "lookup with field name filtering" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const ip = try std.net.Address.parseIp("89.160.20.128", 0);
 
@@ -784,7 +784,7 @@ test "lookup with custom record" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const MyCity = struct {
         city: struct {
@@ -808,7 +808,7 @@ test "lookup with any.Value" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const ip = try std.net.Address.parseIp("89.160.20.128", 0);
     const got = (try db.lookup(allocator, any.Value, ip, .{})).?;
@@ -830,7 +830,7 @@ test "lookup with any.Value and field name filtering" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const ip = try std.net.Address.parseIp("89.160.20.128", 0);
     const got = (try db.lookup(
@@ -858,7 +858,7 @@ test "within returns all networks" {
         allocator,
         "test-data/test-data/GeoLite2-City-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     var it = try db.within(allocator, geolite2.City, net.Network.all_ipv6, .{});
     defer it.deinit();
@@ -874,7 +874,7 @@ test "within yields record when query prefix is narrower than record network" {
         allocator,
         "test-data/test-data/GeoLite2-ASN-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     // 89.160.20.0/24 is inside the /17 record.
     // The iterator must still yield it even though the data record is found
@@ -901,7 +901,7 @@ test "within yields record when start node is a data pointer" {
         allocator,
         "test-data/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const network = try net.Network.parse("0.0.0.0/0");
     var it = try db.within(allocator, any.Value, network, .{});
@@ -920,7 +920,7 @@ test "reject IPv6 on IPv4-only database" {
         allocator,
         "test-data/test-data/MaxMind-DB-test-ipv4-32.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     const network = try net.Network.parse("::/0");
     const it = db.within(allocator, any.Value, network, .{});
@@ -936,7 +936,7 @@ test "within skips empty records" {
         allocator,
         "test-data/test-data/GeoIP2-Anonymous-IP-Test.mmdb",
     );
-    defer db.unmap();
+    defer db.close();
 
     // All records including empty.
     {

src/net.zig

@@ -150,22 +150,22 @@ pub const IP = union(enum) {
             .v4 => |b| {
                 // Combines IP bytes into a big-endian u32, e.g.,
                 // 89.160.20.128 = 89 << 24 | 160 << 16 | 20 << 8 | 128
-                const ipAsNumber = std.mem.readInt(u32, &b, .big);
+                const ip_as_number = std.mem.readInt(u32, &b, .big);
                 const ones: u32 = std.math.maxInt(u32);
                 const bitmask = if (prefix_len == 0) 0 else ones << @intCast(32 - prefix_len);
 
                 var out: [4]u8 = undefined;
-                std.mem.writeInt(u32, &out, ipAsNumber & bitmask, .big);
+                std.mem.writeInt(u32, &out, ip_as_number & bitmask, .big);
 
                 return .{ .v4 = out };
             },
             .v6 => |b| {
-                const ipAsNumber = std.mem.readInt(u128, &b, .big);
+                const ip_as_number = std.mem.readInt(u128, &b, .big);
                 const ones: u128 = std.math.maxInt(u128);
                 const bitmask = if (prefix_len == 0) 0 else ones << @intCast(128 - prefix_len);
 
                 var out: [16]u8 = undefined;
-                std.mem.writeInt(u128, &out, ipAsNumber & bitmask, .big);
+                std.mem.writeInt(u128, &out, ip_as_number & bitmask, .big);
 
                 return .{ .v6 = out };
             },